dev-java/gradle-bin: Add gradle-bin-4.0, remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

14 files changed, 5 insertions, 834 deletions

diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 6159059d..655b7dfc 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,19 +1,7 @@
 DIST gradle-1.10-all.zip 54965002 SHA256 cd1a0f532258369c414a56b3e73b7bd7f087cf515b7c71dcb9091598c4a8d815 SHA512 c6e165d35992bb629b8f589d32ff17598aa18df3c0a5e505e059d4f61c7c4d73f4c267705d0da69c0ab11ad938fab87c270c5a90881a4d881f3b925c632dbca3 WHIRLPOOL d69b5e63e4e1f77a695661e3521e09d83698ef868eea10bf6be8984b3f41ab4141001fc38499776203bdce798aff43ddfd942e5c2bdc6ec19aff821e29058c70
 DIST gradle-1.12-all.zip 57658365 SHA256 cf111fcb34804940404e79eaf307876acb8434005bc4cc782d260730a0a2a4f2 SHA512 22c36ac3de35168aa736ee5370933c74656086e26f398ea40a1562f44c7388146db344604bccd188502dd2ec7577b091fdf455b0828eb8783870b6ac17797f74 WHIRLPOOL d4d4b1ef65da664cf1e0da995c7c029f7693d50d3bad3603c456ad081f50e580477c40e10b2bf98ddb4353ffd09ec426564e20c942f84f52a961c829b3672d8c
 DIST gradle-2.10-all.zip 68425872 SHA256 496d60c331f8666f99b66d08ff67a880697a7e85a9d9b76ff08814cf97f61a4c SHA512 4977eae3763f1f7e85ff30cbc6949ef7d15d239f4379476e7c416f4794811e64e60e04c3ddc01ca87673a742f8ca8e1e45ed52330c06f83ac8a19df8611f6fa3 WHIRLPOOL 4de66219b5002953092cae6da77a7236f83a2bf7a5a0daa7d555b52322daec8ae29ce2a1284b96da7871d5183de92f897d3b2e511182d634700c82cc56349e2a
-DIST gradle-2.11-all.zip 69319677 SHA256 a1242e4db8f979998796b1844e608c2acf8f8f54df518bbb3d5954e52253ba71 SHA512 05be0ed4dbb085837020381537683e9ee29e974cf03bd9d7546cf571ea5e4b104b3559b5b60232b554310fd1825c142189d9f7bf5e93d94ac06e9875e69f8aee WHIRLPOOL 4372a6a70e0ee260e7afdba2b15e0db87215ef192db87ba7ccf3e2d39b9adf5a979f56721f5ae2a10aba78f9e591ac5230ce9a17fce088eea785d370aa910898
-DIST gradle-2.12-all.zip 69509213 SHA256 d8b1948a575dc9ec13e03db94502ce91815d73da023f611296c04b852164cb5f SHA512 55429b8066458408c1bd8a4ecb34ae027ecb925d0ca4123edee78c7afb522600236b6d2d6af3834bca39b7082f767e2474c65566ed59da334dd27849f6d77591 WHIRLPOOL a11f6f3d31bad69850bb326b4f6f38c0a30c50a0424e8c5b474fb05be96264ee733f0ca3e3345163fb45acc580ca4bfc632660e5816ffe90e913ad3063576e7a
-DIST gradle-2.13-all.zip 69869079 SHA256 fb126ed684150f9dc39a811cbcf4daada4292fd387ed998c151ff2cf2536d94d SHA512 78fd6fe5f6540e13bac476bf8c34cc8a175ccf5350a970dd85c7ac003102a55cf10544fcb7cfe5e74c47458a6aed39b3fed5975ffec24bcd3029af884389faf2 WHIRLPOOL d30f5efb346b878f8c74708a3e16f58ee5b0b27be4fcf0e96af4c43784bca09d22bbcd8872f0f367de1708620ee8578da19d3a638867210dd938119cc36561c0
-DIST gradle-2.14-all.zip 68973218 SHA256 65bbc0ef9c48be86fb06522fc927d59dcc7c04266f2bb8156be76971f7c3fc4a SHA512 1d5448183d1ba7ff12f9f8714bc77c55788b8bbd5c9736a9eb764433e877a56deb2f2445cdc9e9a6d0bfcf26fe0aa9ff5f825a58ff3d2a868ef38c87d7562c64 WHIRLPOOL 2782b04c17322b964a8551c8a8892731ffc35c5136186c6070b051c18c44794b39f7c6ff5e3c4b6caa0ade98998304c20fbe63978388b4f921159de504664375
 DIST gradle-2.14.1-all.zip 69028536 SHA256 88a910cdf2e03ebbb5fe90f7ecf534fc9ac22e12112dc9a2fee810c598a76091 SHA512 c62b3df6e16711e193bdc42b0248d9ccac76f2ba9088008265b40feaae539aebb9d36a6adf8513836b0b95b3c6180bddb918ee1b55e2af234f7a03a43f9d655a WHIRLPOOL 2e9c76a65df14a1c13e9d29e1cb2a30d0822a8625cf2a5dd582ceee230545e52812cf2ab285c38af516d11fcecce11568c88f491720325860db11e11336ef385
