From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4406958973 for ; Wed, 10 Feb 2016 09:08:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B927921C0C4; Wed, 10 Feb 2016 09:08:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 443DD21C0C4 for ; Wed, 10 Feb 2016 09:08:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEF9B340ADB for ; Wed, 10 Feb 2016 09:07:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEEB18DF for ; Wed, 10 Feb 2016 09:07:56 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1455095200.ef5886e525e32529cfdbe16545982e6b837991e4.flow@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/gradle-bin/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/gradle-bin/gradle-bin-2.10.ebuild dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild dev-java/gradle-bin/gradle-bin-2.11.ebuild X-VCS-Directories: dev-java/gradle-bin/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: ef5886e525e32529cfdbe16545982e6b837991e4 X-VCS-Branch: master Date: Wed, 10 Feb 2016 09:07:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7bf0cca1-0543-4a6c-8878-594537f76ff2 X-Archives-Hash: 2d1ab3464324beda89ede9b8752254c7 commit: ef5886e525e32529cfdbe16545982e6b837991e4 Author: Florian Schmaus geekplace eu> AuthorDate: Wed Feb 10 09:06:40 2016 +0000 Commit: Florian Schmaus geekplace 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() {