Version bump

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

4 files changed, 41 insertions, 15 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 8680a1fa5907..8c9e14ebe31f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.497 2012/07/23 15:09:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.498 2012/07/27 17:54:03 dilfridge Exp $
+
+*cups-1.6.0 (27 Jul 2012)
+
+  27 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6_rc1.ebuild,
+  +cups-1.6.0.ebuild, cups-9999.ebuild:
+  Version bump
 
   23 Jul 2012; <swift@gentoo.org> cups-1.4.8-r1.ebuild, cups-1.5.2-r4.ebuild,
   cups-1.5.3.ebuild, cups-1.6_rc1.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2b00c9db47b3..6d0aadc4b7b7 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cups-1.4.0-backend-https.patch 483 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526 SHA512 b027cc2d6f0753d26fd8cb4c9405088f9444c0202d17a43841b3b1f99f2674ebf03aee73fbad4198a9859c748dd7ee2a4d69366eef251e2ef5524cec02729d53 WHIRLPOOL f692e716b68d0ea4cb1cccd0f62b5a74f6d382c07a9ba293e20efaac74eef0d32b32176302e03b5577b778b35cb3648415f92da398ead07e68436dcaddaedcd9
 AUX cups-1.4.2-str3200.patch 1654 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 SHA512 42973efea5e3b2a345b94459690fc1ed5406d3073453cf011f802c70a78eb95aef5490f4ea819a055f2ed2b286c0f0a7d5dcf0b4672e056316b8870e84f79e97 WHIRLPOOL 1ad0beb2251be588c195608b6f308881e4d0deaaae4ffaa3466d42e243f5066954d524b30f09e06afa794634eb076eb67dbdf51c579dd9247dd28dbda422d655
 AUX cups-1.4.4-dont-compress-manpages.patch 580 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860 SHA512 d262615af6ba4f95378ce2ced3816f42e4f616f7f021999508a8a652039b63eb0a7175e6cd41e8fdcc793a7d9137e7c3009ffa347e9567b4f38c8d82bee41b05 WHIRLPOOL 9096554a336874a7498cf40c20311ac2df36a18a4242fb3d0b73de395211244879e9648adbbfc1e40c4aee53c7827e3525c51bd6eae99910c99b8424ddade451
@@ -23,13 +26,30 @@ DIST cups-1.4.8-source.tar.bz2 4547162 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8
 DIST cups-1.5.2-avahi.patch.bz2 17252 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede SHA512 8bb501d5989272803ad420e38249b5ac69c93d9bb12d86663d98b090e2bbf025c104b9e6a65b240d3df868ec780a3fa74b24bc7c3c4e007b0a21022750a5bf20 WHIRLPOOL f97bdef28419d5e9626823ea69ac59ea6f4d1d5dbdd075b386e23993eaf0ad475508b04eeff9089edce1b264e8086dbab00b6cac2265df1c97104829c044f4fb
 DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a SHA512 212d3cf4110cfbbf9feaf96d37598860c154d90df474cf85488208899b4624b7e325a46f4bf6cbbde9f76a1b98f26578085143023936ceda3dc62270fa86d0a3 WHIRLPOOL 563d60ae528fe9d558298542c283b53023fc546e652b3edccc4657f14500fcb7c0062ad09f2586fc84b02b2ef23a4e1a6b2cb0d8f1fa5993a0828a25c8e4be2d
 DIST cups-1.5.2-source.tar.bz2 9595665 SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb SHA512 c1d83a7540d9506bd8e7d0ce8761a4737928feef388cc5008179d408cc7cf59347fdbfb5a1c9c66b229919d316e37ef2d1863ac5caacada11afb1514ab682309 WHIRLPOOL f2db515343ee0a564436363ed9b6625cf04e6e1e1a93cfbaad1dfaaecd49a89d7afd4bf0bc2828a435aea807b41dad93229d7f0bdf3228d7c6ee3c066482c362
