Remove pointless cups useflag - does not even configure w/o cups, Make cups-1.2 aware, no revbump because no installed files were changed

Package-Manager: portage-2.1_pre10-r4

4 files changed, 45 insertions, 33 deletions

diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index b3a6cd4d1014..4e6273394843 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -7,14 +7,14 @@ EBUILD cups-pdf-1.7.0a.ebuild 865 RMD160 6c12440734648b98d40d5be538a2213bc484d94
 MD5 3974adb92bfc83daa77086187652a741 cups-pdf-1.7.0a.ebuild 865
 RMD160 6c12440734648b98d40d5be538a2213bc484d946 cups-pdf-1.7.0a.ebuild 865
 SHA256 9b4fe05cbe055ddec905ecf70e0bef9d03d83e06e7241178ceb97116d84b6cf1 cups-pdf-1.7.0a.ebuild 865
-EBUILD cups-pdf-2.2.0.ebuild 898 RMD160 ecebe520b9199ec5488aadc5d7588ac306c682a9 SHA1 0c9adf469be6b73a8143d5b08b7d8a1f5be0b5d7 SHA256 360b6975bb99b7d87d8084d9c6e79fe164c2b82ff0cff5ae671c06e3dbfcb4a1 size 898
-MD5 b3904bbceba85a096034f483803bd947 cups-pdf-2.2.0.ebuild 898
-RMD160 ecebe520b9199ec5488aadc5d7588ac306c682a9 cups-pdf-2.2.0.ebuild 898
-SHA256 360b6975bb99b7d87d8084d9c6e79fe164c2b82ff0cff5ae671c06e3dbfcb4a1 cups-pdf-2.2.0.ebuild 898
-MISC ChangeLog 3075 RMD160 fb75ed810b20d0f1a804ca7a5508913846df2e8d SHA1 b3071d0d4d60d5eec80bc5d7cb26ac9ea04ad39d SHA256 c50baaa0475456569d7dc8acc4afa5f6102b7bfb6993d688078370ea0430d109 size 3075
-MD5 297d7f7206862e66bceba7c8d003faf2 ChangeLog 3075
-RMD160 fb75ed810b20d0f1a804ca7a5508913846df2e8d ChangeLog 3075
-SHA256 c50baaa0475456569d7dc8acc4afa5f6102b7bfb6993d688078370ea0430d109 ChangeLog 3075
+EBUILD cups-pdf-2.2.0.ebuild 998 RMD160 4af833b223fd9d8635cd56a764fc902abbda5b56 SHA1 d7ed773c50fb4195b49bca6cdca926c85802b525 SHA256 1206e6ea143225be82b4936a38634cfc75db03ba615a76e219ab5b725c55a476 size 998
+MD5 a4237b2b0dd6fd5c8c35a66ee0f11ffd cups-pdf-2.2.0.ebuild 998
+RMD160 4af833b223fd9d8635cd56a764fc902abbda5b56 cups-pdf-2.2.0.ebuild 998
+SHA256 1206e6ea143225be82b4936a38634cfc75db03ba615a76e219ab5b725c55a476 cups-pdf-2.2.0.ebuild 998
+MISC ChangeLog 3174 RMD160 f5f895b5aa5784c34a425e269aa3a43c31c34ba3 SHA1 192c715318b5d83edd3b421cb90774f5c131f2ff SHA256 2d6081bcbdd4e9e9a9b9d1772550f5a32ccefaa81ae41461105fd8c6ce93e848 size 3174
+MD5 3808e266695807c75dd1674f9ea1fda6 ChangeLog 3174
+RMD160 f5f895b5aa5784c34a425e269aa3a43c31c34ba3 ChangeLog 3174
+SHA256 2d6081bcbdd4e9e9a9b9d1772550f5a32ccefaa81ae41461105fd8c6ce93e848 ChangeLog 3174
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -22,15 +22,13 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 176f85d8e8929d023c44364dda413dd9 files/digest-cups-pdf-1.7.0a 66
 RMD160 1876b0429af48acbc9ddbd0e2c2d0d3fa7991bde files/digest-cups-pdf-1.7.0a 66
 SHA256 4133d64e4be996e5b2ca7ebbd28bc1665afc3745373966d664bfd86018b7248c files/digest-cups-pdf-1.7.0a 66
-size 66 files/digest-cups-pdf-1.7.0a 66
 MD5 de2248e12e93896ca728640d770894e5 files/digest-cups-pdf-2.2.0 241
 RMD160 559b758272dd9308f746ad4e2ccf96e0f3aa6b09 files/digest-cups-pdf-2.2.0 241
 SHA256 6ebb7dc1091328bd9152db71eb2cc989b8a5eaece2df326460cc4a52de24c246 files/digest-cups-pdf-2.2.0 241
