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

["James Le Cuirot" <chewi@gentoo.org>]

commit:     480b1bc512c75a7401bad720ba74e78aa1d48454
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Sep  4 16:20:03 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 19:41:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=480b1bc5

dev-java/gradle: bump to 3.0

Closes: https://github.com/gentoo/java-overlay/pull/35

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-java/gradle/Manifest                           |  2 +-
 .../{gradle-2.3.ebuild => gradle-3.0.ebuild}       | 25 ++++++++++++++--------
 dev-java/gradle/metadata.xml                       |  5 +++++
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/dev-java/gradle/Manifest b/dev-java/gradle/Manifest
index d17d1d6..0a7c409 100644
--- a/dev-java/gradle/Manifest
+++ b/dev-java/gradle/Manifest
@@ -1 +1 @@
-DIST gradle-2.3-src.zip 13324201 SHA256 42ceee8cb3b115dc0fb4f0ffbc5ad2332f9c889cda57cf6a3bbb2ed702cd4f94 SHA512 f7ee5be13cc33588961491ce9edfb58b3523a07f9ecb1a6c629dddd5b404c17b8908f29f04930db08d28e0955b73423850e743e204592a9fdf31f1b2faee4363 WHIRLPOOL a9fcfac49bd1476aaff99c82a948ae26a8f24aec4da7a883dc2b384dd15cde904b5bc829146512873ca53b61e44dfa9882639271819be9020d1137f0c916d380
+DIST gradle-3.0-src.zip 18060495 SHA256 f3927cbd18753d0efaa378ae518db5ee41f1af6922b3ca2a54a89c174cc2f2ed SHA512 2423451492acee767fabee6a3eefa000056747c9588ba0a2791f4ecd995a17f6094ac4793f001f8e31d8bc2e7776043b91677f943d23373b00b0cb51aad2d6e0 WHIRLPOOL 781e0aa076ea7b64a49fd160635314b5a55f8435e1ceef00ae94947f4d8b9562bc223e6f7c703065b8577cc54859eb2dea865e1a0f219e725e12fc325d8f44d2

diff --git a/dev-java/gradle/gradle-2.3.ebuild b/dev-java/gradle/gradle-3.0.ebuild
similarity index 77%
rename from dev-java/gradle/gradle-2.3.ebuild
rename to dev-java/gradle/gradle-3.0.ebuild
index 802a6b7..4d8ad0a 100644
--- a/dev-java/gradle/gradle-2.3.ebuild
+++ b/dev-java/gradle/gradle-3.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit java-pkg-2
 
@@ -13,20 +12,28 @@ LICENSE="Apache-2.0"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
+DEPEND="
+	app-arch/zip
+	app-eselect/eselect-gradle
+"
 RDEPEND=">=virtual/jdk-1.5"
+IUSE="doc"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
 
 src_compile() {
-	gradle --gradle-user-home "$WORKDIR" install -Pgradle_installPath=dist || die
+	./gradlew --gradle-user-home "${WORKDIR}" "$(usex doc installAll install)" -Pgradle_installPath=dist || die 'Gradle build failed'
 }
 
 src_install() {
+	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
+
 	cd dist || die
 	dodoc changelog.txt getting-started.html
 
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
 	insinto "${gradle_dir}"
 
 	# jars in lib/
@@ -38,7 +45,7 @@ src_install() {
 	done
 
 	# plugins in lib/plugins
-	cd plugins
+	cd plugins || die
 	java-pkg_jarinto ${JAVA_PKG_JARDEST}/plugins
 	for jar in *.jar; do
 		java-pkg_newjar ${jar} ${jar}

diff --git a/dev-java/gradle/metadata.xml b/dev-java/gradle/metadata.xml
index 03136bb..608996f 100644
--- a/dev-java/gradle/metadata.xml
+++ b/dev-java/gradle/metadata.xml
@@ -5,4 +5,9 @@
     <email>flo@geekplace.eu</email>
     <description>Maintainer, CC him on bugs</description>
   </maintainer>
+  <maintainer type="person">
+    <email>gradle@mva.name</email>
+    <description>Maintainer, CC him on bugs</description>
+    <name>Vadim A. Misbakh-Soloviov</name>
+  </maintainer>
 </pkgmetadata>