commit: a1241ab5ac6c5337ba86fe2dd6a6ddc7656da4ae Author: Kaibo Ma <kaiboma06 <AT> gmail <DOT> com> AuthorDate: Tue Mar 2 12:37:08 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Tue Mar 2 12:37:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1241ab5
dev-java/gradle-*: format ebuilds Signed-off-by: Kaibo Ma <kaiboma06 <AT> gmail.com> .../gradle-base-annotations-6.8.2.ebuild | 2 +- .../gradle-base-services-6.8.2.ebuild | 26 ++++++++++++++++++---- .../gradle-build-operations-6.8.2.ebuild | 5 +++-- .../gradle-hashing/gradle-hashing-6.8.2.ebuild | 5 +++-- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild b/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild index e66c8dc5..d2fb22e3 100644 --- a/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild +++ b/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Build automation tool for JVM Languages, C(++), etc." HOMEPAGE="https://gradle.org"; -SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz"; +SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="6.8" diff --git a/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild b/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild index 08ee2e20..f3629aa6 100644 --- a/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild +++ b/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild @@ -9,14 +9,24 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Build automation tool for JVM Languages, C(++), etc." HOMEPAGE="https://gradle.org"; -SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz"; +SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="6.8" KEYWORDS="~amd64" -CDEPEND="dev-java/javax-inject:0 dev-java/slf4j-api:0 dev-java/guava:20 dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-java/asm:7 dev-java/gradle-base-annotations:${SLOT} dev-java/gradle-hashing:${SLOT} dev-java/gradle-build-operations:${SLOT}" -JDK_DEPEND="dev-java/openjdk:11 dev-java/openjdk-bin:11" +CDEPEND="dev-java/javax-inject:0 +dev-java/slf4j-api:0 +dev-java/guava:20 +dev-java/commons-lang:2.1 +dev-java/commons-io:1 +dev-java/asm:7 +dev-java/gradle-base-annotations:${SLOT} +dev-java/gradle-hashing:${SLOT} +dev-java/gradle-build-operations:${SLOT}" + +JDK_DEPEND="dev-java/openjdk:11 +dev-java/openjdk-bin:11" RDEPEND="|| ( dev-java/openjdk-jre-bin:11 ${JDK_DEPEND} ) ${CDEPEND}" @@ -26,7 +36,15 @@ ${CDEPEND}" MY_PN="${PN/gradle-/}" S="${WORKDIR}/gradle-${PV}" JAVA_SRC_DIR="subprojects/${MY_PN}/src/main/java" -JAVA_GENTOO_CLASSPATH="javax-inject slf4j-api guava-20 commons-lang-2.1 commons-io-1 asm-7 gradle-base-annotations-${SLOT} gradle-hashing-${SLOT} gradle-build-operations-${SLOT}" +JAVA_GENTOO_CLASSPATH="javax-inject +slf4j-api +guava-20 +commons-lang-2.1 +commons-io-1 +asm-7 +gradle-base-annotations-${SLOT} +gradle-hashing-${SLOT} +gradle-build-operations-${SLOT}" JAVA_PKG_WANT_TARGET=11 JAVA_PKG_WANT_SOURCE=11 JAVA_PKG_WANT_BUILD_VM="openjdk-bin-11 openjdk-11" diff --git a/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild b/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild index 66da109a..bae4fb75 100644 --- a/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild +++ b/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild @@ -9,13 +9,14 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Build automation tool for JVM Languages, C(++), etc." HOMEPAGE="https://gradle.org"; -SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz"; +SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="6.8" KEYWORDS="~amd64 ~x86" -CDEPEND="dev-java/slf4j-api dev-java/gradle-base-annotations:${SLOT}" +CDEPEND="dev-java/slf4j-api +dev-java/gradle-base-annotations:${SLOT}" RDEPEND=">=virtual/jre-1.8 ${CDEPEND}" diff --git a/dev-java/gradle-hashing/gradle-hashing-6.8.2.ebuild b/dev-java/gradle-hashing/gradle-hashing-6.8.2.ebuild index f1a0f302..a5b184eb 100644 --- a/dev-java/gradle-hashing/gradle-hashing-6.8.2.ebuild +++ b/dev-java/gradle-hashing/gradle-hashing-6.8.2.ebuild @@ -9,13 +9,14 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Build automation tool for JVM Languages, C(++), etc." HOMEPAGE="https://gradle.org"; -SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz"; +SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="6.8" KEYWORDS="~amd64 ~x86" -CDEPEND="dev-java/guava:20 dev-java/gradle-base-annotations:${SLOT}" +CDEPEND="dev-java/guava:20 +dev-java/gradle-base-annotations:${SLOT}" RDEPEND=">=virtual/jre-1.8 ${CDEPEND}"
