Version bump.

(Portage version: 14273-svn/cvs/Linux x86_64)

8 files changed, 48 insertions, 310 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 0f6ad50e6eb5..9eadaa5222a6 100644
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,18 @@
 # 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.10 2009/05/01 20:51:19 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.11 2009/09/15 00:44:12 arfrever Exp $
+
+*xapian-bindings-1.0.16 (15 Sep 2009)
+
+  15 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -xapian-bindings-0.9.6-r1.ebuild,
+  -files/xapian-bindings-0.9.6-java-array-delete.patch,
+  -files/xapian-bindings-0.9.6-parallel-make.patch,
+  -files/xapian-bindings-0.9.6-php-tests.patch,
+  -files/xapian-bindings-0.9.6-php-tests-2.patch,
+  -xapian-bindings-0.9.9.ebuild, -xapian-bindings-1.0.10.ebuild,
+  +xapian-bindings-1.0.16.ebuild:
+  Version bump.
 
   01 May 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -files/xapian-bindings-0.9.5-skip-csharp-test.patch,
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-java-array-delete.patch b/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-java-array-delete.patch
deleted file mode 100644
index 13b1aa79ce73..000000000000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-java-array-delete.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: native/Query.cc
-===================================================================
---- native/Query.cc	(revision 6993)
-+++ native/Query.cc	(working copy)
-@@ -110,7 +110,7 @@
-         jsize size = env->GetArrayLength(terms);
-         string *array = toArray(env, terms, size);
-         Query *q = new Query(op_table[op-1], array, array+size);
--	delete array;
-+	delete[] array;
-         return _query->put(q);
-     CATCH(-1)
- }
-@@ -124,7 +124,7 @@
- 	    queries[x] = _query->get(qid_ptr[x]);
- 	}
-         Query *q = new Query(op_table[op-1], queries, queries+len);
--	delete queries;
-+	delete[] queries;
-         return _query->put(q);
-     CATCH(-1)
- }
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-parallel-make.patch b/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-parallel-make.patch
deleted file mode 100644
index 882b0dd0daca..000000000000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-parallel-make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'python/Makefile.am'
---- python/Makefile.am	
-+++ python/Makefile.am	
-@@ -49,7 +49,7 @@
- # the .py file to the build directory instead.  We "import _xapian" first
- # so that if we fail to import the glue library we don't generate a broken
- # xapian.pyc.
--xapian.pyc: xapian.py
-+xapian.pyc: xapian.py _xapian.la
- 	PYTHONPATH=".$(PYTHON_PATHSEP).libs" $(PYTHON) -c "import _xapian;import xapian"
- 
- xapian.py: @PYTHON_MODERN_OR_OLDE@/xapian.py
-
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-php-tests-2.patch b/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-php-tests-2.patch
deleted file mode 100644
index fd43d7f39bfc..000000000000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-php-tests-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- smoketest5.php.orig	2006-05-24 17:31:13.000000000 +0200
-+++ smoketest5.php	2006-05-24 17:37:19.000000000 +0200
-@@ -26,6 +26,6 @@
- 	print "Retrieved non-existent document\n";
- 	exit(1);
-     }
--} catch (e) {
-+} catch (Exception $e) {
- }
- ?>
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-php-tests.patch b/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-php-tests.patch
deleted file mode 100644
index ce5a2bd9c3c1..000000000000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-0.9.6-php-tests.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Index: smoketest.php
-===================================================================
---- smoketest.php	(revision 7002)
-+++ smoketest.php	(working copy)
-@@ -108,17 +108,7 @@
-     exit(1);
- }
- 
--# Check PHP4 handling of Xapian::DocNotFoundError
--$old_error_reporting = error_reporting();
--if ($old_error_reporting & E_WARNING)
--    error_reporting($old_error_reporting ^ E_WARNING);
--$doc2 = Database_get_document($db, 2);
--if ($doc2 != null) {
--    print "Retrieved non-existent document\n";
--    exit(1);
--}
--if ($old_error_reporting & E_WARNING)
--    error_reporting($old_error_reporting);
-+include "smoketest".substr(PHP_VERSION, 0, 1).".php";
- 
- # Regression test - overload resolution involving boolean types failed.
- Enquire_set_sort_by_value($enq, 1, TRUE);
-Index: smoketest4.php
-===================================================================
---- smoketest4.php	(revision 0)
-+++ smoketest4.php	(revision 0)
-@@ -0,0 +1,33 @@
-+<?php
-+/* PHP4 specific tests.
-+ *
-+ * Copyright (C) 2006 Olly Betts
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-+ * USA
-+ */
-+
-+# Check PHP4 handling of Xapian::DocNotFoundError
-+$old_error_reporting = error_reporting();
-+if ($old_error_reporting & E_WARNING)
-+    error_reporting($old_error_reporting ^ E_WARNING);
-+$doc2 = Database_get_document($db, 2);
-+if ($doc2 != null) {
-+    print "Retrieved non-existent document\n";
-+    exit(1);
-+}
-+if ($old_error_reporting & E_WARNING)
-+    error_reporting($old_error_reporting);
-+?>
-Index: smoketest5.php
-===================================================================
---- smoketest5.php	(revision 0)
-+++ smoketest5.php	(revision 0)
-@@ -0,0 +1,31 @@
-+<?php
-+/* PHP5 specific tests.
-+ *
-+ * Copyright (C) 2006 Olly Betts
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-+ * USA
-+ */
-+
-+# Check PHP5 handling of Xapian::DocNotFoundError
-+try {
-+    $doc2 = Database_get_document($db, 2);
-+    if ($doc2 != null) {
-+	print "Retrieved non-existent document\n";
-+	exit(1);
-+    }
-+} catch (e) {
-+}
-+?>
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
deleted file mode 100644
index a7fb16f1fce1..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.3 2007/07/12 02:25:34 mr_bones_ 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 tcl mono java ruby"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}
-	python? ( >=dev-lang/python-2.1 )
-	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_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 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
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-0.9.9.ebuild b/dev-libs/xapian-bindings/xapian-bindings-0.9.9.ebuild
deleted file mode 100644
index b03d9efcd9f8..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-0.9.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 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.9.ebuild,v 1.3 2007/07/12 02:25:34 mr_bones_ Exp $
-
-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"
-
-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 )
-	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 -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
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.16.ebuild
index f2a2262a59f9..fb73ae83da91 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.0.10.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.0.16.ebuild
@@ -1,26 +1,26 @@
 # 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.3 2009/05/01 20:51:19 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.0.16.ebuild,v 1.1 2009/09/15 00:44:12 arfrever Exp $
 
