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

(Portage version: 2.1.2_rc2-r2)
 (Signed Manifest commit)

5 files changed, 19 insertions, 163 deletions

diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index e802fdd9024f..7b1917d2e391 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -21,41 +21,34 @@ AUX xapian-bindings-0.9.6-php-tests.patch 3348 RMD160 9d76d88d32c8e0088d4d9a0462
 MD5 0adc5870a023f380da4d48da08c6ac6f files/xapian-bindings-0.9.6-php-tests.patch 3348
 RMD160 9d76d88d32c8e0088d4d9a0462ce50b1d99a47d2 files/xapian-bindings-0.9.6-php-tests.patch 3348
 SHA256 5ccdd098b366dfa8b898679af0c6aee0aed72c4a79b38834e38f70d4b0ac2b27 files/xapian-bindings-0.9.6-php-tests.patch 3348
-DIST xapian-bindings-0.9.5.tar.gz 754243 RMD160 89e0c008b014e9f0c24d9c642ddae56f7ff55f2f SHA256 f943a00e8674bb0a362eb443379084e549281f33ba473a7b0d871f0b57e39caa
 DIST xapian-bindings-0.9.6.tar.gz 792703 RMD160 7320856c454e8ba675d168baccb92be022e2a24e SHA1 5255de13fcf159f780060559886e29f6dc9df740 SHA256 758765bde18817a7e4fde5d21742be5fb154f77ba211fe93d3dd00523e1657ed
