Build the libsphinxclient library as well and fix prefix issues with patches from grobian. This fixes bug 328213.

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

5 files changed, 240 insertions, 2 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index cecb011176e2..78c5606ddad3 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.30 2010/11/02 18:13:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.31 2010/11/09 20:31:01 graaff Exp $
+
+*sphinx-1.10_beta-r1 (09 Nov 2010)
+*sphinx-0.9.9-r2 (09 Nov 2010)
+
+  09 Nov 2010; Hans de Graaff <graaff@gentoo.org> +sphinx-0.9.9-r2.ebuild,
+  +sphinx-1.10_beta-r1.ebuild, +files/sphinx-1.10_beta-nosigpipe.patch:
+  Build the libsphinxclient library as well and fix prefix issues with
+  patches from grobian. This fixes bug 328213.
 
   02 Nov 2010; Fabian Groffen <grobian@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 a805d0503019..00f929489a63 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX searchd.rc 762 RMD160 b607d99b0b3f279b2669f593deead434a7e6b352 SHA1 d1a056df1819ea9acc0b182189d501b01e6609cb SHA256 6aa55b4761ce78e1e6e5153022797ffedc912638b965aeeab084e1246db5d70e
+AUX sphinx-1.10_beta-nosigpipe.patch 790 RMD160 e6a5c199c4eb6dfbfeab2bf90e09f1ace638d9c0 SHA1 c71167f497a59bb7dca65673c39b658e5310123d SHA256 e74de3e8d444e88ab94d67f5878dbf0f322397290bc68e506492370df3f6a8b9
 DIST libstemmer_c-20091122.tgz 129207 RMD160 af69a8008c69422f0ddc3c30f54a336f21718853 SHA1 3a5605d507582770d496c3b0ada4ae7df378834e SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7
 DIST libstemmer_c.tgz 129195 RMD160 3d255f174b462704a615f9c7871f2d86fce8c2dd SHA1 2d0ef03ea0fbf68580c141ac7ac3e49e84e1df17 SHA256 4f2749ea3ecd2a4ac7a1a1dc4f914a9797860a92118789da070365565143b272
 DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc9 SHA1 eed4c6f5b314f965c19cca8aebd0b6d847cd35f9 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013
@@ -6,7 +10,16 @@ DIST sphinx-0.9.9.tar.gz 1218359 RMD160 ed3cd1a9328114c1d2a6325cce5520065076c275
 DIST sphinx-1.10-beta.tar.gz 1518778 RMD160 1d600289c76d412e96af611ec5c614fcfd3489e1 SHA1 28e84071e75d017f4e3403e5d22dbc1302a3c912 SHA256 51b3e5f3254b4d93d6dce91a44451486e5b0f82a1e44799481158e1f95fc1c60
 EBUILD sphinx-0.9.8.1.ebuild 1256 RMD160 bd3c011e1202870c9514f81099cfc21b00c6c180 SHA1 fa4c08816fefa9878faf5f7b2018586b15cf8cff SHA256 ac58fa534b8ce45a4b8f78c8d6f410250292aa48aad99f8d572f5e2f231d11b0
 EBUILD sphinx-0.9.9-r1.ebuild 1921 RMD160 a0f023a28b270105df5f787e79b2f3e41d8b7085 SHA1 8ae00a64a75391d9174e67053da58b4376932550 SHA256 e7a35b5ea2bfae172eb52b29a12ae8b70f540981103f3fec068595cf99cbbd0b
+EBUILD sphinx-0.9.9-r2.ebuild 2379 RMD160 10331989f209c554da426bed87374c04cf9efffa SHA1 a92ac5890bb230ca3f6fe7db6125d399a9ad372f SHA256 0a598e61efaab3918fd6353f0ac2b33c7f095c9b9fe5d5de17a8a6897b489523
 EBUILD sphinx-0.9.9.ebuild 1552 RMD160 819efed6bf1df22a70be9a45355673e4c97c71aa SHA1 0ba7dc938577b9615d8e5974c978ccdc158d41e8 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59
