gentoo resync : 31.03.2018

3 files changed, 6 insertions, 16 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 410c92c66d17..a5ea40e5f1ee 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -17,6 +17,6 @@ DIST cups-2.3b4-source.tar.gz 10130356 BLAKE2B 10dd250516bafa1df0e8d123fbfff44f2
 EBUILD cups-2.1.4.ebuild 10275 BLAKE2B b94862bd0d4320f13aeac959a1433a234e544a3a659d45a9426d5245c275252bb1dc1f9f7345fa4126bcfa66665118640de57113ffeafe37518871d78cca8b25 SHA512 344b4afec144bc7c41b6abf05d3edc7bc154bff78ec26c8360f8d22b6ca93d99f4dfbba7dd0601a25cb29286572b082888dca9d94baa9cbbd81726be12549055
 EBUILD cups-2.2.6.ebuild 9962 BLAKE2B 3588e4b816ae0f0d60ca5d6f738552a9af92e245de957e8978482ade9f6d1a175c5616cd50b54625a97dbb97245f2c84826370b04db19f5b2d79b7d8dbb69fcc SHA512 7a8573928c49de88d7d14ca997a4eeddd0a96f36a7f00bf8f240425cafc2cef219ce8eaa1239c837d23d3a11694628bb1f9f822ce595dfc5f87b10697c61542c
 EBUILD cups-2.2.7.ebuild 9957 BLAKE2B afa6181c1cf3123eaebc75048dd5f0816415c4c9b5586b69bb84103f62011ff4258c63b5916c85e540f26656ea410f725244f3506e619d879b6577a735a0b4b0 SHA512 425ef7271c595c7a11f134dc8024fc68e1198345bdad4307e001f8e4ed84f9b34064f338bb167f1ce0aec1ddf65bced6995888683b591a15a5bedde0c0005769
-EBUILD cups-2.3_beta4.ebuild 9997 BLAKE2B 07e259552a3b98846b008a9fe97eab0102555a901358f78f914cea30c56ab6b883c2b9c3f2476037afc7c363531af0c5570434ac15b138b64be8112573b8dd6e SHA512 0d7ad1dcc59d1ef25ff5f4c18b71dd46ef41ed3aee3a1ea65dd5ff9146aac9cd3270efbdfd168e4e56c7387153dc5d9633d839b70ff14e55d17ba183340e0652
-EBUILD cups-9999.ebuild 9997 BLAKE2B 07e259552a3b98846b008a9fe97eab0102555a901358f78f914cea30c56ab6b883c2b9c3f2476037afc7c363531af0c5570434ac15b138b64be8112573b8dd6e SHA512 0d7ad1dcc59d1ef25ff5f4c18b71dd46ef41ed3aee3a1ea65dd5ff9146aac9cd3270efbdfd168e4e56c7387153dc5d9633d839b70ff14e55d17ba183340e0652
+EBUILD cups-2.3_beta4.ebuild 9877 BLAKE2B 39ada1548f440a4d91602ba56d4451382783e2d851e3b0891ccdae42c54d71915f69cd5fa868c6ed60e266c5ecd4bd73a18f644630b4e196a9942bdb99fd83e3 SHA512 b141f3a9da543989a82af2c1bdef94bc8ee173710e6607efd0c0bbf95ff4e921373aa7cc7ddf739edd32e38b7a8e3052ebfc2737c68a34007f95c8d6393b92e4
+EBUILD cups-9999.ebuild 9877 BLAKE2B 39ada1548f440a4d91602ba56d4451382783e2d851e3b0891ccdae42c54d71915f69cd5fa868c6ed60e266c5ecd4bd73a18f644630b4e196a9942bdb99fd83e3 SHA512 b141f3a9da543989a82af2c1bdef94bc8ee173710e6607efd0c0bbf95ff4e921373aa7cc7ddf739edd32e38b7a8e3052ebfc2737c68a34007f95c8d6393b92e4
 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717
diff --git a/net-print/cups/cups-2.3_beta4.ebuild b/net-print/cups/cups-2.3_beta4.ebuild
index b971a2a2cdcf..5a4700f50873 100644
--- a/net-print/cups/cups-2.3_beta4.ebuild
+++ b/net-print/cups/cups-2.3_beta4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
 	multilib multilib-minimal pam python-single-r1 user versionator \
-	java-pkg-opt-2 systemd toolchain-funcs
+	systemd toolchain-funcs
 
 MY_PV="${PV/_rc/rc}"
 MY_PV="${MY_PV/_beta/b}"
@@ -32,8 +32,7 @@ HOMEPAGE="https://www.cups.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
-	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 CDEPEND="
 	app-text/libpaper
@@ -45,7 +44,6 @@ CDEPEND="
 		)
 	)
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6:* )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
@@ -176,7 +174,6 @@ multilib_src_configure() {
 		$(use_enable debug)
 		$(use_enable debug debug-guards)
 		$(use_enable debug debug-printfs)
-		$(multilib_native_use_with java)
 		$(use_enable kerberos gssapi)
 		$(multilib_native_use_enable pam)
 		$(multilib_native_use_with python python "${PYTHON}")
@@ -187,8 +184,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable usb libusb)
 		$(use_enable zeroconf avahi)
 		--disable-dnssd
-		--without-perl
-		--without-php
 		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
 	)
 
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index b971a2a2cdcf..5a4700f50873 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
 	multilib multilib-minimal pam python-single-r1 user versionator \
-	java-pkg-opt-2 systemd toolchain-funcs
+	systemd toolchain-funcs
 
 MY_PV="${PV/_rc/rc}"
 MY_PV="${MY_PV/_beta/b}"
@@ -32,8 +32,7 @@ HOMEPAGE="https://www.cups.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
-	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 CDEPEND="
 	app-text/libpaper
@@ -45,7 +44,6 @@ CDEPEND="
 		)
 	)
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6:* )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
@@ -176,7 +174,6 @@ multilib_src_configure() {
 		$(use_enable debug)
 		$(use_enable debug debug-guards)
 		$(use_enable debug debug-printfs)
-		$(multilib_native_use_with java)
 		$(use_enable kerberos gssapi)
 		$(multilib_native_use_enable pam)
 		$(multilib_native_use_with python python "${PYTHON}")
@@ -187,8 +184,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable usb libusb)
 		$(use_enable zeroconf avahi)
 		--disable-dnssd
-		--without-perl
-		--without-php
 		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
 	)