Cleanup.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 9 insertions, 205 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 1b70c6208761..4ee151d8d6a4 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.67 2013/10/15 19:04:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.68 2013/11/27 06:58:06 graaff Exp $
+
+  27 Nov 2013; Hans de Graaff <graaff@gentoo.org> -sphinx-2.0.6.ebuild,
+  -sphinx-2.0.8.ebuild:
+  Cleanup.
 
 *sphinx-2.1.2 (15 Oct 2013)
 
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 5f22a502ae0e..4f62d5209706 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -10,21 +10,17 @@ AUX sphinx-2.0.1_beta-solaris.patch 1036 SHA256 cde3f1ebb1a602c2fe9e22ae1831bf58
 AUX sphinx-2.0.4_gcc-4.7.patch 1264 SHA256 8169c066d88bf216c291a98d1db5c8b285b2efbcaacb2ee51049f223b35931e4 SHA512 6545edee5fde55e0d998a78a856d7a75aaedb27aacc3402a49211f37c452332eacafc199566e2de1e0fd6c969f5df8ccb8fa438c068b1aef736180c10e556296 WHIRLPOOL 6b1a6e5ffcd811352ed23a20870665878a211fefe4d0977d7bff69e85ed79dae089f76b4f29cd4b9b48ce8e6754fbd82d0a9399ab3c8365add1dddafd090a4f7
 DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d WHIRLPOOL 03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
 DIST sphinx-0.9.9.tar.gz 1218359 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512 bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2 WHIRLPOOL 70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
-DIST sphinx-2.0.6-release.tar.gz 1972728 SHA256 de943c397efda706661b3a12e12e9f8cc8a03bf6c02c5a6ba967a06384feede2 SHA512 fdd3be8c4606a26e1f00bf5b92cbdc8f30482cb4c4b8130022bb1fec250e743a3f4beb1ba5b6b20dcdf39c57ec4d9efc679ea3130b4c32d4932cc748479dde5c WHIRLPOOL c986c372db65c7226273586398e085102725bc7cc9cb44ac39c1943c7df029a7c8e85a5b642f881e92aab0dbf0a66b3e5a1abd949042f81766f970f032977f30
-DIST sphinx-2.0.8-release.tar.gz 1989017 SHA256 bd699bf34635558e4d9d4d8bdcf5fcdd9c2e8f6c614824bec793b0010fa6cda3 SHA512 aa68344683d7cb4869c070967e44d40ba40d6b9a0ec9f27cfa4116266d79a91a5756f90e7d8d4f5a42faa857e70da12873505d3dbbad9b86a6fdb3da14ff10d8 WHIRLPOOL f2732997b6dc29a1517b942dce73f3a8ad5d027ee7af940d458dd8f53fe891fe0d0518df7e2c0af0fa05aa60c25b263814cc4460f329623ceb5a74253c4dab7c
 DIST sphinx-2.0.9-release.tar.gz 1996939 SHA256 c4fb5d7951bc0831e46f102d17b5f32bbde11434ce3b00b20531dfe9e646869d SHA512 92fc7e3808f4b2fcdc47b510951cd6111e235e8cefa9f4046cd1943fe7161421495a858125c2f1416e893698d78dc83aeb57ea590dca6e4f9e95b6baaaa5f06d WHIRLPOOL 360c884205b8d78024bd8713c33bb4ad6773a5c15253121cfd093149b544162f5fbf02a0698476035d831f915317841acd871622a69692a9c1f212f4d7b492a9
 DIST sphinx-2.1.2-release.tar.gz 2388748 SHA256 73d63a5875a557196847d373f74a65713c81ede8329389fccc593f0e65703e60 SHA512 35bca5c405e812a21d57db7c1499bea3c441ac117bd7ea18f8111158b6faaba63e4c10f9eb848485073905ed424efc71dbadcdf350a1fb4cfa308201bb02dbf9 WHIRLPOOL b5857b6a997960bc95d78a9c1cd5dd919ae018139f7975318a659b15f613280be0da72358c4a70f0092132f4c7b4e2729958dcd803baf9440ca0d2ffb4b35c92
 EBUILD sphinx-0.9.9.ebuild 1552 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59 SHA512 03e39d6ec347d790dfc1b87be19c632c8c1eb24497f69f4450038119eefa55c30f8ca866c8ae694d1f140af9d842c2d14778a48317bac1a890aaf97b5a1a56a3 WHIRLPOOL 1a5e907ccf4e96a59b487152e3560d1d6506dcd947127cb587c3f75a39b89d0a80e2fc9c72aa2b1e7674e9ee390d6343026c3fe4da7121911883874567a57bf1
