Version bump.

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

3 files changed, 102 insertions, 15 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 045a0e9d8365..f86eece9318a 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.75 2014/03/04 20:20:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.76 2014/04/02 05:53:11 graaff Exp $
+
+*sphinx-2.1.7 (02 Apr 2014)
+
+  02 Apr 2014; Hans de Graaff <graaff@gentoo.org> +sphinx-2.1.7.ebuild:
+  Version bump.
 
   04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> sphinx-2.0.10.ebuild:
   Stable for x86, wrt bug #502496
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 41341a768ec9..f37ceb3b1b5c 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -14,27 +14,19 @@ DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256 efc9e90d1edec4f159846c8d4ca8839
 DIST sphinx-2.0.9-release.tar.gz 1996939 SHA256 c4fb5d7951bc0831e46f102d17b5f32bbde11434ce3b00b20531dfe9e646869d SHA512 92fc7e3808f4b2fcdc47b510951cd6111e235e8cefa9f4046cd1943fe7161421495a858125c2f1416e893698d78dc83aeb57ea590dca6e4f9e95b6baaaa5f06d WHIRLPOOL 360c884205b8d78024bd8713c33bb4ad6773a5c15253121cfd093149b544162f5fbf02a0698476035d831f915317841acd871622a69692a9c1f212f4d7b492a9
 DIST sphinx-2.1.5-release.tar.gz 2414784 SHA256 a69ed011c0ae993582d5c4cb902469fb4797c26e3143abbad63827f054a19f72 SHA512 eea56c60b84c78cece16b61fd48f7e950ab057b978353fc4ff3df835c9ccc8cbab1764ecd0f2567ea34a4bd9e7762107830e1fcb169cfeb042a7323835fe538a WHIRLPOOL f8b35f411c121233baf99272ba03c9c94a785f930421ac7455c3960b0ed3d833f9642b2d80cb96cfe4ce7779a3072b9dff353ef48253da5cbf14c9be4187ea36
 DIST sphinx-2.1.6-release.tar.gz 2429835 SHA256 f59e5e07ce91ed6010b98b1d841def14648a6cc6983a1ddb68b5f8059b380c35 SHA512 d2ecdff0dc4f384e64c00f2f5f11a3e6953e794e4c923ead52bdc2ea2c33d58bbee937b0472127637f297326ea4904a264ac5068c1d6b3f108d14d26d4fcb53c WHIRLPOOL 75167ece6f64d76c7acb9364e241e730c9acb980a05091efd1f70fee24eaf30928969e392e7cb1f7b55490fd40aaca83411a5252f05a9837806dcdf0a1041e0c
+DIST sphinx-2.1.7-release.tar.gz 2439971 SHA256 3662f29ba74ec048d2031b4034af4c879b66fd10f082aa6d3dd85b0a49d95fa2 SHA512 6ce1f9ab78572ef6d9209ead27e949558018f954ac363c078061949b71bdc3a1d380046d9534e67653719966a8146c647fc2ecf823babf8a22f22a1e25671634 WHIRLPOOL 45d28f2c42b365f7fda6ae2e4f4c6654edcc059dfdb336181e5ae93ccc2fa484029168cb63dd3d3f0a1ddbc5a954f754f0e0511d391920daab85e00833bbf229
 EBUILD sphinx-0.9.9.ebuild 1552 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59 SHA512 03e39d6ec347d790dfc1b87be19c632c8c1eb24497f69f4450038119eefa55c30f8ca866c8ae694d1f140af9d842c2d14778a48317bac1a890aaf97b5a1a56a3 WHIRLPOOL 1a5e907ccf4e96a59b487152e3560d1d6506dcd947127cb587c3f75a39b89d0a80e2fc9c72aa2b1e7674e9ee390d6343026c3fe4da7121911883874567a57bf1
 EBUILD sphinx-2.0.10.ebuild 2731 SHA256 4df418d8d3193d63091c011c30985a66aefae0e76e067af4b44101c0fe3fe130 SHA512 525fd035a80a0f2f7f4e023a3bf7aa8bc90f86bb00e72ef4dbea8b4e1e5f60895aeb9f965043c4737364e39adbd18f3ec3b88adfdddec8afec6a9d47c74aaaf3 WHIRLPOOL bd384fffa3608dfafe8c991bb67bfb02d376f5f3813fe1ecfef419c973cee1adcafd53298babb55e821d5996b6f335092a4a7cdb547e36b8716d311d6de30f81
 EBUILD sphinx-2.0.9.ebuild 2730 SHA256 7a8690033fc4ac36cce8647f347f8733894fd3d87c93adfe4604059296e6de03 SHA512 6ae2f651315cba6b1c7864a00b70b202146ccf5ed648bf4356dd63d69b5ffad769ef6dad30f287bb8f7166a12bdf88c55bbb44179d9205bc97d7a231990d70c9 WHIRLPOOL 246dd2f38b980cd2b3841f165a55bd9cb595a486b42690d661360301d13e773c5eef84fcea07812661b31e9c8c123dd5ff6a5144f4849840f9cb8e8b12354023
 EBUILD sphinx-2.1.5.ebuild 2711 SHA256 cf1ad6c6dd03fbffb9a237f03cd4b14cfe67efdf46390db989fd8a18639fe65d SHA512 22f70e8926c0cd9ae76c43284182350aec5d40283fdda6a8552f96820e6ec00adc395cfea6ce45f9c32c0880f8da9389c94f7616d89bb723615faeb91ae1adaa WHIRLPOOL cb8d7d889216a727b52b79c1e81c094d7e6931a2d6788a6e8ef8a696375c7e663b852b87d3d5bb17d28c195423e8243605bd0df5d559b9252c78e66c635618fe
 EBUILD sphinx-2.1.6.ebuild 2470 SHA256 44d018b75d906145ebd8ced7c05151acc0558f31850a6d1edd2f2e1e4125904c SHA512 579f44ed7ff2afd2849f01e791ce38493a4e19e1e5708c65d9b93b3fe31576b390b52bb85037c5d79673b5f97aa4b8f8dbde5c602abf5c470242d637b7732e1b WHIRLPOOL a4311cf446758918578875e15b0102ff6a787f3dcfb68d71dc7d81876308879613be5717d4d3a894fdb328a0af1fdab42a012c43896114723a2f4d8f1945167b
