Remove obsolete code from src_prepare() and src_test()

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 13 insertions, 39 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index bb509af30adc..f7686c557d38 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.1 2012/08/22 07:28:13 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.2 2012/08/22 07:50:06 ryao Exp $
+
+  22 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc10.ebuild,
+  zfs-kmod-9999.ebuild:
+  Remove obsolete code from src_prepare() and src_test()
 
 *zfs-kmod-9999 (22 Aug 2012)
 *zfs-kmod-0.6.0_rc10 (22 Aug 2012)
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 30caa0dab80c..ee108f21e96b 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,7 +2,7 @@ AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch 1438 SHA256 d1f1b3f47e0ada27
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch 1979 SHA256 6f61761703c4c71d8c91fb6e49b927069301698d78fea35c2bcdc603bfdce59d SHA512 dd4bfdd218791c6eef6120d95049860ba304ac474872357f3a5ff5b3783421a39035c732cd508f990145ff371bb8fcca2757152d41d963bcd559fa8f69fdedbe WHIRLPOOL 9bbd6479c22c905615ba6b4188aa332a9ec2685536cd6f784da28c081fdde430df15cb902b2ec1f7f9cdbfdcb20aabbc49460f5de09656686193001338c05a7a
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch 2593 SHA256 a51425a9d97dc7177be6bf05a14d1905d52be5b503ab27e570e1e7e254befcf8 SHA512 7579231f68a1d840a1d568b12bb5bc8bd78d15c379020618b061015cc4771655650157e993ee77731f9bdc6e7ee1a6dd3ead3f548724e72e398b0400a9eeb5e4 WHIRLPOOL 57787a873e5c0195060a3e146c34f465df3c8fcb8123263435fcc9180bebef19fbba911767f8e5131063c0e1199db34c40c062038bb1d9bed311a4d8ac2e85ce
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
-EBUILD zfs-kmod-0.6.0_rc10.ebuild 2450 SHA256 13ca9bd6bd2c767b3542ed28d7dcaa35e28c567a2c3e690bd0c906921a51fded SHA512 2f65ec5a8e4bb44d86829a7ed4da953f9d8ffffb0819412ab05b48b3cd7eb788726aa428b4d7db06c4b28f5dd4ca3054beac1c363be9e01ce8ae88f980c71bad WHIRLPOOL 4b1544082c634fbc1cddffaf6b84fd5517a8c48d165ce3d3d82f06cc1d43c7d6bcd0dc86ec74a66dfedf156539ec44eae51b0ad3e298a7bda2e45d72538495b1
-EBUILD zfs-kmod-9999.ebuild 2444 SHA256 1731ce85ad5176abd6d0b5d3640ed2f8d52fdd8807d321f26b809b3f29ccca18 SHA512 e98e8b102d3ccd77afbecd298ae5a7171e566e8205ddc903ef5bfd0b4ffc6804e84bf7adedf7ebcfcc5407e30fa859cc62ac08b81b3e533c8a3b15150f6ddac7 WHIRLPOOL 7bdbcbde6b099151331594f1c865b2529e52b7e4114f0306f8159defaa5ae61d88893ab415242189b0da8e2372b92a54a9a20506754897629e56b3a2dddfd19e
-MISC ChangeLog 603 SHA256 7a2b95413bc869647cc34745291a6b058ffcd8d59aeb1222444cb4e98900bda9 SHA512 660ab57d6a60af2f4fbc9e4cd518e0997a3387562ffe7d76151f9095339b4357f4a26f4471aa4d64e3f1968bd8b299ce0fac4eea127ee970ad355db5be888b58 WHIRLPOOL 1e4fd212ff7b38b23b51db38e1f80263f1cc0809109903996ebe9fde310492ce5c1b6844d47bf176339ea7d3ef12a549d38357bdc18172488452fcd99fe0f2bf
+EBUILD zfs-kmod-0.6.0_rc10.ebuild 2065 SHA256 d50ac5ad8b6a43bfb8a331045aadb8ce56dc4edb2644004831183508e87b5676 SHA512 ecc247fceb876ca298f3fa9eb6a7dde8391c93a000121fcacdb9310024bd60fea5bea856b63432e4d67be1fd5dce796e28d3f7ad55fc0e0e9ea05ac8d2db2e12 WHIRLPOOL c70e4d92337f5287f7a3a022a8264bffb1302721d8c08452efb922f4271f7b20d863382568552a0c6c3978b68d4b0ba631e9804261d90202b6703ae758a01e19
+EBUILD zfs-kmod-9999.ebuild 2059 SHA256 66d30054c76759baf34e8329777b7e97541872ca96605f83db157e006c3b2397 SHA512 61b36bf5665d938ad8909afc191e4e4201841b6d4c563bb6802d89a1d43c85a96af5aa162074ecc5881fde33d164bc84ab309aef391f246eaa554c3397d5ab03 WHIRLPOOL 150840afdadfe14fd3546a6c707b81f74f27d67faf442344cadfa6d9029a668e3403c5d6e63c48d4e377f6766ac065ba3eeeab6338d95d29dc3f8462b843b417
+MISC ChangeLog 758 SHA256 84d47ee4e8b1e38e8128afdd02f691c50fc740b3ee1a498ae4a9bd35f4184779 SHA512 474081449d00dcd585e978600ae3db73ab8a27817529fabf7de4f874bf11e76a2b8bbdbc1b7c0886513cdb1dc149cd60b02428c5719132439051c64db0aa383a WHIRLPOOL 2049397899446a273dfdc2d0d51924656be8886561c2be2ceaaabbcd5e73fe4d01ad3f787c1bf3085d2534dd17fa3806ead5d9cea6f1d1d1d8de88c74ff5fd0e
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
index 86fe86a9f00f..9062afb8517e 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.1 2012/08/22 07:28:13 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
 
 EAPI="4"
 
