[gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/

[Amy Winston]

commit:     d08438a57084d53bee582fdccc10adc824df71de
Author:     Marshall Brewer (Gentoo Key) <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Mon May  9 09:38:19 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon May  9 10:59:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08438a5

dev-lang/nqp: revbump 2016.04-r2 (fixes compile failure)

Logic error when determining options for Configure.pl.
Gentoo-Bug: 582520

Package-Manager: portage-2.2.28

 .../nqp/{nqp-2016.04-r1.ebuild => nqp-2016.04-r2.ebuild} | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dev-lang/nqp/nqp-2016.04-r1.ebuild 
b/dev-lang/nqp/nqp-2016.04-r2.ebuild
similarity index 77%
rename from dev-lang/nqp/nqp-2016.04-r1.ebuild
rename to dev-lang/nqp/nqp-2016.04-r2.ebuild
index f3057ed..e47071d 100644
--- a/dev-lang/nqp/nqp-2016.04-r1.ebuild
+++ b/dev-lang/nqp/nqp-2016.04-r2.ebuild
@@ -64,12 +64,18 @@ src_configure() {
                "--backend=${backends}"
                "--prefix=/usr" )
 
-       # 2016.04 doesn't like our jna-3.4.1
+       # 2016.04 doesn't like our jna-3.4.1 nor jna-4.1.0
        # keep testing against it
-       use system-libs && myconfargs+=(
-               "--with-asm=$(echo $(java-pkg_getjars asm-4) | tr : '\n' | grep 
'/asm\.jar$')"
-               "--with-asm-tree=$(echo $(java-pkg_getjars asm-4) | tr : '\n' | 
grep '/asm-tree\.jar$')"
-               "--with-jline=$(echo $(java-pkg_getjars jline) | tr : '\n' | 
grep '/jline\.jar$')" )
+       if use system-libs; then
+               if use java; then
+                       myconfargs+=(
+                               "--with-asm=$(echo $(java-pkg_getjars asm-4) | 
tr : '\n' | grep '/asm\.jar$')"
+                               "--with-asm-tree=$(echo $(java-pkg_getjars 
asm-4) | tr : '\n' | grep '/asm-tree\.jar$')"
+                               "--with-jline=$(echo $(java-pkg_getjars jline) 
| tr : '\n' | grep '/jline\.jar$')" )
+               else
+                       einfo "USE=system-libs set, but this won't have any 
effect without USE=java."
+               fi
+       fi
 
        perl Configure.pl "${myconfargs[@]}" || die
 }