Fix ghostscript detection with gs-sp thanks to Sebastian Bergmann <sebastian@gentoo.org> in bug 144354

Package-Manager: portage-2.1.1_pre5-r2

4 files changed, 24 insertions, 19 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 7e2e4168c3a6..01c84b43fe62 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.194 2006/08/18 19:53:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.195 2006/08/18 22:27:38 genstef Exp $
+
+  18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild,
+  cups-1.2.2.ebuild:
+  Fix ghostscript detection with gs-sp thanks to Sebastian Bergmann
+  <sebastian@gentoo.org> in bug 144354
 
   18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
   Depend with X useflag on xdg-utils to select the browser thanks to Wiktor
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 1dcaf10fb37a..f940d1d9f68c 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -72,18 +72,18 @@ EBUILD cups-1.1.23-r1.ebuild 4132 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763a
 MD5 b1e18a006a467d2c94dd37e0f469db56 cups-1.1.23-r1.ebuild 4132
 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac cups-1.1.23-r1.ebuild 4132
 SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b cups-1.1.23-r1.ebuild 4132
-EBUILD cups-1.1.23-r8.ebuild 4963 RMD160 3e19f1c744dd482ce3a277288fe749fbbe5eec84 SHA1 de44c572c5e15c7e119b68c3477f3a2d79fabc8b SHA256 d314487c71ab2dfb919fee6f2be86cfd1908fbc4959d2ddc57b2edd232059b69
-MD5 1a6910f3b2a5b3f6900ac380e513f84a cups-1.1.23-r8.ebuild 4963
-RMD160 3e19f1c744dd482ce3a277288fe749fbbe5eec84 cups-1.1.23-r8.ebuild 4963
-SHA256 d314487c71ab2dfb919fee6f2be86cfd1908fbc4959d2ddc57b2edd232059b69 cups-1.1.23-r8.ebuild 4963
-EBUILD cups-1.2.2.ebuild 5946 RMD160 ba658095d56455d3732d9452a6bf677190f29895 SHA1 e23d720bb2536e36f5d7ddf56c0044d719aa8a97 SHA256 a921e343f092e5b18433ea48311ad48ea6738bae88f6672664a24881e7682ee4
-MD5 747303706378d79ac6e11fe240c60b96 cups-1.2.2.ebuild 5946
-RMD160 ba658095d56455d3732d9452a6bf677190f29895 cups-1.2.2.ebuild 5946
-SHA256 a921e343f092e5b18433ea48311ad48ea6738bae88f6672664a24881e7682ee4 cups-1.2.2.ebuild 5946
-MISC ChangeLog 27128 RMD160 86c2ad62e0d12031f577263d9756d7a796141ed3 SHA1 5548d2568e49a77d8eb4302e600ac56fdca64ccb SHA256 a807f50afff8a56fb5630b8415f48af3b85b4579e589dbb2c99d467f6c5c2623
-MD5 3f6f4a22b6ae05f03bc088ac8b3a638e ChangeLog 27128
-RMD160 86c2ad62e0d12031f577263d9756d7a796141ed3 ChangeLog 27128
-SHA256 a807f50afff8a56fb5630b8415f48af3b85b4579e589dbb2c99d467f6c5c2623 ChangeLog 27128
+EBUILD cups-1.1.23-r8.ebuild 4983 RMD160 4c36407a2cf0a9a124f766458fd7e465358a725e SHA1 2ff1aceefec5efa15406befc749aa0bd2a2b5d1a SHA256 c9de0ac2e9460305cc9209352ba251610d8998589caa77662be5487b2ade97db
+MD5 6cd1ab27ff5d14d5f42a5c6a21a3cf22 cups-1.1.23-r8.ebuild 4983
+RMD160 4c36407a2cf0a9a124f766458fd7e465358a725e cups-1.1.23-r8.ebuild 4983
+SHA256 c9de0ac2e9460305cc9209352ba251610d8998589caa77662be5487b2ade97db cups-1.1.23-r8.ebuild 4983
+EBUILD cups-1.2.2.ebuild 5966 RMD160 6f1ce6684f01c947c2f12eac3e101e37e6e51904 SHA1 0a56a6d39c742b4a724595db41ffba8083340ba1 SHA256 71c65419c5b70f963bef118a9a9f09fe35e2284e9e6a0bbf0553487cacc4b363
+MD5 d9bad8f8f4b98ab8c3add503ee719659 cups-1.2.2.ebuild 5966
+RMD160 6f1ce6684f01c947c2f12eac3e101e37e6e51904 cups-1.2.2.ebuild 5966
+SHA256 71c65419c5b70f963bef118a9a9f09fe35e2284e9e6a0bbf0553487cacc4b363 cups-1.2.2.ebuild 5966
+MISC ChangeLog 27333 RMD160 726f6aaf5dde243850641d059233f768885252cb SHA1 37feb002d075265559b7f006b3e3fe42dcd37cc1 SHA256 339b9a66c5ff537c4cf58804d032fd985e01a454869c5b2af3bc7cb8894b5d3e
+MD5 97a34d7a5d5a612022bdb4e2b7bae3bb ChangeLog 27333
+RMD160 726f6aaf5dde243850641d059233f768885252cb ChangeLog 27333
+SHA256 339b9a66c5ff537c4cf58804d032fd985e01a454869c5b2af3bc7cb8894b5d3e ChangeLog 27333
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/cups/cups-1.1.23-r8.ebuild b/net-print/cups/cups-1.1.23-r8.ebuild
index cb5d0a337a64..927929c3f325 100644
--- a/net-print/cups/cups-1.1.23-r8.ebuild
+++ b/net-print/cups/cups-1.1.23-r8.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/cups/cups-1.1.23-r8.ebuild,v 1.3 2006/08/17 23:59:44 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r8.ebuild,v 1.4 2006/08/18 22:27:38 genstef Exp $
 
 inherit eutils flag-o-matic pam autotools
 
@@ -169,7 +169,7 @@ pkg_postinst() {
 
 	local good_gs=false
 	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
-		if built_with_use ${x} cups; then
+		if has_version ${x} && built_with_use ${x} cups; then
 			good_gs=true
 			break
 		fi
diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild
index a676800125b4..afa4361d2480 100644
--- a/net-print/cups/cups-1.2.2.ebuild
+++ b/net-print/cups/cups-1.2.2.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/cups/cups-1.2.2.ebuild,v 1.3 2006/08/18 19:53:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.4 2006/08/18 22:27:38 genstef Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -166,7 +166,7 @@ pkg_postinst() {
 
 	local good_gs=false
 	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
-		if built_with_use ${x} cups; then
+		if has_version ${x} && built_with_use ${x} cups; then
 			good_gs=true
 			break
 		fi
@@ -189,8 +189,8 @@ pkg_postinst() {
 		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
 		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
 		ewarn
-		einfo "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		einfo "symlinks installed by this package, it wont be needed on later merges."
+		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
+		ewarn "symlinks installed by this package, it wont be needed on later merges."
 		ewarn "You should also run revdep-rebuild"
 
 		# place symlinks to make the update smoothless