Version bump. Bug 408055.

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

3 files changed, 113 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 5017f27046a0..6b5057818158 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.40 2012/03/14 07:02:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.41 2012/03/14 07:40:27 graaff Exp $
+
+*sphinx-2.0.4 (14 Mar 2012)
+
+  14 Mar 2012; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.4.ebuild:
+  Version bump. Bug 408055.
 
   14 Mar 2012; Hans de Graaff <graaff@gentoo.org> -sphinx-2.0.1_beta.ebuild,
   -sphinx-2.0.2_beta.ebuild:
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 98d8a4a2e1a6..32dfafe2f251 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -13,17 +13,19 @@ DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc
 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.3-release.tar.gz 1923911 RMD160 04140bffc8e5c6cc9466cdb8d6eac226f7f06b3e SHA1 dcc8055648d6bebff17ee65673011d64cc02ca41 SHA256 875af63473875b7c7e152e85ed34bd1a92d09db062a289b594bf049b3a8c82dd
+DIST sphinx-2.0.4-release.tar.gz 1938089 RMD160 90eb45f5a703911ea9379d43259c1723e4636402 SHA1 168794dcfb4644ac02dcce863c04b351399b0863 SHA256 43c4b62949d8fbd2b6ba93e20cb0f35c14f428be501af47e75a3ef713efa2886
 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
 EBUILD sphinx-2.0.3.ebuild 2565 RMD160 fba385726b09a59d58a654c36da8225a9777bce9 SHA1 ddbd0c8c0a6c0f935650493b295e511dca964ce1 SHA256 5bbc2cc48a66704f2ddd4249ce6bba4b78663525dd62e8444d8a2b6becf34be2
-MISC ChangeLog 7156 RMD160 64d1caaaf1b7b58fe9f98e6a60129c231841e5c9 SHA1 7ce4fdfdb6ed898808a004ea3b9a4feaa7eaa1c9 SHA256 015cf836627b52fd9f6f2455c0aad0b575bbd0936811441baad7c8d4366d06cf
+EBUILD sphinx-2.0.4.ebuild 2565 RMD160 1904cb7c5d58b35dff0c2884a1eb7b136a683a72 SHA1 18a950695ceee2c475fa18219a0341c559a75f87 SHA256 3d87fb21cb981459436085675cde2a802589538690424c14098941f24eb14dd6
+MISC ChangeLog 7286 RMD160 1b6ec34f3f8699845b25d2d90f2e0ef417157963 SHA1 9a585bbe59002f946190ff3cc9a4f998e8cfcce8 SHA256 e368729c898681380173ab834b700077a838b429e6ab4f3d010f58f6e54a2cb3
 MISC metadata.xml 337 RMD160 7c89f7f8e67273a4a7d4b79b3e6257a7622f570b SHA1 126d46d2da8c613c8ee0f1beb1de2652096313bc SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9gQq0ACgkQiIP6VqMIqNfD6gD8ClVcVSSXsCkICNUPqoFZAJ3R
-b3gEY24KGCxK+uA/Mr0A/jIl4pGWMvsv5CHpLL1UOQdVBkrcFpfor3ydRjgF9rLe
-=3sFK
+iF4EAREIAAYFAk9gS3AACgkQiIP6VqMIqNeLYwD8Cebviq0FseJgBJFv0wmAAiTd
+DIoUuIjXCD94vr7kJ+EA/21mEIBatQyyxQidCPAL2qBFWEIMWBvSIFfLjT6FlAxp
+=bh79
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.0.4.ebuild b/app-misc/sphinx/sphinx-2.0.4.ebuild
new file mode 100644
index 000000000000..4810745146b1
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.4.ebuild
@@ -0,0 +1,101 @@
+# 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.4.ebuild,v 1.1 2012/03/14 07:40: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="~amd64 ~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
+	sed -i -e '/\/usr\/local\//d' configure.ac || die
+
+	# Regenerate autoconf files in the api directory first to avoid
+	# running elibtoolize twice, which results in a warning.
+	pushd api/libsphinxclient || die
+	eautoreconf
+	popd || 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
+	fi
+}