Inherit eutils directly. Die on rm and mv. Thanks to nimiux in bug #439032.

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

6 files changed, 29 insertions, 25 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index f43d4202101d..dedb3ba81aa0 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.246 2012/10/19 16:57:08 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.247 2012/10/20 11:54:01 billie Exp $
+
+  20 Oct 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.4.ebuild,
+  hplip-3.12.9-r1.ebuild, hplip-3.12.10.ebuild, hplip-3.12.10a.ebuild:
+  Inherit eutils directly. Die on rm and mv. Thanks to nimiux in bug #439032.
 
   19 Oct 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.10a.ebuild,
   metadata.xml:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 848d2e9422b8..a4e53005f22a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -15,16 +15,16 @@ DIST hplip-3.12.4-patches-1.tar.xz 9048 SHA256 88924b3a7bca2350de57e7f1eca5632cb
 DIST hplip-3.12.4.tar.gz 20603723 SHA256 350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
 DIST hplip-3.12.9-patches-2.tar.xz 10328 SHA256 d992fdf42bbcde92de9f4256308b3b35b74e3fcae50704d59eaf26bd2beab5b4 SHA512 846b9cc96b1eefcbc0960c312a60ab8913b6db109bfa828d19f1e9cdfccc47e193d582767d828437dbebc9ec1c0617a590e8f3f2e744d9f5bddb6056d43fe6a7 WHIRLPOOL 5d63763f11d8f91a6506301ec2c7e37c1f9e5693c83d818f67129a42c7489fd9ed09c0a06f216af72c21f488cefc6f2b455a010fc504e3fc7b12b877190e9d9b
 DIST hplip-3.12.9.tar.gz 21314003 SHA256 e7361b9d6e968ce3306dc438e622a4412156e7c2d71b2a6face5952cf52e23c4 SHA512 bf0f498d7516c4b7653799c043dd6336a620be31680e1419bf09f9fd52492fc92f59e030df5110f89615c16d27ecad0169c83c938651a7fa7257057ccf5d30eb WHIRLPOOL 1059cf4216b60752c4f6da299f2dd86bdb26be7171275107280953225a9d1d729b135ba0f7990a8ed757fd52880612718bd846abb68ecbf61652923db88ca425
