diff options
Diffstat (limited to 'www-client/elinks')
| -rw-r--r-- | www-client/elinks/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/elinks/elinks-0.12_pre5-r2.ebuild | 37 |
2 files changed, 30 insertions, 13 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog index 8915f09cb82d..95645ce2642c 100644 --- a/www-client/elinks/ChangeLog +++ b/www-client/elinks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/elinks # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.148 2012/10/06 03:25:54 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.149 2012/10/10 14:45:50 axs Exp $ + + 10 Oct 2012; Ian Stakenvicius <axs@gentoo.org> elinks-0.12_pre5-r2.ebuild: + added hackery to ensure configure script does not find @preserved-libs + version of spidermonkey lib (see comments in bug 437196) 06 Oct 2012; Anthony G. Basile <blueness@gentoo.org> elinks-0.12_pre5-r2.ebuild: diff --git a/www-client/elinks/elinks-0.12_pre5-r2.ebuild b/www-client/elinks/elinks-0.12_pre5-r2.ebuild index b2fe58d710c6..8fe333e05355 100644 --- a/www-client/elinks/elinks-0.12_pre5-r2.ebuild +++ b/www-client/elinks/elinks-0.12_pre5-r2.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/www-client/elinks/elinks-0.12_pre5-r2.ebuild,v 1.7 2012/10/06 03:25:54 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r2.ebuild,v 1.8 2012/10/10 14:45:50 axs Exp $ EAPI=4 inherit eutils autotools flag-o-matic @@ -54,18 +54,31 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.11.5-makefile.patch epatch "${FILESDIR}"/${P}-compilation-fix.patch - if use javascript && has_version ">=dev-lang/spidermonkey-1.8"; then - if has_version ">=dev-lang/spidermonkey-1.8.5"; then - epatch "${WORKDIR}"/patches/${P}-js185-1-heartbeat.patch - epatch "${WORKDIR}"/patches/${P}-js185-2-up.patch - epatch "${WORKDIR}"/patches/${P}-js185-3-histback.patch - epatch "${FILESDIR}"/${P}-sm185-jsval-fixes.patch - # expand lib check to also match mozjs187 - if has_version ">=dev-lang/spidermonkey-1.8.7"; then - sed -i 's:mozjs185:mozjs187 mozjs185:' configure.in + if use javascript ; then + if has_version ">=dev-lang/spidermonkey-1.8"; then + if has_version ">=dev-lang/spidermonkey-1.8.5"; then + epatch "${WORKDIR}"/patches/${P}-js185-1-heartbeat.patch + epatch "${WORKDIR}"/patches/${P}-js185-2-up.patch + epatch "${WORKDIR}"/patches/${P}-js185-3-histback.patch + epatch "${FILESDIR}"/${P}-sm185-jsval-fixes.patch + if has_version ">=dev-lang/spidermonkey-1.8.7"; then + # fix lib order in configure check and add mozjs187 + # (these seds are necessary so that @preserved-libs copies are not used) + sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs187 mozjs185 mozjs js smjs; do:' \ + configure.in || die + else + # fix lib order in configure check + # (these seds are necessary so that @preserved-libs copies are not used) + sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \ + configure.in || die + fi + else + # fix lib order in configure check + # (these seds are necessary so that @preserved-libs copies are not used) + epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch + sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs js smjs; do:' \ + configure.in || die fi - else - epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch fi fi epatch "${FILESDIR}"/${P}-ruby-1.9.patch |