summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2014-02-12 17:21:21 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2014-02-12 17:21:21 +0000
commitef1be65bb48f1ab92e9c44970811e52e3fc52f7a (patch)
treed87d6ba5c6e69303d0f2f1fb5c806cb41d74afbd /net-print
parentinitial commit for bug #191149. (diff)
downloadhistorical-ef1be65bb48f1ab92e9c44970811e52e3fc52f7a.tar.gz
historical-ef1be65bb48f1ab92e9c44970811e52e3fc52f7a.tar.bz2
historical-ef1be65bb48f1ab92e9c44970811e52e3fc52f7a.zip
Allow newer cups-filters to replace foomatic-filters here too.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x94BFDF4484AD142F
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog5
-rw-r--r--net-print/cups/Manifest34
-rw-r--r--net-print/cups/cups-1.6.4.ebuild6
3 files changed, 25 insertions, 20 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ba146f5dadd9..a40338b85338 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-print/cups
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.585 2014/01/24 18:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.586 2014/02/12 17:21:10 dilfridge Exp $
+
+ 12 Feb 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.4.ebuild:
+ Allow newer cups-filters to replace foomatic-filters here too.
24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.4.ebuild,
cups-1.7.1.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index aed5db249cd0..62e6fdd993ff 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,27 +9,27 @@ AUX cups-1.6.2-statedir.patch 468 SHA256 52867308281522fce419b704ddf5c2c7c10b670
AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
DIST cups-1.6.4-source.tar.bz2 8262021 SHA256 b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73 SHA512 b150b5915a6ab433546e14024c673372fba04623accc10c637742c83342d73bfb91b9bfbb2e3e6a64a4cc189449ae811eb4a721a994ed42e1a9c489a166f2719 WHIRLPOOL 4152b1b2699af91831f21f308e9836f66649bf6ccaeb03b7fe2fef7017ecaa0907dce5adf7eb7c37af0e6dd10de53f295b29cad52dad38fe1a8c141525b87541
DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
-EBUILD cups-1.6.4.ebuild 9063 SHA256 f61989d481a662c53cdd9dcf8b6c3b81b2650b9c0f26ee3e3637da98206dbea7 SHA512 f6eac95e493e78b2bfefeb88e9a6614e98944ecc578bcc33caff15b8e2ab987520d51b8ce73ade214cb436af5826ccac624b8750dd9da345d3683bcb1a4a65d6 WHIRLPOOL 57d6cadb36761ea00ea85981ae721c42233e0f3b3bb6249909e5cd17193aa92edc231dd26ef15810b94c59a2d9dafca3fd7945d5d31e53d4ed409b1ad4f62829
+EBUILD cups-1.6.4.ebuild 9118 SHA256 a30eb0e4f2e47a3189a163df7bd293806607d03420d6c002bb84cd3bb9777817 SHA512 702091d21e097bd5d5b142feab6da59fffa8377e29fbdd8c53caea81d4168ec44b771bcd355d1aae8ed8380630796a8a1e0dcb9bf76675f046d7a4d6496538a5 WHIRLPOOL d9854fcdd866f8bbdacf255f14806221b18c81e93634d53fd8eff5dc02d0b0b5feab5f2dd00c8a435a0fe8052b7af1bc5738173a6e622862ed2b98be68ba5ebd
EBUILD cups-1.7.1.ebuild 9245 SHA256 3bb1d66b0439562f157de2a05c9d96b4a146d818bad10c97f9f740ff7ef2db48 SHA512 5d25a5ee65190cff3170cedd7c7de05b667ebc50cbbe02a6ac2e6be8f7a15d01aed561073316c2e59c46efe004a6b7b8c90284806d5998553af6308d925d73e1 WHIRLPOOL 57f4e0623584f6d4fa9569d5d63ec3e36cb4b6f18104cf27fb30a1d549c26559e64240446591ce4298a03408baa2a3327d48e2ff3601089c7af5e5ac620b68dd
EBUILD cups-9999.ebuild 9234 SHA256 eed33cb98895899f6a89f2a921cd76978d92d3304b4b0757e0110376205ae60f SHA512 7cfc10fd34f978a3106fc31ef9d3e02d3e25d7fca1f78e312b52e35460a9f8fe0f1d49cd98206ae328f150f47a34898b3e8b056c1ef5f3f01ce91cde403453ad WHIRLPOOL b8859f0632999afe1c7e2b4099fa18ce5974aa0f8df2f37bb7ddfcadd03d370cca8b42b70781c73f616d94f39785b056a238855e1112c93ce8cf304dded623f0
-MISC ChangeLog 89019 SHA256 ea4cac69a28ce47a615ba20a2f8598a1b8ad55248ba6c0bf8febf2197113a47f SHA512 6a7e606b5ea28bf3acf43913d80319e47e6ba7ef91832e96dfff0b26b2d119e2b05f3701f5eae95d7af1902520458ed3cde9afcc02c00e7cd27557fefd78e3e7 WHIRLPOOL 8a9f29132c0d3a1179f22613a0b8ca051f60bed7967ffcf30059b9d8e3f123079753ecb0d002695caa71d5d39b38aa78c0a565551f623a451764a37073280f6d
+MISC ChangeLog 89161 SHA256 e00ac5577a6cdbc9033bbe52db41c6434d667f34107fe4660353491380d9d7f1 SHA512 ff617c9e4b326d78dbfffdcf24adc27b7793d5eca9552434b759f000ac7b22c8b32e457d62666e51a72f15bd35139117a594fecf5101c058e4f7e959598f4d23 WHIRLPOOL 5dcd9044a2c3fd7d37d33a4875a1eab3e62ea932dfd8ca83255281ac125ca5e1485eae3cfd07760f553dd97c5dc8cac720481644278ab395ae43b0f2279633aa
MISC metadata.xml 601 SHA256 9bcf6942c89c7dd963f9a34c413c1da17e25cd36489b95b708d4a89ff9659ea8 SHA512 58f0fe7d1f7b66a637013eeddb26a5c409d46915c8f4220e54850cf17cfa0cb082b3c2c5055a660857729cb4c5a53c7ac229dab6a29f801e53dae0ddc94cb573 WHIRLPOOL 55660efe3345c304742dbb12947776a97ebec51354fbab55423dd1fa7efa1b3d9321f067dfcc469462911e12446892b223ebbd3b670d1126255ffe642a64a527
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJS4rfaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc9oMQAOVURCgEBV+yqcnUWpPNinRt
-6ADttR4EYcuzRaiyC+Em4Mqosc0XgoputAYdM1bRMJdGJwsikZhOKAgBkBbbd+Ar
-Iu+o1h1sUA5mliQfOFVG+DngLwO2hqbIVR5BNqLeKqXnhsUkeN80GRSBW4vbE6hj
-MnW0iLSXGsz6VnKC1QLVksIlo/WYSe+N4FxEekhv9gQtAaG5pYzU7BJvIk/Yggm9
-kHg/b9CLmX71wdQ8hQDkvrpiE8wofODbmxKiGXjNgJ/1/SYuh6MR8s9BkOCapvR8
-NtzYqk+XBRDARsFTaBPIRZ+n8oPugj33K7GMWvlKfJ1cve+0fy94U7LooVdoIrA5
-xS90GV1Wy2kqR2pXDEc2lO1i11elykgE5FN6uR1IlEHF05ptkrnllB62Q3+omH2S
-z4GUE/IkjE5kUheCj7+AJjuP4cpEWhdQiChMSEQ/TmHw3NrR7+1GEthnwU7+Zo21
-yS/9OfyoLZh3qisP36kjDhRTJB2eSsE7plUjvASpU7XRAH6NzqoIXT//JTfP8vA8
-9Cpo0l/j0IsguU72Ar0lBO70DHtdizlpsgB/ATG35ED1PrkIZWXrmCWjn2aj3cx0
-0QLAzx3snaAqa6svnJAKaRnZm+eRdPw+M79xwIbLGjsCKNP67syWCwec1+72KDeH
-DxvO80sRJCgkh/HHvQRZ
-=M41j
+iQJ8BAEBCABmBQJS+62HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
+NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvJnMP/iMYbYGTjIIhtddmVvvNQC+F
+Kzl6neeU3amwCvqcHhnOJAv68Ubl69MtdhEm6FJdSmHyx2Symk9/NPkYAbt590b5
+weLqrLaqsbvRuvig4voM/VYr3jHhFYLvQZfjY1rHF2ad82EY+KGUXr0XCV81Jpzh
+0YwIptSKg4xDv9/JnbwOlkOkeISPI9Eysicuqj0dV96gnhEJIt599r6tnJtu6Va4
+XM/DUiU0NzzXnlPH1f7qkAfLYk46y/Od8WE61DgbEGNp2/QyBFqX2HX5vvrxD5Pq
+jE3rDuBvu5R6SBJa54qGD/kT9GgS1xieSKMiLjqcHkYa48BmelNtvNTDcMePzHe0
+C0tw7KPCW8XQJs1j4vn0W+9yT3U7TQ6n4YPBFZy94eLZLGJmHIIpJ1CKBnIIL/Cb
+H4aX5oHJzaDVvlyzjILTF81p4v1J1p0eTV//Y1MEwKeJX7+AIp0a/Z7FCuoTWZg7
+qRS9t8CKKti9YCjt/5VIPiXFP4gAhaz31+51ugbGF2AFk5AffwL9g07JO157LM0N
+zQGRB8VEACuTM/MlOISWVvkdn04ocj2JkN3OBtDPREmPWHMBd2XBN1ssWKVvF6OP
+/X91MrdblN+Jw0ZMo9/UnwjiwEm09IvQVWuL3vIYLDGuWOOE3T2/aye+y2WbHXm2
+3z6DQ45WiMejJSC7IA+F
+=J2N8
-----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.4.ebuild b/net-print/cups/cups-1.6.4.ebuild
index 7c6a7d20f2de..5edde95efe14 100644
--- a/net-print/cups/cups-1.6.4.ebuild
+++ b/net-print/cups/cups-1.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.4.ebuild,v 1.11 2014/01/24 18:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.4.ebuild,v 1.12 2014/02/12 17:21:10 dilfridge Exp $
EAPI=5
@@ -73,7 +73,9 @@ PDEPEND="
app-text/ghostscript-gpl[cups]
app-text/poppler[utils]
>=net-print/cups-filters-1.0.30
- filters? ( net-print/foomatic-filters )
+ filters? (
+ || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+ )
"
REQUIRED_USE="