Remove swig dep and conditional dep on php, add PHP_EXT_OPTIONAL_USE=php, bug #383047

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

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 4e6fc1359718684577f68be9b95ad63593c30c5d..6b1edf808a88271268122b9f743b2cd0dec6cc66 100644 (file)
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.23 2011/09/16 14:06:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.24 2011/09/16 19:53:26 blueness Exp $
+
+*xapian-bindings-1.2.7-r1 (16 Sep 2011)
+
+  16 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  -xapian-bindings-1.2.7.ebuild, +xapian-bindings-1.2.7-r1.ebuild:
+  Remove swig dep and conditional dep on php, add PHP_EXT_OPTIONAL_USE="php",
+  bug #383047
 
   16 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
   Removing python herd from maintainers.

diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index e4c0da0530c2114284e7840669fc581a4317a413..f9406da5365690015848b6e157345d30fc85c94b 100644 (file)
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST xapian-bindings-1.2.5.tar.gz 1334636 RMD160 e7de918437ee5ba88bf67a9b64da7f760b0c6580 SHA1 ff9528d094396b3b58bd32a263211c783af034f2 SHA256 0d723af62b8d633cd49fdf92058a4985061659454b390c0c08db05fa4f7fb09c
 DIST xapian-bindings-1.2.7.tar.gz 1447683 RMD160 f8b1d05a35a304f6e41246ee2c9ba7aab07bb321 SHA1 79e9f0b01f1af3440d10d00469dbe248784ffa1c SHA256 c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8
 EBUILD xapian-bindings-1.2.5.ebuild 3294 RMD160 5f758ddd3ffca158edccfbbb49ffc134602edfd0 SHA1 bea00745fdaf00c8f3d93060f63fb511737df5fe SHA256 955147fdd8cef9f30e775e80bfdd33b223ee9bea5f38f9f5cfc9b54447aa35f8
-EBUILD xapian-bindings-1.2.7.ebuild 3915 RMD160 e323b7b7c5874423c03b0a471ed99fb3347e1ef8 SHA1 76ddf8d4c9f4f5ccee3d04ef7748fe0e378ed699 SHA256 20d3023a3f55f2661a724c43450fa31280ab21fc143544d96381fe6bb24b9d12
-MISC ChangeLog 4911 RMD160 3dd20c43d8b7eb18593536e92b5521bdafef06ad SHA1 86e3451a17bf4b14e335c90e1ac277c786906420 SHA256 8bdaedf01471f9ce94b2f696572604a20de81864adb1aa76512ef0796a1706ba
+EBUILD xapian-bindings-1.2.7-r1.ebuild 4003 RMD160 510d9c004e5ca0580076f687886eca7bb30ab911 SHA1 4eb694079a66f58884c977b2b45b5c47f4a36f38 SHA256 dc910c7e4a86c4943d37a0e4f8a7376ee486b1d9d6d6ab398445c8b35b15b84e
+MISC ChangeLog 5172 RMD160 1a01efa7ab310f948567b263e924c25f378f04fe SHA1 930837b057adb4ad3caeb5738ddc27f1bb62db01 SHA256 469279933db67eed8c45d9e9b2341cb77ba944475e176e147673645fe340e875
 MISC metadata.xml 335 RMD160 da243801277f2da4bbcf986c3414c12ed172ab11 SHA1 4f89931c428a950f44135c2907dc96aa034c8363 SHA256 49769f112084a9a3b040db78f0dc136ab740e7e25adb09ddb135ac8bd3aa5943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk5zV9MACgkQxeMuLWsGW/sABQCcD1faYo5JbGNFsvdae2PSvfOs
-nHAAoJ8XbY+l2X72eQiNfDNoAqGRNPcV
-=gdkp
+iEYEAREIAAYFAk5zqUAACgkQl5yvQNBFVTWp0wCfVlRh3W2PODWapABJlqxKiWSR
+pNkAn0Kfy+5euPciShh0dHTJEujgsMmc
+=6qX+
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild
similarity index 94%
rename from dev-libs/xapian-bindings/xapian-bindings-1.2.7.ebuild
rename to dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild
index ebdbd21881f72edc3c6563df6f3ba8463cb97eff..9c9a56aefb48fa91799c5893b289be735761e076 100644 (file)
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.7.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7.ebuild,v 1.1 2011/09/15 12:13:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild,v 1.1 2011/09/16 19:53:26 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -10,6 +10,7 @@ RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
 
 inherit java-pkg-opt-2 mono php-ext-source-r2 python
 
@@ -26,11 +27,9 @@ COMMONDEPEND="=dev-libs/xapian-${PV}*
        lua? ( >=dev-lang/lua-5.1 )
        mono? ( >=dev-lang/mono-1.0.8 )
        perl? ( dev-lang/perl )
-       php? ( >=dev-lang/php-5 )
        ruby? ( dev-lang/ruby )
        tcl? ( >=dev-lang/tcl-8.1 )"
 DEPEND="${COMMONDEPEND}
-       python? ( >=dev-lang/swig-1.3.29-r1 )
        java? ( >=virtual/jdk-1.3 )"
 RDEPEND="${COMMONDEPEND}
        java? ( >=virtual/jre-1.3 )"
@@ -67,6 +66,9 @@ src_configure() {
                $(use_with python) \
                $(use_with ruby) \
                $(use_with tcl)
+
+       # Python bindings are built/tested/installed manually.
+       sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
 }
 
 src_compile() {