cups use, cups-config --serverbin

Package-Manager: portage-2.1_pre10-r4

3 files changed, 20 insertions, 23 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index cb68a8968954..2a804209ce85 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,11 +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.32 2006/05/08 22:40:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.33 2006/05/08 22:53:36 genstef Exp $
 
   08 May 2006; Stefan Schweizer <genstef@gentoo.org>
   foomatic-filters-3.0.2-r1.ebuild:
-  Remove pointless cups useflag - does not even configure w/o cups, Make
-  cups-1.2 aware, no revbump because no installed files were changed
+  Make cups-1.2 aware, no revbump because no installed files were changed
 
 *foomatic-filters-3.0.2-r1 (05 May 2006)
 
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index 13cc3a0c93aa..c15433ced13e 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -6,18 +6,18 @@ MD5 c58e4d6d5d27ae3024c05a6e6b27fc21 files/foomatic-filters-3.0.2-multilib.patch
 RMD160 281421904552b4f410b6226c855be6509f9a4998 files/foomatic-filters-3.0.2-multilib.patch 1569
 SHA256 1172136a08318ede371823f9761da056885853407dce970414f1cedf255d09bd files/foomatic-filters-3.0.2-multilib.patch 1569
 DIST foomatic-filters-3.0.2.tar.gz 125875 RMD160 612529ea462f7f1500f30ffed4aec105b410936c SHA256 161dc80957cdbcb0c43dc4f1db08968e3ee645b64eff9342294b33fe95436792 size 125875
-EBUILD foomatic-filters-3.0.2-r1.ebuild 1484 RMD160 c821ce3a93ef59beb6474dd641e4449c827d0457 SHA1 47b53c57e7945f80adb3777d679841d476885dd2 SHA256 a2eaa6c63eaccb9a9759689f0b612a049cec437b78dd47027792b09dfe6338dc size 1484
-MD5 7dfff407ff77de08f8c512adb2b21026 foomatic-filters-3.0.2-r1.ebuild 1484
-RMD160 c821ce3a93ef59beb6474dd641e4449c827d0457 foomatic-filters-3.0.2-r1.ebuild 1484
-SHA256 a2eaa6c63eaccb9a9759689f0b612a049cec437b78dd47027792b09dfe6338dc foomatic-filters-3.0.2-r1.ebuild 1484
+EBUILD foomatic-filters-3.0.2-r1.ebuild 1373 RMD160 7c7a86f65e3131e6f56886b3223fa25dc8c0863d SHA1 6d21200da66c572e9de64192151788b0c792bd31 SHA256 470792b9742bc794dde59d767bd468e679de26d0ebec44d7eae4f43386752e54 size 1373
+MD5 2eba1dc8cf63d0ce9ba4d5728f54bbd9 foomatic-filters-3.0.2-r1.ebuild 1373
+RMD160 7c7a86f65e3131e6f56886b3223fa25dc8c0863d foomatic-filters-3.0.2-r1.ebuild 1373
+SHA256 470792b9742bc794dde59d767bd468e679de26d0ebec44d7eae4f43386752e54 foomatic-filters-3.0.2-r1.ebuild 1373
 EBUILD foomatic-filters-3.0.2.ebuild 1171 RMD160 e7e779132fb437d92a910722284cba493eb1e0a2 SHA1 299bdbde09a6e08aad37ac62cd49554ddd1199bf SHA256 de1d48c6864b82d1670250f450653743a17da21c047bb4ce5e912ec1b80519f7 size 1171
 MD5 1f1d9494da6b339c68969c9c6195346e foomatic-filters-3.0.2.ebuild 1171
 RMD160 e7e779132fb437d92a910722284cba493eb1e0a2 foomatic-filters-3.0.2.ebuild 1171
 SHA256 de1d48c6864b82d1670250f450653743a17da21c047bb4ce5e912ec1b80519f7 foomatic-filters-3.0.2.ebuild 1171
-MISC ChangeLog 4373 RMD160 061ab80fbca12db08fc127cb2dce0c40277ff17d SHA1 ab3a03ae8282ec82aa5c6598f75738561ccd5a4b SHA256 8f577af5feda1e3067bd216b9acb53832d090fe5acd3a6a13399b91434c778fc size 4373
-MD5 62581ddac1b6a1057124464884fbb897 ChangeLog 4373
-RMD160 061ab80fbca12db08fc127cb2dce0c40277ff17d ChangeLog 4373
-SHA256 8f577af5feda1e3067bd216b9acb53832d090fe5acd3a6a13399b91434c778fc ChangeLog 4373
+MISC ChangeLog 4305 RMD160 6d07699856f7b5e3e2d9c23946314a2409906f3d SHA1 0c4686b1b26f7fbd142bf0fcc24ec369b9d32fae SHA256 f0aaa105f5e03a5c409c2754d04e4399876e31ccba07a45240496d32f303e241 size 4305
+MD5 3968059d8ec02245e5b8ffff54d9a881 ChangeLog 4305
+RMD160 6d07699856f7b5e3e2d9c23946314a2409906f3d ChangeLog 4305
+SHA256 f0aaa105f5e03a5c409c2754d04e4399876e31ccba07a45240496d32f303e241 ChangeLog 4305
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -31,7 +31,7 @@ SHA256 18ae4fb0ab42f417831c2c72ba16e37c3640c3651e90cd3e5574e0293b72e305 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEX8i4NJowsmZ/PzARAqUEAKDcJYej0KpV2QffBWsVcDoq2qlFFwCfZleo
-nnXqW+L8LCwjEXcK4SVqGlw=
-=95vB
+iD8DBQFEX8vCNJowsmZ/PzARAkuSAJoCH1ybOhPn8SaovkNF9E6/q6cvnQCbBIaU
+beMjoL5ytfVsBUV03wWQckU=
+=juZm
 -----END PGP SIGNATURE-----
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 464006d6e492..a30eb278eb5f 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.2 2006/05/08 22:40:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.2-r1.ebuild,v 1.3 2006/05/08 22:53:36 genstef Exp $
 
 inherit eutils
 
@@ -11,10 +11,10 @@ SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="samba"
+IUSE="cups samba"
 
 DEPEND="samba? ( net-fs/samba )
-	>=net-print/cups-1.1.19
+	cups? ( >=net-print/cups-1.1.19 )
 	|| (
 		app-text/enscript
 		net-print/cups
@@ -33,7 +33,7 @@ src_unpack() {
 }
 
 src_compile() {
-	has_version =net-print/cups-1.2* && export CUPS=/usr/libexec/cups CUPS_FILTERS=/usr/libexec/cups/filter 
+	export CUPS=$(cups-config --serverbin) CUPS_FILTERS=$(cups-config --serverbin)/filter
 	econf || die "econf failed"
 	emake || die "emake failed"
 }
@@ -43,10 +43,8 @@ src_install() {
 
 	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
 
-	dosym /usr/bin/foomatic-gswrapper /usr/$(get_libdir)/cups/filter/foomatic-gswrapper
-	dosym /usr/bin/foomatic-rip /usr/$(get_libdir)/cups/filter/cupsomatic
-	if has_version =net-print/cups-1.2*; then
-		mv ${D}/usr/$(get_libdir)/cups/* ${D}/usr/libexec/cups
-		rm ${D}/usr/$(get_libdir)/cups/
+	if use cups; then
+		dosym /usr/bin/foomatic-gswrapper $(cups-config --serverbin)/filter/foomatic-gswrapper
+		dosym /usr/bin/foomatic-rip $(cups-config --serverbin)/filter/cupsomatic
 	fi
 }