Fixed for and marked ~sparc-solaris, ~sparc64-solaris

Package-Manager: portage-2.2.01.19295-prefix/cvs/SunOS i386

4 files changed, 51 insertions, 12 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 2a7116688e80..23912ad04ab5 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.36 2011/05/29 15:31:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.37 2011/09/28 10:40:10 grobian Exp $
+
+  28 Sep 2011; Fabian Groffen <grobian@gentoo.org> sphinx-2.0.1_beta.ebuild,
+  +files/sphinx-2.0.1_beta-solaris.patch:
+  Fixed for and marked ~sparc-solaris, ~sparc64-solaris
 
   29 May 2011; Fabian Groffen <grobian@gentoo.org> sphinx-2.0.1_beta.ebuild,
   +files/sphinx-2.0.1_beta-darwin8.patch:
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 2138177b6235..a1e6986c18a4 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
 AUX sphinx-2.0.1_beta-darwin8.patch 538 RMD160 e22097c697588d9a9240b4c42c27fd6dfcec3e3f SHA1 cc2da6ce909a0f0c23b08a47bbf4a9b9a359c9aa SHA256 e7350f5c5fcd1a5a0925cdb9a775efd5747d5d790aa9eb3319717e98be82b683
+AUX sphinx-2.0.1_beta-solaris.patch 1036 RMD160 6b5ee4293b1580e313831126c1e75c031ccec6bc SHA1 77649297db77bbe174d6750002af27ac3e05b873 SHA256 cde3f1ebb1a602c2fe9e22ae1831bf58893d0745c627ce8ad44ce1ebb1354c8c
 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
@@ -16,15 +17,13 @@ EBUILD sphinx-0.9.8.1.ebuild 1256 RMD160 bd3c011e1202870c9514f81099cfc21b00c6c18
 EBUILD sphinx-0.9.9-r2.ebuild 2435 RMD160 250c1ae6aa4a52d8f418c44125bc31ab2c6418a9 SHA1 82d5c1c9e7f9d04785816b29c0d382fcf3dcf4b5 SHA256 92e16762929ea63633798ca8d8e970f967aa4d9886bf933f9dcc457c9e19b06c
 EBUILD sphinx-0.9.9.ebuild 1552 RMD160 819efed6bf1df22a70be9a45355673e4c97c71aa SHA1 0ba7dc938577b9615d8e5974c978ccdc158d41e8 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59
 EBUILD sphinx-1.10_beta-r1.ebuild 2512 RMD160 73ac8775312320d3f99dc19dbfadca7bbfbe42b5 SHA1 73cb28ea3e525fbe0ecd86882319c32fb800e551 SHA256 dc09f422e0a3c105b94951d1c8c27d69735d82f2cc1cac57081a4c051fb1ca0f
-EBUILD sphinx-2.0.1_beta.ebuild 2407 RMD160 0ef5583f23668daf954f57197eef863e0422742b SHA1 c6da31322f02b2dddfcf26c70fe95646d87ad71c SHA256 3b88fd6568d5915a6db8e91b3977e789a7e2d917c296fe7124325ff454009472
-MISC ChangeLog 6574 RMD160 2d2d5fe9ca4dfb524d821a7ab4da93e29ce53050 SHA1 8f6ada01de86b69dd5b9959094f2a9f26a2874ad SHA256 aa3c8b30e6591bcfe6342e418b1436fbfa5d8289f50c322bbc523b1ed786dd97
+EBUILD sphinx-2.0.1_beta.ebuild 2480 RMD160 6c812ff95aaaf9969a46be632e803b503934afa1 SHA1 f21722ee374d0567da2fffeb9ade17ebf91cc157 SHA256 5b7e69841ed503ec0b39dc84c4ad921d2c921522f57d780df629f6f0a6e6e0c9
+MISC ChangeLog 6750 RMD160 4b52351a46e56052e4fc84ebe55da51a27b5dc00 SHA1 a6a5d55bda10c030d2c13a7d977407529b9d1385 SHA256 da4ceaff2f821857bef8ab8ac7a8c20ebc2efd08ab04a3e13764e42b3e47478a
 MISC metadata.xml 337 RMD160 7c89f7f8e67273a4a7d4b79b3e6257a7622f570b SHA1 126d46d2da8c613c8ee0f1beb1de2652096313bc SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (SunOS)
 
-iJwEAQEIAAYFAk58/5cACgkQfXuS5UK5QB32EAQAivAQK7srpQr6Y8pGPclZ/qo2
-Yu+bt+Ys/GcLgA9cotJDY5nEHqrl/oRZsUhp2FPfKsNVdQsp90QDhY5ZdiTx7SVM
-P4SqFwT8t2JU/kBYrx+5zTBYKqib/EdJsQ/ROyJYPdSoUSNfM1cbcnJXUgiE5Wfw
-r71sdzlbednOJGJwxm8=
-=yRzG
+iEYEARECAAYFAk6C+ZAACgkQX3X2B8XHTonUqgCeM+WfWIjSIYYV2TXAwump6bzc
+WFsAoIgJ6yI5xs4jUkukoRoQGpRYkjqS
+=fY0W
 -----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch b/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
new file mode 100644
index 000000000000..6cc69d2ccd96
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
@@ -0,0 +1,35 @@
+link against required libraries
+include sys/fcntl.h for F_[SG]ET constants
+don't try to use an undefined constant
+
+--- api/libsphinxclient/configure.in
++++ api/libsphinxclient/configure.in
+@@ -33,6 +33,9 @@
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(string.h strings.h unistd.h stdint.h)
+ 
++AC_CHECK_LIB([nsl], gethostbyname)
++AC_CHECK_LIB([socket], connect)
++
+ DEFAULT_INSTALL_PREFIX="/usr/local"
+ 
+ AC_ARG_ENABLE(debug,
+--- api/libsphinxclient/sphinxclient.c
++++ api/libsphinxclient/sphinxclient.c
+@@ -57,6 +57,7 @@
+ 	#include <netdb.h>
+ 	#include <errno.h>
+ 	#include <sys/un.h>
++	#include <sys/fcntl.h>
+ #endif
+ 
+ //////////////////////////////////////////////////////////////////////////
+@@ -1280,7 +1281,7 @@
+ static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
+ {
+ 	int res;
+-#if defined(_WIN32) || defined(SO_NOSIGPIPE)
++#if defined(_WIN32) || defined(SO_NOSIGPIPE) || !defined(MSG_NOSIGNAL)
+ 	res = send ( fd, bytes, len, 0 );
+ #else
+ 	res = send ( fd, bytes, len, MSG_NOSIGNAL );
diff --git a/app-misc/sphinx/sphinx-2.0.1_beta.ebuild b/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
index f34c9e9fe078..67a328f5d402 100644
--- a/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.1_beta.ebuild,v 1.2 2011/05/29 15:31:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.1_beta.ebuild,v 1.3 2011/09/28 10:40:10 grobian Exp $
 
 EAPI=3
 inherit eutils autotools
@@ -18,7 +18,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug id64 mysql odbc postgres stemmer test"
 
 RDEPEND="mysql? ( virtual/mysql )
@@ -40,6 +40,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-darwin8.patch
+	epatch "${FILESDIR}"/${P}-solaris.patch
 
 	# drop nasty hardcoded search path breaking Prefix
 	sed -i -e '/\/usr\/local\//d' configure.ac || die