Fix multiple PHP_TARGETS, thanks Arfrever

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 70 insertions, 36 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 46bf1db3acc3..a294d2ee07fe 100644
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.82 2014/10/21 21:25:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.83 2014/10/22 21:28:51 blueness Exp $
+
+  22 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
+  xapian-bindings-1.2.19.ebuild:
+  Fix multiple PHP_TARGETS, thanks Arfrever
 
   21 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   xapian-bindings-1.2.19.ebuild:
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index efa53c9159ed..d221e7bcd85e 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -9,26 +9,24 @@ DIST xapian-bindings-1.3.1.tar.gz 1562988 SHA256 5c18ce77b08d2fcc738dadbf8544823
 EBUILD xapian-bindings-1.2.14.ebuild 4573 SHA256 9a1b4db00866fe604fd3bcec3e86fb46ffdcdf60f2df6a5c9131b210471e117f SHA512 e4a2b71f94fb43e765b28a9bde7ed523324e39d5992bc31a7f5ff9decbc028d71ed3ebcae83e400dfa97702e47951ba6fbc35096b88f718d041dc7e548970527 WHIRLPOOL a87730bffd24832b808628e0e031a3dbdb22af1358c168f5eb076500b4d15dac2eb18c6dd8d9d6fa788c7828658f5ae7a05afaa6937603a65dbe08a46d8535f6
 EBUILD xapian-bindings-1.2.17.ebuild 4330 SHA256 261361ca84c0cae766414e5ad844478e30b44f3393fdd3d2aacf565424d368c0 SHA512 cfae74c173468889d4bd2883075ed6856c537668c0e6c8f4a74c0d54dafc17a46b332d8a260034c61a014f0e0a5903a6e6e8beba0a7de26ed6dd0a13d8208f8b WHIRLPOOL da9c4c362fdd8b9853c434baf2dd56a09a8ce10e506dae99ecedd03e7384ec7bc4caa28ea50ac0f58c5f1947fbf0a29e916eb02f6e9ad0fc7de2f78148809c28
 EBUILD xapian-bindings-1.2.18.ebuild 4329 SHA256 1291e84320f16fb62d3b302b9f47daec8bdd2225d89e8aac0a59d7dd6feb4729 SHA512 4ac9bd7353c5609986a43bf8480686401603e2670728c1b5fc4403e794404b151085c7f124bdc2711ef9c3050a4000e4782f3f33adca981c1ac83ad9d7ed822b WHIRLPOOL f3f641c952a6fd8bbadcb557f43642ce3a349705936a91ef3c39aaf25f58d55b669bff6ee63b97a3370cfc9d3ac993b05ec9202ec7d5e6f3135f1d5a29a253ed
-EBUILD xapian-bindings-1.2.19.ebuild 4330 SHA256 11faf7a1c7a6c815ff92e7f63d1bb76d1d829e04dde698551615c3387e986dc2 SHA512 d34fe40050e03892776966498b142c7715fab18cf0da58ce4cdac55847f2be89b0f99427f876029b7901225d5ec1217bc7c94bfde332abdf8f867ee2a6695cd7 WHIRLPOOL d1194ce8c5bf0b8fa7bd5de81fbd00d5da170ff77c2e197ea572476ca8edf416a0616a97fe21df9f40805b6b8e4ee56ff880d096ca9034350cda5c481cb9f257
+EBUILD xapian-bindings-1.2.19.ebuild 5587 SHA256 777f10fd2741d25c9c5df69f20f512b247cf182e92130d5a65b54714c3ca7dd9 SHA512 9cba4f29b2789922838f7861c66301489a2f0ecab052718ab648aa759f31437a69a1f0ccfef0fcd7ee26e5d80eb98fb72066693105ea2c459d4f07a917be68a9 WHIRLPOOL d72a6f010bcf474d67e40a5b4cb90a83cbde65452e1448d7a64c4b44c1941ee1b73d45be898ef8e2328a208644f793f9ff833b88d8c02da45fadda10caa90f77
 EBUILD xapian-bindings-1.3.1.ebuild 4449 SHA256 009ed4910398970f51ff38ad01f7a4c34b3f89d28e4bd459f6c682fad34134c6 SHA512 e5f70db00899e671c109415efeaa7077f066fdef74cc6931f4bcc9d9a8a2c7f8948d13c440fdb93c7d66772c88a95b7d4b623f6f722cea29c623629ff82a0d3b WHIRLPOOL fa0e1d311e09c3876e88e6a492de347fea2037d00d2f64fc5ae098e6810f30eb15a7598130e1c846968201d63675e80cc40928140e1f3e12a4a35598fff595dc
