Revision bump to fix building with gcc 4.7. Thanks to Brennan Shacklett in bug 425522 for finding and cleaning up the debian patch for it.

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

4 files changed, 145 insertions, 5 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 69057b4d0682..d60a920801f5 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2012/07/09 05:35:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.47 2012/07/21 08:00:54 graaff Exp $
+
+*sphinx-2.0.4-r1 (21 Jul 2012)
+
+  21 Jul 2012; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.4-r1.ebuild,
+  +files/sphinx-2.0.4_gcc-4.7.patch:
+  Revision bump to fix building with gcc 4.7. Thanks to Brennan Shacklett in
+  bug 425522 for finding and cleaning up the debian patch for it.
 
   09 Jul 2012; Hans de Graaff <graaff@gentoo.org> -sphinx-0.9.9-r2.ebuild,
   -sphinx-1.10_beta-r1.ebuild, -sphinx-2.0.3.ebuild:
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index dcb449bc6870..588f8ae3a1a1 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -7,6 +7,7 @@ AUX sphinx-1.10_beta-libsphinxclient-darwin.patch 593 SHA256 6fe810d95d5079c0564
 AUX sphinx-1.10_beta-nosigpipe.patch 790 SHA256 e74de3e8d444e88ab94d67f5878dbf0f322397290bc68e506492370df3f6a8b9 SHA512 08492c0a6e3da3a498addfcf7958557cf4384c638ba71b319d961679773db821ac12ffae85d599bbbddccfbf345fbe9b3bba7727d4b2ed9f1b77d746ae7af14a WHIRLPOOL 3195fd0bcd91bf113d076c1fee3215d7e87f26c17d1dfd45b30f3906d7174d75393bb5dbd642199141650f77ed43ab8a036e56e2567183f7a9d58e1f6a0ea835
 AUX sphinx-2.0.1_beta-darwin8.patch 538 SHA256 e7350f5c5fcd1a5a0925cdb9a775efd5747d5d790aa9eb3319717e98be82b683 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14 WHIRLPOOL 7b35a4081c03e821c10e17bb36b91d8a4f1438a64d1b29b979a2163a90419971b70ec6a8c2ee80bec34c4c505f0aa0d83a59bea9261bbb3a03960d2ba9d8f9e9
 AUX sphinx-2.0.1_beta-solaris.patch 1036 SHA256 cde3f1ebb1a602c2fe9e22ae1831bf58893d0745c627ce8ad44ce1ebb1354c8c SHA512 997ec24201ccf28bc1675683a96d6661d57a1f4ea13c5069c62df075bdffa64c8f91bcff914130a53b8574bc58e01874fd7c92279a815afd51b103d3ac58df31 WHIRLPOOL 3056b96d58a4a6ccc1055b7c8fa631c0ffc3d02a63c03426fa9dca5ce264a7e62077a849a5af363974830267bcf6728e02711e649bd682ba043a2de0cbfabccb
+AUX sphinx-2.0.4_gcc-4.7.patch 1264 SHA256 8169c066d88bf216c291a98d1db5c8b285b2efbcaacb2ee51049f223b35931e4 SHA512 6545edee5fde55e0d998a78a856d7a75aaedb27aacc3402a49211f37c452332eacafc199566e2de1e0fd6c969f5df8ccb8fa438c068b1aef736180c10e556296 WHIRLPOOL 6b1a6e5ffcd811352ed23a20870665878a211fefe4d0977d7bff69e85ed79dae089f76b4f29cd4b9b48ce8e6754fbd82d0a9399ab3c8365add1dddafd090a4f7
 DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d WHIRLPOOL 03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
 DIST libstemmer_c.tgz 129518 SHA256 ac2ef71ae205260fc229c8c33c1dd94e8ac8ad7ce0f767566ec9ebcf1c79df0f SHA512 a05070043cf07bf4e0b86c50d36463092d33864a693df1f00b955451e5267c09e7d62f686f940ec39a1c2f3c2b810788d2b931ba2fc2728455ee795a1c39e83e WHIRLPOOL eaa0e9994df06e4bd919874edadfaa5d14ae8417bb53db058dcb143a33ef7db139d5ad25ddc6720e4f0296bfffd93cb83dd8c9ac94318e98219eb0e6c5c3e48c
 DIST sphinx-0.9.8.1.tar.gz 949660 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013 SHA512 dc2c2b1c85fe59ca03584fc25e8803bbd8bfb22a9f7e959474c9a09f2a2f50f36f45c168fd730c7d9e92f006cab3d67a0e433f490aa61c277729d2789be5f4e5 WHIRLPOOL 767cbe02dbe62af3b37cc0a30c2b7546ed64f629441cdfb757cab69901b0c6401c366b613d8d629a374143e96e1cb7aa4dc86bdafbb1ac5963020089cd524974
