Version bump with bug fixes.

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

3 files changed, 113 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 36ff4fa03fad..c0ae225d2e0e 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,11 @@
 # 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.63 2013/06/27 16:11:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.64 2013/08/28 09:26:23 graaff Exp $
+
+*sphinx-2.0.9 (28 Aug 2013)
+
+  28 Aug 2013; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.9.ebuild:
+  Version bump with bug fixes.
 
   27 Jun 2013; Jeroen Roovers <jer@gentoo.org> sphinx-2.0.8.ebuild:
   Marked ~hppa too.
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 473c42f56797..acd5c728f10b 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -12,15 +12,17 @@ DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fc
 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
 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
-MISC ChangeLog 9941 SHA256 a4012e79a39d5fe1a75b76764efdcb289bd57131ecc534bc47b1b7d7322ab400 SHA512 8dd68bcaaad280a4801099564ff7b187f3ece57d4a08e257534d3b6663b8e885f5116d362af77cab6ed610f1964f3e74d6af3d9ecc9f817ece8de530ebbd2c26 WHIRLPOOL 48d5dbe4688fcb6601387dc0f03530127b16ecdb1acc707a8bf15f5cf17a93d1ee439f18c25420d348e451df0469f53e54476ef39db09ee51e5717a30acf293c
+EBUILD sphinx-2.0.9.ebuild 2735 SHA256 8e4c532e51ab3f21b5e516f87531b319e00aeb41594cbfaf4675994ddc890dd6 SHA512 92081524582bd4746d7612261aa0f5b4993a02866f345bace70d8214c6cb5cd6e62a1624a4a06e08561eafa28b8fec08cd153c79d8b4aadeebd312f321c0b145 WHIRLPOOL 273dff7549473c3e511a3f6c59a0a707ff93282cd8f4c521556c685072c29a20b35a86959991f79eea3f5b2750254a9fd9485fab9a0498d4406deb2f23e9a81f
+MISC ChangeLog 10077 SHA256 64a44423ca9085a17d4a717bf684c862ea750356ac824dbdb2770ec5a1b2f720 SHA512 58d03cd74251f0623bd35eee6002c966dc179f0e955e99f04fa9e8b697b1a563f3d511e990f51feb0c8205eee548c6dc86855fc543665c493498eb9492b3a2db WHIRLPOOL 1e77fd016134910d54305535b3d441adc7e323057b7bf65fd4e6805311f3860d9cff56339581451cddd75db5b8df217f1d71bf148a1479f4a8be8d173f4c0510
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMZEwACgkQVWmRsqeSphOsSwCfSozqumZ/rdgmWPrd5BUVTgMc
-+OQAn3IOV74JpumGhv7tI2NTMRVNYk6W
-=QOq/
+iF4EAREIAAYFAlIdwkYACgkQiIP6VqMIqNcn5AD/d4M2+3kLnZ8l0shu6atf2tSo
+fhwkTj78VZwkfbMcRaYA/0irIRN+MJVcezEUE95qUZTMcdb2N2GRVtYg6aaBUQJM
+=LFAk
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.0.9.ebuild b/app-misc/sphinx/sphinx-2.0.9.ebuild
new file mode 100644
index 000000000000..d4d848f7403e
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.9.ebuild
@@ -0,0 +1,101 @@
+# 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.9.ebuild,v 1.1 2013/08/28 09:26:23 graaff 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
+
+	# Fix QA compilation warnings.
+	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || 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
+}