Version bump, add EAPI2 USE dep, add gentoo mirror to SRC_URI. Bugs #255518 and #256559.

(Portage version: 2.1.6.11/cvs/Linux i686)

4 files changed, 87 insertions, 8 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 04cba5367cfe..a7e7d9d3d438 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.8 2009/01/21 16:10:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.9 2009/05/01 19:34:40 gengor Exp $
+
+*xapian-bindings-1.0.12 (01 May 2009)
+
+  01 May 2009; Gordon Malm <gengor@gentoo.org> xapian-bindings-1.0.6.ebuild,
+  xapian-bindings-1.0.10.ebuild, +xapian-bindings-1.0.12.ebuild:
+  Version bump, add EAPI2 USE dep, add gentoo mirror to SRC_URI. Bugs #255518
+  and #256559.
 
 *xapian-bindings-1.0.10 (21 Jan 2009)
 
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild
index 283c4d67fefb..0b6a67fad486 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2009 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.0.10.ebuild,v 1.1 2009/01/21 16:10:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild,v 1.2 2009/05/01 19:34:40 gengor Exp $
+
+EAPI=2
 
 inherit mono java-pkg-opt-2
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://www.oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -14,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python php tcl mono java ruby"
 
 COMMONDEPEND="=dev-libs/xapian-${PV}
-	python? ( >=dev-lang/python-2.2 )
+	python? ( >=dev-lang/python-2.2[threads] )
 	php? ( >=dev-lang/php-4 )
 	tcl? ( >=dev-lang/tcl-8.1 )
 	mono? ( >=dev-lang/mono-1.0.8 )
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.0.12.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.12.ebuild
new file mode 100644
index 000000000000..4e5ae847cd70
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.0.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 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.0.12.ebuild,v 1.1 2009/05/01 19:34:40 gengor Exp $
+
+EAPI=2
+
+inherit mono java-pkg-opt-2
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://www.oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="python php tcl mono java ruby"
+
+COMMONDEPEND="=dev-libs/xapian-${PV}
+	python? ( >=dev-lang/python-2.2[threads] )
+	php? ( >=dev-lang/php-4 )
+	tcl? ( >=dev-lang/tcl-8.1 )
+	mono? ( >=dev-lang/mono-1.0.8 )
+	ruby? ( dev-lang/ruby )"
+
+DEPEND="${COMMONDEPEND}
+	python? ( >=dev-lang/swig-1.3.29-r1 )
+	java? ( >=virtual/jdk-1.3 )"
+
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.3 )"
+
+src_compile() {
+	if use java; then
+		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+	fi
+	econf \
+		$(use_with python) \
+		$(use_with php) \
+		$(use_with tcl) \
+		$(use_with mono csharp) \
+		$(use_with java) \
+		$(use_with ruby) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	if use java; then
+		java-pkg_dojar java/built/xapian_jni.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
+		rm "${D}/${S}/java/built/libxapian_jni.so"
+		rmdir -p "${D}/${S}/java/built"
+		rmdir -p "${D}/${S}/java/native"
+	fi
+
+	# For some USE combos 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"
+}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild
index 04978cfb44ed..cb55ba195755 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.0.6.ebuild,v 1.1 2008/04/05 20:45:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild,v 1.2 2009/05/01 19:34:40 gengor Exp $
+
+EAPI=2
 
 inherit mono java-pkg-opt-2
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://www.oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -14,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python php tcl mono java ruby"
 
 COMMONDEPEND="=dev-libs/xapian-${PV}
-	python? ( >=dev-lang/python-2.2 )
+	python? ( >=dev-lang/python-2.2[threads] )
 	php? ( >=dev-lang/php-4 )
 	tcl? ( >=dev-lang/tcl-8.1 )
 	mono? ( >=dev-lang/mono-1.0.8 )