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

["Florian Schmaus" <flow@gentoo.org>]

commit:     a0cc7bfaf37b91c8925e18b4ca9bf8592a1c31a8
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 07:24:53 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 07:24:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=a0cc7bfa

dev-java/gradle: update to 7.1, does not yet work

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/gradle/Manifest            |  3 +-
 dev-java/gradle/gradle-3.1.ebuild   | 70 -------------------------------------
 dev-java/gradle/gradle-7.1.0.ebuild | 50 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 72 deletions(-)

diff --git a/dev-java/gradle/Manifest b/dev-java/gradle/Manifest
index 4bee18a0..28e0970b 100644
--- a/dev-java/gradle/Manifest
+++ b/dev-java/gradle/Manifest
@@ -1,2 +1 @@
-DIST gradle-3.1-rc-1-bin.zip 68966616 SHA256 9d67811a2dee405c920e6bced2d687142e2378eb33c3af960bdbaef39bcb2485 SHA512 c7a093921db88d3147a4214a484cede06f1d436614b65ac43420a9a3615a61c01692d177cee2cf3f306226cc69e5866fef4a462e6bd8330a84fe1f363a4c424c WHIRLPOOL 62b207d3e06d866e988c72bb09f33ed1eee09d352f1f4647003b0d215e610754401ea4041ebe1ee391316abbeaaaf3ca7bacac3658c7524168c1c0969587eba2
-DIST gradle-3.1-src.zip 18372591 SHA256 94273588a8ecdedadcf842467e0e71c3b6e2ee7cb2818aa8bf840e44a8a56569 SHA512 fcbed86a2278c613dcf032e4110c53080dfc81561073447b821a37a98b44913c573fb006f6bc08d1e6cd82540b1ccae2167ec590eafa5f655ff8716d548dfad0 WHIRLPOOL 6cd5a79863a86b70730b2cf67ce4edd3ceb7b10d0a112302a5297e430bb5c294c7a970e3a28905a270bcfbd0d41d8dcc6c437c2482462420c98b8c92a8732c6b
+DIST gradle-7.1.0.tar.gz 25092640 BLAKE2B f5514b78f3233231e9faa0e7ab6d20dd3b466ee45b9b25917594860939be47789d9a414e5c81ade190fb7d08a5d329c03c91d4bdca3ed35fbe8596aaa28bc170 SHA512 9d55f71af47153ebea685cfaf7ecfd98502654b500f9f1cd9c252ec65b1931c77f2b6d56b42513deae655ea46b08e306a6db4bd516dd5e8d46a47c51bb77186d

diff --git a/dev-java/gradle/gradle-3.1.ebuild b/dev-java/gradle/gradle-3.1.ebuild
deleted file mode 100644
index 9ca71df1..00000000
--- a/dev-java/gradle/gradle-3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="
-	http://services.gradle.org/distributions/${P}-src.zip
-	http://services.gradle.org/distributions/${P}-rc-1-bin.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.5"
-IUSE="doc"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-
-	sed -i "s|https\\\\://services.gradle.org/distributions/|file://${DISTDIR}/|" \
-		gradle/wrapper/gradle-wrapper.properties \
-		|| die 'unable to edit source fetch'
-}
-
-src_compile() {
-	./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
-
-	insinto "${gradle_dir}"
-
-	# 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 || die
-	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/gradle-7.1.0.ebuild b/dev-java/gradle/gradle-7.1.0.ebuild
new file mode 100644
index 00000000..7c2d03bf
--- /dev/null
+++ b/dev-java/gradle/gradle-7.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gradle
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+HOMEPAGE="https://www.gradle.org/"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-eselect/eselect-gradle
+"
+RDEPEND=">=virtual/jdk-1.8:*"
+
+# Hopefully we can remove network-sandbox at one point in the future
+# from RESTRICT. But for now, it is necessary.
+RESTRICT="network-sandbox"
+
+src_compile() {
+	if ! I_KNOW_THAT_DEV_JAVA_GRADLE_DOES_NOT_YET_WORK; then
+		die "You don't know that dev-java/gradle does not yet work"
+	fi
+
+	local gradle_dir="${ED}/usr/share/${PN}-${SLOT}"
+
+	egradle install "-Pgradle_installPath=${gradle_dir}"
+
+	egradle :distributions-full:binDistributionZip
+	egradle assemble
+}
+
+src_install() {
+	local gradle_dir="${ED}/usr/share/${PN}-${SLOT}"
+
+	egradle install "-Pgradle_installPath=${gradle_dir}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}