-EBUILD xapian-bindings-0.9.5.ebuild 1211 RMD160 9eb22dc938898e9935e1939b6c89cb48575846d7 SHA1 50620124fc0ee6c2aecb50c5c52cee2afe613031 SHA256 66d1db2ad2ec038e5d8063de3ae211276f7ba26c251e73bdda1e7b89c4d44d0d
-MD5 b8f49c4cee56ce68695007b9ebcca202 xapian-bindings-0.9.5.ebuild 1211
-RMD160 9eb22dc938898e9935e1939b6c89cb48575846d7 xapian-bindings-0.9.5.ebuild 1211
-SHA256 66d1db2ad2ec038e5d8063de3ae211276f7ba26c251e73bdda1e7b89c4d44d0d xapian-bindings-0.9.5.ebuild 1211
-EBUILD xapian-bindings-0.9.6-r1.ebuild 2244 RMD160 2de7ccbe30e17be97715bd1461a30c709f55decf SHA1 1e597e96ed368d1ac5fc5aeb73d0cb8a97ac6a13 SHA256 4fc6800dbc117992cdbc86c38b4c81f2527876c72314ecfb6339dc29f2bc43be
-MD5 da62cc64111031582a9823b094eaa9c1 xapian-bindings-0.9.6-r1.ebuild 2244
-RMD160 2de7ccbe30e17be97715bd1461a30c709f55decf xapian-bindings-0.9.6-r1.ebuild 2244
-SHA256 4fc6800dbc117992cdbc86c38b4c81f2527876c72314ecfb6339dc29f2bc43be xapian-bindings-0.9.6-r1.ebuild 2244
-EBUILD xapian-bindings-0.9.6.ebuild 2033 RMD160 6d0c568be19aafbc76bdf5cc632515c455878b39 SHA1 19cbab51aa9a452890f7f0d6225bc749a6258dc4 SHA256 bd48012db809f82637b6ddd15f91ab8ddee18fdb1adfa06332968c28d1a8a3da
-MD5 8b8bbbfc8d7bb8618909664337c0a9e3 xapian-bindings-0.9.6.ebuild 2033
-RMD160 6d0c568be19aafbc76bdf5cc632515c455878b39 xapian-bindings-0.9.6.ebuild 2033
-SHA256 bd48012db809f82637b6ddd15f91ab8ddee18fdb1adfa06332968c28d1a8a3da xapian-bindings-0.9.6.ebuild 2033
-MISC ChangeLog 1125 RMD160 1e92a89b1a307e0b4e255197eec20c689d5e2eab SHA1 7d3ddb3e598ebf2a31d8351f5c4eb4fc93dd6bec SHA256 43f92b432a9cbdc23e23df4fefc7da25491fd3280efa56a8d3ac7c00f48d7442
-MD5 231f6c220a715bddd7a3b64b42394264 ChangeLog 1125
-RMD160 1e92a89b1a307e0b4e255197eec20c689d5e2eab ChangeLog 1125
-SHA256 43f92b432a9cbdc23e23df4fefc7da25491fd3280efa56a8d3ac7c00f48d7442 ChangeLog 1125
+DIST xapian-bindings-0.9.9.tar.gz 804582 RMD160 19eb5226e97c278e3b69899d727c10999488fc42 SHA1 d0f8cee5330f621175b630db62f46090c2e52bca SHA256 84c4fcccd72f4d788f4575cfa7dc1aa06594068b54ec150aa72fbcc89ce3c8c5
+EBUILD xapian-bindings-0.9.6-r1.ebuild 2234 RMD160 076c26377466ff386a3ec7082cba29f18b65d945 SHA1 b07f5ac9f03467b3874468113038b63b2b737068 SHA256 1c8c9594f5d352660deb1d349334d8f8b99119a29fdd8fcd57aa63fc2065bc61
+MD5 0d79da739f2dc8051e0dff135a87bf9a xapian-bindings-0.9.6-r1.ebuild 2234
+RMD160 076c26377466ff386a3ec7082cba29f18b65d945 xapian-bindings-0.9.6-r1.ebuild 2234
+SHA256 1c8c9594f5d352660deb1d349334d8f8b99119a29fdd8fcd57aa63fc2065bc61 xapian-bindings-0.9.6-r1.ebuild 2234
+EBUILD xapian-bindings-0.9.9.ebuild 1690 RMD160 8bd326fbdc0b5e838597e901b6e81b7b93a70996 SHA1 ebf74bfe9d1314e3d48f706ab7a5f48c4d1b5af0 SHA256 964ce5a93dde5d326daa06947188cf976d0a20cd5d7c72a69533a92c87f319f4
+MD5 c68fde401681e03250a569cb9ca3d496 xapian-bindings-0.9.9.ebuild 1690
+RMD160 8bd326fbdc0b5e838597e901b6e81b7b93a70996 xapian-bindings-0.9.9.ebuild 1690
+SHA256 964ce5a93dde5d326daa06947188cf976d0a20cd5d7c72a69533a92c87f319f4 xapian-bindings-0.9.9.ebuild 1690
+MISC ChangeLog 1422 RMD160 bc37ec86265d5c678a02488225d1a8c23bd487ff SHA1 cfeee108e30aa3f68705f27127e79ce1397526b8 SHA256 e63998648da4e09214881d869b3ceadc9630312bf6391a3b00d3b5c0f8005fcf
+MD5 f513a5a12975491af2e2d0078044b87e ChangeLog 1422
+RMD160 bc37ec86265d5c678a02488225d1a8c23bd487ff ChangeLog 1422
+SHA256 e63998648da4e09214881d869b3ceadc9630312bf6391a3b00d3b5c0f8005fcf ChangeLog 1422
 MISC metadata.xml 348 RMD160 e40b78aae59abc91c7665c525b0cbcc732b5dba8 SHA1 d7804461beb66cc1943ef0f1630ed27fcc3d7ef5 SHA256 1e3c30c6fe78e88adad51f2d0d39fb8fb3939dfa44e4cd482a7601abe561e2a5
 MD5 83b891da88c9cfdeca4c8d5e8bb5d6d1 metadata.xml 348
 RMD160 e40b78aae59abc91c7665c525b0cbcc732b5dba8 metadata.xml 348
 SHA256 1e3c30c6fe78e88adad51f2d0d39fb8fb3939dfa44e4cd482a7601abe561e2a5 metadata.xml 348
-MD5 87d815e4367d99ea308638c45807d116 files/digest-xapian-bindings-0.9.5 265
-RMD160 aedcac80d99eb525504cf8b6489205d8244656ad files/digest-xapian-bindings-0.9.5 265
-SHA256 6a22717024e77b30cf2390f9a8adf23b082f24d56034f6e2e56f68a0f128e1b1 files/digest-xapian-bindings-0.9.5 265
-MD5 6de3010e12fd1799a059c95f49e739f7 files/digest-xapian-bindings-0.9.6 265
-RMD160 37721c9d66a8b894b0389cc68914d55ca26a1b54 files/digest-xapian-bindings-0.9.6 265
-SHA256 44dee39b6f5252f435abc0503e2520bbb039527531f4cfe8754503aac019c72d files/digest-xapian-bindings-0.9.6 265
 MD5 6de3010e12fd1799a059c95f49e739f7 files/digest-xapian-bindings-0.9.6-r1 265
 RMD160 37721c9d66a8b894b0389cc68914d55ca26a1b54 files/digest-xapian-bindings-0.9.6-r1 265
 SHA256 44dee39b6f5252f435abc0503e2520bbb039527531f4cfe8754503aac019c72d files/digest-xapian-bindings-0.9.6-r1 265
