Version bump. Fix bug 446754.

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

3 files changed, 110 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 163012fd0d66..54e16bb7d768 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.59 2013/05/02 18:17:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.60 2013/05/02 19:16:45 graaff Exp $
+
+*sphinx-2.0.8 (02 May 2013)
+
+  02 May 2013; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.8.ebuild:
+  Version bump. Fix bug 446754.
 
   02 May 2013; Hans de Graaff <graaff@gentoo.org> -sphinx-2.0.4.ebuild,
   -sphinx-2.0.4-r1.ebuild, -sphinx-2.0.5.ebuild:
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 987f4e9a6fc0..15e768bd5ff3 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -11,14 +11,16 @@ AUX sphinx-2.0.4_gcc-4.7.patch 1264 SHA256 8169c066d88bf216c291a98d1db5c8b285b2e
 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
 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
-MISC ChangeLog 9509 SHA256 bfa7088b435c216ac90351f94b09bcac1464e9622f6d1e65a14d6b7d151d834f SHA512 6f9674a7750bf9fb2d411fe47ff0fe950137e1ef6f9ca3c6c57be94a41d4c3695f09be4084049e8bf1d708ef44b1b888bb1fddaa9ab8ade873e839b7ec49a86b WHIRLPOOL 3eb40f7ca0dd74a34908bf61f1efe66b233f1bc4924617bc8bdfba821f11b835d176ec6447d841ac5c54416c2239a8a09ff3f41a0ab052bb103b7ac1ff7bdce1
+EBUILD sphinx-2.0.8.ebuild 2626 SHA256 3f155e473232e679da0dc45487575925843682855d9d82b00100d85ab121b0e8 SHA512 547c6bbdde58d55f20ae759e78453e081e15b187c021cfcc2dcaf29b7849932decc2219b58b49f979c92551fe75b3a77705ac1edd63cd31ebe3c7790cdc21fed WHIRLPOOL 3e62b8b3c872cb9b0301d6e43096dc21bc32f227b1f4b1a8e1f33a4987530abde15a9214867d9b90bfd1cec57d6babb95b9a2f47f03c622ae16d054a1a036c08
+MISC ChangeLog 9643 SHA256 97bda8455d4232c94241cf70d19c697fbf9a09cff606fdd0671418f4e7983794 SHA512 e27881eec21323f24a48cfd4f628bce3259d56bd913591d21bade03759c5f86d761af31672137e1455b17616378e5044279a947674cbeb39424695a5ca825d3b WHIRLPOOL c0bc2af3fbcdedc39e84baada7b38df41820335a2580127fe299c924aa93e5ea848f4d2d46e50860d2ae0e80a8d7f27692092344d6239ef77d72192d9f48a1ff
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGCrdYACgkQiIP6VqMIqNe/twD/W85p6zzB8BiVssXfrJSUTfYj
-+e0VgGV/bpDqqsYzMLMA/RYyvFX3jpyk7dKh1cckOO88eO4hQ5V/5g1nWlRJ4PUe
-=f/UU
+iF4EAREIAAYFAlGCu54ACgkQiIP6VqMIqNcM4AD9Fba7c2svvY/NvYYuNnGOa7M9
+4lNuttWGHylJbf8seG4BAIqaSINdYgspaLI5Q4FFlpZb/z2CaFx2g+DsY3QRmmTB
+=O55b
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.0.8.ebuild b/app-misc/sphinx/sphinx-2.0.8.ebuild
new file mode 100644
index 000000000000..9e506444976c
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.8.ebuild
@@ -0,0 +1,98 @@
+# 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.1 2013/05/02 19:16:45 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 ~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
+}