fixing USE=-cups properly

Package-Manager: portage-2.1.2_rc3-r1

4 files changed, 24 insertions, 21 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index e846bd41da27..4cb8e9cef6c6 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.48 2006/12/03 19:07:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.49 2006/12/11 10:11:15 genstef Exp $
+
+  11 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
+  foomatic-filters-3.0.2-r1.ebuild, foomatic-filters-3.0.20060720.ebuild:
+  fixing USE=-cups properly
 
   03 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   foomatic-filters-3.0.20060720.ebuild:
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index 08a26db0127a..3b74d57af07b 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -8,18 +8,18 @@ RMD160 c1b98f966465fd8f7562ad87c6d172e598262023 files/foomatic-filters-3.0.20060
 SHA256 6f8241bf46a5fff13bf06b066a8c84f6f2245c40094d75d67953430c4fbd89c9 files/foomatic-filters-3.0.20060601-multilib.patch 2001
 DIST foomatic-filters-3.0-20060720.tar.gz 165214 RMD160 709d1c6717d84620faa129a15c3a791ae9454d45 SHA1 0f4e5e45b78f0867c57c7f034a4feb117f2646d1 SHA256 56e268077c8ec5cd48fe15bd1af8f87a19536782e8e5a3d2d06d39badcaa3fff
 DIST foomatic-filters-3.0.2.tar.gz 125875 RMD160 612529ea462f7f1500f30ffed4aec105b410936c SHA1 6d949949f432212632c704904272bc32f287b577 SHA256 161dc80957cdbcb0c43dc4f1db08968e3ee645b64eff9342294b33fe95436792
-EBUILD foomatic-filters-3.0.2-r1.ebuild 1440 RMD160 98655346adc2ba00997c3fb1f754d9e94d882c6f SHA1 24ced507c8fcbebfdfa6d1e2bb85d0ddf152902d SHA256 c13cd0b381bb33fbb2021e4f300c8d68f1210b4da209e9588aab245973a3ffa6
-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 1738 RMD160 2eb3acb50d4d52558ca6e3763605ee29f47dc03e SHA1 19cff6098edaf3d983abed70b0b3db40ae321393 SHA256 160a65670ee72b664df6fbe2a4300878c1f7d8d124149ca1f540186e8f0570eb
-MD5 a855184e95da359a2306af105f58d242 foomatic-filters-3.0.20060720.ebuild 1738
-RMD160 2eb3acb50d4d52558ca6e3763605ee29f47dc03e foomatic-filters-3.0.20060720.ebuild 1738
-SHA256 160a65670ee72b664df6fbe2a4300878c1f7d8d124149ca1f540186e8f0570eb foomatic-filters-3.0.20060720.ebuild 1738
-MISC ChangeLog 6252 RMD160 f6f53e4483dece5896cab44a87f4bc78b1bc7666 SHA1 dc2cec5c4ace892a2c0e8188278766f08e9e3113 SHA256 9611e21a121eb94befdbe4e15c67eb25f969f95f735571bde65d2dfe419e9c2d
-MD5 b152e3c55a3977b67f8df5f8b1fad8d6 ChangeLog 6252
-RMD160 f6f53e4483dece5896cab44a87f4bc78b1bc7666 ChangeLog 6252
-SHA256 9611e21a121eb94befdbe4e15c67eb25f969f95f735571bde65d2dfe419e9c2d ChangeLog 6252
+EBUILD foomatic-filters-3.0.2-r1.ebuild 1407 RMD160 52d55701f8c826fd595f1f849c2e8bcd943b6c65 SHA1 3190b95388ba6bffd9bb0a9cfed54b6895b12b4c SHA256 a6a175500af996da97b2189be25e2ff4d2fdda2363595e7839712cd30d2b63c8
+MD5 658edfe9010222096838e20b468447bb foomatic-filters-3.0.2-r1.ebuild 1407
+RMD160 52d55701f8c826fd595f1f849c2e8bcd943b6c65 foomatic-filters-3.0.2-r1.ebuild 1407
+SHA256 a6a175500af996da97b2189be25e2ff4d2fdda2363595e7839712cd30d2b63c8 foomatic-filters-3.0.2-r1.ebuild 1407
+EBUILD foomatic-filters-3.0.20060720.ebuild 1763 RMD160 54a7bf7916b6c57db4ccefd9ecf88951c135dc11 SHA1 fa89a5f347d4e0e7ecac65f76209ae22fb9870e4 SHA256 440ec5e4aac4dee7308bf1cd65994acc69d929b55b072801cf852d0c0bbd395c
+MD5 0b225ef3ed3b5998424eb49484545e5d foomatic-filters-3.0.20060720.ebuild 1763
+RMD160 54a7bf7916b6c57db4ccefd9ecf88951c135dc11 foomatic-filters-3.0.20060720.ebuild 1763
+SHA256 440ec5e4aac4dee7308bf1cd65994acc69d929b55b072801cf852d0c0bbd395c foomatic-filters-3.0.20060720.ebuild 1763
+MISC ChangeLog 6405 RMD160 8470153742d024f99c21cd1a4505b8f754bb7737 SHA1 a3279a21a2e0d2766cf5763fe84dfebd9ec2d1a8 SHA256 c42608e30f014909e52eeb482b08f23433f070eb233bda4a03998460072f2252
+MD5 b221c7e9bfdb7a4b034a28196f87264a ChangeLog 6405
+RMD160 8470153742d024f99c21cd1a4505b8f754bb7737 ChangeLog 6405
+SHA256 c42608e30f014909e52eeb482b08f23433f070eb233bda4a03998460072f2252 ChangeLog 6405
 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/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild
index de41024d1d3a..a2078e5cdb52 100644
--- a/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild
+++ b/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.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.2-r1.ebuild,v 1.10 2006/10/19 16:38:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild,v 1.11 2006/12/11 10:11:15 genstef Exp $
 
 inherit eutils
 
@@ -21,8 +21,7 @@ DEPEND="samba? ( net-fs/samba )
 		app-text/a2ps
 		app-text/mpage
 	)
-	virtual/ghostscript
-	!<net-print/foomatic-db-20050910"
+	virtual/ghostscript"
 
 src_unpack() {
 	unpack ${A}
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 04e69dbf7dbf..64638314c9e1 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.12 2006/12/03 19:07:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.13 2006/12/11 10:11:15 genstef Exp $
 
 inherit eutils versionator autotools
 
@@ -37,8 +37,8 @@ src_unpack() {
 }
 
 src_compile() {
-	export CUPS_BACKENDS=$(cups-config --serverbin 2>&1)/backend \
-		CUPS_FILTERS=$(cups-config --serverbin 2>&1)/filter CUPS=$(cups-config --serverbin 2>&1)
+	export CUPS_BACKENDS=$(cups-config --serverbin 2>/dev/null)/backend \
+		CUPS_FILTERS=$(cups-config --serverbin 2>/dev/null)/filter CUPS=$(cups-config --serverbin 2>&1)
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
@@ -52,7 +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 2>&1)/filter
-		rm -r "${D}"/$(cups-config --serverbin 2>&1)/backend
+		rm -r "${D}"/$(cups-config --serverbin 2>/dev/null)/filter
+		rm -r "${D}"/$(cups-config --serverbin 2>/dev/null)/backend
 	fi
 }