-size 241 files/digest-cups-pdf-2.2.0 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFES0oJNJowsmZ/PzARAuCQAJ4mycHMIKJh9/0s6ud5NlmDGbWs5wCgzjQ0
-8SZuA/YPJ+Wx5myH5QkZon8=
-=PguQ
+iD8DBQFEX8mANJowsmZ/PzARApnbAKDaCJaa1uRVTHolhFc3fSYxOzKrUwCfUVvo
+0DHdZjnBClyyTQzZUdNefd0=
+=FREK
 -----END PGP SIGNATURE-----
diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index 3b72fe492a99..cb68a8968954 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2006/05/05 05:25:58 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.32 2006/05/08 22:40:35 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
 
 *foomatic-filters-3.0.2-r1 (05 May 2006)
 
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index 4c1fa2f75d8a..13cc3a0c93aa 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 1202 RMD160 e14dff83f850214e177686ade4499f9fac37ec45 SHA1 9b0addf1e7a687784a8105a63c960557777c5db6 SHA256 14501c836bd0a84dbfa47ae7c32d32b1ede08c913fc1f70b19431d21ffb510d4 size 1202
-MD5 a82c8be7275d5523964f84d8b63d5cab foomatic-filters-3.0.2-r1.ebuild 1202
-RMD160 e14dff83f850214e177686ade4499f9fac37ec45 foomatic-filters-3.0.2-r1.ebuild 1202
-SHA256 14501c836bd0a84dbfa47ae7c32d32b1ede08c913fc1f70b19431d21ffb510d4 foomatic-filters-3.0.2-r1.ebuild 1202
+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.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 4141 RMD160 af2e47e5ca385490bdc16854130f76a6a228c4e3 SHA1 e3c0f394583df15b15af827d8428cb6c6bc5b091 SHA256 a1103887dd9d5c7c0d9e7f4544a6c495c7e720ac04d1777c90d7aeb61f4bd08d size 4141
-MD5 56a126e713919a9d30e543ed2d0cfe05 ChangeLog 4141
-RMD160 af2e47e5ca385490bdc16854130f76a6a228c4e3 ChangeLog 4141
-SHA256 a1103887dd9d5c7c0d9e7f4544a6c495c7e720ac04d1777c90d7aeb61f4bd08d ChangeLog 4141
+MISC ChangeLog 4373 RMD160 061ab80fbca12db08fc127cb2dce0c40277ff17d SHA1 ab3a03ae8282ec82aa5c6598f75738561ccd5a4b SHA256 8f577af5feda1e3067bd216b9acb53832d090fe5acd3a6a13399b91434c778fc size 4373
+MD5 62581ddac1b6a1057124464884fbb897 ChangeLog 4373
+RMD160 061ab80fbca12db08fc127cb2dce0c40277ff17d ChangeLog 4373
+SHA256 8f577af5feda1e3067bd216b9acb53832d090fe5acd3a6a13399b91434c778fc ChangeLog 4373
 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)
 
-iD8DBQFEWuH1NJowsmZ/PzARAtshAKC6uqxV/zNkYcxdSfIyB8ysPyVpKACgtAom
-f4kc4VCBTE8ebb+igc0Qfvc=
-=sSky
+iD8DBQFEX8i4NJowsmZ/PzARAqUEAKDcJYej0KpV2QffBWsVcDoq2qlFFwCfZleo
+nnXqW+L8LCwjEXcK4SVqGlw=
+=95vB
 -----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 e53af04a2a52..464006d6e492 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.1 2006/05/05 05:25:58 genstef Exp $
+# $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 $
 
 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="cups samba"
+IUSE="samba"
 
 DEPEND="samba? ( net-fs/samba )
-	cups? ( >=net-print/cups-1.1.19 )
+	>=net-print/cups-1.1.19
 	|| (
 		app-text/enscript
 		net-print/cups
@@ -32,12 +32,21 @@ src_unpack() {
 	autoconf || die "autoconf failed"
 }
 
+src_compile() {
+	has_version =net-print/cups-1.2* && export CUPS=/usr/libexec/cups CUPS_FILTERS=/usr/libexec/cups/filter 
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	if use cups; then
-		dosym /usr/bin/foomatic-gswrapper /usr/$(get_libdir)/cups/filter/foomatic-gswrapper
-		dosym /usr/bin/foomatic-rip /usr/$(get_libdir)/cups/filter/cupsomatic
-	fi
 	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/
+	fi
 }