-EBUILD hplip-3.12.10.ebuild 6600 SHA256 00bcbdeceead066400f05a382ce893854692444127e730f07855c24666f4a3d6 SHA512 3ce4d33d8a3895898ad5a816c1ecd3888ca43190fd4a4cf83181e955874c938a0af7dbf839b79a4c40e5b4e926ba3d375cd355bbb3cdbbadc2515d89c513160e WHIRLPOOL e48f0589282cb17dfb1f1598f67e2e2f79d4660219ff256bf96949d75eac32e2c28fce8ec6aef763144b8a3e8ad2c80c636f8f9b9ca52385c432ae8af784ca48
-EBUILD hplip-3.12.10a.ebuild 6761 SHA256 7ce99fee16ded640dedacc44a4bd2029f1d4be8db590c4ab4437649a0c6a1037 SHA512 09a731569aad5e32a70b516db0a1eedcf67da7f0ac65778c4e8e25ec271e18fc04ea48a50989b49c12c3834be7a7308fc0e8813c72dbd10f26ae30b1b6b14fd6 WHIRLPOOL 5674d275c52cedf037804efbfe62e7fb9ec1c7fe0442b910283d322a9473a93dfcb3a3532a29e925a9bccec93ea79072ed1e29af4abfe0a862d915d082837386
-EBUILD hplip-3.12.4.ebuild 6419 SHA256 ca2de34f09f990df2af5d7ac9a0e24c7a6368eaf65400bdb35da0d7742095f85 SHA512 032d6368162c66a971e892d53429ad36f7e605ab5103a0aa57bf563661f909fda80a16c8651c489211b74df3caa218eadc682e3d0e4dd2b733aaaf606edd2229 WHIRLPOOL cc71a7703c7838dde94346c0a255999a3e5f478db634056a7a56f7512488a089356d047bf3f09c5ba891bf596bc14a2ec67f18808b0bfdb24225963e293e31c5
-EBUILD hplip-3.12.9-r1.ebuild 6602 SHA256 41a95901b6d7681d1d97f63eb5b639a27de11718ef7a07d2528e53331db9ef99 SHA512 e57cbf93af83609630aac55e1c7259d431104cc4f9076e078da8a143494edd97669843d1363770ad5a0d1cb579bac5e45a6d981d4673552010ba00570bb1a182 WHIRLPOOL a4cbc84a2a52dad90b518b1b892335bddbcbd0d9b6e7aea4106bae9b916872407b94b546b750fd014d3efeea6963b34ef98dd48ced30ddcd9dafa49b693addeb
-MISC ChangeLog 42847 SHA256 b7f3d9a40763b7dbb8cfc0880db09c3b0c44037878cbb1b48cc8c867f0690cd5 SHA512 73bd097af91e67cb5d0055314c518707bfbb8f179c7129401b1ae6622cef1d4a6a15c86728983d0a1b238a3d4f0f49f8a8107bb80793bf8c7ca815ec027dc0a1 WHIRLPOOL c893ef15892ce5bd69737ad8bbbdba48e0732a51edabaf7917b88b21efabedaeba0cded787dd61c0a4ef70846d3a2a39e2e6d6e9480857952ee40653f7c3f8f8
+EBUILD hplip-3.12.10.ebuild 6621 SHA256 8477c717f743dfd1bd6217d0c07085c9a9f61474bb457aa3e1a0d3f5a979da14 SHA512 c67894c163206b44b042c05787135972fac5386ce7ee029ad21483052ee708db488523ddc1470921f0b2597ac3c7fae377466ec732bd35ef5fbf1fddf4832357 WHIRLPOOL cee6754ef7ca17d2f08e8fff49df0c4edf607ad8e942cbbd45e5b0b7c16dd93a96e158c6c4eba8dd00218218e05e1fd3f21b42c25ffd4158f845bebbd0757b70
+EBUILD hplip-3.12.10a.ebuild 6782 SHA256 196819c63330946e5452f6cc424e284ecc1c6f2aebe12589f07e364c62583afc SHA512 234b258d4ffbaf707e251d74be1967cfc71c0a41c9acdbe1e8bebef5edaa549f79eeecde6112d1c4576e713dc7e5de922a090afb80b5b8256911ba74b0478a86 WHIRLPOOL 65a5149a5945eb55da6c37a43ccbcdcd77e4e59217d448d1e7a4604a4ee244726a5140f17089c0f4dbc3e8df46bfffc209a65be1499356f7cc502ab816ec5545
+EBUILD hplip-3.12.4.ebuild 6441 SHA256 346c34674d8b787302513371d6c57a226d64b83fe31cb4b38a52a74f271d2adf SHA512 6c523f0f601b2e5de5c810342f87eec10a071010ac6aa5de4966e433c0ccfaa792a04747e865c79c80caa0644f95a2c8c0f8174934639344e156264d6daec1a3 WHIRLPOOL 3de61f598ad8db6352de0bb5cb28642a63ef471c04f5abf0be5f99e08b940fbc588fa917ab485997be880e8334a9848a234523a97f9b80d771ccc0ec2d9c020d
+EBUILD hplip-3.12.9-r1.ebuild 6619 SHA256 12b3ee023ecfae0eb98961c5a9db66e835f65ec9ccf1348b28be798e2464c30e SHA512 ff9b035b634dbedbb864b45b692b5a10207a40f0dd56824bc15cd482b81a78f4639b4d0d96769322fa60da64fd7816e7af6f0b01906e0ab56a5e6fe1c734dbde WHIRLPOOL 8e79187c7620d6b9426c551541eaa6a6230e5374f184fb62c1e282c3b249eccad750d9e75550b7bb4763d17e75dac060dcd942f154f0f8d4dd41240bd0a8c2f1
+MISC ChangeLog 43070 SHA256 8b9c75c064511ef46ecd6895e35e1bb300069afa406400337efcdbf474846df2 SHA512 e0b14d149f6e2ff19d19cf68ff0f894e0045d92d1d0dfab763ef921c566cd7cd2fd2d8f46b11415eea09e3fd598a34b3d53779e8acf628574ff23ba37f9f8f5a WHIRLPOOL 57c4ba8457af990f8bed06e064c5be55f318a55ff8398b17f3f9a8c32ebf9fee2f63f4c1afdc5d82a222477dd003ef4acd47564e8b44df2227f7270ad3383dbf
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCBhmYACgkQlcuUeyFa0U31swCfSqY+KV25/l6+64SVBMeyz3Z6
-XtgAn39s7gqpxGzkBI+k4MMaweCoR1OP
-=OgeW
+iEYEAREIAAYFAlCCkNoACgkQlcuUeyFa0U1DQQCg6DzSEOs9TOPtSLTwa4p6jWEI
+owYAoPH1MLoOHSotGPB5RtoNNsJVuKkF
+=xYr+
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.10.ebuild b/net-print/hplip/hplip-3.12.10.ebuild
index 548792ce79c3..2e88644c7a05 100644
--- a/net-print/hplip/hplip-3.12.10.ebuild
+++ b/net-print/hplip/hplip-3.12.10.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/net-print/hplip/hplip-3.12.10.ebuild,v 1.1 2012/10/05 16:28:51 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10.ebuild,v 1.2 2012/10/20 11:54:01 billie Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -119,10 +119,10 @@ src_prepare() {
 	# The hpcups driver does not use foomatic-rip
 	local i
 	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
+		rm -f ${i}.temp || die
 		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
 			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
+		mv ${i}.temp ${i} || die
 	done
 
 	eautoreconf
diff --git a/net-print/hplip/hplip-3.12.10a.ebuild b/net-print/hplip/hplip-3.12.10a.ebuild
index 9547099d6cfe..883d0d9f648c 100644
--- a/net-print/hplip/hplip-3.12.10a.ebuild
+++ b/net-print/hplip/hplip-3.12.10a.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/net-print/hplip/hplip-3.12.10a.ebuild,v 1.2 2012/10/19 16:57:08 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.3 2012/10/20 11:54:01 billie Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -120,10 +120,10 @@ src_prepare() {
 	# The hpcups driver does not use foomatic-rip
 	local i
 	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
+		rm -f ${i}.temp || die
 		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
 			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
+		mv ${i}.temp ${i} || die
 	done
 
 	eautoreconf
diff --git a/net-print/hplip/hplip-3.12.4.ebuild b/net-print/hplip/hplip-3.12.4.ebuild
index abf798230d2e..114214335579 100644
--- a/net-print/hplip/hplip-3.12.4.ebuild
+++ b/net-print/hplip/hplip-3.12.4.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/net-print/hplip/hplip-3.12.4.ebuild,v 1.9 2012/09/18 18:10:42 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v 1.10 2012/10/20 11:54:01 billie Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit fdo-mime linux-info python autotools
+inherit eutils fdo-mime linux-info python autotools
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -117,10 +117,10 @@ src_prepare() {
 	# The hpcups driver does not use foomatic-rip
 	local i
 	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
+		rm -f ${i}.temp || die
 		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
 			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
+		mv ${i}.temp ${i} || die
 	done
 
 	eautoreconf
diff --git a/net-print/hplip/hplip-3.12.9-r1.ebuild b/net-print/hplip/hplip-3.12.9-r1.ebuild
index f3e009a12069..2cfb5c5a8bb5 100644
--- a/net-print/hplip/hplip-3.12.9-r1.ebuild
+++ b/net-print/hplip/hplip-3.12.9-r1.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/net-print/hplip/hplip-3.12.9-r1.ebuild,v 1.5 2012/10/17 03:19:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.9-r1.ebuild,v 1.6 2012/10/20 11:54:01 billie Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"
 PYTHON_USE_WITH_OPT="!minimal"
 
-inherit fdo-mime linux-info python autotools toolchain-funcs
+inherit eutils fdo-mime linux-info python autotools toolchain-funcs
 
 DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -119,10 +119,10 @@ src_prepare() {
 	# The hpcups driver does not use foomatic-rip
 	local i
 	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
+		rm -f ${i}.temp || die
 		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
 			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
+		mv ${i}.temp ${i} || die
 	done
 
 	eautoreconf