Make zfs install to / not to /usr

6 files changed, 28 insertions, 52 deletions

diff --git a/sys-devel/spl/Manifest b/sys-devel/spl/Manifest
index 620edef2e..ea57a7bca 100644
--- a/sys-devel/spl/Manifest
+++ b/sys-devel/spl/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX spl-0.6.0-includedir.patch 1179 RMD160 cade3b696d6981b2583cc5ae8ecf614d38ef2efc SHA1 2c5ce007df75a7a8425e1a28308eefdcb29446c2 SHA256 8d05fc006348264e1633e14b73e022d482164d6cefc8d2425faffc50d2346150
 DIST spl-0.6.0-rc3.tar.gz 498596 RMD160 e86e1f7cf3508a16abc225b04b39b1c408ecfc53 SHA1 0d261ef4f1f5751c0a457c522c954d83412c2a29 SHA256 73c5686c076cfe2b5727e1b92a32ae595bc45957511dbae4f5f5e06ace63bdee
-EBUILD spl-0.6.0_rc3.ebuild 903 RMD160 cee3164afde9e4a58424ab0323b13ac894fae8fb SHA1 5ca09e337c268653ff5154e1c11fc11f8ff79aee SHA256 b58ddf22a61e52d76dc56650bc0e9653087c4ebc7dc7d799f04a089f7af4c384
-EBUILD spl-9999.ebuild 863 RMD160 b5605e456646c25689ca12abe1607f0c34b403c4 SHA1 3741fe3ec3d15c0dc5e6aced1a5004d3310143f7 SHA256 4188a131dc2973ff1b5504a9a5bbd54b1b31b32a7ac35a3a35c8f2e64937e537
+EBUILD spl-0.6.0_rc3.ebuild 941 RMD160 d097ace338bc463b8ad889c1a78d4e6558eb5023 SHA1 317b73a2dc35448b638ff626dc32671ba35f516e SHA256 c012bcd190cdedb9fd129dd3c038980d3e3cb9f92261b7cb1720d5be8d9bf4c5
+EBUILD spl-9999.ebuild 901 RMD160 0794d9600c2e7157b26401a440a9a218c6a100bf SHA1 f5d25a0eb24a6245857f7d3f7970aa066af4d518 SHA256 bddb8f9ec814b85dfd1ed8c9f51b75a8e3127f07100c46c46fa5f662d5c9d762
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNp3wNAAoJEOf+E+/4L5Lm++8P+wSJvFzE+zUDkTY0Oat5VuR5
-PtywTX6ufxG2r6cOVAUgSaU1yWKaAtN7Ym495yFpqWvrriwZ5BW5vay4XfPrNqJw
-zlpb6W29G56lhhe9GVkWdWlictKCjpwVVKGuX5P78hmeDDTnET9FyN9QDB65E9q9
-Y+DNLuBXVFCAsESILHQBYd1o6tCko0PGfYb20Hjm9eNpvgxeuPEnZ2UMMLGH5WpS
-hcUyRfPuFz51pvPlJM7LNkPKOF67YyUVxvRUYIGuUbHKa3LJ/AtwgAzz2+/uulG3
-yWfnc3KmcC6NS6MKwFaQrTY9n4SGUnIUJIFVWRLwxdhCTt4a9peja6OJXqzyT3KN
-lK+d1fQaCvuVpgVuKennQnCjEXaBOSGqs2FQKTU3fKLteG9WxdlhO3rQGIunYh5i
-VkbAd4ja/k0hzGzqnVIdAmyiGg3Il24I8Ix4XGMpYehHGY7WyezkPQkwzdfqHzZv
-OD42BDPPUJ6ph3NPdzLQNY8P0300AC7+qU6qHw5gRTS2VkJphLjEyKMjDsHZl3m4
-HPk1Dxb8kldFhn+j8OYrNtr8fcfxXehOTJxyOEh02oGJwaqKjwnLLtBiqEfw5wkA
-m2CIsoOkGT4zR007nRtIXzrr2AAmupoHzXo65TNj7eSA/tFUy05m3GVQX0tPAFTg
-PXqo4bYlubNq8mpGILD1
-=DfeT
------END PGP SIGNATURE-----
diff --git a/sys-devel/spl/spl-0.6.0_rc3.ebuild b/sys-devel/spl/spl-0.6.0_rc3.ebuild
index f3f7751b3..40b2501e8 100644
--- a/sys-devel/spl/spl-0.6.0_rc3.ebuild
+++ b/sys-devel/spl/spl-0.6.0_rc3.ebuild
@@ -31,7 +31,11 @@ src_prepare() {
 
 src_configure() {
 	set_arch_to_kernel
-	econf --with-config=all --with-linux="${KERNEL_DIR}" --with-linux-obj="${KERNEL_DIR}"
+	econf \
+		--prefix="${EPREFIX}" \
+		--with-config=all \
+		--with-linux="${KERNEL_DIR}" \
+		--with-linux-obj="${KERNEL_DIR}"
 }
 
 src_install() {
diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuild
index 85484762a..5aed7dd01 100644
--- a/sys-devel/spl/spl-9999.ebuild
+++ b/sys-devel/spl/spl-9999.ebuild
@@ -30,7 +30,11 @@ src_prepare() {
 
 src_configure() {
 	set_arch_to_kernel
-	econf --with-config=all --with-linux="${KERNEL_DIR}" --with-linux-obj="${KERNEL_DIR}"
+	econf \
+		--prefix="${EPREFIX}" \
+		--with-config=all \
+		--with-linux="${KERNEL_DIR}" \
+		--with-linux-obj="${KERNEL_DIR}"
 }
 
 src_install() {
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 206b5c7d2..dc6cd7c8f 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d
 DIST zfs-0.6.0-rc3.tar.gz 1918941 RMD160 08c5f0b68a74c660fb6eaf6be846bbca5d5c62f6 SHA1 ce251400cf98469becbeaa7513c788ce45a0f50e SHA256 ad643be4227c4d19314f0116195a0274019d3727f97446dd44a241a3c2b21001
-EBUILD zfs-0.6.0_rc3.ebuild 1037 RMD160 818d5b04e48af1124fde5e0ca46181650bf2de0f SHA1 fa26df8e8000e723bd5ce5f2af9b9a1400db2240 SHA256 edab89818dc1aaee8349a55f009d2fd76ddfcbb434c4e3d525e9480120c26eec
-EBUILD zfs-9999.ebuild 999 RMD160 61ed50bb483ec74f0ec6f74f4e0a64b52967cd88 SHA1 e9d73125cba32f3ea7e19c946dceedd832cfc4e5 SHA256 dcaf97cfc3f125c2c0d9cafb5732f5cf7d52e98043ba65d7d606458f5a588e0d
+EBUILD zfs-0.6.0_rc3.ebuild 1078 RMD160 7b81b8bcfd986d320fa865152d97c3ad5153f874 SHA1 d33d7ebe90dc4202bfc505fce8c8550bbb50f49d SHA256 0f25d9aad816a6af93ba6c78b5d1bba6e5aede7def9d26210c1b4df314b679a1
+EBUILD zfs-9999.ebuild 1040 RMD160 f8b1c331154646620b2675f0bca10c4e21c17257 SHA1 eeee26a51065cad050d975a13a2a8b96efd3929b SHA256 e56dd2edb2edb3e2d220f0dff4a1a6219c8c8f10b537cca8cc364e03d32d2280
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNp30CAAoJEOf+E+/4L5LmPOUQAIJvgMQ2e7nltUC3diEjbA3q
-MDEP2R4FF2aQCCx16UbJm4DW7HLl+3hlps26+vRJ6yWOeI1buUP9mpZtQcMdLGal
-sy1C8qmVxJVnQrOZL3JCJMa5dRVxHSiuMtTVhou5EbMSep9KlUeHNOGIA1ek+X2K
-9RorU66edMUb6QVkrA4d9jt1Mf4ndjpM8RTKeqzp6b7z5/K1RbOgPDwmRrjatemO
-sRDQ5BGTOJfDI0QoTIWr3yEnK/s5/QpDSvAXisKN3TuLGkXeJEamaX4IAjfIrFRu
-BRKOOLvOKbsTD3mAuvL0ORzGGdjnEsQnI8mnsfgtsQErwigW9SAU1wmNrO308917
-VYR5DmWecckjwHsbPHIhY0/WXzc4xXMT2BnFQEP+GIVyPN1pj2K7qMOrehfYAmYM
-mvH9na6mYORuvi+0gIoDeiHAyvOpDXQtTJzhFLv3Hbax4jqIlC9SzA6NKouSs5nW
-6Z5sq7WrFizA84H5FMeANhYzomBMTcPHEnDxlIV8g0e3aUM0N3bqbgaLjcUOHOiV
-e3vI6GvFhyPV0lsAOXdhRjS5I9ar/Bli9cRsAFrIo00pLFqEs3x46RyHLwSNly9T
-wm88a8vdEBk0cXuhj9yhbWMI2vBklkJ8X527RU2V643hsqaK0PbKEGcv4ElkMhx8
-4Hh1kOuO5ndR/3MamtYO
-=/n11
------END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
index ab60f3a56..c72cbb2df 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
@@ -34,9 +34,13 @@ src_prepare() {
 
 src_configure() {
 	set_arch_to_kernel
-	econf --with-config=all \
-			--with-linux="${KERNEL_DIR}" --with-linux-obj="${KERNEL_DIR}" \
-			--with-spl=/usr/include/spl --with-spl-obj=/usr/include/spl/module
+	econf \
+		--with-prefix="${EPREFIX}" \
+		--with-config=all \
+		--with-linux="${KERNEL_DIR}" \
+		--with-linux-obj="${KERNEL_DIR}" \
+		--with-spl=/usr/include/spl \
+		--with-spl-obj=/usr/include/spl/module
 }
 
 src_compile() {
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 3f8e326a3..83946192a 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -35,9 +35,13 @@ src_prepare() {
 
 src_configure() {
 	set_arch_to_kernel
-	econf --with-config=all \
-			--with-linux="${KERNEL_DIR}" --with-linux-obj="${KERNEL_DIR}" \
-			--with-spl=/usr/include/spl --with-spl-obj=/usr/include/spl/module
+	econf \
+		--with-prefix="${EPREFIX}" \
+		--with-config=all \
+		--with-linux="${KERNEL_DIR}" \
+		--with-linux-obj="${KERNEL_DIR}" \
+		--with-spl=/usr/include/spl \
+		--with-spl-obj=/usr/include/spl/module
 }
 
 src_compile() {