diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2012-08-08 18:32:32 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2012-08-08 18:32:32 +0000 |
| commit | f49b2191ccbe2fc8259d73c2a6e3da16c4eb7b16 (patch) | |
| tree | cbddec048e17bd4617cff5933644bbf90546012e /app-misc/sphinx | |
| parent | Use getopt-long on non-linux systems (bug #409811, thanks to Stuart Shelton, ... (diff) | |
| download | historical-f49b2191ccbe2fc8259d73c2a6e3da16c4eb7b16.tar.gz historical-f49b2191ccbe2fc8259d73c2a6e3da16c4eb7b16.tar.bz2 historical-f49b2191ccbe2fc8259d73c2a6e3da16c4eb7b16.zip | |
Avoid eautoreconf and thus the problem reported in bug 425380, thanks to grobian.
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'app-misc/sphinx')
| -rw-r--r-- | app-misc/sphinx/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/sphinx/Manifest | 10 | ||||
| -rw-r--r-- | app-misc/sphinx/sphinx-2.0.4-r1.ebuild | 10 |
3 files changed, 14 insertions, 12 deletions
diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog index d60a920801f5..ba099a03d618 100644 --- a/app-misc/sphinx/ChangeLog +++ b/app-misc/sphinx/ChangeLog @@ -1,6 +1,10 @@ # 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.47 2012/07/21 08:00:54 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.48 2012/08/08 18:32:32 graaff Exp $ + + 08 Aug 2012; Hans de Graaff <graaff@gentoo.org> sphinx-2.0.4-r1.ebuild: + Avoid eautoreconf and thus the problem reported in bug 425380, thanks to + grobian. *sphinx-2.0.4-r1 (21 Jul 2012) diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest index 588f8ae3a1a1..4c76c2ee92b5 100644 --- a/app-misc/sphinx/Manifest +++ b/app-misc/sphinx/Manifest @@ -15,14 +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-r1.ebuild 2638 SHA256 eefc847570a5c60b97c3de53bbd67c7a0bd8969f2bf0de1ed6449b3ba9432d0e SHA512 3a70ebfbe452cf4432ae631a6d7d14b10a38f5960fa1e5a36dc30dc83397ea801287eb3ef2e2ed7cea76c08165f4b072c2df9a82daebbf38a03c05c983685da9 WHIRLPOOL 60849d756e770dcbf8e9f4ea0f71b24f36bdb3f6069087e330606c365efde6e5b1963d9a54fcc795b5e011a7a33b18130c40ec295e8e91d74624b23a8c2f6374 EBUILD sphinx-2.0.4.ebuild 2589 SHA256 229b1ef9265064d38e18b8cf0319b6cae0d3ae4a1a78d9a5ac9a88966e75b232 SHA512 99c5345282b7ca00438ae94bea0923e2e2df5a8d600c2b97c5dd2cb66b72a56d4f6b62b34bbcf95897b444cd1d895dec62aaabf2e71c888691dd246119797ec9 WHIRLPOOL 5ef3131495b10eb1a9bc5daea40e4fcb967c3daa8770537ee7ac6427b34e3c4ab33c59cdae8712e2ce60e9d39cf7d9a2f8e357b06ceb9e864d7b83191c98effa -MISC ChangeLog 8132 SHA256 df0b75535c742550052c89e4ef3935d6e85d1c920f7561d6e0609f1f87bf523b SHA512 75a4e47373e74d196dbcb1f612294090c1a121be566413607de77b72e29e639d2a2b854d666e4fc774863faa202c10b3847f946f5905fc84480d734199865980 WHIRLPOOL f98731c7a077720c0218033997769bf64cd612042a47408091b189284a2a6902462b2c66db2b6deb82316a9c26582f89af4108c97b4be51b89eb56177b1e3db8 +MISC ChangeLog 8293 SHA256 e07310f6b10d05560e09640e615e1661c5cd84b05ba5a76ed968e44acffdd843 SHA512 9737e47800a3035853fd3cca5d24044fffcd13381e26d8e46224fcef3abe8d6fae2e2ac87c42b08c23287bf12f5f01da07b1a80a167a71146e48ba6baf10aeb4 WHIRLPOOL ecb62a35e1d570b2b8db11149189696f3340eef4f998d4ad2a6036543e62ca6294d15878ca59969f8bf4f0a67da56975aad19f29631d5a0f799febbca19928e3 MISC metadata.xml 337 SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd SHA512 59396e4a389398e533a4d9a4bbb8fc73fd585782500fb51a384aaed97781ebf6724344ae605d43e60d3426c85ca685002ff63952a647145284f28ef8dd411304 WHIRLPOOL c1cfba17f3ec92b9b32bedbb439923ec30e24e5f0b0d499021504f5a6ab0ae19ec363d4a79bb7a615a239b80d36b6094c7582e84ab5d3a874fb9f41ba34ce56e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlAKYbwACgkQiIP6VqMIqNdC6wEAl2H3q3YcGKGf1ofy552JprxO -L/0/R7MmtSSnTmi+NsYBAJOkz6syE4gjzKU/4g1Y316B0k97HKw3J9pyt5daXDrq -=clPI +iF4EAREIAAYFAlAisMYACgkQiIP6VqMIqNfAIgD/Qx6iHlSAoyANFJ+HHtZWu/m7 +9yXP1aeDzUDcdSkBLbwA/iDHbiIzBHJsBuEPtD6lj6RBvtMXMmW4wTMHhAfjV++d +=0AkH -----END PGP SIGNATURE----- diff --git a/app-misc/sphinx/sphinx-2.0.4-r1.ebuild b/app-misc/sphinx/sphinx-2.0.4-r1.ebuild index 6276074b904b..c7230dbcbd24 100644 --- a/app-misc/sphinx/sphinx-2.0.4-r1.ebuild +++ b/app-misc/sphinx/sphinx-2.0.4-r1.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.4-r1.ebuild,v 1.2 2012/08/08 18:32:32 graaff Exp $ EAPI=4 inherit eutils autotools @@ -44,15 +44,13 @@ src_prepare() { "${FILESDIR}"/${P}_gcc-4.7.patch # drop nasty hardcoded search path breaking Prefix - sed -i -e '/\/usr\/local\//d' configure.ac || die + # We patch configure directly since otherwise we need to run + # eautoreconf twice and that causes problems, bug 425380 + sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || 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() { |