Version bump, remove old; this needs cups-1.6, which is not keyworded yet, so remove keywords for now

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 50 insertions, 42 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index ef943a1fbb7d..9c3fc4981949 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.4 2012/05/21 19:18:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.5 2012/06/02 19:47:16 dilfridge Exp $
+
+*cups-filters-1.0.18 (02 Jun 2012)
+
+  02 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cups-filters-1.0.11.ebuild, cups-filters-1.0.17.ebuild,
+  +cups-filters-1.0.18.ebuild:
+  Version bump, remove old; this needs cups-1.6, which is not keyworded yet, so
+  remove keywords for now
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org>
   cups-filters-1.0.11.ebuild, cups-filters-1.0.17.ebuild:
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 65eef71f6f13..dec661e23fac 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cups-filters-1.0.11-makefiles.patch 7582 RMD160 9a753859a45c56d6e18b0275eafd6f69d5195334 SHA1 9773ee18d3481e1759986c20baf1adfa2d30d203 SHA256 9a25decdb0033eb1a1910c3787eaad6ac4ec69715db426edbdbdf22b759a5bdc
-DIST cups-filters-1.0.11.tar.gz 1019935 RMD160 b1067e23f1480a29572a6a6fddb6b51171f0bf71 SHA1 12aea06cffc182304055c91895cda14e235cfbf0 SHA256 5d3b476758a29de62576eb355e690581cbc7fe5465556b9a7b717e4097951bae
 DIST cups-filters-1.0.17.tar.gz 1019661 RMD160 de5c5fa4eb1391271d76ca5c049145d601ed0923 SHA1 fd80efeefb5f37755588db868c52a8cd49e620d5 SHA256 af66f4b19c6448f4b42613a66c852fbd7d4622aa9bad1ccc0e42cb7f2e617772
