Fix compilation with python 2.5 and migrate to the generation 2 java eclass.

Package-Manager: portage-2.1.2_pre1-r2

4 files changed, 113 insertions, 9 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index a0a86bd405bd..9bae69e996b7 100644
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.2 2006/05/25 01:33:58 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.3 2006/09/26 21:32:56 marienz Exp $
+
+*xapian-bindings-0.9.6-r1 (26 Sep 2006)
+
+  26 Sep 2006; Marien Zwart <marienz@gentoo.org>
+  +xapian-bindings-0.9.6-r1.ebuild:
+  Fix compilation with python 2.5 and migrate to the generation 2 java eclass.
 
 *xapian-bindings-0.9.6 (25 May 2006)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 29d76b94937e..e802fdd9024f 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -27,14 +27,18 @@ EBUILD xapian-bindings-0.9.5.ebuild 1211 RMD160 9eb22dc938898e9935e1939b6c89cb48
 MD5 b8f49c4cee56ce68695007b9ebcca202 xapian-bindings-0.9.5.ebuild 1211
 RMD160 9eb22dc938898e9935e1939b6c89cb48575846d7 xapian-bindings-0.9.5.ebuild 1211
 SHA256 66d1db2ad2ec038e5d8063de3ae211276f7ba26c251e73bdda1e7b89c4d44d0d xapian-bindings-0.9.5.ebuild 1211
+EBUILD xapian-bindings-0.9.6-r1.ebuild 2244 RMD160 2de7ccbe30e17be97715bd1461a30c709f55decf SHA1 1e597e96ed368d1ac5fc5aeb73d0cb8a97ac6a13 SHA256 4fc6800dbc117992cdbc86c38b4c81f2527876c72314ecfb6339dc29f2bc43be
+MD5 da62cc64111031582a9823b094eaa9c1 xapian-bindings-0.9.6-r1.ebuild 2244
+RMD160 2de7ccbe30e17be97715bd1461a30c709f55decf xapian-bindings-0.9.6-r1.ebuild 2244
+SHA256 4fc6800dbc117992cdbc86c38b4c81f2527876c72314ecfb6339dc29f2bc43be xapian-bindings-0.9.6-r1.ebuild 2244
 EBUILD xapian-bindings-0.9.6.ebuild 2033 RMD160 6d0c568be19aafbc76bdf5cc632515c455878b39 SHA1 19cbab51aa9a452890f7f0d6225bc749a6258dc4 SHA256 bd48012db809f82637b6ddd15f91ab8ddee18fdb1adfa06332968c28d1a8a3da
 MD5 8b8bbbfc8d7bb8618909664337c0a9e3 xapian-bindings-0.9.6.ebuild 2033
 RMD160 6d0c568be19aafbc76bdf5cc632515c455878b39 xapian-bindings-0.9.6.ebuild 2033
 SHA256 bd48012db809f82637b6ddd15f91ab8ddee18fdb1adfa06332968c28d1a8a3da xapian-bindings-0.9.6.ebuild 2033
-MISC ChangeLog 919 RMD160 bd93fc4401c8f79138868f12e4f5f7946e8c2529 SHA1 7d76f10dcb69061963ff31c1790bb988b15075bd SHA256 8b98774ea4b7027f8f15a7084d45b0c04ed734c6329d5cfa86a22363c9cf2141
-MD5 8c1502dc469c275b505eded19b1196ca ChangeLog 919
-RMD160 bd93fc4401c8f79138868f12e4f5f7946e8c2529 ChangeLog 919
-SHA256 8b98774ea4b7027f8f15a7084d45b0c04ed734c6329d5cfa86a22363c9cf2141 ChangeLog 919
+MISC ChangeLog 1125 RMD160 1e92a89b1a307e0b4e255197eec20c689d5e2eab SHA1 7d3ddb3e598ebf2a31d8351f5c4eb4fc93dd6bec SHA256 43f92b432a9cbdc23e23df4fefc7da25491fd3280efa56a8d3ac7c00f48d7442
+MD5 231f6c220a715bddd7a3b64b42394264 ChangeLog 1125
+RMD160 1e92a89b1a307e0b4e255197eec20c689d5e2eab ChangeLog 1125
+SHA256 43f92b432a9cbdc23e23df4fefc7da25491fd3280efa56a8d3ac7c00f48d7442 ChangeLog 1125
 MISC metadata.xml 348 RMD160 e40b78aae59abc91c7665c525b0cbcc732b5dba8 SHA1 d7804461beb66cc1943ef0f1630ed27fcc3d7ef5 SHA256 1e3c30c6fe78e88adad51f2d0d39fb8fb3939dfa44e4cd482a7601abe561e2a5
 MD5 83b891da88c9cfdeca4c8d5e8bb5d6d1 metadata.xml 348
 RMD160 e40b78aae59abc91c7665c525b0cbcc732b5dba8 metadata.xml 348
