Version bump.

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

3 files changed, 111 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 0cb8e550ee24..b190f01ac2b7 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.51 2012/09/20 05:23:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.52 2012/11/20 18:17:27 graaff Exp $
+
+*sphinx-2.0.6 (20 Nov 2012)
+
+  20 Nov 2012; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.6.ebuild:
+  Version bump.
 
   20 Sep 2012; Hans de Graaff <graaff@gentoo.org> -sphinx-0.9.8.1.ebuild:
   Cleanup.
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 67032a1ab295..9d306293caad 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -12,16 +12,18 @@ 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.4-release.tar.gz 1938089 SHA256 43c4b62949d8fbd2b6ba93e20cb0f35c14f428be501af47e75a3ef713efa2886 SHA512 34bc6718328f9aad3ad8f081c67bee292af70827cc6d27e9f69198a5a5245fb2d5d76467c1bbea6ff1b4b45b249c302e844c7ce3c2976b103b80fc6a8013f567 WHIRLPOOL 79b564a5888fd7f485a8304b24ae38fdab6423fdec80355e8df5807d289de35b0b1b3aecf1f0ebd5a7c078111400a494ce736e29539f66ba2253911650fb6bfd
 DIST sphinx-2.0.5-release.tar.gz 1959258 SHA256 45d89b9112cf52adb2a7289df3b6f4d37371bad8f892b9da4b75b574c7e6ba90 SHA512 83dbcfcbc8237ab13dadd2d488feb4bb679115f901b191ef3541a9f79234c6559c3b7558c654f0dfba9fba0f26a233230f3916a50ea72a33292810277b221e5b WHIRLPOOL 0aaf70f20b0936f8967a863f2bee33fc1434a5189e6bd788dd4193e710d8f0e61d3ff23f0054c30e88293fda853e1933cc1d45204c22874d187526288d18ef1a
+DIST sphinx-2.0.6-release.tar.gz 1972728 SHA256 de943c397efda706661b3a12e12e9f8cc8a03bf6c02c5a6ba967a06384feede2 SHA512 fdd3be8c4606a26e1f00bf5b92cbdc8f30482cb4c4b8130022bb1fec250e743a3f4beb1ba5b6b20dcdf39c57ec4d9efc679ea3130b4c32d4932cc748479dde5c WHIRLPOOL c986c372db65c7226273586398e085102725bc7cc9cb44ac39c1943c7df029a7c8e85a5b642f881e92aab0dbf0a66b3e5a1abd949042f81766f970f032977f30
 EBUILD sphinx-0.9.9.ebuild 1552 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59 SHA512 03e39d6ec347d790dfc1b87be19c632c8c1eb24497f69f4450038119eefa55c30f8ca866c8ae694d1f140af9d842c2d14778a48317bac1a890aaf97b5a1a56a3 WHIRLPOOL 1a5e907ccf4e96a59b487152e3560d1d6506dcd947127cb587c3f75a39b89d0a80e2fc9c72aa2b1e7674e9ee390d6343026c3fe4da7121911883874567a57bf1
 EBUILD sphinx-2.0.4-r1.ebuild 2638 SHA256 eefc847570a5c60b97c3de53bbd67c7a0bd8969f2bf0de1ed6449b3ba9432d0e SHA512 3a70ebfbe452cf4432ae631a6d7d14b10a38f5960fa1e5a36dc30dc83397ea801287eb3ef2e2ed7cea76c08165f4b072c2df9a82daebbf38a03c05c983685da9 WHIRLPOOL 60849d756e770dcbf8e9f4ea0f71b24f36bdb3f6069087e330606c365efde6e5b1963d9a54fcc795b5e011a7a33b18130c40ec295e8e91d74624b23a8c2f6374
 EBUILD sphinx-2.0.4.ebuild 2589 SHA256 229b1ef9265064d38e18b8cf0319b6cae0d3ae4a1a78d9a5ac9a88966e75b232 SHA512 99c5345282b7ca00438ae94bea0923e2e2df5a8d600c2b97c5dd2cb66b72a56d4f6b62b34bbcf95897b444cd1d895dec62aaabf2e71c888691dd246119797ec9 WHIRLPOOL 5ef3131495b10eb1a9bc5daea40e4fcb967c3daa8770537ee7ac6427b34e3c4ab33c59cdae8712e2ce60e9d39cf7d9a2f8e357b06ceb9e864d7b83191c98effa
 EBUILD sphinx-2.0.5.ebuild 2598 SHA256 9499232b7568ff8ac87bcc70cad37b411162240d0505d8c4d5174e77cac7523f SHA512 1c21fe04c1da01ba5d3f045a7e2812ecc1d2bce447e6e1dbde7d5639d344396353a0171ad4a408e2fcf935e0ca13097e03b6e242fa6d1cc38b40da1820957fcb WHIRLPOOL 7b956c7073f558a878e4269712f42ef5af69cc97809a4116cfa794ad45373e9bc415cde13e0aa344be76422ec35ca93f37629e990f0b344458e9f289b65eec7a
