Fix building on Darwin for both versions with libsphinxclient, keyword 1.10_beta appropriately now it builds

Package-Manager: portage-2.2.01.17168-prefix/cvs/Darwin powerpc

6 files changed, 65 insertions, 17 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 78c5606ddad3..96078151a5aa 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2010/11/09 20:31:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.32 2010/11/10 07:54:57 grobian Exp $
+
+  10 Nov 2010; Fabian Groffen <grobian@gentoo.org> sphinx-0.9.9-r2.ebuild,
+  sphinx-1.10_beta-r1.ebuild, +files/sphinx-1.10_beta-darwin8.patch,
+  +files/sphinx-1.10_beta-libsphinxclient-darwin.patch:
+  Fix building on Darwin for both versions with libsphinxclient, keyword
+  1.10_beta appropriately now it builds
 
 *sphinx-1.10_beta-r1 (09 Nov 2010)
 *sphinx-0.9.9-r2 (09 Nov 2010)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 00f929489a63..89934a265b56 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,7 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX searchd.rc 762 RMD160 b607d99b0b3f279b2669f593deead434a7e6b352 SHA1 d1a056df1819ea9acc0b182189d501b01e6609cb SHA256 6aa55b4761ce78e1e6e5153022797ffedc912638b965aeeab084e1246db5d70e
+AUX sphinx-1.10_beta-darwin8.patch 845 RMD160 d7ef965ebbadb9a1f56ffc5684120bff71e82dc5 SHA1 d05a997cf2d3cc6e89c2172fa27d4852c3f76965 SHA256 c79ac91fd1b2e0f6701556ceeee492946898333eff3aa28f17d6346ea7f8bf35
+AUX sphinx-1.10_beta-libsphinxclient-darwin.patch 593 RMD160 7a4212ca62dfcc976717935ddce34c3c9560eb05 SHA1 aafef262004e819afe53611f1c17d95264d434a7 SHA256 6fe810d95d5079c056437269770bee19e16aa5c43cc0eca7b735f69718f7ac49
 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
@@ -10,16 +9,9 @@ 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-r2.ebuild 2425 RMD160 d1ead766915b0eb8e02dd90a43aa307fcf715411 SHA1 40bf06c0ccf52c404e1c3509d1c602726916a939 SHA256 196f8458a597fb98629108f53f264a2fc24a879b80599b58e044a1c84d5caa40
 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-r1.ebuild 2502 RMD160 a1efb043aa5414ea38b9a921392652cbc91114f2 SHA1 d1247eb33b5c98b1b50d426912ea7ef90d311607 SHA256 5ce11d97d51b1898109d6757af54ea8f3a0eae8267cfc6f055873bd8a4b58f8e
 EBUILD sphinx-1.10_beta.ebuild 1973 RMD160 401684b879324d596aa11c3cc020f7140496c597 SHA1 7e13bbefb5af8cffd547685354f4e78885809ead SHA256 b20d7200635f432a44794037881bc0876db91fe7dd914edec85c0686d2b63097
-MISC ChangeLog 5604 RMD160 6a920a68d37fb934eac89a6ab2d2f580985be12a SHA1 d37c0077553e86858ef78bd2d9db413eb642275e SHA256 f0355795b9cccb6695f4e54e252710843e15a73a4e7e9cfc81a48c71270f9dc9
+MISC ChangeLog 5919 RMD160 1c5c57a874109fc127314841856f9deb04ad21fe SHA1 5bcaee0b525a883eb6a8679bfc2418f3318153df SHA256 eaed04aa360e06e13465e9840ed3f721589944c8dae2fba9096892746174b105
 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-darwin8.patch b/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
new file mode 100644
index 000000000000..73ddd556d76d
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
@@ -0,0 +1,23 @@
+Darwin8 has no backtrace functionalities yet
+
+--- src/searchd.cpp
++++ src/searchd.cpp
+@@ -1291,6 +1291,10 @@
+ 	__asm __volatile__ ( "movq %%rbp,%0":"=r"(pFramePointer):"r"(pFramePointer) );
+ #endif
+ 
++#ifndef SIGRETURN_FRAME_OFFSET
++	sphLogFatal ( "Cannot get stack frame pointer on this architecture" );
++#else
++
+ 	if ( !pFramePointer )
+ 	{
+ 		sphLogFatal ( "Frame pointer is null. Unable to backtrace the stack. Did you build the searchd with -fomit-frame-pointer?" );
+@@ -1329,6 +1333,7 @@
+ 	if ( !bOk )
+ 		sphWarning ( "Something wrong in frame pointers. BackTrace failed (failed FP was %p)", pNewFP );
+ 	else
++#endif
+ #endif // !HAVE_BACKTRACE
+ 		sphInfo ( "Stack trace seems to be succesfull. Now you have to resolve the numbers above and attach resolved values to the bugreport. See the section about resolving in the documentation" );
+ 
diff --git a/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch b/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
new file mode 100644
index 000000000000..594b7351e121
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
@@ -0,0 +1,22 @@
+On Darwin, the linker doesn't like it when vsnprintf is prefixed by an
+underscore.  This obviously is an error, since it's only necessary for
+Windows.  Add an extra guard, such that vsnprintf is left alone.
+
+--- api/libsphinxclient/sphinxclient.c
++++ api/libsphinxclient/sphinxclient.c
+@@ -13,6 +13,7 @@
+ // did not, you can find it at http://www.gnu.org/
+ //
+ 
++#if defined(_MSC_VER)
+ #if _MSC_VER>=1400
+ // VS 2005 and above
+ #define _CRT_SECURE_NO_DEPRECATE 1
+@@ -21,6 +22,7 @@
+ // VS 2003 and below
+ #define vsnprintf _vsnprintf
+ #endif
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdarg.h>
diff --git a/app-misc/sphinx/sphinx-0.9.9-r2.ebuild b/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
index 379742a6a6d6..d28f5cee21a7 100644
--- a/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
+++ b/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r2.ebuild,v 1.2 2010/11/10 07:54:57 grobian Exp $
 
 EAPI=3
 inherit eutils autotools
@@ -46,6 +46,9 @@ src_prepare() {
 		api/libsphinxclient/sphinxclient.c || die
 
 	eautoreconf
+
+	cd api/libsphinxclient || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild b/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
index ebaf2c2c7ad3..59ffba4f0f19 100644
--- a/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
+++ b/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild,v 1.2 2010/11/10 07:54:57 grobian Exp $
 
 EAPI=3
 inherit eutils autotools
@@ -18,7 +18,7 @@ SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="debug id64 mysql odbc postgres stemmer test"
 
 RDEPEND="mysql? ( virtual/mysql )
@@ -43,6 +43,8 @@ src_prepare() {
 	sed -i -e '/\/usr\/local\//d' configure.ac || die
 
 	epatch "${FILESDIR}"/${P}-nosigpipe.patch
+	epatch "${FILESDIR}"/${P}-darwin8.patch
+	epatch "${FILESDIR}"/${P}-libsphinxclient-darwin.patch
 
 	eautoreconf