-DIST gradle-2.2.1-all.zip 58602849 SHA256 1d7c28b3731906fd1b2955946c1d052303881585fc14baedd675e4cf2bc1ecab SHA512 16775f13a4bc2e9bec32b2838434dace7f04fb49461d65a8e400004a4142c9742930a91f07bf1db498d3f68bfaa1be49387f36039354280edb7cd9d6783e43fc WHIRLPOOL 6f8b99e08054f7c1d2ee24fb2bf84d099dcdf9e61dc6b92a03dc2e0d6747dec81f09769d50d893eee5c4026f2e46d1fecd11a3813b8f7fb9db8c9b3a46926477
-DIST gradle-2.3-all.zip 60081333 SHA256 515962aeec8c3e67b97f0c13c4575beeed1b5da16181d8b9054416339edc8c2d SHA512 316a8bcfdab50bba0f0d19d42fff8100cca8bfbaca919255da5beb3ae7f082bf40d021e1c668075260d74116058acee8f52911b0dce036800701824ecbc26343 WHIRLPOOL 4a8fe3a6fffb26cb13f9ff4e70f99e9d13f0a9bec5a3267f310d5987ff93a1df8c446816a463654e84f5b179ad72bdab01404087ddcac212576268b7adfada5b
-DIST gradle-2.4-all.zip 65433094 SHA256 371cb9fbebbe9880d147f59bab36d61eee122854ef8c9ee1ecf12b82368bcf10 SHA512 a09b94f3453043ee3d73fbf9e029df8f82f94f27071338a1557e9504a0cf69ddd0f58821a021e23d798d66872c54c52c9e850bdfb559c674b9d418de78de60d5 WHIRLPOOL 816e04e67c55c36f1224534a40f5398f7aa32abe8f40d336d5596ccccb260d784de0fa86e8684e7cae3b1c00a0ffffd3067d61294aca44e23bef50ddd7627e41
-DIST gradle-2.6-all.zip 65594074 SHA256 5489234fc9c9733fc4115055618763ccb4d916d667980e6ab4fa57fc81197d16 SHA512 29ec0ba12d5ac0658e7925ad760b25462384d7bfcb249638b42a0ff608b88aa9d7ec04c5e590d4c368c7ed8529b6d6a07dde552c2ae6dda7e33578a16cd4d41b WHIRLPOOL d7f8cdfef17960426685aff149c26151c25d82973b91f3d26ace39f21d030e09460fad3f77fd41c4932c3c5cdce8f9e78e38a30e6b365255c28d4dfb913d9564
-DIST gradle-2.7-all.zip 65866593 SHA256 2ba0aaa11a3e96ec0af31d532d808e1f09cc6dcad0954e637902a1ab544b9e60 SHA512 89d2ec75d94b7e341dfd6b41813174ea08b12d097a4b58ecf31f56feea3335d52b897d3d03df7876b5b6182e09bbb215906d958531e60026bfd72541adc48ed7 WHIRLPOOL 4542918bcacface934b027620633b6821359b837996e530effd0a4bf435750320cd055fee8f6f26cd247fab0768cb8d4c03cc608b142c4bd4b9beafa3b663dfb
-DIST gradle-2.8-all.zip 66378720 SHA256 65f3880dcb5f728b9d198b14d7f0a678d35ecd33668efc219815a9b4713848be SHA512 94ed03c08748688aa54ed48c4c634d97a7909c2f479d82508d736cbf0f4cf44da7d17922643abe275d4602d6e73fabb3aa5a95dc907bd98910f70675433464e7 WHIRLPOOL de9c9014000915aef9fde5e4a7143847fbc72df3cc409db4044ce4c37ec0f1d7cd035528ccf178018d551588a7c09d64f64d7033fe3ce490e98df881b9f92014
-DIST gradle-2.9-all.zip 66616757 SHA256 4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9 SHA512 c73218fa822971afe148ffdb79c5b05fe86f3ba894b3c9c6c0b3c31d4ac5a51e948fa80c4a42e77c96a3e657c316cd2c213ef5d92147e233b46fa94a1f584234 WHIRLPOOL ba72cdc1362bdd950425eb00f8ef7842f4dd6c567d4a94a44ae63c62cef61ea44d3a14db2674fd58084748ca4c273a74dd6df7fffe3fad9b2798081747ea9b8a
-DIST gradle-3.1-all.zip 88979389 SHA256 43be380834a13e28e9504c21f67fe1a8895ab54f314a6596601896dca7213482 SHA512 d98061443f7c5bdd161a75a49efcc3cb0a46847e5d341a3116d44c1379dc5bb35ef4a75a1043649a9ed836d355c0ccd50a15638e5283bea66c37b95968051aa8 WHIRLPOOL 25030e07201c4b5966576ad9d899248ca35c2eb256626de19bd37ceacb9dc2dec8ef6634b9ec52b176c8bf09c6d0cdb66e5d18430a9fbec81cfd7497d4dd522a
-DIST gradle-3.3-all.zip 91388147 SHA256 71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3 WHIRLPOOL d2058d046137b507aecae0ac8ebdc719dc1e1c253162be1975ff9daaca04178398b7621c142ed467a8608bf99d952c1046306aeb3b96626bf70899d7213ba91b
 DIST gradle-3.4-all.zip 91570006 SHA256 37c2fdce55411e4c89b896c292cae1f8f437862c8433c8a74cfc3805d7670c0a SHA512 5f9a23078593a6880c55f58ec14ea104781a10775d76649d941b7dc12f4f41936ab95702fb00e8154f58819e60d8b67a865cc1b90066dd38eb56750cc16dd465 WHIRLPOOL 47f056a40a15142422f7bbb508aa549fdbade142f54b3cbc8a7852bfb6a340bd9c808197d346d9a20e918090893831e7888a8656650efe8693138217330f173d
 DIST gradle-3.5-all.zip 95084513 SHA256 d84bf6b6113da081d0082bcb63bd8547824c6967fe68704d1e3a6fde822b7212 SHA512 13eb1b73a1e432f3230e3b030de3b50bbd8dfce11b3bb9079fc0ab76e865470e3cb10720def2ad0e514383fef50e468ccc54ca7751c0065fb8aae55a40c54479 WHIRLPOOL a2402df200bdd9977e38983cae2c129a95fac42b4ac6d3a4107dd2533fd9b66b20a39110431a0bff8c62311eabb85406581cd44733382562e26f780f5f389364