-EBUILD cups-filters-1.0.11.ebuild 1121 RMD160 01d2986a8998afb249a2604a914b226c8b80b0af SHA1 0396bf18f1b4cbd4409ba28987179918d2f41dfb SHA256 e5c7aa5770542d12d748f09aa99f4a8efb11e79d7d52afc07d43dbf73b4c52ad
-EBUILD cups-filters-1.0.17.ebuild 1120 RMD160 4c5cb5d938ca7916cd18c40d5d70c8712fca815f SHA1 2c6c220173ac0974d82294eeef79337c2311accc SHA256 cbb10ebb1c4b7ef6235fa26161d57c2417cd3c70a8a0fba73b2c2a0628d004a0
-MISC ChangeLog 936 RMD160 9f1f5db1b073e1a313770f5b364163027cbf3454 SHA1 d6e0df84fe0fda8e88d4152d8f78bb040ad8feae SHA256 ac701b239e015844124f7157469036063f9d8d003b13009e4d80237f643fcdff
+DIST cups-filters-1.0.18.tar.gz 1022509 RMD160 84cba51cab4a8c78f80de268342ec281967bdf68 SHA1 00fa6d585a4b546b36d0f4a92855a43982933875 SHA256 6926980653e7cb5f94b91921517678cca7f0e6781364823a05f7b4b0ec919106
+EBUILD cups-filters-1.0.17.ebuild 1119 RMD160 65561b8d4be11439ddccc8fccc3ef4681721999e SHA1 c8a647667d83e53f543b51ad580f807bc8d0c107 SHA256 1cc5f7de3b0b68f7bd0a0c083d235db7fc152bc62b12b874a955e78559566a8a
+EBUILD cups-filters-1.0.18.ebuild 1119 RMD160 7cf53106d123bb434d3e54907ca2f4dbc902bc28 SHA1 1da23549bc08811f42c983081d0177035f10633d SHA256 9f93882bd7da4d4bf55c8254bf1868427b8892cabbbca27cc092ed65e7840ae9
+MISC ChangeLog 1225 RMD160 848526cafaa54158337804f19dcdaae7b7483551 SHA1 80a6c232b8d0a136c5b9a6d24ba6d385d81b85d7 SHA256 7715807eb5abb56f7cd2b9ba4ad51e58a5c33d13667a7be09a353851bc27c837
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPupT7AAoJEF0huFKJUZL51z0QAJNijmANFaCv6aAkDIluXWmf
-WvhVAUrAquJFuGC/KO9jnnuhFbyapJaxh+Jwcg5H7NVbrATUqvCgjbRrKCVNI8fz
-0T5ipKGlRrC/u3wyKuXbtmKVilHYpFsGCgPNIbtMbA8W7DwzDYjRq5CtYKjKzIzm
-IrH6NyzwMRYv3QufkFoQBXFwG3szcufcxDuBTLqqG7TAZYqGWNJpG3FJ/iPnqHHf
-u212cIPizMyArXg3aBnTdeedPxe8XsDhNkFtfZoBr5IIX0UWS0MP9n6rDeLm7ZOD
-zwpaLQ63im4hTWpIzLNb2TQKMLNwzXKM14zNdH8+ndvY9gZVUUA5k2TxEUIasMt2
-hKMJRo5r+VfHG/eiRR0SwK+4C2Ch/jSeAOFWbxfo6ZK5qzT0G++4aAy8Nly/CG4Z
-lkJ5gvjtNA4l/1xIAhEQ/di1QDJ0QLGEVS3ViuVrtjDfwPk+OGzb5qKPVg7H7KKW
-OZ0ofg3wZrKHMfwiCNqzAEv5vbuT2y/9wttkQE4QKWBBY4mPU+UYqTQJy15WhrtH
-DRcYNuyHFSXTJDGCWfgg4jmTBl1GaYEbMiyj2GprTmIGo8GuXpU9xA3Y6kTpho/X
-kV2zEjnx16Kd8rwEX4DfVLU8/6lEMYmgSOqu02Y+R0wtYhtI//S6LyXICUjmIel5
-yDB3uuTmra+p+xVnNfx/
-=pLSJ
+iQIcBAEBCgAGBQJPym4NAAoJENwGBM22xffeGY8P/ReDqreZIUA92jktMMOA5B2r
+VFYNeBdtTmOx/OrZ2eT6rhvVl8amK5S0RsPlsUA0PXpffgIkTj95O0+V4fWs1P7p
+ui5XtjhsySD+Bs0SdgrOyE0GVe97v0znK3qC4XIDJbfdA+0jkooQn8GvTlo3T3Si
+4ERrjML33+fxYsdhLz317PDKuYXafMyohGW+ydJZD/hzGs8eBEOz8SuwM85V+erA
+FTUFrF6sCtQ6Y0/4wetFksN+/1Noa1CBTJpi+T2BtggOJ0ljG4jvj36CgEHNf8Dk
++QE5YDrbTHz6Uc0RTFtt/ms5PdAVAtoFOAwl+PSljEg9JZpdEO4xZuiLUcVxP6mY
+NEnEGSqGZVdUXPoGPImm2Ml5d7HrEE/albjdOyXjtdh6SUpnSFMDGCfA1BRuI/+c
+hE679UpURMUbrzuT/cL8RJ/TrSC0kcL/+Z0yuCGCKMsqaYwlhkyLc1xHhxo7BNV7
+c4D2T5rttdx0AN4Ou7ddfmywkpPlCAUGu/0tzZ4xQgLGAm/sduVcmO8Y3lJsRw7S
+jxcg7qScCDTb+ZHv5fiwOzbplyascoIaEEgLOlhtjSdXrA3bctkrdRMhf9l7XRq3
+FWLq4PI8EWeFNpEJjrlNgq1kdF3FmwMH44zobqqmHqs7j9Ur6ILfrDOEUhvMxbxT
+DYgHac1sW3ul1MRgauG+
+=HUtR
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.17.ebuild b/net-print/cups-filters/cups-filters-1.0.17.ebuild
index 1546eb92bf8b..8dd8cc4666fe 100644
--- a/net-print/cups-filters/cups-filters-1.0.17.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.17.ebuild,v 1.2 2012/05/21 17:06:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.17.ebuild,v 1.3 2012/06/02 19:47:16 dilfridge Exp $
 
 EAPI=4
 
