Fix build with USE=-cups thanks to spanky in bug 156966

Package-Manager: portage-2.1.2_rc2-r4

3 files changed, 18 insertions, 23 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index 3097b7328bd9..c0a33e162f17 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foomatic-filters
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.46 2006/12/01 17:58:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.47 2006/12/03 14:42:36 genstef Exp $
+
+  03 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
+  foomatic-filters-3.0.20060720.ebuild:
+  Fix build with USE=-cups thanks to spanky in bug 156966
 
   01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   foomatic-filters-3.0.20060720.ebuild:
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index 274fab630d51..77bbfaeebffd 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX foomatic-filters-3.0.2-multilib.patch 1569 RMD160 281421904552b4f410b6226c855be6509f9a4998 SHA1 2c2b88058cb48dd76474701311173236a611e3ec SHA256 1172136a08318ede371823f9761da056885853407dce970414f1cedf255d09bd
 MD5 c58e4d6d5d27ae3024c05a6e6b27fc21 files/foomatic-filters-3.0.2-multilib.patch 1569
 RMD160 281421904552b4f410b6226c855be6509f9a4998 files/foomatic-filters-3.0.2-multilib.patch 1569
@@ -15,14 +12,14 @@ EBUILD foomatic-filters-3.0.2-r1.ebuild 1440 RMD160 98655346adc2ba00997c3fb1f754
 MD5 e49df4add02edbf64619e056d1c7325e foomatic-filters-3.0.2-r1.ebuild 1440
 RMD160 98655346adc2ba00997c3fb1f754d9e94d882c6f foomatic-filters-3.0.2-r1.ebuild 1440
 SHA256 c13cd0b381bb33fbb2021e4f300c8d68f1210b4da209e9588aab245973a3ffa6 foomatic-filters-3.0.2-r1.ebuild 1440
-EBUILD foomatic-filters-3.0.20060720.ebuild 1662 RMD160 fd070cd92cc3a34494822fcfba0bea675c44c656 SHA1 1db99a04884df61ec21342bf069cd9d763867439 SHA256 a1493672e8b74d595840769a30d656134146a596cbd1c02ade00a0f9869572b4
-MD5 87c89ca5c4b359425e845b37d0dd6ef9 foomatic-filters-3.0.20060720.ebuild 1662
-RMD160 fd070cd92cc3a34494822fcfba0bea675c44c656 foomatic-filters-3.0.20060720.ebuild 1662
-SHA256 a1493672e8b74d595840769a30d656134146a596cbd1c02ade00a0f9869572b4 foomatic-filters-3.0.20060720.ebuild 1662
-MISC ChangeLog 5975 RMD160 8725e5630d0abf2aac9edc9ff4e47b878558f432 SHA1 a575d2cbaddec0518a3596838e0c1d977b2c1c7f SHA256 e7e23ec2e9aabe302b48579299ed94f4b841b9aad9f25f7b66df340eb8ebc3f0
-MD5 5d43809fff9d40ecca01827ca4856053 ChangeLog 5975
-RMD160 8725e5630d0abf2aac9edc9ff4e47b878558f432 ChangeLog 5975
-SHA256 e7e23ec2e9aabe302b48579299ed94f4b841b9aad9f25f7b66df340eb8ebc3f0 ChangeLog 5975
+EBUILD foomatic-filters-3.0.20060720.ebuild 1736 RMD160 f445475b4417230a6122d91ac8efa9bcf309f410 SHA1 63c8558e2057b122906d7d12422143450392d288 SHA256 2b3aef249d264164c62870a8d0bf831d7411427cf6e6f473d3883f752c3708e9
+MD5 484f4b0b56eb51f3b8f4b5e3dfe847c0 foomatic-filters-3.0.20060720.ebuild 1736
+RMD160 f445475b4417230a6122d91ac8efa9bcf309f410 foomatic-filters-3.0.20060720.ebuild 1736
+SHA256 2b3aef249d264164c62870a8d0bf831d7411427cf6e6f473d3883f752c3708e9 foomatic-filters-3.0.20060720.ebuild 1736
+MISC ChangeLog 6126 RMD160 78c2a75c157b1650e93ec3bae6264557c645c0b5 SHA1 f8beabefa0e9e7e4a7265a4d6a577ffd61ff6afc SHA256 853e7e80315f63cb3d9f72c59d66a33349badd7e9635d702707d047c5fc9f714
+MD5 23deb70e434cf186820e6cca8249eee0 ChangeLog 6126
+RMD160 78c2a75c157b1650e93ec3bae6264557c645c0b5 ChangeLog 6126
+SHA256 853e7e80315f63cb3d9f72c59d66a33349badd7e9635d702707d047c5fc9f714 ChangeLog 6126
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -33,10 +30,3 @@ SHA256 18ae4fb0ab42f417831c2c72ba16e37c3640c3651e90cd3e5574e0293b72e305 files/di
 MD5 c5e46046c1913c7e90c7714139b6ceb5 files/digest-foomatic-filters-3.0.20060720 289
 RMD160 ec991e57059dba17835b3f279ca0fed7a7d498ee files/digest-foomatic-filters-3.0.20060720 289
 SHA256 5c373ed6b9c3818726edcd81801df19aeebbfcc61cfbfb8223b4bd39b255929d files/digest-foomatic-filters-3.0.20060720 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFcG1kKRy60XGEcJIRAtVTAJ9LKtnd7rHMmPIToEL35q0a4h1O7QCeIpie
-sn5qzkPwWRqLk4E4oWoKa4k=
-=5Jdq
------END PGP SIGNATURE-----
diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild
index 14716760617f..cf25b7438eff 100644
--- a/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild
+++ b/net-print/foomatic-filters/foomatic-filters-3.0.20060720.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/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.10 2006/12/01 17:58:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.11 2006/12/03 14:42:36 genstef Exp $
 
 inherit eutils versionator autotools
 
@@ -37,8 +37,8 @@ src_unpack() {
 }
 
 src_compile() {
-	export CUPS_BACKENDS=$(cups-config --serverbin)/backend \
-		CUPS_FILTERS=$(cups-config --serverbin)/filter CUPS=$(cups-config --serverbin)
+	export CUPS_BACKENDS=$(cups-config --serverbin 2>&1)/backend \
+		CUPS_FILTERS=$(cups-config --serverbin 2>&1)/filter CUPS=$(cups-config --serverbin 2>&1)
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
@@ -52,6 +52,7 @@ src_install() {
 		dosym /usr/bin/foomatic-gswrapper $(cups-config --serverbin)/filter/foomatic-gswrapper
 		dosym /usr/bin/foomatic-rip $(cups-config --serverbin)/filter/cupsomatic
 	else
-		rm -r "${D}"/$(cups-config --serverbin)/filter
+		rm -r "${D}"/$(cups-config --serverbin 2>&1)/filter
+		rm -r "${D}"/$(cups-config --serverbin 2>&1)/backend
 	fi
 }