From: Stefan Schweizer <genstef@gentoo.org>
Date: Sat, 17 Jun 2006 11:19:09 +0000 (+0000)
Subject: more cups-1.2 compat
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=119f9f808a6c47cc9c483d1eeb42075d58153ca6;p=gentoo.git

more cups-1.2 compat
Package-Manager: portage-2.1.1_pre1
---

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index dcce59f0c08f..6648dcc83184 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -24,10 +24,10 @@ EBUILD hplip-0.9.8-r2.ebuild 3325 RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdff
 MD5 12340dda48ab3f17a14149a5c797cf67 hplip-0.9.8-r2.ebuild 3325
 RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff hplip-0.9.8-r2.ebuild 3325
 SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98 hplip-0.9.8-r2.ebuild 3325
-EBUILD hplip-1.6.6.ebuild 3255 RMD160 02555b15c74e5aafd643b5ffc93c332744c4034d SHA1 d53e3f7cdf0a70e5cb5f183971b71c95e30c03b9 SHA256 543c582132ffd3027b4eef0023bb23e909dce69e59fe4d9929c5a042bb2d0021
-MD5 e9a3e976f4a499ab699d92673527f656 hplip-1.6.6.ebuild 3255
-RMD160 02555b15c74e5aafd643b5ffc93c332744c4034d hplip-1.6.6.ebuild 3255
-SHA256 543c582132ffd3027b4eef0023bb23e909dce69e59fe4d9929c5a042bb2d0021 hplip-1.6.6.ebuild 3255
+EBUILD hplip-1.6.6.ebuild 3294 RMD160 9cf9bc3f24cdf6331dcc4a491da1de2b36641726 SHA1 0ff02595b0caca7015d8632a74a114b4ece00127 SHA256 4c906528001497afe6e18f5cd41dc3480467b90bcefd2d58f717525c38b26816
+MD5 2796aa805147d6243a2ce9342b1e73f3 hplip-1.6.6.ebuild 3294
+RMD160 9cf9bc3f24cdf6331dcc4a491da1de2b36641726 hplip-1.6.6.ebuild 3294
+SHA256 4c906528001497afe6e18f5cd41dc3480467b90bcefd2d58f717525c38b26816 hplip-1.6.6.ebuild 3294
 MISC ChangeLog 6135 RMD160 ad816567266e736c0cfaf443f495e7f54733a737 SHA1 75c396907504b756213c144c5febda7628fae4a2 SHA256 438be7f64b774ba83c4b145a2804160a4f348239b7e3e09a40974a91a3d2b5e2
 MD5 df19a2eaf83dae479324a47402a0630d ChangeLog 6135
 RMD160 ad816567266e736c0cfaf443f495e7f54733a737 ChangeLog 6135
diff --git a/net-print/hplip/hplip-1.6.6.ebuild b/net-print/hplip/hplip-1.6.6.ebuild
index 0f80b728aef7..86cfc3e82cc0 100644
--- a/net-print/hplip/hplip-1.6.6.ebuild
+++ b/net-print/hplip/hplip-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6.ebuild,v 1.2 2006/06/17 00:15:05 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6.ebuild,v 1.3 2006/06/17 11:19:09 genstef Exp $
 
 inherit eutils
 
@@ -38,9 +38,9 @@ RDEPEND="virtual/ghostscript
 	${DEPEND}"
 
 pkg_setup() {
-	# avoid collisions
+	# 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;
+		rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
 	fi
 }