From 21482f5dabda855fbc5b2669b51199d9bb7da845 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Mon, 5 May 2025 18:56:45 +0000 Subject: Adding metadata --- dev-java/jettison/jettison-1.5.4.ebuild | 2 +- dev-java/json-path/json-path-2.9.0.ebuild | 2 +- dev-java/json-smart/Manifest | 1 - dev-java/json-smart/json-smart-2.5.1.ebuild | 70 ---------- dev-java/json-smart/json-smart-2.5.2.ebuild | 2 +- dev-java/json/Manifest | 2 - dev-java/json/json-20241224.ebuild | 81 ----------- dev-java/json/json-20250107.ebuild | 2 +- dev-java/jsonb-api/jsonb-api-2.0.0.ebuild | 2 +- dev-java/jsonp-api/jsonp-api-2.0.2.ebuild | 2 +- dev-java/protobuf-java/Manifest | 1 - dev-java/protobuf-java/protobuf-java-4.28.3.ebuild | 152 --------------------- .../tapestry-json/tapestry-json-5.8.7-r1.ebuild | 2 +- 13 files changed, 7 insertions(+), 314 deletions(-) delete mode 100644 dev-java/json-smart/json-smart-2.5.1.ebuild delete mode 100644 dev-java/json/json-20241224.ebuild delete mode 100644 dev-java/protobuf-java/protobuf-java-4.28.3.ebuild (limited to 'dev-java') diff --git a/dev-java/jettison/jettison-1.5.4.ebuild b/dev-java/jettison/jettison-1.5.4.ebuild index 7067b8f8bbf3..639bcc07451e 100644 --- a/dev-java/jettison/jettison-1.5.4.ebuild +++ b/dev-java/jettison/jettison-1.5.4.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/jettison-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/json-path/json-path-2.9.0.ebuild b/dev-java/json-path/json-path-2.9.0.ebuild index 0cf3fa50595c..eae3051cc66e 100644 --- a/dev-java/json-path/json-path-2.9.0.ebuild +++ b/dev-java/json-path/json-path-2.9.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/JsonPath-${P}/json-path" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" CP_DEPEND=" dev-java/tapestry-json:0 diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest index 02f851ce45c2..befc17b69f3f 100644 --- a/dev-java/json-smart/Manifest +++ b/dev-java/json-smart/Manifest @@ -1,3 +1,2 @@ DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83 -DIST json-smart-2.5.1.tar.gz 91171 BLAKE2B 21e83eadb15dbaa43ebe1fc9a5fd9500d4d233571dc4b65f417d7179630fde8a47e44cb652b2f598a2a6f46569876e8cac4769752dd4db179dc01b274514ef02 SHA512 00454e1debcebe009300a8f5d53b24b5c1917d173c9f3b98278236b52584631ab0e8bbf18c193f181e77537fb335b5bb31c1978918dc4f6e0ca82c44adb6797b DIST json-smart-2.5.2.tar.gz 91767 BLAKE2B a5088792ffaf45b07c6256827f1327383a9b8e1f823a70ef07d70ecedd521f534aef3b832b81e069e409fd4ee6da6e783e05d72f746b31d4e811bd4cf5df0566 SHA512 b718eaf83c43856d215294cf30a6bdfad5e345cec1001a9865d9771c7e60f17148cad69f8c18bc609a094ff9de38baa1bf7c9e24412d6326ed35c0bc69a19b9f diff --git a/dev-java/json-smart/json-smart-2.5.1.ebuild b/dev-java/json-smart/json-smart-2.5.1.ebuild deleted file mode 100644 index 11def85a6af5..000000000000 --- a/dev-java/json-smart/json-smart-2.5.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_PROVIDES=" - net.minidev:accessors-smart:${PV} - net.minidev:json-smart:${PV} -" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="JSON Small and Fast Parser" -HOMEPAGE="https://urielch.github.io" -SRC_URI="https://github.com/netplex/json-smart-v2/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-v2-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64" -RESTRICT="test" #839681 - -DEPEND=" - dev-java/asm:0 - >=virtual/jdk-1.8:* -" - -RDEPEND=">=virtual/jre-1.8:*" - -JAVADOC_CLASSPATH="asm" -JAVADOC_SRC_DIRS=( - accessors-smart/src/main/java - json-smart/src/main/java -) - -src_compile() { - einfo "Compiling accessors-smart.jar" - JAVA_CLASSPATH_EXTRA="asm" - JAVA_JAR_FILENAME="accessors-smart.jar" - JAVA_SRC_DIR="accessors-smart/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":accessors-smart.jar" - rm -r target || die - - einfo "Compiling json-smart.jar" - JAVA_JAR_FILENAME="json-smart.jar" - JAVA_SRC_DIR="json-smart/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":json-smart.jar" - rm -r target || die - - use doc && ejavadoc -} - -src_install() { - einstalldocs - java-pkg_dojar "accessors-smart.jar" - java-pkg_dojar "json-smart.jar" - - if use doc; then - java-pkg_dojavadoc target/api - fi - - if use source; then - java-pkg_dosrc "accessors-smart/src/main/java/*" - java-pkg_dosrc "json-smart/src/main/java/*" - fi -} diff --git a/dev-java/json-smart/json-smart-2.5.2.ebuild b/dev-java/json-smart/json-smart-2.5.2.ebuild index cb994b59522c..11def85a6af5 100644 --- a/dev-java/json-smart/json-smart-2.5.2.ebuild +++ b/dev-java/json-smart/json-smart-2.5.2.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" RESTRICT="test" #839681 DEPEND=" diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index bebb347045f3..ebf942b29489 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,3 +1 @@ -DIST json-20241224.tar.gz 260438 BLAKE2B a531f8009cada5bbb9cd7207ce20ed1b1d358bc6533b9678a7845c31714351bac3406fd85663bf7e3fcc9cf4249221a6a5599b1d841a82e924f594ae6a46e848 SHA512 d487201c20c4c36714a944297fd0a175006ddc742e077bbb2a0e541c8b52fafc0169bc984e5a5f085e580e5a770fa30f0588c2f15ad761f6afae22134b544797 DIST json-20250107.tar.gz 260468 BLAKE2B 830c43e242204cfa1cd544b05ca99664c6401665d7937fade4435c502061a76809828ee70bb3375d2b81a224c5051837f603f895fcd6ebeaf3313cd8402043af SHA512 8b56c0c3e03377a25c5f4ac0a30e0ff050c71f282b123236a699af7905d7fd2d809f9fa85276fd22f744763a72a2709a8999f900a269e0e3b1373423ed2bab19 -DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a diff --git a/dev-java/json/json-20241224.ebuild b/dev-java/json/json-20241224.ebuild deleted file mode 100644 index ef1a62017cab..000000000000 --- a/dev-java/json/json-20241224.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.json:json:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple check-reqs - -DESCRIPTION="A reference implementation of a JSON package in Java" -HOMEPAGE="https://github.com/stleary/JSON-java" -JPV="2.9.0" -SRC_URI="https://github.com/stleary/JSON-java/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar - )" -S="${WORKDIR}/JSON-java-${PV}" - -LICENSE="JSON" -SLOT="0" -KEYWORDS="amd64" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/asm:0 - dev-java/json-smart:0 - dev-java/mockito:4 - dev-java/slf4j-api:0 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README,SECURITY}.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.json" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - asm - json-smart - junit-4 - mockito-4 - slf4j-api -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -check_env() { - if use test; then - # this is needed only for tests - CHECKREQS_MEMORY="2048M" - check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - check_env -} - -pkg_setup() { - check_env - java-pkg-2_pkg_setup -} - -src_test() { - # setting Xms for bug #930723 - # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m" - JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}" - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency - - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 17; then - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED ) - fi - java-pkg-simple_src_test -} diff --git a/dev-java/json/json-20250107.ebuild b/dev-java/json/json-20250107.ebuild index e090e84eaedd..7d2ce317ac05 100644 --- a/dev-java/json/json-20250107.ebuild +++ b/dev-java/json/json-20250107.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/JSON-java-${PV}" LICENSE="JSON" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/jsonb-api/jsonb-api-2.0.0.ebuild b/dev-java/jsonb-api/jsonb-api-2.0.0.ebuild index 683e706de906..3c083725c29a 100644 --- a/dev-java/jsonb-api/jsonb-api-2.0.0.ebuild +++ b/dev-java/jsonb-api/jsonb-api-2.0.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}-RELEASE" LICENSE="EPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" CP_DEPEND="~dev-java/jsonp-api-2.0.2:0" diff --git a/dev-java/jsonp-api/jsonp-api-2.0.2.ebuild b/dev-java/jsonp-api/jsonp-api-2.0.2.ebuild index 75db75db4ee9..d4dfde635f40 100644 --- a/dev-java/jsonp-api/jsonp-api-2.0.2.ebuild +++ b/dev-java/jsonp-api/jsonp-api-2.0.2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}-RELEASE" LICENSE="EPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 5a928e3904f5..4596b9d09908 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,4 +1,3 @@ -DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643 DIST protobuf-29.3.tar.gz 9348951 BLAKE2B 8d37daac6f0d832e5bff5c56b9be73fce1fe016ca4e905f4c66d8fea20fabbee54a6be2c824f503d40f8492a4ec6280a539c454de9a118b69ebc57f2afe3d965 SHA512 0c776133f5789d21baa8860cb41e7926a162d74810a01722b762a78f93e559494e903fcaa092515bfe2ce057fd065a5dd000b316edb1af32c2ef9dbadf02b4c6 DIST protobuf-29.4.tar.gz 9350942 BLAKE2B fd3b81905e26db2ec3b54eaf30cf250db2894f91d5da73130106f6778f4e2f13b690961eecb8f5b8c23ac72428753611cd9bf719da986083e09ab32160e25314 SHA512 c888cb9961d58b7fb11a3363ff4d2684605cdd79756712f407ffe5f275569bf69b4370f1d2a0e20775646745cddd41a9b510f1c1981be4e969c9acf0dc2ba734 diff --git a/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild b/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild deleted file mode 100644 index 4893d43ca895..000000000000 --- a/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="Core Protocol Buffers library" -HOMEPAGE="https://protobuf.dev" -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 4.28.3 from the 28.3 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -MY_PV4="${PV#4.}" -MY_PV="${MY_PV4/_rc/-rc}" -MY_P="protobuf-${MY_PV}.tar.gz" -TV="1.1.3" -SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P} - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )" -S="${WORKDIR}/protobuf-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="java/core/src/main/resources" -JAVA_SRC_DIR="java/core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_SRC_DIR="java/core/src/test/java" - -run-protoc() { - if use system-protoc; then - protoc $1 - else - "${BUILD_DIR}"/protoc $1 - fi -} - -src_prepare() { - # If the corrsponding version of system-protoc is not available we build protoc locally - if ! use system-protoc; then - cmake_src_prepare - fi - java-pkg-2_src_prepare - - # https://github.com/protocolbuffers/protobuf/blob/v28.3/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:java/core/src/main/java:' \ - -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i java/core/generate-sources-build.xml || die "sed to sources failed" - - # https://github.com/protocolbuffers/protobuf/blob/v28.3/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:${test.proto.dir}:java/core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Split the file in two parts, one for each run-protoc call - awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ - java/core/generate-test-sources-build.xml || die -} - -src_configure() { - local mycmakeargs=( - -Dprotobuf_BUILD_TESTS=OFF - -Dprotobuf_ABSL_PROVIDER=package - ) - if ! use system-protoc; then - cmake_src_configure - fi -} - -src_compile() { - if ! use system-protoc; then - cmake_src_compile - fi - - einfo "Run protoc to generate sources" - run-protoc \ - @java/core/generate-sources-build.xml \ - || die "protoc sources failed" - - java-pkg-simple_src_compile -} - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar" - - # google/protobuf/java_features.proto: File not found. - cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die - - einfo "Running protoc on first part of generate-test-sources-build.xml" - run-protoc @test-sources-build-1 \ - || die "run-protoc test-sources-build-1 failed" - - einfo "Running protoc on second part of generate-test-sources-build.xml" - run-protoc @test-sources-build-2 \ - || die "run-protoc test-sources-build-2 failed" - - # java/core/src/test/java/editions_unittest/TestDelimited.java:2867: - # error: package editions_unittest.MessageImport does not exist - rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die - - einfo "Running tests" - # Invalid test class 'map_test.MapInitializationOrderTest': - # 1. Test class should have exactly one public constructor - # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': - # 1. Test class should have exactly one public constructor - pushd "${JAVA_TEST_SRC_DIR}" || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -path "**/*Test.java" \ - ! -path "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -path '*protobuf_unittest/CachedFieldSizeTest.java' - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install -} diff --git a/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild b/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild index 1f1d2f78081f..86a92de6444b 100644 --- a/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild +++ b/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://downloads.apache.org/tapestry/apache-tapestry-${PV}-sources.zip LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND="app-arch/unzip" -- cgit v1.3.1