Version bump.

Package-Manager: portage-14273-svn/cvs/Linux x86_64

9 files changed, 51 insertions, 333 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/Manifest b/dev-libs/xapian-bindings/Manifest
index 7170201a98a7..3e1daa5c31f3 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xapian-bindings-0.9.6-java-array-delete.patch 659 RMD160 d5c2e0933f270f03af2b6e6509a82bb283e0275d SHA1 fa1d329ac8ece6386cfc39d138efa471ae3adb9c SHA256 87e6adcd318482a341e4496f7c0c74cb4be4c1e41040c9334586275863e619b2
-AUX xapian-bindings-0.9.6-parallel-make.patch 460 RMD160 3614483ff18190d9c9f823531dd6c2a246fa85a0 SHA1 620ca0d3a7f3a53241f14d41fc90c3df9c7e57dc SHA256 5c5e634f20d34ceb4de8f08135ae9ae036470f9f744b0e4c3f084240992240bc
-AUX xapian-bindings-0.9.6-php-tests-2.patch 244 RMD160 909d983c7453e541956c79d3c4bc750c96e48833 SHA1 6d040a2ebf70c23106c37f2ef151fcb164f5aec9 SHA256 90ad061d46b13c547e10f6ae45faed16c57955c774834982160796f5a119392d
-AUX xapian-bindings-0.9.6-php-tests.patch 3348 RMD160 9d76d88d32c8e0088d4d9a0462ce50b1d99a47d2 SHA1 9279173cb24858c674fdca89f329f8b75aae9178 SHA256 5ccdd098b366dfa8b898679af0c6aee0aed72c4a79b38834e38f70d4b0ac2b27
-DIST xapian-bindings-0.9.6.tar.gz 792703 RMD160 7320856c454e8ba675d168baccb92be022e2a24e SHA1 5255de13fcf159f780060559886e29f6dc9df740 SHA256 758765bde18817a7e4fde5d21742be5fb154f77ba211fe93d3dd00523e1657ed
-DIST xapian-bindings-0.9.9.tar.gz 804582 RMD160 19eb5226e97c278e3b69899d727c10999488fc42 SHA1 d0f8cee5330f621175b630db62f46090c2e52bca SHA256 84c4fcccd72f4d788f4575cfa7dc1aa06594068b54ec150aa72fbcc89ce3c8c5
-DIST xapian-bindings-1.0.10.tar.gz 1048760 RMD160 b76b0e6612c75eacc24c088d5807f594142012ad SHA1 d96e286b9605aaedb09955d9a12695bc1a0147e9 SHA256 e440cb58eed147030d11fcc73b31298c3e4bb40729843f7696b9be0b0b868e75
 DIST xapian-bindings-1.0.12.tar.gz 1053343 RMD160 f2cebf52b6cebcc3ac093d5b1de740d2bc613131 SHA1 8a82b7e2139d2f50c95deae50b32f7bc88f63a8c SHA256 9bb65513e03f3f244d5cc6f5926f99a1cd9c6a4ece5a26ea4dcad8206bc17dcf
+DIST xapian-bindings-1.0.16.tar.gz 1052201 RMD160 84949bf019237cf4694f805614b346e7772b52da SHA1 6d22701894090b6001d94107d3189721a974db96 SHA256 824413cd1bd2097b571aae192c863a260fd9147777c470c89d139cf0cca4cb0e
 DIST xapian-bindings-1.0.6.tar.gz 1036278 RMD160 c9e7f23a996fe15bb44188c4f4c026f9aba7e72b SHA1 0fb74089e8d0bf32e8d591b4d0566f79f25597b4 SHA256 9f6b3b5c7abf3c112a0805d4b7be455754537ebe36fb4fee87e4dd22f960d309
-EBUILD xapian-bindings-0.9.6-r1.ebuild 2235 RMD160 d16fed84ad9bc134b884cdde7b8e6ea31308d5b1 SHA1 cf61b98f07fdd7c609a6d116eb71f62e7ad03f27 SHA256 e83b640d228744e53e47ba30624b933cafda503ab367c91fa9df5be201e6bc3a
-EBUILD xapian-bindings-0.9.9.ebuild 1698 RMD160 26795f7adf287d5cb26faeab0576e0e9c6198175 SHA1 9b7d1ce52978f5042c51a18ec0951b820215261a SHA256 66346634641691f78123745b7a9b4ef11ab18137deeb58667c31a1b48ddc2c00
-EBUILD xapian-bindings-1.0.10.ebuild 1730 RMD160 40d0dd02596a2783cb0dcb8f74fb147affb5674d SHA1 2cddd961745d2e0ac8287a2fb512bf9ce6e345ad SHA256 9f79f2078c484df2a01969fb991c915bd2a59a78c1710b6dedc469dd7de4d718
 EBUILD xapian-bindings-1.0.12.ebuild 1730 RMD160 8d4a6f5ad6cf014bd4ca75cedab7bb1e76632d62 SHA1 9ef6f45788611df5686e5a19f513e77360395b16 SHA256 1635b8b62ec3886f15c8dd8e3a6483dc0913d8b53a26ce5020a5f9b9dade3015
+EBUILD xapian-bindings-1.0.16.ebuild 2117 RMD160 57ab48e66034775416c335f822ea061727973122 SHA1 44dd502169ca7b0586cdcf016851f326deff675f SHA256 f4a33c663602a1d660f64c5e6bbbac109df6c1ab5cc0c12cf430cf97c6f8be5a
 EBUILD xapian-bindings-1.0.6.ebuild 1729 RMD160 fc8f1fef0c35d339fde1fb8ec03ab6184a6f0386 SHA1 85de48d8c1ffe9fd2088d55e5ac7cdafebc5f6ec SHA256 fb2cffb5ee98a81b72190cea8060a92c8e98ed1ed28ba24cfaf9e972263edac3
-MISC ChangeLog 2471 RMD160 217c854ec12c423ee36332b1901f79748b3a29d9 SHA1 58e4305fc1bbd1e9b8aff061c111a7962a8ad19d SHA256 fb9d879d790ae2524c90a758746c80663c666ec6587ef2183ec5062fba410683
+MISC ChangeLog 2944 RMD160 a06d7a74dd02f950cca27faabf1b0b4f2ee3da19 SHA1 9d342bd9adc8c9e7e476787a3a95261e34d423d9 SHA256 2b7d7645d017f8af39df7fe7e97a22a885a2a256410161affc9d2f04979a3ff7
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iJwEAQECAAYFAkn7YM4ACgkQG7kqcTWJkGfHygP9F6ePBWlMa80My+LYRzv8yiCe
-jLfGSewQppRjM7eG/DktBM3uHr5h8efowgnrk/XhJWte/jUnFpm1EhBgsgcciJxQ
-uPFd2hAcmvM2ONx/fgzDX8JM7FW/95NQhp10cwBjG7LAirPEaJGfXzskl1xhX6qS
-9rKPXm+wdiFXKGX5tJo=
-=QnLY
------END PGP SIGNATURE-----
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
+}