+EBUILD sphinx-1.10_beta-r1.ebuild 2380 RMD160 e8df9ef6c205578e210c704d51b5d7b6f61bc41a SHA1 b5114029f56d94d91045fa30c039ad5367e4c8bd SHA256 d09c1c2981d8d4e497905dea027e70999d5506e2bca8e634c1dbfd73a0eab4b3
 EBUILD sphinx-1.10_beta.ebuild 1973 RMD160 401684b879324d596aa11c3cc020f7140496c597 SHA1 7e13bbefb5af8cffd547685354f4e78885809ead SHA256 b20d7200635f432a44794037881bc0876db91fe7dd914edec85c0686d2b63097
-MISC ChangeLog 5272 RMD160 36539854829102fea8974ed98b3679b998ec5d54 SHA1 8f988f104c5db9cc8420d2b6efb45e090a6ca737 SHA256 5c45e26f0a1736686dc49725ddec7437f14e5df9f0c4b155c4a0b8081dd812d7
+MISC ChangeLog 5604 RMD160 6a920a68d37fb934eac89a6ab2d2f580985be12a SHA1 d37c0077553e86858ef78bd2d9db413eb642275e SHA256 f0355795b9cccb6695f4e54e252710843e15a73a4e7e9cfc81a48c71270f9dc9
 MISC metadata.xml 358 RMD160 756ddce7322eb8b7cde365ca96c7997b26f6fa42 SHA1 2c8c1f55e21e904d6336f486a07eff8bbfdd03af SHA256 77a4da29239cfbdb02772dcabd0b233515790a6703b30b76ded71269a4e658de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkzZr5MACgkQZihJkut28SvyrQEAj0gVu5Mp1Bu/gAR+4u8RV7g6
+2+haMYfWjL8qyAFb8OUA/0a3eOgvaFLO4kRftvQWK1qOZi8ETba198q7i251ySzJ
+=q+U1
+-----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch b/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
new file mode 100644
index 000000000000..a713a891f21d
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
@@ -0,0 +1,26 @@
+Part of upstream fix:
+http://code.google.com/p/sphinxsearch/source/detail?r=2423
+
+--- api/libsphinxclient/sphinxclient.c.~1~	2010-07-15 13:05:40.000000000 +0200
++++ api/libsphinxclient/sphinxclient.c	2010-11-09 19:55:28.964939046 +0100
+@@ -1268,7 +1268,11 @@
+ static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
+ {
+ 	int res;
++#if defined(_WIN32) || defined(SO_NOSIGPIPE)
+ 	res = send ( fd, bytes, len, 0 );
++#else
++	res = send ( fd, bytes, len, MSG_NOSIGNAL );
++#endif
+ 
+ 	if ( res<0 )
+ 	{
+@@ -1354,7 +1358,7 @@
+ 	}
+ 
+ 	optval = 1;
+-#ifndef _WIN32
++#if defined(SO_NOSIGPIPE)
+ 	if ( setsockopt ( sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&optval, (socklen_t)sizeof(optval) ) < 0 )
+ 	{
+ 		set_error ( client, "setsockopt() failed: %s", sock_error() );
diff --git a/app-misc/sphinx/sphinx-0.9.9-r2.ebuild b/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
new file mode 100644
index 000000000000..379742a6a6d6
--- /dev/null
+++ b/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r2.ebuild,v 1.1 2010/11/09 20:31:01 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/downloads/${MY_P}.tar.gz
+	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~amd64-linux"
+IUSE="debug id64 mysql postgres stemmer test"
+
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	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
+
+	# fix for upstream building bug #468
+	sed -i -e '270,290s/void sock_close/static void sock_close/' \
+		api/libsphinxclient/sphinxclient.c || 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 postgres pgsql) \
+		$(use_with stemmer libstemmer)
+
+	cd api/libsphinxclient || die
+	econf STRIP=:
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	emake -j1 -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 -C api/libsphinxclient DESTDIR="${D}" install || die "install 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
+}
diff --git a/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild b/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
new file mode 100644
index 000000000000..ebaf2c2c7ad3
--- /dev/null
+++ b/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild,v 1.1 2010/11/09 20:31:01 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/downloads/${MY_P}.tar.gz
+	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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
+
+	epatch "${FILESDIR}"/${P}-nosigpipe.patch
+
+	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
+}