@@ -12,14 +12,14 @@ SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="jpeg lcms png tiff zlib"
 
 RDEPEND="
 	app-text/ghostscript-gpl
 	app-text/poppler[jpeg?,lcms?]
 	media-libs/freetype:2
-	net-print/cups
+	>net-print/cups-1.5.9999
 	jpeg? ( virtual/jpeg )
 	lcms? ( media-libs/lcms:2 )
 	png? ( media-libs/libpng )
diff --git a/net-print/cups-filters/cups-filters-1.0.11.ebuild b/net-print/cups-filters/cups-filters-1.0.18.ebuild
index 2155ff9c14d4..7571ffd765d2 100644
--- a/net-print/cups-filters/cups-filters-1.0.11.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.11.ebuild,v 1.2 2012/05/21 19:18:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.18.ebuild,v 1.1 2012/06/02 19:47:17 dilfridge Exp $
 
 EAPI=4
 
@@ -12,14 +12,14 @@ SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="jpeg lcms png tiff zlib"
 
 RDEPEND="
 	app-text/ghostscript-gpl
 	app-text/poppler[jpeg?,lcms?]
 	media-libs/freetype:2
-	net-print/cups
+	>net-print/cups-1.5.9999
 	jpeg? ( virtual/jpeg )
 	lcms? ( media-libs/lcms:2 )
 	png? ( media-libs/libpng )
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9f9d3f45b7aa..4da756de8405 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -35,24 +35,24 @@ EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f7872
 EBUILD cups-1.5.2-r21.ebuild 8826 RMD160 5f18a992b36f0eabc3e644f96cbff42a2adf5228 SHA1 e3f3732d6a29b03131d878bb162abb437c1829c5 SHA256 f0c8b7b022b1989845f7cb3b7b412ffbdeff4006332d25fb9bf120b5c01c9487
 EBUILD cups-1.5.2-r4.ebuild 8331 RMD160 90cfea788dea3d15ae896fe7cb79a2d6de47b267 SHA1 e3b70a5022f02593781112cb54f15fc9d226ce69 SHA256 073f73dd2344da4affcb8bc190a40aa019a69794d35787797c5890266004cc28
 EBUILD cups-1.5.3.ebuild 8459 RMD160 abbab5ad629bcd8cc4871716e1e44453a80cc355 SHA1 5300a52b66f98495a91e6bc412003da9a297e96a SHA256 571e753f11a063792799c4a9e6950dca426a8fd02f8e75df4084ebd88e2dbdf8
