summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-05-29 15:31:35 +0000
committerFabian Groffen <grobian@gentoo.org>2011-05-29 15:31:35 +0000
commit686ffbd80b9f5a2860b7445b92b1b065208877d1 (patch)
tree27f01271343b1bc0ce574a8889fd04ea28450032 /app-misc
parentVersion bump. Bug 345721 (diff)
downloadhistorical-686ffbd80b9f5a2860b7445b92b1b065208877d1.tar.gz
historical-686ffbd80b9f5a2860b7445b92b1b065208877d1.tar.bz2
historical-686ffbd80b9f5a2860b7445b92b1b065208877d1.zip
Fixed for and keyworded ~ppc-macos and ~x86-macos
Package-Manager: portage-2.2.01.18706-prefix/cvs/Darwin powerpc
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/sphinx/ChangeLog6
-rw-r--r--app-misc/sphinx/Manifest15
-rw-r--r--app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch22
-rw-r--r--app-misc/sphinx/sphinx-2.0.1_beta.ebuild6
4 files changed, 39 insertions, 10 deletions
diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 110196cfd845..2a7116688e80 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.35 2011/05/13 18:28:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.36 2011/05/29 15:31:35 grobian Exp $
+
+ 29 May 2011; Fabian Groffen <grobian@gentoo.org> sphinx-2.0.1_beta.ebuild,
+ +files/sphinx-2.0.1_beta-darwin8.patch:
+ Fixed for and keyworded ~ppc-macos and ~x86-macos
*sphinx-2.0.1_beta (13 May 2011)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index df68315aaa4c..74c507098064 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,10 +1,11 @@
-----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
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
@@ -15,13 +16,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 2342 RMD160 c1b174921b27db809911a6d94c2cde4c9fe4f9ab SHA1 844c904f8a03025acae183424650fa74f522ad0a SHA256 278272041c8e43282bda21b69be74e32f9b7c410648c230a27ca871d2430c379
-MISC ChangeLog 6401 RMD160 48eac8058b7eb7f1149d79fd13527f7354c380dd SHA1 76adaf17379f04805b7bc401d166ef77e15c5227 SHA256 c246994548e1c64bfa3fe08fe581eef91efdf942185717dc3cf14213266da955
+EBUILD sphinx-2.0.1_beta.ebuild 2407 RMD160 0ef5583f23668daf954f57197eef863e0422742b SHA1 c6da31322f02b2dddfcf26c70fe95646d87ad71c SHA256 3b88fd6568d5915a6db8e91b3977e789a7e2d917c296fe7124325ff454009472
+MISC ChangeLog 6574 RMD160 2d2d5fe9ca4dfb524d821a7ab4da93e29ce53050 SHA1 8f6ada01de86b69dd5b9959094f2a9f26a2874ad SHA256 aa3c8b30e6591bcfe6342e418b1436fbfa5d8289f50c322bbc523b1ed786dd97
MISC metadata.xml 358 RMD160 756ddce7322eb8b7cde365ca96c7997b26f6fa42 SHA1 2c8c1f55e21e904d6336f486a07eff8bbfdd03af SHA256 77a4da29239cfbdb02772dcabd0b233515790a6703b30b76ded71269a4e658de
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (Darwin)
-iF4EAREIAAYFAk3NeG8ACgkQrnu0mw69JkrdsAD/RR6XVEblv0NdC47j3+XXK24T
-0NAzIh+DFDEYlbNFVrQA/iV8FxKoOMEZSRw6XTxqNXgDgsPVsIYH4sW8yp58rRkK
-=/KLG
+iEYEARECAAYFAk3iZsAACgkQX3X2B8XHTomxDgCfTjGJW6BRS04wo/CQa8hYzHwT
+itUAoJndekfgvbi7Av77gA12HSKJkx7D
+=QHnj
-----END PGP SIGNATURE-----
diff --git a/app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch b/app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch
new file mode 100644
index 000000000000..e0dcd54097fd
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.0.1_beta-darwin8.patch
@@ -0,0 +1,22 @@
+Darwin8 has no backtrace functionalities yet
+
+--- src/sphinxutils.cpp
++++ src/sphinxutils.cpp
+@@ -1364,6 +1364,9 @@
+ }
+ sphSafeInfo ( iFD, "Stack bottom = 0x%p, thread stack size = 0x%x", pMyStack, iStackSize );
+
++#ifndef SIGRETURN_FRAME_OFFSET
++ sphLogFatal ( "Cannot get stack frame pointer on this architecture" );
++#else
+ while ( pMyStack && !bSafe )
+ {
+ sphSafeInfo ( iFD, "begin of manual backtrace:" );
+@@ -1421,6 +1424,7 @@
+
+ break;
+ }
++#endif
+
+ #if HAVE_BACKTRACE
+ sphSafeInfo ( iFD, "begin of system backtrace:" );
diff --git a/app-misc/sphinx/sphinx-2.0.1_beta.ebuild b/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
index e06c936f09a4..f34c9e9fe078 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.1 2011/05/13 18:28:58 graaff Exp $
+# $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 $
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"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
IUSE="debug id64 mysql odbc postgres stemmer test"
RDEPEND="mysql? ( virtual/mysql )
@@ -39,6 +39,8 @@ src_unpack() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-darwin8.patch
+
# drop nasty hardcoded search path breaking Prefix
sed -i -e '/\/usr\/local\//d' configure.ac || die
eautoreconf