Drop php scripting support; it is unmaintained by upstream, has already been removed in trunk, and displays build failures with recent php. Bug 388105

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

3 files changed, 23 insertions, 30 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 0847e7db32fb..fc1d067d114a 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.452 2012/02/07 16:32:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.453 2012/02/07 16:43:38 dilfridge Exp $
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r1.ebuild:
+  Drop php scripting support; it is unmaintained by upstream, has already been
+  removed in trunk, and displays build failures with recent php. Bug 388105
 
 *cups-1.5.2-r1 (07 Feb 2012)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index cf22496fe635..17e4b6fcfada 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -22,23 +22,23 @@ DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b6
 EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a SHA1 a15340529eecbbc8a95392d2f1b508cfb4caa47e SHA256 77271eb2ea0dd120801a4b1e5381ea4859e80375d9587f83ec3f4c37ab8868c8
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
 EBUILD cups-1.5.0-r4.ebuild 7775 RMD160 7fd5f4de9110102f765b9bf698b37ea63af9f65c SHA1 db33feabdb65d4cb10d9f275cff9698ef0afec42 SHA256 66738bc3aad1a8380f0ef2a6aeb3b13edc626cfd958dfbb9f68295f3262898de
-EBUILD cups-1.5.2-r1.ebuild 7827 RMD160 639c3e36badadf4c7172c41f5cf0aad8ba24a5ee SHA1 8ea607d07ee218259a1533e6dffca110bb8308f1 SHA256 ed998275fb90a09489bb81e41e95f5a1a8381066a8965d90ff7de9c47bd82f07
-MISC ChangeLog 68689 RMD160 d1c11f017b4124d1a00f30cc68983640ef8f2070 SHA1 25e96a0ec03c18183e4663f70903e1592f1f81bc SHA256 3db594f801ce68fda599f6d37060d9c634f67338caf03bf3bdcbad154bb0bfc9
+EBUILD cups-1.5.2-r1.ebuild 7612 RMD160 fa4100765018b903f4637086a4548b0296553e9b SHA1 51b64958eca8101dceddeacd90d48c9d68e98db4 SHA256 d39753945a297c30d628a4f7eb7e4a3b3544720cf3bf4686014a2b953301f4fb
+MISC ChangeLog 68924 RMD160 e884ff5833b1b8efc565ad0eb53445823fbd571f SHA1 19fefc5fd4438b0317f3c329cd93c5a6dd063451 SHA256 8332f74abe089cdef4cbd68aa2fa94cec3f6e7690cfcc728026e2f858993c6c7
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPMVJTAAoJEEb+UGWnxTyHuPEQAJzUfX2XmZ8FKG9NXzHdMT9t
-DIQY+sH7SCLNLWIvi5bCuG5lS2Enc/JoxvzhDUGZgdRJ2ZKB+tr29ETXf92g034y
-kxOktnjhtGzkz0gDFzEdwjp54jolUs5GzZ9qAsA2oK27jDygK+Gu6vmH1OZKFC7N
-XqYwpF/4dDhdPO27tcbtskP1tHIGYUSK17LWKp/sGiu03tVFQ/3+8dW0Fpb/ojdc
-nvu0jTvMqVXuGZz9F4lytmxPSYPGJ5xNKoNl3PHctkNP8oR5j8hV5UGwBNP8ZCx0
-7js0AOSHNRTxM7gWIdGBN2LnW3MWyeQ39NSJrkwJP2JvuQCPYsuKvNR+yq/Arjv5
-Z4O3tZ54p9v3bf1ywml7KiHb51OEJuTUFruPATM4J/bDGnr4d6EsOQhSpRPsTtEM
-Mq2yx5MqU2y7M/CRtQNR7P34h05QPR3i9Oz7yHeQq7ssb6hyf//6Opxx4uLrJrqB
-MKVONZLIgmfvCCkwV1GGK3NmJIO9qMH3LhS73Fb57XZfWO6VvoUn+DfvitH+6lT3
-y5PiK1jKK/136k7UNCTqCYvQ5mcCacTxqcVg7al8Zn/ZfHM3fpF78evLw6F3COeW
-mGfR/HK4qmRvRaFjxU08rlvFtIdywAY2LcHy1AgsF3AN8O6IImMmSaHo1dyri+g8
-Ue5tkPavLplCbzV3uDaG
-=L/zU
+iQIcBAEBCgAGBQJPMVTZAAoJEEb+UGWnxTyHXnAP/jFjSP9VoiDlY3I9Bn0dcN7m
+Q7FMbtMvhrdwQgprzlAQMptY0CAnqwo73O2DKrg53q9Ops6EhLmcNG+NVywCGuqc
+SIHQqL3PZ89oT/HkcMPs9C95F47ZSy1BVGhRhkGotVxwzMHon81sLAckVF0qkmSU
+dJSPe3mmesd8t7mBTndDguPk7TuO6LZS1zqVfS6WyywMUl5h+Z3And8tHI+Rr6Fr
+KoUaOJZ3Dguus6RxUioJeD5FVku3sOkGGspR6v3G2sC2IKohK42UcY2U22NqRD6R
+T+C/S4BHqZEXv6aYF0xwF5ws1jVj9Vswc8QLO3HId2ju17dVd+G6rBWijLdM7MKR
+6KCjwpXnjF6WLQcO8msQt7bDw3sz0OFimKj7CDLXLtKYQMuxLoCzbiXF6e/SIvL7
+bc9szLJIMOPeH22f2gSVC8ymC0tbho9S0NAuzDJBUr+OFSxBHyXmW8mUuhhUBL93
+1Qs6rYONVhxjSGPMXQZD124PSeu4Ju6jdWoDArgLkriVVmxvp/l2MpqBx1kH1EER
+/fvdNLBHyjARK1lF9bUw3BwBEq1NHMzBi1lGfY0Xb8/GNJX33RqxfNGkr+AJC0Vy
+E/ZltJWR8xMp7q5VXzltkNvNZfF4zpn5ZsdEf7lM3pnGcmRquSPXGMIEad6wMnFx
+GNhaMgFlWs/lY0KZ0JsZ
+=EcEm
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r1.ebuild b/net-print/cups/cups-1.5.2-r1.ebuild
index f116d1ef1a01..1345cddfd088 100644
--- a/net-print/cups/cups-1.5.2-r1.ebuild
+++ b/net-print/cups/cups-1.5.2-r1.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.5.2-r1.ebuild,v 1.1 2012/02/07 16:32:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild,v 1.2 2012/02/07 16:43:38 dilfridge Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python slp +ssl static-libs +threads +tiff usb X xinetd"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -41,7 +41,6 @@ RDEPEND="
 	ldap? ( net-nds/openldap[ssl?,gnutls?] )
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
 	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
@@ -185,7 +184,7 @@ src_configure() {
 		$(use_enable usb libusb) \
 		$(use_with java) \
 		$(use_with perl) \
-		$(use_with php) \
+		--without-php \
 		$(use_with python) \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
@@ -207,11 +206,6 @@ src_compile() {
 		perl-module_src_prep
 		perl-module_src_compile
 	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake
-	fi
 }
 
 src_install() {
@@ -224,11 +218,6 @@ src_install() {
 		fixlocalpod
 	fi
 
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
-	fi
-
 	# clean out cups init scripts
 	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}