commit: 914bc8d4558326eabbc747edfe867e80d65610ef
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 06:23:04 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 06:23:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=914bc8d4
dev-java/gradle-bin: delete old, update ebuilds
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/gradle-bin/Manifest | 9 -----
dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild | 60 ----------------------------
dev-java/gradle-bin/gradle-bin-4.10.3.ebuild | 13 +++---
dev-java/gradle-bin/gradle-bin-5.1.1.ebuild | 60 ----------------------------
dev-java/gradle-bin/gradle-bin-5.2.1.ebuild | 60 ----------------------------
dev-java/gradle-bin/gradle-bin-5.4.1.ebuild | 60 ----------------------------
dev-java/gradle-bin/gradle-bin-5.5.1.ebuild | 60 ----------------------------
dev-java/gradle-bin/gradle-bin-5.6.2.ebuild | 13 +++---
dev-java/gradle-bin/gradle-bin-6.2.2.ebuild | 55 -------------------------
dev-java/gradle-bin/gradle-bin-6.4.1.ebuild | 55 -------------------------
dev-java/gradle-bin/gradle-bin-6.6.1.ebuild | 55 -------------------------
dev-java/gradle-bin/gradle-bin-6.7.1.ebuild | 55 -------------------------
dev-java/gradle-bin/gradle-bin-6.8.3.ebuild | 2 +-
dev-java/gradle-bin/gradle-bin-7.1.ebuild | 2 +-
14 files changed, 18 insertions(+), 541 deletions(-)
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index ea1bccd0..73b25d59 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,13 +1,4 @@
-DIST gradle-3.5-all.zip 95084513 BLAKE2B
17ee9fb3569842f21f26c00f711ab38a8b295b35e5eb6715e2958a9c2318690acbfe2ff018ecbe5e85eadd0bc1708dccad8972f7fe07d485f10aec84b113cafe
SHA512
13eb1b73a1e432f3230e3b030de3b50bbd8dfce11b3bb9079fc0ab76e865470e3cb10720def2ad0e514383fef50e468ccc54ca7751c0065fb8aae55a40c54479
DIST gradle-4.10.3-all.zip 117609625 BLAKE2B
c74da2bd24783bd80d6800d23bd2f7676e6871e69f981695d8eb28d000fd47739607c1840568cbe7c934eca21754ac3cb890925e45af9c43266bd31006274b8b
SHA512
a688267399a1632d86e8c3d28e34ea58992bba64968f4d01b6c3e4ea63081167c556806b1e2718e6858a8d402c941fcdcbe761f3622fa2f74bd53dedffa620ff
-DIST gradle-5.1.1-all.zip 130765970 BLAKE2B
95b4ceb2e06b62607b9151bd085ab607c0939f3d6c5a1abf23e2f14ec54b5b3bc26c02fce2db9d3e77be6e219a72a7d0faa4d8edfaa072d2bcd9b65e03e98243
SHA512
31f43751d517f5ecf47ba66332563bc7ca1a3145adfb09190ec0232107fc812a7e8114a1d374aeb2378c88f6433b2d15f58f80706bb8e166e7a1be8a8a444d71
-DIST gradle-5.2.1-all.zip 132549774 BLAKE2B
c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d
SHA512
e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b
-DIST gradle-5.4.1-all.zip 132768903 BLAKE2B
d5d3f770734268843741ce5ce9f3c0940882064bbb9b019d7954af90e54ae87c4df9e3385cce14919f764d9fe3713bf8f3f61edc6aea25b82ab267e3369d39e2
SHA512
8074546752c0b910f817c53ba42dfe5b2d434da906706c8227d8a8dbc51b0d9c5c2df75d15f6c5dbe57c20f3791715a89a00348a2663a664c97c8c09543d2148
-DIST gradle-5.5.1-all.zip 136383676 BLAKE2B
4cb939d297107e3cedfe720a3006742266e6c35a1bf80a7689f29cebf61bce3720d2c3b786b41a98d8bac4d71dac93d482885b63f64f6fd632657e0ae848cb1c
SHA512
a94e5e683efb18c51a74377a1ece710f299e6f69e8f726f586b4ce90917c88bcba5cddabcfb96b3c35054200d970ffbe9db08c7c8cc2af2b98a409b79a78aa29
DIST gradle-5.6.2-all.zip 139632144 BLAKE2B
6d43594a752cf8eedb9958ac76a703cee35561779a152324e8429a1ce79b3c169dd5d34da780eec3147bae26472416f60fe77272927755ee5455481ca6c14e0f
SHA512
f3e400d4b9dd3b11ab1bebb20fa927495760c4c57da814d08eeda0851d04609b719f930c1ce3030e35004a8af546b8847e9b389eb91c2a12da0ade974dab5ced
-DIST gradle-6.2.2-all.zip 139200435 BLAKE2B
5e9a0a1418e5bbeb7c26435d1d851bb68bc09793fc90aa48a18b3d9fac2610dc5736f16dc43ae5fc8f2fe88bf204b3f5d7faa55dc481c80bc95e27e6a6acb047
SHA512
0aff7221aeba40049015947fcb9949658b5e497f2e9dc9d4109bb46e923d6734cb402a5347c85f9aa0440672606e21e3d9cd65a3b065895ea2ede24713b31737
-DIST gradle-6.4.1-all.zip 145723302 BLAKE2B
a1a42a672d117365a8c89d7e68da295ac33e340b5a74d4f078ca83a09efa3c696e208308b4c67ecf6fadce35a358fa0cabfea53c1fd04951745d5510f860e8b0
SHA512
616e55e3b611261831afd031495ccbd5f929b9d67ea70e7ed76899dd35cc90ab48e793f3912f6f44ce400dcd3e517a7b56856a79add281ea556b2c5cfc8d91d5
-DIST gradle-6.6.1-all.zip 145214952 BLAKE2B
ad3afde7f47a4aa1b618b2a4bb0ef8178a4fc4f08dfeb0957b29a92fa5eb7601074a41631becfd8e8a5bc35bcf03ee95b324ed47da068c43e6568c7f7d8b20fc
SHA512
42d438d614fb9cbc5cd8a240eca940fc3d384dfa234f7146eb1dbb53059be7d1ce87504ddfa56bf2e60cba1f9ed28030d8332893e2bee56a71be15aba8805a4c
-DIST gradle-6.7.1-all.zip 146321962 BLAKE2B
9127ce5bc05d672930c00efb645ce11bfccb50c55f8a6248337fa3ac5417e1fff6581ef7647c2eb8faad94d5c9b1108bea6d971b0ef5d603bb90bf43f62a2aec
SHA512
9cc4e349b4ecfdd327930787ce2d26976eb3d9fb83f224efc40cd38ba078e88883851c4b167eea5d176e935764572ecfb795984724f6abd2140da7b9cff66935
DIST gradle-6.8.3-all.zip 150631445 BLAKE2B
935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6
SHA512
fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
DIST gradle-7.1-all.zip 154782196 BLAKE2B
8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd
SHA512
30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01
diff --git a/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild
b/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild
deleted file mode 100644
index 61ad91fd..00000000
--- a/dev-java/gradle-bin/gradle-bin-3.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://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.10.3.ebuild
b/dev-java/gradle-bin/gradle-bin-4.10.3.ebuild
index 61ad91fd..66a89bb4 100644
--- a/dev-java/gradle-bin/gradle-bin-4.10.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-4.10.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit java-pkg-2
@@ -15,9 +15,12 @@ LICENSE="Apache-2.0"
SLOT="${PV}"
KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/zip
- app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.6"
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+ ${DEPEND}
+ >=virtual/jre-1.6:*
+"
IUSE="source doc examples"
diff --git a/dev-java/gradle-bin/gradle-bin-5.1.1.ebuild
b/dev-java/gradle-bin/gradle-bin-5.1.1.ebuild
deleted file mode 100644
index 78fcc496..00000000
--- a/dev-java/gradle-bin/gradle-bin-5.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://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-5.2.1.ebuild
b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild
deleted file mode 100644
index 78fcc496..00000000
--- a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://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-5.4.1.ebuild
b/dev-java/gradle-bin/gradle-bin-5.4.1.ebuild
deleted file mode 100644
index 78fcc496..00000000
--- a/dev-java/gradle-bin/gradle-bin-5.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://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-5.5.1.ebuild
b/dev-java/gradle-bin/gradle-bin-5.5.1.ebuild
deleted file mode 100644
index 78fcc496..00000000
--- a/dev-java/gradle-bin/gradle-bin-5.5.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://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-5.6.2.ebuild
b/dev-java/gradle-bin/gradle-bin-5.6.2.ebuild
index 78fcc496..66a89bb4 100644
--- a/dev-java/gradle-bin/gradle-bin-5.6.2.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-5.6.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit java-pkg-2
@@ -15,9 +15,12 @@ LICENSE="Apache-2.0"
SLOT="${PV}"
KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/zip
- app-eselect/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.6"
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+ ${DEPEND}
+ >=virtual/jre-1.6:*
+"
IUSE="source doc examples"
diff --git a/dev-java/gradle-bin/gradle-bin-6.2.2.ebuild
b/dev-java/gradle-bin/gradle-bin-6.2.2.ebuild
deleted file mode 100644
index 4f904e61..00000000
--- a/dev-java/gradle-bin/gradle-bin-6.2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://www.gradle.org/";
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip
- app-eselect/eselect-gradle"
-RDEPEND="virtual/jre"
-
-IUSE="source doc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
- dodoc docs/release-notes.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
-
- 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-6.4.1.ebuild
b/dev-java/gradle-bin/gradle-bin-6.4.1.ebuild
deleted file mode 100644
index 4f904e61..00000000
--- a/dev-java/gradle-bin/gradle-bin-6.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://www.gradle.org/";
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip
- app-eselect/eselect-gradle"
-RDEPEND="virtual/jre"
-
-IUSE="source doc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
- dodoc docs/release-notes.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
-
- 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-6.6.1.ebuild
b/dev-java/gradle-bin/gradle-bin-6.6.1.ebuild
deleted file mode 100644
index 4f904e61..00000000
--- a/dev-java/gradle-bin/gradle-bin-6.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://www.gradle.org/";
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip
- app-eselect/eselect-gradle"
-RDEPEND="virtual/jre"
-
-IUSE="source doc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
- dodoc docs/release-notes.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
-
- 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-6.7.1.ebuild
b/dev-java/gradle-bin/gradle-bin-6.7.1.ebuild
deleted file mode 100644
index 4f904e61..00000000
--- a/dev-java/gradle-bin/gradle-bin-6.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://services.gradle.org/distributions/${MY_P}-all.zip";
-HOMEPAGE="https://www.gradle.org/";
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip
- app-eselect/eselect-gradle"
-RDEPEND="virtual/jre"
-
-IUSE="source doc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
-
- dodoc docs/release-notes.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
-
- 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-6.8.3.ebuild
b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
index d20aec89..466cc26f 100644
--- a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
@@ -19,7 +19,7 @@ DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
RDEPEND="
${DEPEND}
- virtual/jre
+ >=virtual/jre-1.8:*
"
IUSE="source doc"
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.ebuild
b/dev-java/gradle-bin/gradle-bin-7.1.ebuild
index d20aec89..466cc26f 100644
--- a/dev-java/gradle-bin/gradle-bin-7.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.1.ebuild
@@ -19,7 +19,7 @@ DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
RDEPEND="
${DEPEND}
- virtual/jre
+ >=virtual/jre-1.8:*
"
IUSE="source doc"