+MD5 d9809169b073b64b2481af7e3ce893e9 files/digest-xapian-bindings-0.9.9 265
+RMD160 d22d646000183a2ee06b4ea70564dec89a7c46ae files/digest-xapian-bindings-0.9.9 265
+SHA256 a257c6351fdf413144317cd9caef90aac91f2c72457037c4521d40e3e73e73ea files/digest-xapian-bindings-0.9.9 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGZyOUElL7eJpfEQRAmRwAJkBnBjwvQeEu23uGKO+SpitBAEOygCcC1UK
-1mIxOoHLA0XUzRjBY9cPdJM=
-=WUNH
+iD8DBQFFbKvAUElL7eJpfEQRAt+QAJ9aVrRYTsUNLQcw09DQATk+KNPfJQCgitav
+6sVj+QoqWf6Bcx6TVDva68M=
+=Eosx
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.5 b/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.5
deleted file mode 100644
index 9f556b5a2d0b..000000000000
--- a/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a4eeff51435afe14628a88cfe76c0df5 xapian-bindings-0.9.5.tar.gz 754243
-RMD160 89e0c008b014e9f0c24d9c642ddae56f7ff55f2f xapian-bindings-0.9.5.tar.gz 754243
-SHA256 f943a00e8674bb0a362eb443379084e549281f33ba473a7b0d871f0b57e39caa xapian-bindings-0.9.5.tar.gz 754243
diff --git a/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.6 b/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.6
deleted file mode 100644
index 753185edcf3c..000000000000
--- a/dev-libs/xapian-bindings/files/digest-xapian-bindings-0.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f404b6a9c9e86a9ec6dfbbe38909b2cf xapian-bindings-0.9.6.tar.gz 792703
-RMD160 7320856c454e8ba675d168baccb92be022e2a24e xapian-bindings-0.9.6.tar.gz 792703
-SHA256 758765bde18817a7e4fde5d21742be5fb154f77ba211fe93d3dd00523e1657ed xapian-bindings-0.9.6.tar.gz 792703
diff --git a/dev-libs/xapian-bindings/xapian-bindings-0.9.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-0.9.5.ebuild
deleted file mode 100644
index c3c1ea5147b5..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-0.9.5.ebuild
+++ /dev/null
@@ -1,49 +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.5.ebuild,v 1.2 2006/05/28 18:13:54 swegener Exp $
-
-inherit mono eutils autotools
-
-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 tcltk mono"
-
-DEPEND="=dev-libs/xapian-${PV}
-	python? ( >=dev-lang/python-2.1 )
-	php? ( dev-lang/php )
-	tcltk? ( >=dev-lang/tcl-8.1 )
-	mono? ( >=dev-lang/mono-1.0.8 )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-skip-csharp-test.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with python) \
-		$(use_with php) \
-		$(use_with tcltk tcl) \
-		$(use_with mono csharp) \
-		--without-java \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install || die
-
-	#docs tly et installed under /usr/share/doc/xapian-core,
-	# lets move them under /usr/share/doc..
-	mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-0.9.6.ebuild b/dev-libs/xapian-bindings/xapian-bindings-0.9.6.ebuild
deleted file mode 100644
index 7c086f42c1ea..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-0.9.6.ebuild
+++ /dev/null
@@ -1,82 +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.ebuild,v 1.1 2006/05/25 01:33:58 marienz Exp $
-
-inherit mono eutils autotools java-pkg
-
-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 tcltk 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 )
-	mono? ( >=dev-lang/mono-1.0.8 )
-	ruby? ( dev-lang/ruby )"
-
-DEPEND="${COMMONDEPEND}
-	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 ..
-
-	eautoreconf
-}
-
-src_compile() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} -I${JAVA_HOME}/include"
-		CXXFLAGS="${CXXFLAGS} -I${JAVA_HOME}/include/linux"
-	fi
-	econf \
-		$(use_with python) \
-		$(use_with php) \
-		$(use_with tcltk 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"
-	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
-}