From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 10 Apr 2011 19:33:30 +0000 (-0400)
Subject: Fix the sandbox violation in a better way.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=f286846d9b686bc6062136510992ffed43524491;p=mjo-overlay.git

Fix the sandbox violation in a better way.
---

diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
index 51a14f7..f0652bd 100644
--- a/sys-fs/e4rat/Manifest
+++ b/sys-fs/e4rat/Manifest
@@ -1,5 +1,5 @@
-AUX cmake_mkdir_violation_fix.patch 313 RMD160 1863dc758bdff88367862188f01f9d96e1953d28 SHA1 7bd19734a0f893984ebaa6455378943777d2d46c SHA256 b6e9f7df87a24b6b7e7b83b89d21f290897991ccf7fc682e69269d1dd3215552
-AUX v0.2_as-needed_fix.patch 271 RMD160 e37d99bccab52e17db00bda8d0387bc32f9d93fc SHA1 b48e0320d9b54107aead1e420c284c3647b9a971 SHA256 3881ac1d6b77e7032176c4a1365e108cbc45cf80cc88e153984b4693af3d0468
+AUX cmake_mkdir_violation_fix.patch 336 RMD160 7bcc09fbd70227b36b1dad5c8d89e5d4d2afe48c SHA1 7d5cafeeeaa6559140f335f880e0e7fb5d03d781 SHA256 b8df314c389637fd8ef44cabdb9e0c828494f5961db514e48808f9eb8a4a3810
+AUX v0.2_as-needed_fix.patch 326 RMD160 58047be5b761d725dd95cbd883281c939393adc0 SHA1 2f7f655cbb16329946eb1312c0a8665ad2098d8d SHA256 d35da2282c1baf162c5c2554081e93f2a64a6638437bb6d04fc88c41dd3ce6e7
 DIST e4rat_0.2_src.tar.gz 71420 RMD160 d4a44f6cd0516b80768f24c913410597d3a61374 SHA1 80cd8194639d4c295b0298f63f707d18ff95fd28 SHA256 e494ca2536b4719ddc76306c17e0493e9c8b9b46e826ddd1a15d640bc9bbc38a
-EBUILD e4rat-0.2.ebuild 668 RMD160 8c15da35838e5fc833cc3285066bde4e58b2cb67 SHA1 6bd4d97d86da6e803f9d72b4aa6e2d0151577a75 SHA256 e81fba8d0cfe5cc254e028b7c2abc6fec44cccba5f38dfaaa690af89212dda5c
+EBUILD e4rat-0.2.ebuild 627 RMD160 a073bbc6281cd08050e15e91c83081c5ed5f16bd SHA1 e3c0e0911ae2d0f8d10c0de79cef4d51edfefa54 SHA256 6111d7698dd0bd7207d7ac5cb9f0c39899a21de25a09086b4f630fac4a5a3130
 MISC metadata.xml 241 RMD160 d1bcf027ff9f0cf1953659be5b89b59522c6f063 SHA1 7dff00c0281f5ed66259645e76b04e8ab0241a77 SHA256 fb616eb93c0779c7c5dbf3b445656fb1636d6668443155cb95a8325cd988500f
diff --git a/sys-fs/e4rat/e4rat-0.2.ebuild b/sys-fs/e4rat/e4rat-0.2.ebuild
index d836fdc..5500cff 100644
--- a/sys-fs/e4rat/e4rat-0.2.ebuild
+++ b/sys-fs/e4rat/e4rat-0.2.ebuild
@@ -24,7 +24,3 @@ CMAKE_BUILD_TYPE=release
 CMAKE_IN_SOURCE_BUILD=1
 PATCHES=( "${FILESDIR}/cmake_mkdir_violation_fix.patch"
 	"${FILESDIR}/v0.2_as-needed_fix.patch" )
-
-src_install() {
-	dodir /var/lib/e4rat
-}
diff --git a/sys-fs/e4rat/files/cmake_mkdir_violation_fix.patch b/sys-fs/e4rat/files/cmake_mkdir_violation_fix.patch
index 27ef8ef..d5a0997 100644
--- a/sys-fs/e4rat/files/cmake_mkdir_violation_fix.patch
+++ b/sys-fs/e4rat/files/cmake_mkdir_violation_fix.patch
@@ -1,8 +1,8 @@
---- a/src/CMakeLists.txt	2011-04-01 05:19:13.000000000 -0400
-+++ b/src/CMakeLists.txt	2011-04-08 23:46:18.785068511 -0400
-@@ -127,5 +127,3 @@
-         RUNTIME DESTINATION "sbin"
+--- a/src/CMakeLists.txt	2011-04-09 06:16:48.000000000 -0400
++++ b/src/CMakeLists.txt	2011-04-10 15:16:20.397997585 -0400
+@@ -129,4 +129,4 @@
          LIBRARY DESTINATION "lib"
          ARCHIVE DESTINATION "lib")
--
+ 
 -INSTALL(CODE "MAKE_DIRECTORY(\"/var/lib/${PROJECT_NAME}\")")
++INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}")
diff --git a/sys-fs/e4rat/files/v0.2_as-needed_fix.patch b/sys-fs/e4rat/files/v0.2_as-needed_fix.patch
index 3ab2ebc..e297873 100644
--- a/sys-fs/e4rat/files/v0.2_as-needed_fix.patch
+++ b/sys-fs/e4rat/files/v0.2_as-needed_fix.patch
@@ -1,9 +1,10 @@
---- a/src/CMakeLists.txt	2011-04-01 05:19:13.000000000 -0400
-+++ b/src/CMakeLists.txt	2011-04-09 18:09:18.955994952 -0400
-@@ -129,2 +129,6 @@
+--- a/src/CMakeLists.txt	2011-04-10 15:31:31.679852960 -0400
++++ b/src/CMakeLists.txt	2011-04-10 15:31:20.528764626 -0400
+@@ -130,3 +130,7 @@
          ARCHIVE DESTINATION "lib")
  
+ INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}")
 +
 +target_link_libraries(${PROJECT_NAME}-core
-+        ${${PROJECT_NAME}_LIBRARIES}
++    ${${PROJECT_NAME}_LIBRARIES}
 +    )