From eeae1418821adb57307c3b4d6e56b663254b813e Mon Sep 17 00:00:00 2001 From: Kaibo Ma Date: Wed, 3 Mar 2021 02:17:58 +0800 Subject: [PATCH 1/4] dev-java/gradle-base-services: new package Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Kaibo Ma --- dev-java/gradle-base-services/Manifest | 1 + .../gradle-base-services-6.8.2.ebuild | 33 +++++++++++++++++++ dev-java/gradle-base-services/metadata.xml | 8 +++++ 3 files changed, 42 insertions(+) create mode 100644 dev-java/gradle-base-services/Manifest create mode 100644 dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild create mode 100644 dev-java/gradle-base-services/metadata.xml diff --git a/dev-java/gradle-base-services/Manifest b/dev-java/gradle-base-services/Manifest new file mode 100644 index 0000000000..346b6325bd --- /dev/null +++ b/dev-java/gradle-base-services/Manifest @@ -0,0 +1 @@ +DIST v6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 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 new file mode 100644 index 0000000000..08ee2e200b --- /dev/null +++ b/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +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" + +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" + +RDEPEND="|| ( dev-java/openjdk-jre-bin:11 ${JDK_DEPEND} ) +${CDEPEND}" +DEPEND="|| ( ${JDK_DEPEND} ) +${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_PKG_WANT_TARGET=11 +JAVA_PKG_WANT_SOURCE=11 +JAVA_PKG_WANT_BUILD_VM="openjdk-bin-11 openjdk-11" +RESTRICT="test" diff --git a/dev-java/gradle-base-services/metadata.xml b/dev-java/gradle-base-services/metadata.xml new file mode 100644 index 0000000000..cac9177ff0 --- /dev/null +++ b/dev-java/gradle-base-services/metadata.xml @@ -0,0 +1,8 @@ + + + + + kaiboma06@gmail.com + Kaibo Ma + + From a1241ab5ac6c5337ba86fe2dd6a6ddc7656da4ae Mon Sep 17 00:00:00 2001 From: Kaibo Ma Date: Tue, 2 Mar 2021 20:37:08 +0800 Subject: [PATCH 2/4] dev-java/gradle-*: format ebuilds Signed-off-by: Kaibo Ma --- .../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-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 e66c8dc5ba..d2fb22e365 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 08ee2e200b..f3629aa6d9 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 66da109a7c..bae4fb75db 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 f1a0f302eb..a5b184eb1a 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}" From c02d8e715c519ca77b817cfa615c9834f53f20ca Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 2 Mar 2021 14:19:01 +0100 Subject: [PATCH 3/4] games-action/minecraft-launcher: version bump Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- games-action/minecraft-launcher/Manifest | 4 ++-- ...her-2.2.1441.ebuild => minecraft-launcher-2.2.1867.ebuild} | 0 ...67_beta.ebuild => minecraft-launcher-2.2.2012_beta.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename games-action/minecraft-launcher/{minecraft-launcher-2.2.1441.ebuild => minecraft-launcher-2.2.1867.ebuild} (100%) rename games-action/minecraft-launcher/{minecraft-launcher-2.2.1867_beta.ebuild => minecraft-launcher-2.2.2012_beta.ebuild} (100%) diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest index c2a4e32f24..7544d12356 100644 --- a/games-action/minecraft-launcher/Manifest +++ b/games-action/minecraft-launcher/Manifest @@ -1,5 +1,5 @@ DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125 -DIST minecraft-launcher-2.2.1441.tar.gz 77295040 BLAKE2B 9c56dc06394e9087d345860ea92daf0e01cb10a45196e249cd5bdcce1d326ccbbf788da2610cbb7715740fc73857be1da7fdbc975b7b12a93fd39699d68d9b5e SHA512 b384bbb621a2c379eb6c7ab865252e31a54ad0bd4b2b29ff25d4be635571d967e1be9dfb792f20d0edc3529fd8762a0a73b9bd67456339450ad8ccc6b16de64d -DIST minecraft-launcher-2.2.1867_beta.tar.gz 76767905 BLAKE2B 62af6c11a8ea483cb87b59022ffbfd1d6972aabb4323509452a486afc9de81008872f74d53ea039b1b8ce5adbc9f13bba1937236598f529556ced2d29442f063 SHA512 1a252aab832c5e3fae13a462c22c44fdb0a5727465f643616201ee60ce3810fa9ea3ab59aabfa5a8d0b10976672e8187df9275f3f23d1c42021b8cd5336ec00e +DIST minecraft-launcher-2.2.1867.tar.gz 76767905 BLAKE2B 62af6c11a8ea483cb87b59022ffbfd1d6972aabb4323509452a486afc9de81008872f74d53ea039b1b8ce5adbc9f13bba1937236598f529556ced2d29442f063 SHA512 1a252aab832c5e3fae13a462c22c44fdb0a5727465f643616201ee60ce3810fa9ea3ab59aabfa5a8d0b10976672e8187df9275f3f23d1c42021b8cd5336ec00e +DIST minecraft-launcher-2.2.2012_beta.tar.gz 76656331 BLAKE2B 318c23b665b5442108e56bca08f4d6401778666f103af7e1fd884466a3ccc32f04736b1e935488e31c028972c111eb8b84b3a18d54a92a4c8ca6200957dfee3f SHA512 2c22a698ce124bb81d82c24a749cf40e333de2b776087378aa21817d4c5f1b71796fea307a50db8e2f3fb692ee79a148b7b241e8fee9b3aa2ab98dbd6e1b8c07 DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.2.1441.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.2.1867.ebuild similarity index 100% rename from games-action/minecraft-launcher/minecraft-launcher-2.2.1441.ebuild rename to games-action/minecraft-launcher/minecraft-launcher-2.2.1867.ebuild diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.2.1867_beta.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.2.2012_beta.ebuild similarity index 100% rename from games-action/minecraft-launcher/minecraft-launcher-2.2.1867_beta.ebuild rename to games-action/minecraft-launcher/minecraft-launcher-2.2.2012_beta.ebuild From 8062caa835b2ad7f8f3f16ec62e3f6ba8892c19a Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 2 Mar 2021 14:22:44 +0100 Subject: [PATCH 4/4] dev-java: gradle* fix manifests Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- dev-java/gradle-base-annotations/Manifest | 2 +- dev-java/gradle-base-services/Manifest | 2 +- dev-java/gradle-build-operations/Manifest | 2 +- dev-java/gradle-hashing/Manifest | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-java/gradle-base-annotations/Manifest b/dev-java/gradle-base-annotations/Manifest index 346b6325bd..088990897b 100644 --- a/dev-java/gradle-base-annotations/Manifest +++ b/dev-java/gradle-base-annotations/Manifest @@ -1 +1 @@ -DIST v6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 +DIST gradle-base-annotations-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 diff --git a/dev-java/gradle-base-services/Manifest b/dev-java/gradle-base-services/Manifest index 346b6325bd..9da100b819 100644 --- a/dev-java/gradle-base-services/Manifest +++ b/dev-java/gradle-base-services/Manifest @@ -1 +1 @@ -DIST v6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 +DIST gradle-base-services-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 diff --git a/dev-java/gradle-build-operations/Manifest b/dev-java/gradle-build-operations/Manifest index 346b6325bd..7b5781c5d9 100644 --- a/dev-java/gradle-build-operations/Manifest +++ b/dev-java/gradle-build-operations/Manifest @@ -1 +1 @@ -DIST v6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 +DIST gradle-build-operations-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 diff --git a/dev-java/gradle-hashing/Manifest b/dev-java/gradle-hashing/Manifest index 346b6325bd..71d329046e 100644 --- a/dev-java/gradle-hashing/Manifest +++ b/dev-java/gradle-hashing/Manifest @@ -1 +1 @@ -DIST v6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8 +DIST gradle-hashing-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8