[gentoo-commits] proj/java:master commit in: dev-java/gradle-bin/

[Florian Schmaus]

commit:     ef5886e525e32529cfdbe16545982e6b837991e4
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Wed Feb 10 09:06:40 2016 +0000
Commit:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
CommitDate: Wed Feb 10 09:06:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=ef5886e5

dev-java/gradle-bin-2.11-r1: Fix gradle runtime env

Don't use the java helpers, instead install gradle by basically
merging just the files from the binary distrubtion. The previous
approach, used until <=dev-java/gradle-bin-2.11 caused errors like

> Could not resolve all dependencies for configuration ':XXX:runtime'.
   > Could not resolve junit:junit:4.11.
     Required by:
         XXX:dev-SNAPSHOT
      > Could not resolve junit:junit:4.11.
         > Could not parse POM 
file:/home/XXX/.m2/repository/junit/junit/4.11/junit-4.11.pom
            > org.apache.xerces.parsers.XIncludeAwareParserConfiguration cannot 
be cast to org.apache.xerces.xni.parser.XMLParserConfiguration

in certain situations. The exact reason is unclear, but it now works with 
2.11-r1

Also fix DESCRIPTION length.

Package-Manager: portage-2.2.26

 dev-java/gradle-bin/gradle-bin-2.10.ebuild         |  2 +-
 ...e-bin-2.11.ebuild => gradle-bin-2.11-r1.ebuild} | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/dev-java/gradle-bin/gradle-bin-2.10.ebuild 
b/dev-java/gradle-bin/gradle-bin-2.10.ebuild
index 481b0f1..68de8f4 100644
--- a/dev-java/gradle-bin/gradle-bin-2.10.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-2.10.ebuild
@@ -9,7 +9,7 @@ inherit java-pkg-2
 MY_PN=${PN%%-bin}
 MY_P="${MY_PN}-${PV/_rc/-rc-}"
 
-DESCRIPTION="A project automation and build tool similar to Apache Ant and 
Apache Maven with a Groovy based DSL"
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
 SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip";
 HOMEPAGE="http://www.gradle.org/";
 LICENSE="Apache-2.0"

diff --git a/dev-java/gradle-bin/gradle-bin-2.11.ebuild 
b/dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild
similarity index 60%
rename from dev-java/gradle-bin/gradle-bin-2.11.ebuild
rename to dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild
index 481b0f1..c06d371 100644
--- a/dev-java/gradle-bin/gradle-bin-2.11.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild
@@ -9,7 +9,7 @@ inherit java-pkg-2
 MY_PN=${PN%%-bin}
 MY_P="${MY_PN}-${PV/_rc/-rc-}"
 
-DESCRIPTION="A project automation and build tool similar to Apache Ant and 
Apache Maven with a Groovy based DSL"
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
 SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip";
 HOMEPAGE="http://www.gradle.org/";
 LICENSE="Apache-2.0"
@@ -46,22 +46,10 @@ src_install() {
                java-pkg_doexamples samples
        fi
 
-       # jars in lib/
-       # Note that we can't strip the version from the gradle jars,
-       # because then gradle won't find them.
-       cd lib || die "lib/ not found"
-       for jar in *.jar; do
-               java-pkg_newjar ${jar} ${jar}
-       done
-
-       # plugins in lib/plugins
-       cd plugins
-       java-pkg_jarinto ${JAVA_PKG_JARDEST}/plugins
-       for jar in *.jar; do
-               java-pkg_newjar ${jar} ${jar}
-       done
-
-       java-pkg_dolauncher "${P}" --main org.gradle.launcher.GradleMain 
--java_args "-Dgradle.home=${gradle_dir}/lib \${GRADLE_OPTS}"
+       insinto "${gradle_dir}"
+       doins -r bin/ lib/
+       fperms 755 "${gradle_dir}/bin/gradle"
+       dosym "${gradle_dir}/bin/gradle" "/usr/bin/${P}"
 }
 
 pkg_postinst() {