Merge branch 'master' of git://anongit.gentoo.org/proj/java

9 files changed, 70 insertions, 9 deletions

diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 511d6cce..493983e7 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,4 +1,5 @@
 DIST gradle-3.5-all.zip 95084513 BLAKE2B 17ee9fb3569842f21f26c00f711ab38a8b295b35e5eb6715e2958a9c2318690acbfe2ff018ecbe5e85eadd0bc1708dccad8972f7fe07d485f10aec84b113cafe SHA512 13eb1b73a1e432f3230e3b030de3b50bbd8dfce11b3bb9079fc0ab76e865470e3cb10720def2ad0e514383fef50e468ccc54ca7751c0065fb8aae55a40c54479
+DIST gradle-4.10.2-all.zip 116855693 BLAKE2B 43c12ad5eb9abc7349921a446f957cc1e5890a353d05363b7dc6effbdc7e0f94312155f022b2245bdbf85d648c752251b095665af95680684bec17d92486179f SHA512 71eaaa86af045f3162e9602c5c25c449aafd17f73f958dc991babfe4ebf94772fe9f53a49342dcd50e29ea338486115cb8215b1732944d49ced508d9f9ac7d81
 DIST gradle-4.4.1-all.zip 99180462 BLAKE2B 8b961f3ef296191dbd3415d7428ba943fbcadca0d69d6b77ba60d91a50b69f55be86cb564672e5390caf8e753234aac572d8fce69c2a79321cacf3d3ea035e5b SHA512 f281be409fee7c0b554c0920dd01a09eee0449cc8894e364a0174181836cf4ab986d078ea9fa48acfd16c8900d44cafedf3daeb804f0996f67af2438f5857233
 DIST gradle-4.5.1-all.zip 101862201 BLAKE2B f109a74c28dd839ed099aa8fb69a3397617ea1701230017dc778bacf320a9a864d95979960fe9b1a4ec3714d73bd590013a423aa553fcd37719ee4fbfda49d2e SHA512 914fa381b996d91eb6ef57b4a4855d3cb6dd3ae05f3febed4bb6a114d47e166ed36c60f1277015c8ca21f7f727e3cc82ec208da85458ab9f56d7cad074b09caf
 DIST gradle-4.6-all.zip 106724289 BLAKE2B 15475ccd6ea2305e30d0c2e59659eb742d984b0a6b643d4c5ecbd0ccd7244713eb7431e30588aedbedb5268e616aeebf7abb389551acd4b6b1cd4079f37c85be SHA512 36249d86e5e35d793448960251c9db1be36643ea4846be35e7b9af5c0bed245dac20c4682580c53ff80f6745369cb5dad8dd840a9b00f7b67d1ec563a9e6e106
diff --git a/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild b/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild
index 013665cc..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"
diff --git a/dev-java/gradle-bin/gradle-bin-4.10.2.ebuild b/dev-java/gradle-bin/gradle-bin-4.10.2.ebuild
new file mode 100644
index 00000000..1839593e
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-4.10.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+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"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+		app-eselect/eselect-gradle"
+RDEPEND=">=virtual/jdk-1.6"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	dodoc docs/release-notes.html getting-started.html
+
+	insinto "${gradle_dir}"
+
+	# source
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+
+	# docs
+	if use doc ; then
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	# examples
+	if use examples ; then
+		java-pkg_doexamples samples
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/gradle-bin/gradle-bin-4.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-4.4.1.ebuild
index 013665cc..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-4.4.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"
diff --git a/dev-java/gradle-bin/gradle-bin-4.5.1.ebuild b/dev-java/gradle-bin/gradle-bin-4.5.1.ebuild
index acc8a5e6..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-4.5.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"
diff --git a/dev-java/gradle-bin/gradle-bin-4.6.ebuild b/dev-java/gradle-bin/gradle-bin-4.6.ebuild
index acc8a5e6..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-4.6.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"
diff --git a/dev-java/gradle-bin/gradle-bin-4.7.ebuild b/dev-java/gradle-bin/gradle-bin-4.7.ebuild
index acc8a5e6..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-4.7.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"
diff --git a/dev-java/gradle-bin/gradle-bin-4.8.ebuild b/dev-java/gradle-bin/gradle-bin-4.8.ebuild
index acc8a5e6..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-4.8.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"
diff --git a/dev-java/gradle-bin/gradle-bin-4.9.ebuild b/dev-java/gradle-bin/gradle-bin-4.9.ebuild
index acc8a5e6..1839593e 100644
--- a/dev-java/gradle-bin/gradle-bin-4.9.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
 HOMEPAGE="http://www.gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip
 		app-eselect/eselect-gradle"