summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2011-09-16 19:53:26 +0000
committerAnthony G. Basile <blueness@gentoo.org>2011-09-16 19:53:26 +0000
commitcae42d1747f92ab9bd6973bfd8660a10cd836377 (patch)
treeb9fbe6e9bc3644c74aef6fbdb989fc02b736110b /dev-libs/xapian-bindings
parentdev-java/netbeans-php: fixed jdk dependency (diff)
downloadgentoo-2-cae42d1747f92ab9bd6973bfd8660a10cd836377.tar.gz
gentoo-2-cae42d1747f92ab9bd6973bfd8660a10cd836377.tar.bz2
gentoo-2-cae42d1747f92ab9bd6973bfd8660a10cd836377.zip
Remove swig dep and conditional dep on php, add PHP_EXT_OPTIONAL_USE=php, bug #383047
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/xapian-bindings')
-rw-r--r--dev-libs/xapian-bindings/ChangeLog9
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild (renamed from dev-libs/xapian-bindings/xapian-bindings-1.2.7.ebuild)8
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 4e6fc1359718..6b1edf808a88 100644
--- 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/xapian-bindings-1.2.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild
index ebdbd21881f7..9c9a56aefb48 100644
--- 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() {