@@ -14,13 +15,14 @@ DIST sphinx-0.9.9.tar.gz 1218359 SHA256 bf8f55ffc095ff6b628f0cbc7eb5476181114014
 DIST sphinx-2.0.4-release.tar.gz 1938089 SHA256 43c4b62949d8fbd2b6ba93e20cb0f35c14f428be501af47e75a3ef713efa2886 SHA512 34bc6718328f9aad3ad8f081c67bee292af70827cc6d27e9f69198a5a5245fb2d5d76467c1bbea6ff1b4b45b249c302e844c7ce3c2976b103b80fc6a8013f567 WHIRLPOOL 79b564a5888fd7f485a8304b24ae38fdab6423fdec80355e8df5807d289de35b0b1b3aecf1f0ebd5a7c078111400a494ce736e29539f66ba2253911650fb6bfd
 EBUILD sphinx-0.9.8.1.ebuild 1256 SHA256 ac58fa534b8ce45a4b8f78c8d6f410250292aa48aad99f8d572f5e2f231d11b0 SHA512 f15d33a76ac9aeb81aaab445f4a172134d6186409aea419c54fc439e7d2987f516bdd3c88e1ab92a3513c3edb75d1f52ad60bc22de8b2b2b2601e0d40755c8bc WHIRLPOOL 84fc1c064972c6bd94ae80c264580492b8a04e4ba0e8e1e9e3a5ef358eea7303c5b371e24fcef3db688f56af80d6aa8deefdabca511a096234a5469d30843af9
 EBUILD sphinx-0.9.9.ebuild 1552 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59 SHA512 03e39d6ec347d790dfc1b87be19c632c8c1eb24497f69f4450038119eefa55c30f8ca866c8ae694d1f140af9d842c2d14778a48317bac1a890aaf97b5a1a56a3 WHIRLPOOL 1a5e907ccf4e96a59b487152e3560d1d6506dcd947127cb587c3f75a39b89d0a80e2fc9c72aa2b1e7674e9ee390d6343026c3fe4da7121911883874567a57bf1
+EBUILD sphinx-2.0.4-r1.ebuild 2630 SHA256 f6f27952f9cb0c33cdc3ea4cad4bb60b03e01d3c7c4a96cd73db07903e51d225 SHA512 5ff4a0849ec45cd253ad8b4769b0ca4ba299264b9c5685dfa5aee3df3d1ba327cdcde152d9e65a533d2b290e8504cc184f50340368aeaf461c3a8824a5040f71 WHIRLPOOL f6c5f7558dc44cdb61da5dbe577bc0b252c1b486600a899b7a7cebd1ed8731028106f8ba2f9cbab0ef71c2f0e46cef5c610cf15b35e71e9b2be38571bf756fcf
 EBUILD sphinx-2.0.4.ebuild 2589 SHA256 229b1ef9265064d38e18b8cf0319b6cae0d3ae4a1a78d9a5ac9a88966e75b232 SHA512 99c5345282b7ca00438ae94bea0923e2e2df5a8d600c2b97c5dd2cb66b72a56d4f6b62b34bbcf95897b444cd1d895dec62aaabf2e71c888691dd246119797ec9 WHIRLPOOL 5ef3131495b10eb1a9bc5daea40e4fcb967c3daa8770537ee7ac6427b34e3c4ab33c59cdae8712e2ce60e9d39cf7d9a2f8e357b06ceb9e864d7b83191c98effa
-MISC ChangeLog 7844 SHA256 55c2566f6881ce5fd18886eb62e3b0ceb895553c928dc85b712c1d323a475c15 SHA512 e8ddb037f3c86c202330d685c914d3949091466c9dd4eecfb5e06f0eea5270715d7aa65c291842c74f4e8e3bf34ed2a158cfb3816d93c7d0f9aded056aea366c WHIRLPOOL 81b2c700db85decd20f945ade44623a4c6e0a49cdb5a784629962d90b0df32a4a954a1575027b76b3c70b87fe3d90729199e7284f77344e78b86c611f2f54e5e
+MISC ChangeLog 8132 SHA256 df0b75535c742550052c89e4ef3935d6e85d1c920f7561d6e0609f1f87bf523b SHA512 75a4e47373e74d196dbcb1f612294090c1a121be566413607de77b72e29e639d2a2b854d666e4fc774863faa202c10b3847f946f5905fc84480d734199865980 WHIRLPOOL f98731c7a077720c0218033997769bf64cd612042a47408091b189284a2a6902462b2c66db2b6deb82316a9c26582f89af4108c97b4be51b89eb56177b1e3db8
 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/6bccACgkQiIP6VqMIqNdknAD+OQjebA08xU2nuLIaFTeqZBJo
-hxK9aKFuq8jcWs5tTPYA/iydJefcF9kOSLk6+8GpA438a9Xf0Feo67KuclAzIGwm
-=9wi4
+iF4EAREIAAYFAlAKYbwACgkQiIP6VqMIqNdC6wEAl2H3q3YcGKGf1ofy552JprxO
+L/0/R7MmtSSnTmi+NsYBAJOkz6syE4gjzKU/4g1Y316B0k97HKw3J9pyt5daXDrq
+=clPI
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch b/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch
new file mode 100644
index 000000000000..180db1b57c45
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch
@@ -0,0 +1,29 @@
+--- a/src/sphinxexpr.cpp
++++ b/src/sphinxexpr.cpp
+@@ -1796,7 +1796,7 @@ public:
+ 	/// evaluate arg, return interval id
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
++		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
+ 			if ( val<this->m_dValues[i] )
+ 				return i;
+@@ -1827,7 +1827,7 @@ public:
+ 	/// evaluate arg, return interval id
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
++		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		ARRAY_FOREACH ( i, m_dTurnPoints )
+ 			if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
+ 				return i;
+@@ -1873,7 +1873,7 @@ public:
+ 	/// evaluate arg, check if the value is within set
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
++		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		return this->m_dValues.BinarySearch ( val )!=NULL;
+ 	}
+ 
diff --git a/app-misc/sphinx/sphinx-2.0.4-r1.ebuild b/app-misc/sphinx/sphinx-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..6276074b904b
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.4-r1.ebuild
@@ -0,0 +1,102 @@
+# 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-r1.ebuild,v 1.1 2012/07/21 08:00:54 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="~alpha ~amd64 ~arm ~ia64 ~sparc ~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 \
+		"${FILESDIR}"/${P}_gcc-4.7.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
+}