@@ -45,10 +49,13 @@ SHA256 6a22717024e77b30cf2390f9a8adf23b082f24d56034f6e2e56f68a0f128e1b1 files/di
 MD5 6de3010e12fd1799a059c95f49e739f7 files/digest-xapian-bindings-0.9.6 265
 RMD160 37721c9d66a8b894b0389cc68914d55ca26a1b54 files/digest-xapian-bindings-0.9.6 265
 SHA256 44dee39b6f5252f435abc0503e2520bbb039527531f4cfe8754503aac019c72d files/digest-xapian-bindings-0.9.6 265
+MD5 6de3010e12fd1799a059c95f49e739f7 files/digest-xapian-bindings-0.9.6-r1 265
+RMD160 37721c9d66a8b894b0389cc68914d55ca26a1b54 files/digest-xapian-bindings-0.9.6-r1 265
+SHA256 44dee39b6f5252f435abc0503e2520bbb039527531f4cfe8754503aac019c72d files/digest-xapian-bindings-0.9.6-r1 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEeehYI1lqEGTUzyQRAl5jAJ9RCBbD0Zvx5R9lRkhJKHusAtWlUQCfcnIG
-XJ8U11vUYcBLlJSBIMjwxaw=
-=Vz+P
+iD8DBQFFGZyOUElL7eJpfEQRAmRwAJkBnBjwvQeEu23uGKO+SpitBAEOygCcC1UK
+1mIxOoHLA0XUzRjBY9cPdJM=
+=WUNH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.6-r1 b/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.6-r1
new file mode 100644
index 000000000000..753185edcf3c
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.6-r1
@@ -0,0 +1,3 @@
+MD5 f404b6a9c9e86a9ec6dfbbe38909b2cf xapian-bindings-0.9.6.tar.gz 792703
+RMD160 7320856c454e8ba675d168baccb92be022e2a24e xapian-bindings-0.9.6.tar.gz 792703
+SHA256 758765bde18817a7e4fde5d21742be5fb154f77ba211fe93d3dd00523e1657ed xapian-bindings-0.9.6.tar.gz 792703
diff --git a/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..965645ff0fff
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild,v 1.1 2006/09/26 21:32:56 marienz Exp $
+
+inherit mono eutils autotools 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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="python php tcltk mono java ruby"
+
+COMMONDEPEND="=dev-libs/xapian-${PV}
+	python? ( >=dev-lang/python-2.1 )
+	php? ( >=dev-lang/php-4 )
+	tcltk? ( >=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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# applied upstream
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	cd java
+	# from upstream
+	epatch "${FILESDIR}/${P}-java-array-delete.patch"
+	cd ../php
+	# from upstream
+	epatch "${FILESDIR}/${P}-php-tests.patch"
+	# submitted upstream
+	epatch "${FILESDIR}/${P}-php-tests-2.patch"
+	cd ..
+
+	# Force a regeneration of the bindings with our patched swig.
+	touch python/*.i
+
+	eautoreconf
+}
+
+src_compile() {
+	if use java; then
+		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+	fi
+	# maintainer-mode to regenerate swig-generated files.
+	econf \
+		$(use_enable python maintainer-mode) \
+		$(use_with python) \
+		$(use_with php) \
+		$(use_with tcltk tcl) \
+		$(use_with mono csharp) \
+		$(use_with java) \
+		$(use_with ruby) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake -j1 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
+}