-MISC ChangeLog 11586 SHA256 1f7261fc90c3691db0ddf02ab92f3d3da84e92e375292127e5320955f1b8bb14 SHA512 00ace06a26aef5ffe4b71f7f60266be6ed3abb821fb914edc35d4b6876ad93d57bfc23a56c755aec61c8b95a543f6443afa344b300e99a96939071625989e14f WHIRLPOOL f3e4471467f01a309744da0de6a37db9fe608de718d37a5c0c5bce5f1d14d8e432be5a6a1446d405189e23cc36096822070ed3554387f230e3caa311eaa01b9f
+EBUILD sphinx-2.1.7.ebuild 2470 SHA256 81b95e082253cbe0c254b8919e56e96d01844a1c71ec45f859e5d5c2122371c1 SHA512 fff5feb83c7aae688d1dda56b00077374d72f71c77986f5aa16f69d3ab364fc640f3c4f62e0cd4b0265b24539d81c40bd11aaa1a59465c0e460af6c21ea73a27 WHIRLPOOL 02bf71c281dd1e555bbf5fee08c76d0cd0b85289d4c10efda508569ae38c10021f893627950a75f5fc700ce299c9131bb7ea152334fd35fa4c80fe2e5492f3f9
+MISC ChangeLog 11707 SHA256 d87aa286341640a5c1ce40de6d6b7874d919c7c0959bd65a3030b0eb03f5beda SHA512 1b7c9e66c630ffeaea722b7c9c0514bc78b27857c93c6007d204a6c63f8fe3b8b2e227bba35f5ecfd2b2eb9d8d2c705230c21efb7f4954615c64d5e80a841747 WHIRLPOOL 4c10a23b1d83798748f5f1fdce4141221c8b883967c89794809f3c144f0e48f1dcb3ca2505f03f92d5bedd07c82241b49ffd7c72017427107d7cab1043201b36
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTFjWCAAoJELp701BxlEWfTwUP/0HpWi2oI/MTna7aIIPLDV28
-W+F9kg/hLDTEsrQb3lisHli/Vl20p+cwP62qFCD9t0KtYJ49FnkLNCwf2ZGkTW25
-9g+DPB/oH7b2rw45ZAjPMGahxH/pvuTcocf1ceYdWkuYoilKAVmlSrQTwamgZbgo
-JQ1GGZ6zWg0pjsMMexc1VOw+197Ac81TmvSKT0oWj5QsNJ783TwUxczLvy4/eqOq
-ld9o4wEeutGbC2kojXyshs0RnKc8bfRbZRIstblFRJTqpLfbo1q84McYX8xE3SD9
-QaAtlOBWL7SMJ/hChOyEslS6pn76mTN3MgEDj3pj4oQXROCofDE3SjvgiqZ3utTq
-vGkV26VgOb80JkCtb0TEtibmm+NdGrK8oixTwpMTwIVpLi5c7HrCp5rRkquwsl3e
-l6cwhYtKfPMu2HarQWkxXmrsNwfemoYSndW5KcqDqHQAhmdngBOAnKhJ9Z8and7h
-mTG1KVpfv1193EYz3lLAnGdPKZuWoqwZVMbMJCnVQ+5pZ4tvC0TtxSQrMOss6JIr
-G+7ID5xBPXPcEvyOhZgdP2CwZKPTMcAY3fMBBTpBKkt5R22lwP5u5ZAO2ngGpPUM
-HDBn0MlZ0P45FlLBJdo8nVhQU8rZX81ET9+mUfmhu+msgNjWfmaYAFlV6rbNVAtG
-3i9+Ayuj35fSiTfStcS5
-=P0uD
+iF4EAREIAAYFAlM7pc4ACgkQiIP6VqMIqNcNqwD/UYPt1cYb20nRUtjKxcNI5crl
+c4SITvT3EXfnOxNgdj0A/REu9BRH2IZT1k4FBLRGplQAJlZtgw3tzuz22j3sCSVT
+=LC2K
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.1.7.ebuild b/app-misc/sphinx/sphinx-2.1.7.ebuild
new file mode 100644
index 000000000000..f5e063004da7
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.1.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.1.7.ebuild,v 1.1 2014/04/02 05:53:11 graaff Exp $
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+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"
+
+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 syslog test xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	odbc? ( dev-db/unixODBC )
+	stemmer? ( dev-libs/snowball-stemmer )
+	xml? ( dev-libs/expat )
+	virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+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) \
+		$(use_with syslog syslog) \
+		$(use_with xml libexpat )
+
+	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
+}