-EBUILD sphinx-2.0.6.ebuild 2588 SHA256 1b5603aebaa798273d8366da0f9049e5b67a97747f9ffd6b412ca709316910a3 SHA512 3405392c0c8bd30c3ac4b00e202bb7d133bd300b586237ac36d908ce8fa7df4cbd630583203ba761e8f8a43f77dfb1f8ac6bd23cf730450213d7c42abde05e25 WHIRLPOOL c36138084d3480c6769fb5c0377b09280c6aa3de9c3b4c1db6416641e7181d40a4b0380299e42ef1b901464a15c9b37b95ff38aa4e69b66d6a73629237949635
-EBUILD sphinx-2.0.8.ebuild 2627 SHA256 ed3961f7c1803f01d6191909d54598f414ad6d06ee8a17a43030900db70b8e95 SHA512 d82cf95a67d62068e57c3e91e1b507162ef8e09252029076cd9fbbc72988d744e3f0045823f0f35988fdba4d6198fb5887224fe37ab250296835b5b2298ce6f2 WHIRLPOOL a45b9fe0ea67b020d67a9af63a8399e367c9042a7bc67fc35d40254c5d765adbc68a3437bc76d6b52163e9e08a40c10d22847ed8008b976b15188108903304fc
 EBUILD sphinx-2.0.9.ebuild 2730 SHA256 7a8690033fc4ac36cce8647f347f8733894fd3d87c93adfe4604059296e6de03 SHA512 6ae2f651315cba6b1c7864a00b70b202146ccf5ed648bf4356dd63d69b5ffad769ef6dad30f287bb8f7166a12bdf88c55bbb44179d9205bc97d7a231990d70c9 WHIRLPOOL 246dd2f38b980cd2b3841f165a55bd9cb595a486b42690d661360301d13e773c5eef84fcea07812661b31e9c8c123dd5ff6a5144f4849840f9cb8e8b12354023
 EBUILD sphinx-2.1.2.ebuild 2787 SHA256 976f6763360ccf3065b1a5b840fa228ee1a77879aab575b03ab146410b788e3a SHA512 222b58ce07fd3df5fe8092d2604c1183ca4a604db29db38836444d50c9de4f1e506a6df15e6db8aab690b0e738362df756b2ce26834193cf38f22aededda7f80 WHIRLPOOL e0b7e898176c2156930b48adabe753e843977f59976b5b7bd6e9b798dbf20b12b07878d0df446ccca5a37fe29eec99e74aab4ae2269a7d2e546648dec89a6592
-MISC ChangeLog 10531 SHA256 1509aef516909dad440efe257453530f4c800c4e3c7ec91eb2e6b0e1570ae71c SHA512 12232096f0cc596708d80ed574a9a6258d99e5f638594dfd914566c781ca5aff19d256f8e86cec4b93552f849c22c1cd684a38b50c9b9544c83e8d11a6d37615 WHIRLPOOL 986c7decda31914cf6efe4a5ea33c20a413f1f417a84a9f5b6a58bde2b3a98347f0e2d3d5eb7e536bbdead5557162728c909908718f2e6c013d76d4fb2f49dd6
+MISC ChangeLog 10639 SHA256 e6fcb43f06fe7202715a26ff1560678f505ab11df2e6d05ad0afac99ae9ce14a SHA512 19dd319d3d1e6856d29603946960df1685ea88a2aefc4c0d0b85e7effd21fc3a186fe2b4df475ba27ba93383edaa27e2e5465eed719d3bfcbc6c91e0ed62fdf6 WHIRLPOOL be484e63039d0cb570edc5a5449c40a78ed38bfd493560bdbfdec0d43efc9ef15af7f16165b0113029a1851f5bc1f327e7f7ce515d9b782135f989983b975056
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJdkbMACgkQiIP6VqMIqNfXvQD+KxZblTQDP9oSwaxaOHY4YjFS
-6yclmm0RqcncJOLLRykA/31bItftnpzcmMPkqD9tpj6Qda44dI5ElQG5TYg0mNbG
-=ntZM
+iF4EAREIAAYFAlKVmAMACgkQiIP6VqMIqNephgD9GFW3AW0+yja9dOInML3YZvpg
+srnnsoFBA2UR+Z1dphwBAINvL86EKIyTyAEdzRAFpR2undntF4AvVNXNlQLBmDQ9
+=NeNz
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.0.6.ebuild b/app-misc/sphinx/sphinx-2.0.6.ebuild
deleted file mode 100644
index dca55043b441..000000000000
--- a/app-misc/sphinx/sphinx-2.0.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.6.ebuild,v 1.7 2013/03/03 12:11:42 ago Exp $
-
-EAPI=4
-inherit eutils autotools
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	odbc? ( dev-db/unixODBC )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
-	# drop nasty hardcoded search path breaking Prefix
-	# We patch configure directly since otherwise we need to run
-	# eautoreconf twice and that causes problems, bug 425380
-	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
-
-	pushd api/libsphinxclient || die
-	eautoreconf
-	popd || die
-}
-
-src_configure() {
-	# fix libiconv detection
-	use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
-
-	cd api/libsphinxclient || die
-	econf STRIP=:
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
-	elog "Tests require access to a live MySQL database and may require configuration."
-	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
-
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-
-	if use test; then
-		insinto /usr/share/${PN}
-		doins -r test
-	fi
-}
diff --git a/app-misc/sphinx/sphinx-2.0.8.ebuild b/app-misc/sphinx/sphinx-2.0.8.ebuild
deleted file mode 100644
index d9975a89eb66..000000000000
--- a/app-misc/sphinx/sphinx-2.0.8.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.8.ebuild,v 1.4 2013/06/27 16:11:55 jer Exp $
-
-EAPI=5
-inherit eutils autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	odbc? ( dev-db/unixODBC )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
-	# drop nasty hardcoded search path breaking Prefix
-	# We patch configure directly since otherwise we need to run
-	# eautoreconf twice and that causes problems, bug 425380
-	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
-
-	pushd api/libsphinxclient || die
-	eautoreconf
-	popd || die
-}
-
-src_configure() {
-	# fix libiconv detection
-	use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
-
-	cd api/libsphinxclient || die
-	econf STRIP=:
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" || die "emake failed"
-
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
-	elog "Tests require access to a live MySQL database and may require configuration."
-	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
-
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-
-	if use test; then
-		insinto /usr/share/${PN}
-		doins -r test
-	fi
-}