Version bump

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 15 insertions, 9 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/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