-MISC ChangeLog 13478 SHA256 30209e4c334c5dcba3c34f8af6093bb17d9d5d2c898b4553e1de79dcaf09a0bb SHA512 19b04ca19674e991a78af8d350a561a6a4aeb53e22e715acd0ef41525ed110f87a35518def59224f64f93ca2edd94597fe7bdaf454aec7bea295778af26f0e9d WHIRLPOOL 12a6cf081282b17bb8cce094b914fd686c2d18ced45228580313f934a130cd027ad028f01378f74b4a45a7015a33bc02cb91d4a71d5e11e3dee31e78f065ad29
+MISC ChangeLog 13610 SHA256 cdcf6d94fb09fe911a7843496530ccfc9c81816bd3d7cad4a4c2c5c173a5a7d4 SHA512 2ca5447385926889d838ca13e8297c6e268469a6221f47deb6c4188fa8be814291802465cc9fc3e31780cc13701c1ab84093acca6343f96a68c7fea935b16ca0 WHIRLPOOL 668a0ef2201ac1f62a9c8353ffac1678d401634dbf92e64702bf1894ca597337b3cecd0e74d4247a496c1c94c7e0b7c37dbb97d3e348305a953fea5191310c6b
 MISC metadata.xml 367 SHA256 e757cf120c1188c0010caaf7449e89deee52d8aa275f4f0c3b9cc0c097d28596 SHA512 e562b4dfbdcf62a3f860cd185dcd5fb2cf4067cb9b6c11c94669027c9cbae94bc437fa63e68b3b982a6bdda624087a60b24a269031fae2f3f975efb3d8e85d44 WHIRLPOOL 1314776082f07f5fdf74d15ad6b5093276b58f47e4dce35c0377e6a7baef0941bf567e43047e4ff80a726e2078d506c9029cd033cba8aeba9110b75cbbffa036
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJURs89XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcuDQQAKhb6c8fbtpxF9njB/fFFwl7
-44q169JcrMScwKYIP+7zD88SpToKbBraWVn30l/NSxMfaXTxeqkp2zzi2Vpdqvd+
-UZmGQheSpfhoaV07nAMKytOvTwxlUWNvlXH6Di/vTXcteZTm2ITXQQ9GwAhS35t0
-Af1cFUqG6pQStbPI/rlpqLoJ1HqsBTvxt4t/BjIaxldU8Yy72w5dyrbzX4oOb4in
-0qrfigJU5metyOtJCjFMSN460+gKtoqb2TawzuB7vPkdDBSvCxEGzqyOT+fbr55r
-OniISiNjbHC1STrrLeQ/WV13n+29IhpqU+uZqEiiDxHh4gGNNHQKi8WV1E/pRIjN
-Kwyd9JH8XOi1bhpTDSUN533UAHaioSWVJZwvV71OkeQgtLiuDqLdkLf29MMhFT5m
-f++/rvxAQKkAF8jP6aNPN7zjvcf0Ql7dhJr+4aoIiEaK3D10JmxgOdgc4bja7MGd
-sN2spCZuBxoC2E4YjDoTDlZsAfk9F0Y/rmvtJFAjQHVBXoN6L6fpYfVrWRr7FGoI
-wvkHkHtf4Wm0uWQm2ljl4equ8zPA8qVah5D7GQIFr7Wf8UsCgZtEF4i9dHrv8yAC
-qjjGkkmaYD8lWUNJoEDWTWU0XmrIlkwkqDIqsqCdcXxPRDaXbmPSTdRBVGFcqYUP
-OcdlEMbyu9c0nDC1tDtR
-=C9kj
+iQIcBAEBCAAGBQJUSCHoAAoJEJOE+m71LUu6uZ4P/iafSsqszACt1CoCRVHNyDkv
+aFcrBSxip/hfzbitzlJ2JS+lOq1WiaPCd+0rw/GVBJkvSzw5BhN0NMXO97zL4P5G
+cxj3eH6lcbaTaE2xkUBAlzpAKBj6Qt9VNi8hj/tbIpl5niiuS8YTwagYQtCmMykh
+wBPqV6Kc48bPqxyP/w7oBpmFesipxLwXIcOmEC6hiHVTa3hGdbcEQdcXWEfMlL/U
+MtD4PmT2FMDeojCx+PNtw1JmxAZp+YfS/9qgbNX6s2Gwj/VJsT7PoaxP83G5brXd
+T91MrAJD6RujDSErgdb7qZBCa5gcuxDn+Wq6JV5n22ANsDt01ta15KFx3khCr46e
+TqYYpErkPhP1jYkGfRuVg2o83AGJJceyq0MB0LLP3UEn1k3yjDBh4tfJusmV5BLz
+8xDVESEfmPErn6dMSbX08C5z+sCMIfXCz8qiZ1DTA2AtCILOX+ZaC7K8+9wZiQbA
+l3pwBBn6bXNlZ61/bRFJvczufQZUtexwyYs618a52Bf3QgXOifKJymTWTcDUTSnX
+vH/Qxu+5s2diAjvkXV+MtzhMWQa3kdPzwXgeLojPC8FDbTah3g2UsZH3CpiCMlv/
+lGG+GZQ3zkcWoMg9VDtJlC29GXa3JOyHJPc0WscAwGqJoP1BakOpzrXz5aIM1ewU
+ljRUEKk99gVnP2sFUFxD
+=RPpB
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild
index 31b3c5615427..df74377e5c71 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v 1.2 2014/10/21 21:25:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.19.ebuild,v 1.3 2014/10/22 21:28:51 blueness Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-USE_PYTHON='2.6 2.7'
 
