From: Stefan Schweizer Date: Sat, 7 Apr 2007 12:18:20 +0000 (+0000) Subject: Dont depend on cups for USE=-cups thanks to Cornelius Weig and David Barnett in bug 169230 Package-Manager: portage-2.1.2.3 --- diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 7712e3c05c27..509745a41303 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087 @@ -54,34 +51,29 @@ MD5 24d215a1cf4e63bc56e89755e90f3645 files/pdftops.pl 5624 RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624 SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e +DIST cups-1.2.10-source.tar.bz2 3618084 RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f SHA1 241d7a3c52370fb08ed2ffc3fd8f59673d158299 SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36 DIST cups-1.2.6-source.tar.bz2 3566806 RMD160 a239738f711168cb82c11ee20a7aa92b070e5811 SHA1 1e12d2db23c6a46ae8960b9b765be0f1b829bbac SHA256 cdad0e2e461121257e740b8cb1111c7266cea434dd532a8bcc69c69adffe8aa8 -DIST cups-1.2.7-source.tar.bz2 3585758 RMD160 323bad80f9af3c53eec20a89c44afe26675424fa SHA1 1024f1d4995d8f765dc79ce507eac2be8e0ccd45 SHA256 e7485d6b3dcbd338a2361aff66c516f8dfafc1c81ea5b01396f6ee5f365c4eb3 -DIST cups-1.2.8-source.tar.bz2 3632509 RMD160 43d23bd6ef1f396d57f4b57089e6e31fe1304346 SHA1 690890b7d2f779a872e1464fd354498f7da72fee SHA256 1fea71cc90dcb18fcc86f59821b91b6f78bb623ddb5998e17293b67d9dc67e16 DIST cups-1.2.9-source.tar.bz2 3617594 RMD160 8af1323a8006c3736a15c25c89773292a129161d SHA1 58e67800103e699b4699f17db41da33ddea360fb SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09 EBUILD cups-1.1.23-r8.ebuild 5010 RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd SHA1 db0d26316516da0a744f242e4ca53adaa6160efd SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04 MD5 2443fd46170a523bf9722e0684ddb257 cups-1.1.23-r8.ebuild 5010 RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd cups-1.1.23-r8.ebuild 5010 SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04 cups-1.1.23-r8.ebuild 5010 +EBUILD cups-1.2.10.ebuild 5876 RMD160 7a83efb185a802ebe3d5687f63306e0d3f183e96 SHA1 920f0e06ec8a5c6a0451a491301f4914fa2d3513 SHA256 8d3690323a535ac73d1df38a701c55e2c304a220ce0a62752e9f9efc446e9d52 +MD5 db6e89c318dc30ca1a8b3645d6b53e1d cups-1.2.10.ebuild 5876 +RMD160 7a83efb185a802ebe3d5687f63306e0d3f183e96 cups-1.2.10.ebuild 5876 +SHA256 8d3690323a535ac73d1df38a701c55e2c304a220ce0a62752e9f9efc446e9d52 cups-1.2.10.ebuild 5876 EBUILD cups-1.2.6.ebuild 5774 RMD160 c367d752f15c0cc79b8363f2d074d4e75ab0926e SHA1 f19af647349ed50db13baf1178f300d560c04e78 SHA256 4b0328c5a2563473491395cd7c29f40fa5e2aefa38ff8b5cb47e681af7555bdb MD5 2600c86a8c14db0c09dbbebd56164b12 cups-1.2.6.ebuild 5774 RMD160 c367d752f15c0cc79b8363f2d074d4e75ab0926e cups-1.2.6.ebuild 5774 SHA256 4b0328c5a2563473491395cd7c29f40fa5e2aefa38ff8b5cb47e681af7555bdb cups-1.2.6.ebuild 5774 -EBUILD cups-1.2.7.ebuild 5804 RMD160 62bd8a9956c9ef7bbd733936e2cf715eecbe49aa SHA1 135b032e96d94026a676aefcf5ffc1fc889957e4 SHA256 4f43cbcdd75ef3853d4a63b0eec23c90515d1d91233d2525e485b127bc29c818 -MD5 b1cd15b9d23cba69c9e48ec9076f00b3 cups-1.2.7.ebuild 5804 -RMD160 62bd8a9956c9ef7bbd733936e2cf715eecbe49aa cups-1.2.7.ebuild 5804 -SHA256 4f43cbcdd75ef3853d4a63b0eec23c90515d1d91233d2525e485b127bc29c818 cups-1.2.7.ebuild 5804 -EBUILD cups-1.2.8.ebuild 5874 RMD160 82532f842a80bc182f9fe9ffaaa8763f58b567e1 SHA1 f945504c56e253a8653b2e6bc0ad2d968bb4ca95 SHA256 190b4508f227bc2758477b5863631ced3efe292b48ca32e8b5a577af1687d339 -MD5 040da3e6a3a378c2a19c346d80eafc14 cups-1.2.8.ebuild 5874 -RMD160 82532f842a80bc182f9fe9ffaaa8763f58b567e1 cups-1.2.8.ebuild 5874 -SHA256 190b4508f227bc2758477b5863631ced3efe292b48ca32e8b5a577af1687d339 cups-1.2.8.ebuild 5874 EBUILD cups-1.2.9.ebuild 5868 RMD160 0ec9a211256c3b5b53d3ceb36e128af1ec38703e SHA1 f91eadafdd58ccdeba3dfed01768d55dd4ba911a SHA256 72f110d16606abe210916ed7949cba93880b25fc7cf40e394e2dab8beed2bd11 MD5 92e765c5f9826b19ffd095bb719389b8 cups-1.2.9.ebuild 5868 RMD160 0ec9a211256c3b5b53d3ceb36e128af1ec38703e cups-1.2.9.ebuild 5868 SHA256 72f110d16606abe210916ed7949cba93880b25fc7cf40e394e2dab8beed2bd11 cups-1.2.9.ebuild 5868 -MISC ChangeLog 32236 RMD160 ef6c7636bee47aa5719c4303e56847f6522ead6d SHA1 ec81cc9a42d920bb3cf7f5bbc253aeee42d1b11c SHA256 7552e653f62587eecc2752c82532f00535da318b6395939a4e4c65032f440ebb -MD5 7b2f471c5e2febb1391083faf6c2e530 ChangeLog 32236 -RMD160 ef6c7636bee47aa5719c4303e56847f6522ead6d ChangeLog 32236 -SHA256 7552e653f62587eecc2752c82532f00535da318b6395939a4e4c65032f440ebb ChangeLog 32236 +MISC ChangeLog 32335 RMD160 ea6773f5d1250aa01e951eab607ff9bbbda8b759 SHA1 fc49f5d48304d9aca37ea3fbc12ce04e9510f5f3 SHA256 4e91184aaff77bac049f5cbaba7d31548b0ea356efffe695cb4b8f13a3505b73 +MD5 a37dff244f942d4cf3bda016667c3753 ChangeLog 32335 +RMD160 ea6773f5d1250aa01e951eab607ff9bbbda8b759 ChangeLog 32335 +SHA256 4e91184aaff77bac049f5cbaba7d31548b0ea356efffe695cb4b8f13a3505b73 ChangeLog 32335 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -89,22 +81,12 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262 +MD5 126e6284164bd1c1cc5fc98f1b3f1089 files/digest-cups-1.2.10 262 +RMD160 73673bf65cd75f7e5b15918308b45477ce244a5e files/digest-cups-1.2.10 262 +SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/digest-cups-1.2.10 262 MD5 5b3f9aec328891f1e9bded2d2577bd98 files/digest-cups-1.2.6 259 RMD160 d5f75c2671a926c71c6698fc3100d9acb106fedd files/digest-cups-1.2.6 259 SHA256 3f7f97c3ff4a6096c1b2209892b447540a6dca6b1e53d03232340d5e74cdc60a files/digest-cups-1.2.6 259 -MD5 c1386f5c1290c35314c41cf8600fbae1 files/digest-cups-1.2.7 259 -RMD160 7edcb0f5504aa572d0493a43e31aa696a1d95470 files/digest-cups-1.2.7 259 -SHA256 64b0ad8d15b34845d9191c0b960a2fd6f9f1a96ba62f67634bc53e17d9214e94 files/digest-cups-1.2.7 259 -MD5 b159181e6a934b187d0f1b8f5ecc98e9 files/digest-cups-1.2.8 259 -RMD160 51507a321ff5b2f959a84da972ba6ae312ce83ba files/digest-cups-1.2.8 259 -SHA256 d9827abb94109590a418031c46b208c0e3bcce60ef7901cc5a303a6ef70f53df files/digest-cups-1.2.8 259 MD5 176a666fe4ea35c61883dbca59ed67f2 files/digest-cups-1.2.9 259 RMD160 ee7512fccc424990869d0ca44442749f90eb0a7d files/digest-cups-1.2.9 259 SHA256 8757c4a8802841ca9ff72f5fc260d8fdddbd3970b321db43ac0416fd1b563ae1 files/digest-cups-1.2.9 259 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGC83ckT4lNIS36YERAowTAJ9xDa7FyYk5hF25lmTKqLfQR1EQjgCeJTra -js/evoSp8wfhuhq29U5I3Y4= -=vcap ------END PGP SIGNATURE----- diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog index 46c6ff3260c8..cbc284fad63a 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.51 2007/02/19 21:37:57 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.52 2007/04/07 12:18:20 genstef Exp $ + + 07 Apr 2007; foomatic-filters-3.0.20060720.ebuild: + Dont depend on cups for USE=-cups thanks to Cornelius Weig + and David Barnett + in bug 169230 19 Feb 2007; foomatic-filters-3.0.20060720.ebuild: Really fix bug 156966 diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest index 9aabdc7927d4..36d909c977c5 100644 --- a/net-print/foomatic-filters/Manifest +++ b/net-print/foomatic-filters/Manifest @@ -12,14 +12,14 @@ EBUILD foomatic-filters-3.0.2-r1.ebuild 1407 RMD160 52d55701f8c826fd595f1f849c2e 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 1770 RMD160 adbf9081aa2d20f7f8296524881d8c9a3d3e0234 SHA1 1daabf0a02d2bb2ee160187d9acababafaad5a53 SHA256 d644259be8c918ddad71829ad670bc929976f266ed3783a9fa50e06ee61be76c -MD5 c879dfd63ef9445b57edde9c75cf0653 foomatic-filters-3.0.20060720.ebuild 1770 -RMD160 adbf9081aa2d20f7f8296524881d8c9a3d3e0234 foomatic-filters-3.0.20060720.ebuild 1770 -SHA256 d644259be8c918ddad71829ad670bc929976f266ed3783a9fa50e06ee61be76c foomatic-filters-3.0.20060720.ebuild 1770 -MISC ChangeLog 6630 RMD160 579e3807e42ce6ea636f0f61a1f7868ecd91b0a5 SHA1 a1e97438831f622a26e7daad50ae8d7742ffebc3 SHA256 c37b0f226b1000476ff02638cde205c1246c798b21c038e12a07046cb46bfc6d -MD5 b48f5b9cfa96a6f77a7d684fa7e442cb ChangeLog 6630 -RMD160 579e3807e42ce6ea636f0f61a1f7868ecd91b0a5 ChangeLog 6630 -SHA256 c37b0f226b1000476ff02638cde205c1246c798b21c038e12a07046cb46bfc6d ChangeLog 6630 +EBUILD foomatic-filters-3.0.20060720.ebuild 1771 RMD160 b5aa1514661c26492cf8c861a61d3c744e0de4a4 SHA1 c4b3a5dce61c8f5a8f9b8d37ea099eba2883368e SHA256 49f970b0060c0b1f14ab51b77795d6ea016a671bd679d7b9d2fba91dce732bd9 +MD5 9ca49aa600a3c9e96577ff379aa50782 foomatic-filters-3.0.20060720.ebuild 1771 +RMD160 b5aa1514661c26492cf8c861a61d3c744e0de4a4 foomatic-filters-3.0.20060720.ebuild 1771 +SHA256 49f970b0060c0b1f14ab51b77795d6ea016a671bd679d7b9d2fba91dce732bd9 foomatic-filters-3.0.20060720.ebuild 1771 +MISC ChangeLog 6871 RMD160 65ebbf387612094080b81328debe6a3249a20ec9 SHA1 5783c15445d6914da2c47c434f34c217c72bd3ac SHA256 cd23e8c0e4a7655f97b0f54ec7359888f93e44065806d01d07689434271ee8ca +MD5 53d513f0774611e8cd39054dfb76f33d ChangeLog 6871 +RMD160 65ebbf387612094080b81328debe6a3249a20ec9 ChangeLog 6871 +SHA256 cd23e8c0e4a7655f97b0f54ec7359888f93e44065806d01d07689434271ee8ca ChangeLog 6871 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.20060720.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild index 9754dbc6d9df..510efde96412 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-2007 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.15 2007/02/19 21:37:57 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.20060720.ebuild,v 1.16 2007/04/07 12:18:20 genstef Exp $ inherit eutils versionator autotools @@ -16,13 +16,14 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86- IUSE="cups" RDEPEND="cups? ( >=net-print/cups-1.1.19 ) - dev-lang/perl - || ( - app-text/enscript - net-print/cups - app-text/a2ps - app-text/mpage + !cups? ( + || ( + app-text/enscript + app-text/a2ps + app-text/mpage + ) ) + dev-lang/perl virtual/ghostscript" DEPEND="${RDEPEND}"