Version bump.

Package-Manager: portage-2.2.0_alpha10_p4/cvs/Linux x86_64

3 files changed, 149 insertions, 6 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index c7bf2794b3a3..76be3c329b91 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.17 2010/09/20 16:43:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.18 2010/12/23 12:10:54 arfrever Exp $
+
+*xapian-bindings-1.2.4 (23 Dec 2010)
+
+  23 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -xapian-bindings-1.0.20.ebuild, -xapian-bindings-1.2.2.ebuild,
+  +xapian-bindings-1.2.4.ebuild:
+  Version bump.
 
 *xapian-bindings-1.2.3 (20 Sep 2010)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 2657554e1e83..75e46dc15ad6 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,8 +1,6 @@
-DIST xapian-bindings-1.0.20.tar.gz 1069595 RMD160 f8f9aefe76cc237407f34c53e3e6be894ee4a45d SHA1 63437d4f310842f9cc9e80aad1b8f7113d489270 SHA256 855a106122202bd90b43c2f09861e9ae4ab2115f7ee1fe6208a6d1e614136548
-DIST xapian-bindings-1.2.2.tar.gz 1177296 RMD160 ca59d5f4486f722a1c8d9531d70ccfc945fbc73e SHA1 9b26c1e5f911625bdaee47ac328f7ac626c3df8d SHA256 aa5848db9740b444101831b2891715b3e920076b181fe8ac482fd0d0f8a4e52d
 DIST xapian-bindings-1.2.3.tar.gz 1177525 RMD160 24fd71ab9aab9beaf0194ff58a99c60ab791a998 SHA1 c320a15be7d1dcf5fc22a46b3ada7cbd75de3823 SHA256 3f9d20464893712dc870db9f128ad45e32520cfc2447123caa191ab6c35fefb7
-EBUILD xapian-bindings-1.0.20.ebuild 3209 RMD160 76b5fd72e5ab4fe4f2e028356f8b4b33fd5f2eb6 SHA1 bc9d41077141486be5700f432355fb00eed96931 SHA256 f96deb7e80c6893ec68e005a59987724adc4eb693bd0f012f487579598b18994
-EBUILD xapian-bindings-1.2.2.ebuild 3261 RMD160 a6dbed539e8a2f67ddfc17598dbe3e0e4b3ca217 SHA1 078c54f6990150eb064dc32c5859af3d1aaa1516 SHA256 fc7f22dc3cea5fa7028085f5ed9c8ca7ccb1597e4e40ae51022ffd21fbca1a4d
+DIST xapian-bindings-1.2.4.tar.gz 1314976 RMD160 e4f8b7c0f329527ff99d7665e1e203ecc7bb5292 SHA1 13611f09cdbca8424c871c79d14c8e75b6547a9c SHA256 d41ebd46aa5070782b8294caea6bc02ef96f8506081e52cf8970056bc9a08f0c
 EBUILD xapian-bindings-1.2.3.ebuild 3267 RMD160 2961b24f5a1eab33f2e11d1456224296777532eb SHA1 69cec4d1bbb8aba270608a0221c2be0f5a2fae7e SHA256 14e4b36b78712e4ad74989d788b8c393d8cc4204ffb3c630806e56cb1cc47d97
-MISC ChangeLog 4018 RMD160 ed1576317b629deb6111c83e688f3777848f53a8 SHA1 e5310646c6474467e9ad5012692f73da5682335a SHA256 c37dc8f515553d341a445272a90bc4b4a566b92ae162147c972f7ec6cb05207a
+EBUILD xapian-bindings-1.2.4.ebuild 3294 RMD160 465c3b51761131bc5425f245ebffcbe8af64a6d6 SHA1 bfb6780f237f7d4fb1b7c34b26754496c138314f SHA256 8358324ec2a0939f1d48e4f8d1565237baf1cf59624fa767244f40046cc13b04
+MISC ChangeLog 4244 RMD160 ca3f833a6d3fd75414838f8159d358757f90d6cb SHA1 00680c5fa68ccfd451b0f882ca654ef65df4b4c6 SHA256 5b49b92e7f29dfa5094a2a4a8f70685a82c97386c9fc3aa7f1d62cff3a7c68d7
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.4.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.4.ebuild
new file mode 100644
index 000000000000..32bc82f35017
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2010 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.2.4.ebuild,v 1.1 2010/12/23 12:10:54 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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 )
+	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 )"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed \
+		-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
+		-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_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)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian"
+		}
+		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)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian" \
+				VERBOSE="1" \
+				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)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian" \
+				install
+		}
+		python_execute_function -s --source-dir python installation
+	fi
+
+	# For some USE combinations 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
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup xapian
+	fi
+}