-DIST cups-1.5.3-avahi.patch.bz2 17298 SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef
-DIST cups-1.5.3-source.tar.bz2 9580485 SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
-DIST cups-1.6rc1-source.tar.bz2 8139002 SHA256 bb615f64172baf4b97218d1ae6ef0858b4dda8905e1135226d63550c285cec69 SHA512 65b4ce5d48717d40a52f3170b712e0d7d626bbc54619dfc2d933cfcf819eca22dfe3a5361fa170e82d08b11a3ae3659d124046577e030386c60d43c3d35a9ad8 WHIRLPOOL 105c68fd04291e95270df5b4a50d72f9e646e5d20619dcab83fc8ba038e4ad46dbf5d06c61ce5ef9966400cb4fcfbecfd808ee9fa85272284470bc517446391d
+DIST cups-1.5.3-avahi.patch.bz2 17298 SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef SHA512 144f059e092e8b254ac31b156a6330fbd573ff22bcabc8a13703ef7c17e3fbda328ec7607b6a5e72b6ad7050142c6e73db733ebad31121c6b91b5a49d724b901 WHIRLPOOL c3c753580c0eb00b7842cc12d1799afe14e9b696c621150b1e23f8a115c18a442b9f45e7dfcf3721cb3efd7bfc7da366ac52fc4d4caa002adcdbc23164633820
+DIST cups-1.5.3-source.tar.bz2 9580485 SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d SHA512 0de371eb347a41226a4a84de02f6eddf1585874c606b16173d8ff3e48d4317b1c90b4ef188068786a562c663117c8782339731d4f339ba76f438e8fae0d364cb WHIRLPOOL 09d564c6ac6cb4933e45f7e70b362a61416173cfcbbb3f26ed69c1b2dd51d7e9d8d1ec40993709ccc52a55b7842567a163425f18264ae8e86d20361f75448f5e
+DIST cups-1.6.0-source.tar.bz2 8219736 SHA256 9a30b141e3a11e558753a729d9766f487d31fc26f1bc060f8bb7b93d436b86a8 SHA512 27bacf7f517c4d3e1a1e8d89060fa07f7417707cfc22b8ad3e9389be9aa35b5aa51ad27ca5d1b7db07ee4c093f8c55331078f175d6e2c8e22d0548a9f18e9433 WHIRLPOOL a9f85a4eb25bd16be935b7e52fa2bb14e19a5cb4a4e006057f767ea2324a9dc2fc30d142a30a01587b13677f6ae519195daf100d8b40244344f5bbb115d0b769
 EBUILD cups-1.4.8-r1.ebuild 7288 SHA256 2223e6dfbb12a647bdaab7d521fabe21d0b6c24838dd3cc46cd70f17a0c5ab42 SHA512 44855b10eeb588a69bcfe57980a13a83a49ed5e4d9aea8338e1a395f8ff47a0542d7550a3eda9e5cf4266af12d398d1e3d458af0ea11ffeea52459c32d704feb WHIRLPOOL 18b4c7529e599f29160d2eacaecb550eb8f3e208ba7f3691f5e1ead6e1837bbfae0e24e629a737a6a58832480b15d3dcbdb9dbdcfb8a68305e8f1170210bef6d
 EBUILD cups-1.5.2-r4.ebuild 8400 SHA256 eddf72820de09e9308963ef1b3ba8a9724ec57af7b171a86d551b458dc5c2589 SHA512 b0ae23c2b9fa2c489eff5079ab8ad9476c3102efd0d3d55f12f8ffd6e6aa2bc992c56f91427f80b64d78062c6b22d4cfd7979bd7b609e88881ade67501b94247 WHIRLPOOL f8704cc547ea38479f6f410bf791ad734387b85feac17631c5be0c49a2f64104dd2cee0ed85933b05099c372dd35f724c424d261036737209fce8f62a4e404c9
 EBUILD cups-1.5.3.ebuild 8654 SHA256 58f14d94f76fa4f2fcd47b28d9d1083928d167a0d5815babc87ee33e8f49715b SHA512 c276407c3efb136181b5b2d94ec408a9a199962b8915eedc1b31672daebcabcc129c7132757317ecb596a5d87d88fd69daa5bbc40c52a1ee97d709f072a38c42 WHIRLPOOL e9ac205f7966c09a63f339a2e140a1b57fcdd43e4c7d5156e8cfc4b87c84be4e7f186d404966e95fce7318441bcb5067e0028890f023964ee2fc6fae0879d85d