-EAPI=2
+EAPI="2"
 
-inherit mono java-pkg-opt-2
+inherit java-pkg-opt-2 mono python
 
 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="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="python php tcl mono java ruby"
+IUSE="java mono php python ruby tcl"
 
 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 )"
+	php? ( >=dev-lang/php-4 )
+	python? ( >=dev-lang/python-2.2[threads] )
+	ruby? ( dev-lang/ruby )
+	tcl? ( >=dev-lang/tcl-8.1 )"
 
 DEPEND="${COMMONDEPEND}
 	python? ( >=dev-lang/swig-1.3.29-r1 )
@@ -29,23 +29,29 @@ DEPEND="${COMMONDEPEND}
 RDEPEND="${COMMONDEPEND}
 	java? ( >=virtual/jre-1.3 )"
 
-src_compile() {
+src_prepare() {
+	sed \
+		-e 's:\(^pylib_DATA = xapian.py\).*:\1:' \
+		-e 's|\(^xapian.py: modern/xapian.py\)|\1 _xapian$(PYTHON_SO)|' \
+		-e 's:\. libtoolconfig\.tmp:. ./libtoolconfig.tmp:' \
+		-i python/Makefile.{am,in} || die "sed failed"
+}
+
+src_configure() {
 	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 mono csharp) \
+		$(use_with php) \
+		$(use_with python) \
 		$(use_with ruby) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_with tcl)
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	if use java; then
 		java-pkg_dojar java/built/xapian_jni.jar
@@ -63,3 +69,15 @@ src_install () {
 
 	dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
 }
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize "$(python_get_sitedir)/xapian.py"
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup
+	fi
+}