@@ -54,11 +54,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
-
 	if [ ${PV} != "9999" ]
 	then
 		# Fix various deadlocks
@@ -84,16 +79,6 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
-src_test() {
-	if [ $UID -ne 0 ]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
-
 src_install() {
 	autotools-utils_src_install
 }
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 9dcbb1226606..0c3ed45d3947 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.1 2012/08/22 07:28:13 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
 
 EAPI="4"
 
@@ -54,11 +54,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
-
 	if [ ${PV} != "9999" ]
 	then
 		# Fix various deadlocks
@@ -84,16 +79,6 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
-src_test() {
-	if [ $UID -ne 0 ]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
-
 src_install() {
 	autotools-utils_src_install
 }
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 7e4302149528..11173d941ca7 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,7 +2,7 @@ AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515
 AUX linuxrc 225 SHA256 69c5f407ae20a5e3000dc6389f8c75ee97e11c353489a00cb619134b103bf538 SHA512 b8f311a9ac9008d4f3b30bb2b7ac0144aec6029245ddb50a32fe0b485c9df96db23569d30de502d31d944588513107e6144b535249b704b90b586a2593dd5200 WHIRLPOOL 9de672c9b2a44fa5daab5c48d988465797a1b6fdb5431366969a0172e733b4933bac6ca256977331862e9410c474431b26cf50658fbac1d9b3282e65bf3f83e2
 AUX zfs-shutdown 1252 SHA256 cba63ddf086044c7e041c296ea86f68a1579ac830b8bea56b9f74b4204f96553 SHA512 1c04ba8c1f533efdc2ea938ba508d1789fc6bb653e5ad84dfcd78e41f1271f05309df670b9b8246c3317c96060028266230c83b8c21b7abf71442320cd33a219 WHIRLPOOL 58a3e23d316f673bee78e9837c6aea3be6bfceab5e89a0717b0290257a7a682bef67e6ae98e6f92a0c41a1da043a6ba6eded5974bbff3ee50c39e48ea8d3c77f
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
-EBUILD zfs-0.6.0_rc10-r1.ebuild 2706 SHA256 da91d36d7b60838a25c9249bae90ee3aee5731d9115dfc5b4ca0c273d27345ef SHA512 0e3ab4149505aced97a10f19eceb16a82dac07499782864bc18afbfd4f9766d017ee04d86cc549bd4d1c3aab598c8752e022fb5a1375cb7b181497de3a3bd74e WHIRLPOOL 207faf1dc7d5afccd9ee9c4be7bb691234c0efb13b8b7ac8863a733a33d9849c13da8cb1c5d153222b68736f44001f4b6eeff6c6fb9491cc305182ab1bc5b0a4
-EBUILD zfs-9999.ebuild 2698 SHA256 faf9846efe754fed916801f5759572676490ace6f6f906380f67553af666859b SHA512 437f953eaf52bff27b6bcd2f7eb7cf34e2b620d143944e88a931a5a953cfa0445606b7b565c5b2c48417d54298e14477fb5d24a47e94d2f49f77ef798c7b6e3c WHIRLPOOL 1d955980206623c5b2e6cbd77a14151192f33fcd9a1c180fd21628cb5cefa8c027fbfe0926f1632bc1efc5d235567c545bec20135c6bf2604a3e8a962e629077
-MISC ChangeLog 8513 SHA256 303ed7202cbaef9d413dca1561d7f4b1b0067eed2234877186613ba3c14cac5f SHA512 9fdc5c3c6beb39ddfbf2e6781d19e9ee13a71e91d8af4eb36aba03d9e6aa880baf8ee9d0147cee968f56cbf975ec6e773ac6c383ff229de5b9ea789fcdc78156 WHIRLPOOL 9d19158138e7b3322e8fc5d626bea5efd75626f59bee9c9a1946a03b3fb2f641b14b490108a7985ce85f3b8b6db02ad4e973ee55f210d183543a059e8485b6aa
+EBUILD zfs-0.6.0_rc10-r1.ebuild 2529 SHA256 0467831988ff24a791f4bf39ac302c6aff07c8e751961b1ba58789a05ec938c4 SHA512 ee43bfdd1256c9166a3620f3aad30f7a002bc374bd8f2c30138f11a0e48ff10d40713ac2433d83d98b85adc1f6b24da826d9fa7a1651baddd2954888e545d46a WHIRLPOOL 26d3275d8e74d0a8ff9d528cd7b2c9c832def88ca6c8b114a4e48dadf70570b0c43d6f054c6c5d032ddea850c0d075805ac523316bb4325cb368c76d36bccb8e
+EBUILD zfs-9999.ebuild 2521 SHA256 02c1289e85a3a59bebc7e5ce85c11b988a6cfad69c854bd9c5f487382da2d2af SHA512 1e59fd4d22f9effa48f2939e3af4b7a5fb85f1c38e48c1cd56436dde928d257a93e733ff69466e49b02e9227bee295171f040a5eec6c68d3c30f2de891af660a WHIRLPOOL 2f7be086a11d1db5f80885cf703827304a3acbb423dc223777982153f4432c53eb5048a9f3d492088de35d40020527bfe7aed615d101af5f0f29e9b3697e4490
+MISC ChangeLog 8633 SHA256 1b36affcf67a54ad95cc3f33df30861e671dcee0320ff8ec549f90371b5a45be SHA512 f2453c7448305602f675486d97b09ab83aeac6dcc37ed25a9d7ff6bc6f758297fffaef9cea57f17e65bd4844ba4b4ff530aa0a30b94ddbd3134856609b8b0d36 WHIRLPOOL a30691c31b69bcb0db9f2af22fdd3eaf06087f6fee0d079c9232f5dc838fb2da6e958e707a80a700dd7ee499c3da84a8605521b8bf46924f13ec9037c3587e53
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a