commit: e619b4bf7bdc8bdfa5757e4730fbe5241d532fa0 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Fri Jun 25 10:25:05 2021 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Jun 25 10:40:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e619b4bf
dev-java/gradle-bin: add 6.8.3 and 7.1, drop old Unlike the dropped 6.3 ebuild, these ebuilds only install versioned gradle symlinks in /usr/bin, e.g. /usr/bin/gradle-bin-7.1. The /usr/bin/gradle symlink is managed by app-eselect/eselect-gradle. Closes: https://bugs.gentoo.org/339574 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/gradle-bin/Manifest | 3 +- ...adle-bin-6.3.ebuild => gradle-bin-6.8.3.ebuild} | 38 ++++++++++++++-------- ...gradle-bin-6.3.ebuild => gradle-bin-7.1.ebuild} | 38 ++++++++++++++-------- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index a76117f75ea..fec5d60f9a4 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -1 +1,2 @@ -DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d +DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564 +DIST gradle-bin-7.1.zip 154782196 BLAKE2B 8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd SHA512 30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01 diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild similarity index 65% copy from dev-java/gradle-bin/gradle-bin-6.3.ebuild copy to dev-java/gradle-bin/gradle-bin-6.8.3.ebuild index 1623bb9c3f3..dfbd1549205 100644 --- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild +++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild @@ -19,31 +19,43 @@ LICENSE="Apache-2.0" SLOT="${PV}" KEYWORDS="~amd64 ~x86" +DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" -DEPEND=">=virtual/jre-1.8" -RDEPEND=">=virtual/jdk-1.8" +RDEPEND=" + ${DEPEND} + >=virtual/jre-1.8:* +" S="${WORKDIR}/${MY_P}" +src_compile() { + : +} + src_install() { local gradle_dir="/usr/share/${PN}-${SLOT}" - insinto "${gradle_dir}" - doins -r lib/ - - exeinto "${gradle_dir}"/bin - doexe bin/${MY_PN} - dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}" + if use source; then + java-pkg_dosrc src + fi docinto html dodoc -r docs/release-notes.html - - if use doc ; then + if use doc; then dodoc -r docs/{dsl,userguide} java-pkg_dojavadoc docs/javadoc fi - if use source ; then - java-pkg_dosrc src/* - 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.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.ebuild similarity index 65% rename from dev-java/gradle-bin/gradle-bin-6.3.ebuild rename to dev-java/gradle-bin/gradle-bin-7.1.ebuild index 1623bb9c3f3..dfbd1549205 100644 --- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild +++ b/dev-java/gradle-bin/gradle-bin-7.1.ebuild @@ -19,31 +19,43 @@ LICENSE="Apache-2.0" SLOT="${PV}" KEYWORDS="~amd64 ~x86" +DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" -DEPEND=">=virtual/jre-1.8" -RDEPEND=">=virtual/jdk-1.8" +RDEPEND=" + ${DEPEND} + >=virtual/jre-1.8:* +" S="${WORKDIR}/${MY_P}" +src_compile() { + : +} + src_install() { local gradle_dir="/usr/share/${PN}-${SLOT}" - insinto "${gradle_dir}" - doins -r lib/ - - exeinto "${gradle_dir}"/bin - doexe bin/${MY_PN} - dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}" + if use source; then + java-pkg_dosrc src + fi docinto html dodoc -r docs/release-notes.html - - if use doc ; then + if use doc; then dodoc -r docs/{dsl,userguide} java-pkg_dojavadoc docs/javadoc fi - if use source ; then - java-pkg_dosrc src/* - 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 }