+DIST gradle-4.0-all.zip 90002272 SHA256 a0af75d3d35799a90f56255a24de69c53cd9aea90f0b532586c8f818668e1734 SHA512 4a7ad4519bde94e63f7e14f83180524ee5c63d496d49c41ac7add64ccad1b105bd9a20f2e4bc0791c539845f97e6985328bd732b8ad8d5029afd87ff8b59b2eb WHIRLPOOL 0b1bb585646a83bd17a7d609e8a0f96abf5da16a737a2236c7aace19fc499fddc74a4a412a076835cf8ff9a2bda32447a81fc832871c415a706a29dc451a81fd
diff --git a/dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild b/dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild
deleted file mode 100644
index c06d371d..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	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/${P}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.12.ebuild b/dev-java/gradle-bin/gradle-bin-2.12.ebuild
deleted file mode 100644
index c06d371d..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	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/${P}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.13.ebuild b/dev-java/gradle-bin/gradle-bin-2.13.ebuild
deleted file mode 100644
index c06d371d..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	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/${P}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.14.ebuild b/dev-java/gradle-bin/gradle-bin-2.14.ebuild
deleted file mode 100644
index 132147da..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.14.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-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="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	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/${P}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-2.2.1.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.2.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.3.ebuild b/dev-java/gradle-bin/gradle-bin-2.3.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.4.ebuild b/dev-java/gradle-bin/gradle-bin-2.4.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.6.ebuild b/dev-java/gradle-bin/gradle-bin-2.6.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.7.ebuild b/dev-java/gradle-bin/gradle-bin-2.7.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.8.ebuild b/dev-java/gradle-bin/gradle-bin-2.8.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-2.9.ebuild b/dev-java/gradle-bin/gradle-bin-2.9.ebuild
deleted file mode 100644
index 541892c9..00000000
--- a/dev-java/gradle-bin/gradle-bin-2.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	fi
-
-	# examples
-	if use examples ; then
-		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}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-3.1.ebuild b/dev-java/gradle-bin/gradle-bin-3.1.ebuild
deleted file mode 100644
index 132147da..00000000
--- a/dev-java/gradle-bin/gradle-bin-3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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="~x86 ~amd64"
-
-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="${EROOT}usr/share/${PN}-${SLOT}"
-
-	dodoc changelog.txt 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
-	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/${P}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-3.3.ebuild b/dev-java/gradle-bin/gradle-bin-4.0.ebuild
index c3b8a5f4..013665cc 100644
--- a/dev-java/gradle-bin/gradle-bin-3.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.0.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit java-pkg-2
 
@@ -17,7 +16,7 @@ SLOT="${PV}"
 KEYWORDS="~x86 ~amd64"
 
 DEPEND="app-arch/zip
-	app-eselect/eselect-gradle"
+		app-eselect/eselect-gradle"
 RDEPEND=">=virtual/jdk-1.6"
 
 IUSE="source doc examples"
@@ -25,7 +24,7 @@ IUSE="source doc examples"
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
 
 	dodoc docs/release-notes.html getting-started.html
 
@@ -49,7 +48,7 @@ src_install() {
 	insinto "${gradle_dir}"
 	doins -r bin/ lib/
 	fperms 755 "${gradle_dir}/bin/gradle"
-	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${P}"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
 }
 
 pkg_postinst() {