-EBUILD cups-1.6_beta1.ebuild 7550 RMD160 d47fcb4acc0793c5921feed00f82f5345759d523 SHA1 a2ec889e6def9ebf0193996cf356735692003b84 SHA256 ba7e46c4f138fe0c553458cc3a80710ce12f93ff82afb764b9a3aae0335f3785
-EBUILD cups-9999.ebuild 7627 RMD160 b41f51f94206d56908a1d1961b3405a1e59c7e3e SHA1 65dcac962a3c75c4ef3540d9417c8ce61210554c SHA256 9faa089b60b9e3e58f6660095e4837465cd068a821ed7780d880b7626bcee08b
-MISC ChangeLog 74239 RMD160 92fcd7f2b9958c56cf8d8586478b7ffbf2ae3634 SHA1 8368d38b54f8b4a3204670b986d43bc0e0b757d8 SHA256 c073d3ffe5c66cd6d0559f28ed9ab5ce21c4cf4ae64b40a0875c0f036cb165df
+EBUILD cups-1.6_beta1.ebuild 7574 RMD160 a921e32acfb54c590dd7da28631f5b1e2909e82f SHA1 3314cb407bc78abfe1a773844dfb404b97d64c60 SHA256 9aa8effec91748e21346c9420bf68465324dd420e7d7c006cbbbce4d477c28aa
+EBUILD cups-9999.ebuild 7652 RMD160 678e15d2e0ae3c1aa4faf59794980bd808256c45 SHA1 5a85dd99db2d129e8884f7c3e3ff34d80d8101eb SHA256 8734ae1251dadda257ce3ef959de41f984585df650e0cdd43db70b68a809779b
+MISC ChangeLog 74370 RMD160 f1e4b7e3e3e4ec792132431441b9e85299db6710 SHA1 6ddce6d52cb9c6538ff97f36230a9e9b3e523105 SHA256 2b3d2dde2f59baba3c4e5100d72c5ced346056381a4519c4fd5c59a4312322ee
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPylZ1AAoJENwGBM22xffeONQQAJjCZ9ZkzsaKTy7EaxYRk7r2
-cgIm5MdDa7dB/iBVGZZhwMU/udGqi0D8X8XjsUhS9nF72xXwnmfXyebDjYa7qNjd
-vcOM3piB3c6mix7T8ChIrhAeDi6ZnbpAI6ZV8/g/8dftuYnL1dd1Nu3ftgxh2YUm
-uTLBp2w7iiopjxJEFzJ6TC1KE5wib/LihB8ozW817BH5o06GPueeL9RN7t+rTOIr
-RnpCRKdMTB1gUUMptfU+eEkMI4JA+zIbmg3MZwWyJTJRO17475ClV73ES600H2RH
-P4F67eQwbRZgzTFEbHwaELCW5MGqxmtj8KsUoOoYoGYWGESvQigt+EzAXmbV39ai
-7jsqU4V+Qei+s0W8/OAcgnhHL7ZZvgrrOML4rIEXIiZ0J9DCpkPtPBoNazu4LWAZ
-wSQRuktd0D3qajt0TesRa7Edq+vZ6L0BJN46SzGwOdmXk2hZgkD1tzjpUnfXQbch
-5aSXinx/QOxK3yUS7ua861qc9+bsUB8qyU50bkEDissC82zjKpqi0bWhAVGa9ifx
-i6byfP7smJtnGIh55bLofyrpE/R8yWEohamSWED340rQpBmWvUzIF4+I9I0OfL6H
-xgLFt+p9FvBMu4G2KVL2K72lZMJ7mbCV8gxyOgC/2q7AnCKlYuGWAx0pOdSh5QGu
-HzCNoxp1wVj+0RBEqTW+
-=s+NF
+iQIcBAEBCgAGBQJPym6pAAoJENwGBM22xffe/y8P+wbNn4aw45Xe/OoU3kMkg0Om
+aIT6KbgvwxUFJtAvpgOHqfpjGhVHGCuW1aDdA51H3bj0DqlxvLv/mfe0hNRGh7I9
+RYVRafAC2dZEQNzU6SK99Oq82kYbHDtzgFaZnm4cY/Uzg2b9b/BQ59urIRX+llfV
+zTXu28bn3lCeFRPkJ2GYRrVekUFMn0ZfBeARVgZa88ngkxjmTuOBugyuQuz+nbVg
+DD/e4uSpddAGrd7ggFHmKcArGh7MpWJ/aRXiKNKeKRKqWZhb+J0TbVd/CiybPIFF
+bq7Q1N0arnn2Id51TC1MmEqxhaONL+gqcH8egOtLJrxGHDDLAcQuEZ7y+kKFVWq1
+ARj3QoI8CNX1CDctPSKrpDMb8M4jb0KCXW3OLdjpZhnijliHWzst1yShXtoKkM5u
+TLzu63FtEqgZKM/SYGU01rbGkXRFfdfZVb6EjUIYd6hWwhBigjPG2+WZNkdx0YTF
+8VABdTIqIW8chfSvCOX/GGTRJImJ1ZFBsmBq1rvdsNHpim5IkSAEVbwMLEYH8pJx
+KEzpDY1XB1wypG5PEhfjLxt2qM9lHJRXzZkjbxFB4R0G/QlfIUFH0TuoGP+RXBUC
+ELGJJk1CKknAa87TcxpjI8wVOtG5XEMJD/nt0DjpVTzD4oi+aZT+lW8+C1U7bgE1
+uT+G44hElnLdDJ2bhnR6
+=owig
 -----END PGP SIGNATURE-----