-EBUILD cups-1.6_rc1.ebuild 7811 SHA256 6497a1709f49b8d3b8878f9e4191a9d33f8a93defb0c0a698c45686ee6488ba1 SHA512 1dbfb884571e611ea1f575980225c0cba7e399db3d536696fbe2b58e07ba07874044dfef33d4e6daa038e93474c4af6e89ef41cdfec27dc5dae8a90d7f25ca55 WHIRLPOOL 7f5a1c639ced9687249e68c2a9a7f4f31a0688d0492bcc6c1a7261309a08821195313fade74213d490c261b5d4bf3fb249d3dadcf156266dbfa373aebbe186c9
-EBUILD cups-9999.ebuild 7901 SHA256 2665f5a3f210ecf2326b45dd708682e05dcbf80d7c4c2ae0719a1b783ce68ff9 SHA512 f18d474b7522b5ac8802cd3f250d5741cbaf60ff3c0857e082be36aace146b19a82d2719aaa4e851fdf61ade5b9bae866a0b6e8cd93b6f21bcfa346f8b3626f1 WHIRLPOOL 10a41ddb9b9e1421b9f8519c4c7352ac4cf454e0116d7edfb562abcc3687b9a90efac082db47825bbdcbc4450c30a36eb36e3bc69e1a19ce98ce74ae58dab8c4
-MISC ChangeLog 75677 SHA256 57b8fc0535d034990d28dcb39a6165c4332cf7b2282641c8d0e06634fb480ebd SHA512 33c05a8e7669ca7190e780aea30ce43b8e362b5b43918e12371702ddf034629b464fa365693e93da56074d8c8ea4a528f1777381ab6e16dd0ff9eb8af86a1f89 WHIRLPOOL 0ae738dd28535a62d2477c04afe09c928b680148de77f43e21ef4091ba42bc1ab3119ed0dc7ebe074eff0b0435088b987139bfe9b34d8797632639202598bcb0
+EBUILD cups-1.6.0.ebuild 7840 SHA256 83d86ae5bd510e7172da6ef91e0b47f741a03297da14c211cec51a9dd649fea3 SHA512 3abdee26095615cd3db8e49c978f41caeb25f3567480347b9b8da5dcdb172ee3b37b76337b806d990c1ebc3fe7df0e384bbb31d88063e5f43a04bd76e927a0c1 WHIRLPOOL 8047a199ece877fde7a40fb6daa9114b918c79bfe8f457a88c7d1ffa524b89329e363e9c7f2854ec09da68bb68a9fbfe07188af1768c6f8b0c9764cd68121205
+EBUILD cups-9999.ebuild 7840 SHA256 6c3e797a4e3649729f07d3e4740301624cb06863bc86bacf1f0cc2e1b677a37e SHA512 3ad833edace7b31e329f9f6efda35d22419cb44073a95c752d07063f4cea5520fa357b5e54eff29cade82ee5dc4701871d4d96589e80ec55ab9fb802d488ac3f WHIRLPOOL b96d9fd8aa9f5e33ccbc7e8dbb2d8f347d2f9d664b1c706cce240536a0cccb0876f3a3d36bc03bf6dcbaad40c013ff830b6e2171d3020ef23922d739d0d9d828
+MISC ChangeLog 75843 SHA256 e80e6775dcad6c322a0b76da5d184d01b404202aa0cc11ef6e7f916a2bc28c6e SHA512 a10c9abcfb7cd85035c39fc89be757a93ce5c32382568f8f01c30cb931a8cda22f0498d9193e4b3fa1b87ea29326d720be2c41caef8c8de240a2fd0324e2bbaf WHIRLPOOL a3b366fc421245c8a977ef03ea1e6cab92251189009abeb64dbe81206a78fe423c1923ba186995f48cb41724bfda285886abf3efeb9d51f54a9c02be1c66572d
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQEtYcAAoJEEb+UGWnxTyHYMQP/1VxrmckxpHzzuFHJt95ngFD
+Ub/N/P5u0KGpKaPjteMs79VTD3bzJY+NFcqTY3lF9WEVISrBQhLzksPkkuRvwrk/
+HfeidAhhYMd5H/u7peZnEscNhbZn7Yf85VZewefN3Y9FGjy/rp9hykxRZvy/QsP2
+PQ1NHJ8fvIl2HSMiRAsX+mVqkwUKo4eAS1vgXvI4PjHkWGuF6owZpH/ach0DvNmj
+xR9gOcfgAA42yMBKLyF3XmZGmRzhCcm0OLORHQXTsyj6JnXogrOpZcm/Xmt+uqJI
+1mxWaLb5DUHJeQHA6swH2E8nENXAKbbE8g+cp6WLXukYwT/ksc8aVRvjYQbhTzfz
+0KSxuThdoub1D1uQXsWT4a69J4xqjXc/tnN+z8YRAtRareFS7lDyAReTzLrpVQJu
+Fs7Ie2RWxj84US/elaieCbx9aggr3gtx3/bdgYnTe29zJMaJ17mx6ufxehUvv8G7
+jXCh2hpli+J9lw+/El2lX1g7cdo/vLKI++AP4Z4yquztDDENb3lsxpp5qNDEug98
+5Vimb0oi7zcqoPovg8XLVA8TJ9/vd7V/77jY08YE3Yya8rssXL+ArAGeFWZ2BoKJ
+btDI8WbeeEvQygxJSSvikdPIW1iUkA01Uhs08SL5B7sVTVFYNO6xTlJ/JhDds1Kp
+2UW9NFe0f/VpYkaeGDyO
+=bEDC
+-----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6_rc1.ebuild b/net-print/cups/cups-1.6.0.ebuild
index f7d729cf5ce3..89e501b3523b 100644
--- a/net-print/cups/cups-1.6_rc1.ebuild
+++ b/net-print/cups/cups-1.6.0.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/cups-1.6_rc1.ebuild,v 1.3 2012/07/23 15:09:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.0.ebuild,v 1.1 2012/07/27 17:54:03 dilfridge Exp $
 
 EAPI=4
 
@@ -8,12 +8,12 @@ PYTHON_DEPEND="python? 2:2.5"
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
 
-MY_P=${P/_/}
-MY_PV=${PV/_/}
+MY_P=${P/_beta/b}
+MY_PV=${PV/_beta/b}
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 else
 	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ja"
+LANGS="ca es ja"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index e5df34383a37..6b8bce7fa7cb 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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/cups-9999.ebuild,v 1.14 2012/07/23 15:09:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.15 2012/07/27 17:54:03 dilfridge Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ MY_PV=${PV/_beta/b}
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~x86"
 else
 	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ja"
+LANGS="ca es ja"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done