update linguas (#523738); fix systemd configuration and dependency; keyword 2.0.0 with ~x86

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)

5 files changed, 31 insertions, 18 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 1304f062c6c3..76048781e534 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,15 @@
 # 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.645 2014/10/15 23:30:31 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.646 2014/10/16 19:31:03 tamiko Exp $
+
+*cups-1.7.5-r2 (16 Oct 2014)
+*cups-2.0.0-r2 (16 Oct 2014)
+
+  16 Oct 2014; Matthias Maier <tamiko@gentoo.org> +cups-1.7.5-r2.ebuild,
+  +cups-2.0.0-r2.ebuild, -cups-1.7.5-r1.ebuild, -cups-2.0.0-r1.ebuild,
+  cups-1.7.9999.ebuild, cups-9999.ebuild:
+  update linguas (#523738); fix systemd configuration and dependency; keyword
+  2.0.0 with ~x86
 
   15 Oct 2014; Matthias Maier <tamiko@gentoo.org>
   files/cups-2.0.0-rename-systemd-service-files.patch:
diff --git a/net-print/cups/cups-1.7.5-r1.ebuild b/net-print/cups/cups-1.7.5-r2.ebuild
index 5798e9e14c5a..09e85078d4ba 100644
--- a/net-print/cups/cups-1.7.5-r1.ebuild
+++ b/net-print/cups/cups-1.7.5-r2.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.7.5-r1.ebuild,v 1.2 2014/10/15 19:01:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5-r2.ebuild,v 1.1 2014/10/16 19:31:03 tamiko Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ SLOT="0"
 IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ca es fr it ja pt_BR ru"
+LANGS="ca cs de es fr it ja pt_BR ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
diff --git a/net-print/cups/cups-1.7.9999.ebuild b/net-print/cups/cups-1.7.9999.ebuild
index 246c3f59ca6f..7cb82f4b6818 100644
--- a/net-print/cups/cups-1.7.9999.ebuild
+++ b/net-print/cups/cups-1.7.9999.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.7.9999.ebuild,v 1.5 2014/10/15 21:36:37 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.6 2014/10/16 19:31:03 tamiko Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ SLOT="0"
 IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ca es fr it ja pt_BR ru"
+LANGS="ca cs de es fr it ja pt_BR ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
diff --git a/net-print/cups/cups-2.0.0-r1.ebuild b/net-print/cups/cups-2.0.0-r2.ebuild
index 4d99cbd2b350..bf064307652b 100644
--- a/net-print/cups/cups-2.0.0-r1.ebuild
+++ b/net-print/cups/cups-2.0.0-r2.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-2.0.0-r1.ebuild,v 1.1 2014/10/15 23:08:45 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v 1.1 2014/10/16 19:31:03 tamiko Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
@@ -35,7 +35,7 @@ SLOT="0"
 IUSE="acl dbus debug java kerberos lprng-compat pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ca es fr it ja pt_BR ru"
+LANGS="es"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
@@ -59,6 +59,7 @@ RDEPEND="
 		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
 		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
 	)
+	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
@@ -191,22 +192,23 @@ multilib_src_configure() {
 		--with-languages="${LINGUAS}" \
 		--with-system-groups=lpadmin \
 		$(multilib_native_use_enable acl) \
-		$(use_enable zeroconf avahi) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
+		$(multilib_native_use_with java) \
 		$(use_enable kerberos gssapi) \
 		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
 		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
 		$(multilib_native_use_enable usb libusb) \
+		$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
+		$(use_enable zeroconf avahi) \
 		--disable-dnssd \
-		$(multilib_native_use_with java) \
 		--without-perl \
 		--without-php \
-		$(multilib_native_use_with python python "${PYTHON}") \
-		$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
 		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
 		"${myconf[@]}"
 
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 2ca38537dc09..35aa2652823f 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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-9999.ebuild,v 1.65 2014/10/15 19:01:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.66 2014/10/16 19:31:03 tamiko Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ SLOT="0"
 IUSE="acl dbus debug java kerberos lprng-compat pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ca es fr it ja pt_BR ru"
+LANGS="ca cs de es fr it ja pt_BR ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
@@ -59,6 +59,7 @@ RDEPEND="
 		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
 		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
 	)
+	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
@@ -191,22 +192,23 @@ multilib_src_configure() {
 		--with-languages="${LINGUAS}" \
 		--with-system-groups=lpadmin \
 		$(multilib_native_use_enable acl) \
-		$(use_enable zeroconf avahi) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
+		$(multilib_native_use_with java) \
 		$(use_enable kerberos gssapi) \
 		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
 		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
 		$(multilib_native_use_enable usb libusb) \
+		$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
+		$(use_enable zeroconf avahi) \
 		--disable-dnssd \
-		$(multilib_native_use_with java) \
 		--without-perl \
 		--without-php \
-		$(multilib_native_use_with python python "${PYTHON}") \
-		$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
 		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
 		"${myconf[@]}"