Version bump. Set SUPPORT_PYTHON_ABIS.

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

5 files changed, 126 insertions, 136 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 9eadaa5222a6..33c8b875faf3 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.11 2009/09/15 00:44:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.12 2009/11/22 16:52:35 arfrever Exp $
+
+*xapian-bindings-1.0.17 (22 Nov 2009)
+
+  22 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -xapian-bindings-1.0.6.ebuild, -xapian-bindings-1.0.12.ebuild,
+  +xapian-bindings-1.0.17.ebuild:
+  Version bump. Set SUPPORT_PYTHON_ABIS.
 
 *xapian-bindings-1.0.16 (15 Sep 2009)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 3e1daa5c31f3..2f40c334fa2d 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,8 +1,6 @@
-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-1.0.12.ebuild 1730 RMD160 8d4a6f5ad6cf014bd4ca75cedab7bb1e76632d62 SHA1 9ef6f45788611df5686e5a19f513e77360395b16 SHA256 1635b8b62ec3886f15c8dd8e3a6483dc0913d8b53a26ce5020a5f9b9dade3015
+DIST xapian-bindings-1.0.17.tar.gz 1053141 RMD160 5ef7e762258720a11234715bca8a71f351c2ac11 SHA1 82a9fa61044cdc49d744e132ee9c89cfa20f57f4 SHA256 e79c39e61bb8c47e0a8649064677087fb2e63fa9a6714dedfa3c859405373f60
 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 2944 RMD160 a06d7a74dd02f950cca27faabf1b0b4f2ee3da19 SHA1 9d342bd9adc8c9e7e476787a3a95261e34d423d9 SHA256 2b7d7645d017f8af39df7fe7e97a22a885a2a256410161affc9d2f04979a3ff7
+EBUILD xapian-bindings-1.0.17.ebuild 3045 RMD160 02a09af59fad96b5fb2ca23216800ffa8c11f3b6 SHA1 1b117381546e0bc944e4e4aa43a0b2f26c2a583d SHA256 ddc9754de82fd7ef565afe7ef3eabfdaf1a121370160cd1df6a0f97dda0a5c80
+MISC ChangeLog 3197 RMD160 f6234538b78a6fb8b0cc072953e20eee4f49781d SHA1 877fb8e6bee73a69324bf76c5d37faf4c396bb25 SHA256 7f260bac561cf381c7d0b36127675b59f86ede45636cc3fb2ca98bc4afb174ee
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.0.12.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.12.ebuild
deleted file mode 100644
index 210cbaa61d6e..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.0.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.2 2009/05/01 20:51:19 tommy 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"
-
-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.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.17.ebuild
new file mode 100644
index 000000000000..e4e183c493f3
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.0.17.ebuild
@@ -0,0 +1,115 @@
+# 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.17.ebuild,v 1.1 2009/11/22 16:52:35 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit java-pkg-opt-2 mono python
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="java mono php python ruby tcl"
+
+COMMONDEPEND="=dev-libs/xapian-${PV}
+	mono? ( >=dev-lang/mono-1.0.8 )
+	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 )
+	java? ( >=virtual/jdk-1.3 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.3 )"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	sed \
+		-e 's:\(^pylib_DATA = xapian.py\).*:\1:' \
+		-e 's|\(^xapian.py: modern/xapian.py\)|\1 _xapian$(PYTHON_SO)|' \
+		-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 java) \
+		$(use_with mono csharp) \
+		$(use_with php) \
+		$(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() {
+	default
+
+	if use python; then
+		python_copy_sources python
+		building() {
+			emake PYTHON="$(PYTHON)" PYTHON_INC="$(python_get_includedir)" PYTHON_LIB="$(python_get_libdir)" pylibdir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir python building
+	fi
+}
+
+src_test() {
+	default
+
+	if use python; then
+		testing() {
+			emake PYTHON="$(PYTHON)" PYTHON_INC="$(python_get_includedir)" PYTHON_LIB="$(python_get_libdir)" pylibdir="$(python_get_sitedir)" check
+		}
+		python_execute_function -s --source-dir python testing
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	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
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" PYTHON="$(PYTHON)" PYTHON_INC="$(python_get_includedir)" PYTHON_LIB="$(python_get_libdir)" pylibdir="$(python_get_sitedir)" install
+		}
+		python_execute_function -s --source-dir python installation
+	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"
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize xapian.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup xapian.py
+	fi
+}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild
deleted file mode 100644
index 6bab91f118d4..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.0.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.3 2009/05/01 20:51:19 tommy 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"
-
-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"
-}