Version bump. Drop darwin patches since the related code has changed and I can't verify the patches. Bug 364761.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 107 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 6f5f45119379..110196cfd845 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.34 2011/05/09 18:52:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.35 2011/05/13 18:28:58 graaff Exp $
+
+*sphinx-2.0.1_beta (13 May 2011)
+
+  13 May 2011; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.1_beta.ebuild:
+  Version bump. Drop darwin patches since the related code has changed and I
+  can't verify the patches. Bug 364761.
 
   09 May 2011; Hans de Graaff <graaff@gentoo.org> -sphinx-0.9.9-r1.ebuild,
   -sphinx-1.10_beta.ebuild:
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 99b7b35a5ac0..df68315aaa4c 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -10,16 +10,18 @@ DIST libstemmer_c.tgz 129195 RMD160 3d255f174b462704a615f9c7871f2d86fce8c2dd SHA
 DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc9 SHA1 eed4c6f5b314f965c19cca8aebd0b6d847cd35f9 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013
 DIST sphinx-0.9.9.tar.gz 1218359 RMD160 ed3cd1a9328114c1d2a6325cce5520065076c275 SHA1 8c739b96d756a50972c27c7004488b55d7458015 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4
 DIST sphinx-1.10-beta.tar.gz 1518778 RMD160 1d600289c76d412e96af611ec5c614fcfd3489e1 SHA1 28e84071e75d017f4e3403e5d22dbc1302a3c912 SHA256 51b3e5f3254b4d93d6dce91a44451486e5b0f82a1e44799481158e1f95fc1c60
+DIST sphinx-2.0.1-beta.tar.gz 1761313 RMD160 678ff846c82dff890f1e38daa524464cabf9e563 SHA1 7c1244ea95ab4fed1322c6e0cbbf88c2f7e97f9c SHA256 fe27152ee24224bcf2ab7293dabe826d8db69c35eca16edf1ca510e0a1f4bf81
 EBUILD sphinx-0.9.8.1.ebuild 1256 RMD160 bd3c011e1202870c9514f81099cfc21b00c6c180 SHA1 fa4c08816fefa9878faf5f7b2018586b15cf8cff SHA256 ac58fa534b8ce45a4b8f78c8d6f410250292aa48aad99f8d572f5e2f231d11b0
 EBUILD sphinx-0.9.9-r2.ebuild 2435 RMD160 250c1ae6aa4a52d8f418c44125bc31ab2c6418a9 SHA1 82d5c1c9e7f9d04785816b29c0d382fcf3dcf4b5 SHA256 92e16762929ea63633798ca8d8e970f967aa4d9886bf933f9dcc457c9e19b06c
 EBUILD sphinx-0.9.9.ebuild 1552 RMD160 819efed6bf1df22a70be9a45355673e4c97c71aa SHA1 0ba7dc938577b9615d8e5974c978ccdc158d41e8 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59
 EBUILD sphinx-1.10_beta-r1.ebuild 2512 RMD160 73ac8775312320d3f99dc19dbfadca7bbfbe42b5 SHA1 73cb28ea3e525fbe0ecd86882319c32fb800e551 SHA256 dc09f422e0a3c105b94951d1c8c27d69735d82f2cc1cac57081a4c051fb1ca0f
-MISC ChangeLog 6172 RMD160 5b46eee89eca28885820b1d0cf79b9faea7a2679 SHA1 80be2d74e71336d74d1b054fcf2e003deac0f7d3 SHA256 01f94ab54a9013aaca7e450e34bcda7c0bf4318636e371bfd5cd11cfbb3fffc6
+EBUILD sphinx-2.0.1_beta.ebuild 2342 RMD160 c1b174921b27db809911a6d94c2cde4c9fe4f9ab SHA1 844c904f8a03025acae183424650fa74f522ad0a SHA256 278272041c8e43282bda21b69be74e32f9b7c410648c230a27ca871d2430c379
+MISC ChangeLog 6401 RMD160 48eac8058b7eb7f1149d79fd13527f7354c380dd SHA1 76adaf17379f04805b7bc401d166ef77e15c5227 SHA256 c246994548e1c64bfa3fe08fe581eef91efdf942185717dc3cf14213266da955
 MISC metadata.xml 358 RMD160 756ddce7322eb8b7cde365ca96c7997b26f6fa42 SHA1 2c8c1f55e21e904d6336f486a07eff8bbfdd03af SHA256 77a4da29239cfbdb02772dcabd0b233515790a6703b30b76ded71269a4e658de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3IN9oACgkQrnu0mw69JkquGQD/W+onDvDPoMJm/LIN4FUqkv5N
-TMY4p1Ks4HxqSZJyWegA/2zPEgVCbA1YXpf1KGhvOO1hFqONb49xuWBu4MHbge4z
-=9UPp
+iF4EAREIAAYFAk3NeG8ACgkQrnu0mw69JkrdsAD/RR6XVEblv0NdC47j3+XXK24T
+0NAzIh+DFDEYlbNFVrQA/iV8FxKoOMEZSRw6XTxqNXgDgsPVsIYH4sW8yp58rRkK
+=/KLG
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.0.1_beta.ebuild b/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
new file mode 100644
index 000000000000..e06c936f09a4
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.1_beta.ebuild,v 1.1 2011/05/13 18:28:58 graaff Exp $
+
+EAPI=3
+inherit eutils autotools
+
+MY_P=${P/_/-}
+
+# 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="~amd64 ~x86 ~amd64-linux"
+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() {
+	# drop nasty hardcoded search path breaking Prefix
+	sed -i -e '/\/usr\/local\//d' configure.ac || die
+	eautoreconf
+
+	cd api/libsphinxclient || die
+	eautoreconf
+}
+
+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 || die "install of test files failed."
+	fi
+}