-USE_PHP="php5-4"
+USE_PHP="php5-4 php5-5 php5-6"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
@@ -45,6 +44,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_unpack() {
+	default
+}
+
 src_prepare() {
 	java-pkg-opt-2_src_prepare
 	if use java; then
@@ -85,13 +88,26 @@ src_configure() {
 		$(use_with tcl)
 #		$(use_with mono csharp) \
 
-	# Python bindings are built/tested/installed manually.
+	# PHP and Python bindings are built/tested/installed manually.
+	sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
 	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
 }
 
 src_compile() {
 	default
 
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			cp -r php php-${php_slot}
+			emake -C php-${php_slot} \
+				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
+				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
+				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
+				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
+		done
+	fi
+
 	if use python; then
 		python_copy_sources
 #		building() {
@@ -115,6 +131,18 @@ src_compile() {
 src_test() {
 	default
 
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			emake -C php-${php_slot} \
+				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
+				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
+				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
+				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
+				check
+		done
+	fi
+
 	if use python; then
 		testing() {
 			emake -C python \
@@ -128,7 +156,7 @@ src_test() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	if use java; then
 		java-pkg_dojar java/built/xapian_jni.jar
@@ -139,6 +167,20 @@ src_install () {
 		rmdir -p "${D}/${S}/java/native"
 	fi
 
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			emake DESTDIR="${D}" -C php-${php_slot} \
+				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
+				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
+				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
+				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
+				install
+		done
+
+		php-ext-source-r2_createinifiles
+	fi
+
 	if use python; then
 		installation() {
 			emake -C python \
@@ -151,20 +193,10 @@ src_install () {
 		python_foreach_impl installation
 	fi
 
-	if use php; then
-		php-ext-source-r2_createinifiles
-	fi
-
 	# For some USE combinations this directory is not created
 	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
 		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
 	fi
 
-	dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use php_targets_php5-4; then
-		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
-	fi
+	dodoc AUTHORS HACKING NEWS TODO README
 }