Version bump, remove old ebuilds, rename tcltk USE flag to tcl (bug #17808).

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 79 insertions, 5 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 9bae69e996b7..b593b629585c 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.3 2006/09/26 21:32:56 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.4 2006/11/28 21:35:54 marienz Exp $
+
+*xapian-bindings-0.9.9 (28 Nov 2006)
+
+  28 Nov 2006; Marien Zwart <marienz@gentoo.org>
+  -xapian-bindings-0.9.5.ebuild, -xapian-bindings-0.9.6.ebuild,
+  xapian-bindings-0.9.6-r1.ebuild, +xapian-bindings-0.9.9.ebuild:
+  Version bump, remove old ebuilds, rename tcltk USE flag to tcl (bug #17808).
 
 *xapian-bindings-0.9.6-r1 (26 Sep 2006)
 
diff --git a/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.9 b/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.9
new file mode 100644
index 000000000000..307f713f6fba
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.9
@@ -0,0 +1,3 @@
+MD5 fd21a2393b7a8500ffe9c38371fd76a2 xapian-bindings-0.9.9.tar.gz 804582
+RMD160 19eb5226e97c278e3b69899d727c10999488fc42 xapian-bindings-0.9.9.tar.gz 804582
+SHA256 84c4fcccd72f4d788f4575cfa7dc1aa06594068b54ec150aa72fbcc89ce3c8c5 xapian-bindings-0.9.9.tar.gz 804582
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
index 965645ff0fff..aa7dd656c74a 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-0.9.6-r1.ebuild,v 1.2 2006/11/28 21:35:54 marienz Exp $
 
 inherit mono eutils autotools java-pkg-opt-2
 
@@ -11,12 +11,12 @@ 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"
+IUSE="python php tcl 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 )
+	tcl? ( >=dev-lang/tcl-8.1 )
 	mono? ( >=dev-lang/mono-1.0.8 )
 	ruby? ( dev-lang/ruby )"
 
@@ -59,7 +59,7 @@ src_compile() {
 		$(use_enable python maintainer-mode) \
 		$(use_with python) \
 		$(use_with php) \
-		$(use_with tcltk tcl) \
+		$(use_with tcl) \
 		$(use_with mono csharp) \
 		$(use_with java) \
 		$(use_with ruby) \
diff --git a/dev-libs/xapian-bindings/xapian-bindings-0.9.9.ebuild b/dev-libs/xapian-bindings/xapian-bindings-0.9.9.ebuild
new file mode 100644
index 000000000000..1e464b059e5a
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-0.9.9.ebuild
@@ -0,0 +1,64 @@
+# 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.9.ebuild,v 1.1 2006/11/28 21:35:54 marienz 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="~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
+}