Version bump.

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

3 files changed, 102 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 2ab78e8605a8..55d141f8a9a4 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.77 2014/04/16 05:56:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.78 2014/04/29 17:31:24 graaff Exp $
+
+*sphinx-2.1.8 (29 Apr 2014)
+
+  29 Apr 2014; Hans de Graaff <graaff@gentoo.org> +sphinx-2.1.8.ebuild:
+  Version bump.
 
   16 Apr 2014; Hans de Graaff <graaff@gentoo.org> sphinx-0.9.9.ebuild:
   Specify a working version of automake, fixing bug 506652.
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 00eccb28db06..10c5d6f0764f 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -15,18 +15,20 @@ DIST sphinx-2.0.9-release.tar.gz 1996939 SHA256 c4fb5d7951bc0831e46f102d17b5f32b
 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
+DIST sphinx-2.1.8-release.tar.gz 2442119 SHA256 8aebff8b00ec07b71790a67781c80a9a9b3ee28e2a35b226663aaf37cb78b6db SHA512 e53d62a694c1f89a9614d15a7820f245cdad03d6bc4d512dd3dd743908f11c582f45d5cc0a416d0d05b4cbfaffc491fe40e704c03149774ef498b54519d288cf WHIRLPOOL e4bb44920ed536bf6f8dd52fa1c373e9c88fb07a98a7458bd6f39feee2f10323bae13431d26d6340537cc3d2bfde9b4af188cac89b8bf1694aeb3d0842ad71e7
 EBUILD sphinx-0.9.9.ebuild 1574 SHA256 fb3cf56aa1199ad0bd5933524c0c3c0a55e0e3031d39b6f1e67402d87b2b6873 SHA512 b4af1ef88ad20a56b256c5c126905bb7df1dc5f9f74899be9888603439bc8820f5624be73321d717f5bba60e8b8d32e8b3c905d63ecc8b42b3bb344bd5d2649a WHIRLPOOL da4e6a79d21f05e97112e13f2ac48ac72a13e4f006e102ca278f7438a2296a74391c43ef464078744fd54660d147878b51eadad0de86b3c049bef61265c4413f
 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
 EBUILD sphinx-2.1.7.ebuild 2470 SHA256 81b95e082253cbe0c254b8919e56e96d01844a1c71ec45f859e5d5c2122371c1 SHA512 fff5feb83c7aae688d1dda56b00077374d72f71c77986f5aa16f69d3ab364fc640f3c4f62e0cd4b0265b24539d81c40bd11aaa1a59465c0e460af6c21ea73a27 WHIRLPOOL 02bf71c281dd1e555bbf5fee08c76d0cd0b85289d4c10efda508569ae38c10021f893627950a75f5fc700ce299c9131bb7ea152334fd35fa4c80fe2e5492f3f9
-MISC ChangeLog 11839 SHA256 d33d96540c80fa9ce4bc109d9d3f5ff8ad778ab84bdef1a5f98e24a7c505168f SHA512 48d80d696b49fd9561e0e686e399c830f18b6dc14d997b072ad7034b2f95002152fe9871f8b60d60f3de564ebf12682631a2d5a14727c685cc257b4fa869f427 WHIRLPOOL a8b74553de6b9b036ce3b5c0e0af87750c0fb0985ed8e838bed7116dc9dfc53ee83362449ef14b9924f10a56ec4fe4c0be9c12dcf039a1900fc8524ae8d5fee3
+EBUILD sphinx-2.1.8.ebuild 2470 SHA256 f502d0a3916e5587f7be3fe04b050d191d196385bc51cc7d11cd43de3b6bb4c6 SHA512 c974d51f7866cbab373d31a0a42ddc7e5d5c744c996d5b49dcfb84f19da0050a6d39e6a530d48b8596b5d789deed26e5303c8101c475e2b5b853b4c4db6adbfb WHIRLPOOL 858c19d6a2a3f04bde891737a22dfed76ae74775ad4b71b712ae2a0c9838d6288e1a0091bd653f7dc79ce461e65fe32924980e81559d2222cdb415e14201c3d8
+MISC ChangeLog 11957 SHA256 3a243c44cc772aa4cb3f4366a289d1f7e5fbbfab0af5414754688daacebcc9c9 SHA512 ff10ed57f9fe8b1255c0d5aa2d9ebe994a64fde2ac2b4f371931d5172ee6a273b0dfbf118f0ae88d89484c406d9749510d3dccc1e046a61eed2710526b78eeb8 WHIRLPOOL ad248862e6aefdd82c72ddbc8cb1f4828dd77bc187c4313206d98657147b96ea380647c272de04adccb5c289166a1db7a15cfe47c83c8b04f50ae5375bd0f9b9
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNOG5kACgkQiIP6VqMIqNckPgD/YBg9RS4nn/TvdlDZogjjbpoA
-w3OSBelTAJ92hIRVGA0A+wYKpZQ+np2lQqE2H1LxoRKD7aQSOqfrYJFNYoDAGZw/
-=sc/t
+iF4EAREIAAYFAlNf4fIACgkQiIP6VqMIqNd1MgD/Z035e65JEJv3hK9+6L3N8haC
+wcdvTIChzBCOv202iNYA/ik6X4CboS9qtw6gZ61/PYcbQXb4llYnR1lXJb4gWYIS
+=qH8X
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/sphinx-2.1.8.ebuild b/app-misc/sphinx/sphinx-2.1.8.ebuild
new file mode 100644
index 000000000000..84510ecfba37
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.1.8.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.8.ebuild,v 1.1 2014/04/29 17:31:24 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
+}