Version bump

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

3 files changed, 26 insertions, 20 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9ad553808469..247953d3f582 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.493 2012/06/26 20:17:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.494 2012/06/30 22:21:14 dilfridge Exp $
+
+*cups-1.6_rc1 (30 Jun 2012)
+
+  30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cups-1.6_beta1-r1.ebuild, +cups-1.6_rc1.ebuild:
+  Version bump
 
   26 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild,
   cups-1.5.3.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f9a3cd92e044..acabce26753d 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -28,29 +28,29 @@ DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467ae
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef
 DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
-DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1
+DIST cups-1.6rc1-source.tar.bz2 8139002 RMD160 92d99c2e53c2c51d37d011f4edf28da1757975b5 SHA1 25dbfde70629cf4316167531ec4825da531c3dc2 SHA256 bb615f64172baf4b97218d1ae6ef0858b4dda8905e1135226d63550c285cec69
 EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
 EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
 EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 019f23a7ec692165365a5ccf2f450dd12952c377 SHA1 ea253303c464cb1a32d50b2717a10518f952dcf9 SHA256 3e37ca1ce032aacdc421f14a7060b1401cb043895483171e7f9653eab02210b7
 EBUILD cups-1.5.3.ebuild 8612 RMD160 b036fd44c4fcfbd8ef37274ec2cee1172c7420e7 SHA1 bc14e078429d29794309a198a739432cb8c539d1 SHA256 781c94470a97fcbcbdf6b0a14167b4cbdaa890c9ce04860adeb5a092d4506099
-EBUILD cups-1.6_beta1-r1.ebuild 7844 RMD160 c27354ac1adc6d1ec9d27f74fd722262c61c4bb5 SHA1 ac8340228112ffddab0ff1bc04fa1e30024ce263 SHA256 961dbc3935ac11e00bc76655a8727f000658cb6fbfa42b591849a17b355e623c
+EBUILD cups-1.6_rc1.ebuild 7829 RMD160 7ac092e7cd12c8603b23526601f40bc0366718cf SHA1 b30b6283bf8ec74da982862fcfe04ed4bb311bef SHA256 6d05b55f76ab8bc88d317ae39a81336c613f3a86e4c45ee342c3747a791a638a
 EBUILD cups-9999.ebuild 7919 RMD160 f2be286e9079872dae87d8ff34138b1e65fe134b SHA1 2f255964e7dde4deca9dc2acb8cc9c44c5784f0e SHA256 a0d869507700ec75306b5cca625634ee39a6f8065e558a928df83472addadb96
-MISC ChangeLog 75113 RMD160 ca92f89d1f7dc4d24fc9f6cd1a1187a1c2522e77 SHA1 a7f55f5504280ce0bd56f7b74bcddb8f379688a0 SHA256 aa951fed1d5870e6a0466e2f74ba67b8bac9cc2d6de42a820fbf961b8d0d3714
+MISC ChangeLog 75266 RMD160 9454652a18f87de66a32408f60d6c5962543e4dc SHA1 329cbec61ab858aa5755fbaa659692621288f65a SHA256 6a1e7253a2be01889b16d4e678352f4f54a15fc3d79b6c529496e42e230b7e01
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIbBAEBCgAGBQJP6hktAAoJENwGBM22xffeOcYP+KXoP5UKm8EzLovVFyot/K2+
-v5KEfntZ8nTue5ti0AF2fsZ2nv2ZDgvi7ApNPZL+PDD/eWpyz96y2eDk4sNc5w9R
-s8OamQxZeE5XfoZhcI9TV/t7Js5l8dhcDsR42TxYlMWvk5pmdXNwJ4f6esFglZ1o
-u7NyjfYsdOusDsaaInx3FLk0pthkhhXR1zplw79J68b1rvOksZJtB4XoEPmZ30J2
-fVFn4waba05XiwcfpqmFsBeOnkveRHIahRSHK9XP82dVswboCX8bA9t1VdLGJbjd
-fnnSmHls7BpOO10jrlDk0B1Q0ezbZbHHMISFiggqjSkdzFlO6fVayQUaudUbxXK0
-VaLGIgZCZrTc/hNX2yiJwtrcp3Bl2CW1B82jAYOYzvDeyTnZ5zKYJGQ7n/Gkkfeo
-UL/V1e7DlF1TW8jqYsH+TyQiqtepCSKSZnkk8R0agPbniqxxt09SaBNvy+QxkxDS
-NNQVB4q/U+QlATNGqJjJfsiW3ngB7YcA2uXKQb/26G8cbi8VENpN+1D6ghQg3bau
-m0DA7/3UpcuQHpNofM1yVVxuE2Z/O8xRZtjvbFhZSKNzxWODlVR/XnBwVSWr72+u
-TlNzSnDukXMxBREu/4XTmw9JJ9xY9JAvPbqUEXtyI1S33dxqDitsqnVktnHA2TU1
-e/f12cAV8I/LCJ9WlDY=
-=sXAZ
+iQIcBAEBCgAGBQJP73wnAAoJENwGBM22xffeL8MP/2Be7NMIsMfiSX/jpEbvCi7y
+51Ds1L88j5++G3Hoj/HInl3RoGnsk4WWsJEU1iHluBxW+dbNC5AU8ccZ92nPRiXI
+IlSlWYno2QEQbixCuSn+DuxCODztYDtHOs0qjsfjAUdAqngQwCuU6fPsWYBZRVN2
+cpXhoR08CIIsDIEwCijuEGejUAi+m9k/xVWFWgIRAllcniF5Ogabds++unefrrPc
+vHicVd7RUH8GC1jAp/qweQf8RTBBVI1CgpiX4UBmlN6/C1EOoO21PFszUb59lBja
+zU7+/WVxFG9Zdjj30N/P3qPusNtOSMimVflUP78q3/eHIkJirQmX7sGT/Gfb7tyc
+v5CWsvOu7rXriDQorZLSo2yLgU8fs5jwYHClBwpQd/+k7WEzJdSfJxAFX7t+b4JQ
+IN9zHyMqllH+wvzDUHp+6ngg4hNEIfpWUS6sGwN+utTeKwfpCruyxwS2QuyGFFiw
+os9Sfeul9HJa1Mg6FeY0r+Qk0ZMoHPMSUaC3dFmeEY9hehzb5sk3jgjenI0L2Aly
+87KmJ2piV8flImEBPTkhJFInkDEfBx3SGLbzXRt7IhZ/gkDZcqVWCvwsSlTphILP
+RNuM/dbwHVLo8LrjlZ+gWaCb62Xzz5pOEA/0WgaSj9arca14EmMiKgvRNvojrct7
+SC5pAg5C5gEgm/+ub/vB
+=UkhP
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6_beta1-r1.ebuild b/net-print/cups/cups-1.6_rc1.ebuild
index 3087c815c885..8fc630227957 100644
--- a/net-print/cups/cups-1.6_beta1-r1.ebuild
+++ b/net-print/cups/cups-1.6_rc1.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_beta1-r1.ebuild,v 1.1 2012/06/09 10:59:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6_rc1.ebuild,v 1.1 2012/06/30 22:21:14 dilfridge Exp $
 
 EAPI=4
 
@@ -8,8 +8,8 @@ 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/_beta/b}
-MY_PV=${PV/_beta/b}
+MY_P=${P/_/}
+MY_PV=${PV/_/}
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"