-MISC ChangeLog 8583 SHA256 1cf34af6bad82c33ccde9ac4dfad7899a47d9ce67462af41190f0eff757e7119 SHA512 3da473565215de04a6f3145e48e86aa01d7eb9ceccfad957ac646a74f372a535cb513f7643eb6dde725b9cf77e78363a60fca17c251b273e29817f6d79289899 WHIRLPOOL 837a2d74a406bc9a8bcb0e0ea1f3a5a5f1c109d7bfac252269de15fb612305fe2f635b3042e23ddd6994d5fdc34bfad86599e7e7f5792ed60573265a054055cd
+EBUILD sphinx-2.0.6.ebuild 2598 SHA256 a30314c6c01352bb3d379510f15014374ed0e443b64d98647cdf533594b428c0 SHA512 9245d914149326db1be31d5da75a3bf0179e8f9d13422e583ae0e039a0e9016e9b9a657861a61b9b5ec7618e5649e00b2948a8019129b1fe0fa9f72ced27558e WHIRLPOOL dc7dc24af6116d9c063e6385cfbf0461dac1c0fff2963947932fd8f94cdd70a06addada3e6156be0b7a8092b4ea1bcb14f961d96cc5e1533b5407b42cc2a9405
+MISC ChangeLog 8701 SHA256 82b6254a5d55def707d9347d56aa4574ceebba2ff98eabd34788a44c4cd53b2c SHA512 08291c7e31befa7911091f13740101a8d0c6e92e1511c9abaf464443571251863c4f87fd29d03443df18691354538d4d43831c065f66c770ae770f3fb3e858ac WHIRLPOOL 78f05d6e1aef29dfaf77736cf762a4e64018cc37b5891d1dbb363444fe8b4ac037f0db571f14797e53be59023da3848f2f8417417355fceec90e0b654bb035cd
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBaqGkACgkQiIP6VqMIqNfglwD/dGyv/IaYunjH9QLdg4kEGchw
-zXghJkkLPfcKI+h7BnoA/0dZvcOvITqNtKpgVmqFSIEGr3RcXNnUC1IamIxO+rU7
-=i3+A
+iF4EAREIAAYFAlCryT0ACgkQiIP6VqMIqNf7/wD/TA3nJSGRVDJeSVshS9s66159
+f40dX8aTHAfXgIpafeMA/0l0IWxznzeHYfPupouhk4DCuIqGIxyublgQs1/4yWW/
+=TXXl
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.0.6.ebuild b/app-misc/sphinx/sphinx-2.0.6.ebuild
new file mode 100644
index 000000000000..3c1a9d199ced
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 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.1 2012/11/20 18:17:27 graaff 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 ~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
+	dodir /var/run/sphinx
+
+	newinitd "${FILESDIR}"/searchd.rc searchd
+
+	if use test; then
+		insinto /usr/share/${PN}
+		doins -r test
+	fi
+}