Cleanup. Add missing dies.

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

3 files changed, 17 insertions, 14 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 233666bcd56e..c671e748e435 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.137 2009/12/20 17:54:10 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.138 2009/12/20 18:03:47 billie Exp $
+
+  20 Dec 2009; Daniel Pielmeier <billie@gentoo.org> hplip-3.9.12.ebuild:
+  Cleanup. Add missing dies.
 
 *hplip-3.9.12 (20 Dec 2009)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 95f188eea612..adb7ad18bdbe 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -12,8 +12,8 @@ DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
 EBUILD hplip-2.8.6b.ebuild 5243 RMD160 340bda9d2f26d4a6440a06ab40d25f7bab6ec8b5 SHA1 bb3a445a0b8d433985876ef91c01b8f18968935e SHA256 771ac5ef5f0a0b9c089b21a46bf4809d2e867d62c7a1b5e48d70a0f8154488af
 EBUILD hplip-3.9.10.ebuild 8564 RMD160 25c238972e627c4f55ecad0a9ce92558f098b54e SHA1 7865c1f0ea0e52259412d9238f91788eb02a95fc SHA256 b6917aada1a816d011dd9d17aac138b60b897e6ba940b88c055f2e59a49d3e6c
-EBUILD hplip-3.9.12.ebuild 8588 RMD160 5013ff1c69f26445c7c116233f5eced6a0468d0c SHA1 d1c11f737598c57c5ffed6ed2da105488e7b0fab SHA256 695a4c95270ca557d382aedb6e200b8b18cd4ec06f5278b76538ab2bd8d65f30
+EBUILD hplip-3.9.12.ebuild 8406 RMD160 f7abdcbe4720f1f19df6ada31a3209aa00b74836 SHA1 1d0f6aab2f7040a1e34a51827c6340de78ce0291 SHA256 3337e8ea5e64e08d1dd8b2fa653b5b112fcd7666827cb1d19b764738274b738e
 EBUILD hplip-3.9.4b-r1.ebuild 6465 RMD160 99c22e2497c695a6f4756953ffba4006e035572c SHA1 739c86c85cc82a28c4344953be33d7a16573c5df SHA256 34547dc3ad9b7a905fc86380a10c8a8b8c010a3deb576544ac9f74b21e6d1840
 EBUILD hplip-3.9.8-r3.ebuild 8043 RMD160 3fb2bc1970f674254cf33dce4f28909cfc579155 SHA1 0902a36e7f5e78294b6d0161bd972f3039ca7a0b SHA256 6b506822b4514d3a949b29343337eb820621a8329b0807ebca963c6721a3c262
-MISC ChangeLog 23808 RMD160 373d655d66a3fa923dd9a52efdf98bb8a7348a40 SHA1 db09e26e0c0762bd3b1e3df304665f133554a1fd SHA256 3e6ae76b15477645e26d79881baaf74bc4c9373bad2546de1a5805e292c34d9e
+MISC ChangeLog 23911 RMD160 4ed111eecdce8744f4f9d8c422704f1ac43c46d5 SHA1 d4441aebf944d358d2ad1afda1c166dbfb55a777 SHA256 36426d2fe3f767710bfeaec09b09f48176cacfd634f368d7e26ccd15a0e23407
 MISC metadata.xml 2576 RMD160 a22d81c0a7e8ec6c839a87c32d7c412d79ca5e2e SHA1 9971502edf107a48d22a1a0faf2160122baa7d56 SHA256 9b1b9e41c2df3d9fcc466aedccf078fa03e1b67b38c3bfb4723820e5b56ba0a5
diff --git a/net-print/hplip/hplip-3.9.12.ebuild b/net-print/hplip/hplip-3.9.12.ebuild
index f76cf1ca9a5c..a3d9626daa46 100644
--- a/net-print/hplip/hplip-3.9.12.ebuild
+++ b/net-print/hplip/hplip-3.9.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild,v 1.1 2009/12/20 17:54:10 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild,v 1.2 2009/12/20 18:03:47 billie Exp $
 
-EAPI="2"
+EAPI=2
 
 inherit fdo-mime linux-info python autotools
 
@@ -111,12 +111,12 @@ src_prepare() {
 	# SYSFS deprecated but kept upstream for compatibility reasons
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
 	sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules \
-		data/rules/55-hpmud.rules || die "Sed 55-hpmud.rules 56-hpmud_support.rules failed"
+		data/rules/55-hpmud.rules || die
 
 	# Force recognition of Gentoo distro by hp-check
 	sed -i \
 		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die "Sed installer/core_install.py failed"
+		installer/core_install.py || die
 
 	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
 	# The hpcups driver does not use foomatic-rip
@@ -124,7 +124,7 @@ src_prepare() {
 	for i in ppd/hpijs/*.ppd.gz
 	do
 		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "Sed *.ppd.gz failed"
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die
 		mv ${i}.temp ${i}
 	done
 
@@ -135,10 +135,10 @@ src_prepare() {
 		sed -i \
 			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
 			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
-			base/device.py || die "Sed base/device.py failed"
+			base/device.py || die
 		sed -i \
 			-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
-			hplip-systray.desktop.in || die "Sed hplip-systray.desktop.in failed"
+			hplip-systray.desktop.in || die
 	fi
 
 	eautoreconf
@@ -234,23 +234,23 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Emake install failed"
+	emake DESTDIR="${D}" install || die
 
 	# Installed by sane-backends
 	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf
+	rm -f "${D}"/etc/sane.d/dll.conf || die
 
 	# kde3 autostart hack
 	if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
 		insinto /usr/kde/3.5/share/autostart
-		doins hplip-systray.desktop
+		doins hplip-systray.desktop || die
 	fi
 }
 
 pkg_preinst() {
 	# avoid collisions with cups-1.2 compat symlinks
 	if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ] ; then
-		rm "${ROOT}"/usr/libexec/cups/backend/hp{,fax}
+		rm "${ROOT}"/usr/libexec/cups/backend/hp{,fax} || die
 	fi
 }