diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/Manifest.gz | bin | 60180 -> 60180 bytes | |||
| -rw-r--r-- | dev-java/bsf/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/bsf/bsf-2.4.0-r5.ebuild (renamed from dev-java/bsf/bsf-2.4.0-r4.ebuild) | 11 | ||||
| -rw-r--r-- | dev-java/gson/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/gson/gson-2.10.1.ebuild | 59 | ||||
| -rw-r--r-- | dev-java/gson/gson-2.10.2_pre20231128.ebuild | 4 |
6 files changed, 13 insertions, 67 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 9396a7c4c9af..3dd8560a5639 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest index 9cd0e0f5c42d..3c2e0517e0f2 100644 --- a/dev-java/bsf/Manifest +++ b/dev-java/bsf/Manifest @@ -3,5 +3,5 @@ AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43 DIST bsf-src-2.4.0.tar.gz.asc 191 BLAKE2B c4d17ee6df06aa2da70b9e733cb9890cef2f0f22124d8699400494496c4045851feb006e53ee4f4d09e926d982afd4057c08caf791fd4ea8a8bef5f576d6d8a1 SHA512 b82d1f9e6cd6bc3b3228ceb8f5f0679e8dd95c2200328accafa0ee9fd4b4065367e071d0fa718ecdc34e11c6b14456a671d4e8e74d2b56dea4e8fc3db73c4392 EBUILD bsf-2.4.0-r3.ebuild 2678 BLAKE2B c9c3c31634df671be5dcb7f4e93f135b1a873e48e109e592ee7beca161033ca3eafcaa7f07d2dad0ce4748d4eb0d9872a2dfd9ef8396710db04b1ed18e79a907 SHA512 254420c8664c8b6c50945c19c31aea2a61bcdca929f0cd6a3558773bce802bcac4c505586678bdc3fcb4506197b7e13cf463b4fa1f428cac832fb36059d98c1c -EBUILD bsf-2.4.0-r4.ebuild 1942 BLAKE2B eaae8b9175ba2569788ea4f3828926ddb463f1ea2ffc45a0f8987098e2287fa0e836a9969ec1e0f936b4aece474d9ef301e229ac60c9af0edf89eb0112b62199 SHA512 be8d11bbad22ec7b8df6f668419df95330c6a3abc77c9bc9cc58fac8b76a0041b9990593eec455c19abb2cd2281e2bc8a65f6ee149ad816be813eb9bade945fb +EBUILD bsf-2.4.0-r5.ebuild 2229 BLAKE2B 7ebbaf37407061c7ff289bf727a9224eadb45a930ef32eb0c4eda53bb810c8a8d49658df9df9c4f297daa198577d337e0125889795ed36d83ab0d1cb548ebda8 SHA512 105726a7b66ab418c32f42078f2a99684bc23f68c01e5f1f8546ae1534c7acb37c38d2248b231e0db870adfeb56d12925ef88498d252fd7437c23016f0665f2f MISC metadata.xml 983 BLAKE2B 03534eb384215d3e15764d890376dabbfce25d06b1477d62ecdbe109c76f7b0fbd3eda6233211555e87d1d4583b73a5d9e4f7d5f61e8be4330aefda4c8ae93c9 SHA512 e95534d309f4c49781857b113852a8162eeacfea951b5f961b317bac3624cd6b7b129c192d361c16834884ea67f8eec210796e899da74ede487fbafdca3da5ad diff --git a/dev-java/bsf/bsf-2.4.0-r4.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild index 392c3e6152ec..129e8013ff23 100644 --- a/dev-java/bsf/bsf-2.4.0-r4.ebuild +++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild @@ -35,16 +35,17 @@ RDEPEND="${CDEPEND} DOCS=( CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt ) -JAVA_CLASSPATH_EXTRA=" +JAVA_GENTOO_CLASSPATH=" commons-logging xalan " JAVA_MAIN_CLASS="org.apache.bsf.Main" +JAVA_RESOURCE_DIRS="res" JAVA_SRC_DIR="src" src_prepare() { java-pkg-2_src_prepare - rm -r src/org/apache/bsf/engines/{netrexx,jython} || die + rm -r src/org/apache/bsf/engines/{java,javaclass,jython,netrexx} || die if use javascript; then JAVA_GENTOO_CLASSPATH+=" rhino-1.6" else @@ -55,6 +56,12 @@ src_prepare() { else rm -r src/org/apache/bsf/engines/jacl || die fi + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir res || die "create res" + pushd src > /dev/null || die "pushd" + find -type f -name '*.properties' \ + | xargs cp --parent -t ../res || die "copy resources" + popd > /dev/null } src_install() { diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 516b18b1f0cb..22237029304a 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,7 +1,5 @@ AUX gson-2.10.2-GsonVersionDiagnosticsTest.patch 615 BLAKE2B ac75e23e48885403f61cd0b078984a7210576fc2567086a9d9af99a212471cead5d2d5961bb6b7958fb956eda6c348c08124c6e2c6cbc7afac6ff6a36b82a424 SHA512 c363625a645df1a7c3db737db39cc2e163fe4975b6bb51930b805ba359e61509e41397022d689874b6fa100917f6dd936c13c8c6457137f55370b48de35e2bed DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877 -DIST gson-parent-2.10.1.tar.gz 394777 BLAKE2B e118a7c39b17c4119b4140f3c105fef4c3cb07580dbc530d9bfd59edc4f152f62ac5ff93db1a3861c73758e369ecef4f8ed4e94d556869291469764ea848bbbd SHA512 074f40f7f9aa48daf5b5a3ec371713db02f6f8fceb959b01e8a16732862645d2350f3276ab7ff8021d48082f890b53c6e80d992af6af4b74e4646f85494b8e70 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 -EBUILD gson-2.10.1.ebuild 1681 BLAKE2B 0e91cb624f1883f43f20551f30f17195456678f089d5d89f436b9459b5155ab94f48f17a61ee57de82954e05251110eb567fa541b2b2ee3c7dba1fb994769512 SHA512 b8748b2a22a6c25e7bb22cc6ba8ed048f09b8ff92a26c2783c91d818bd5c3af05cb2ea8fb46584d34c606f16f957443658c23b04427a18864ffa8135709784db -EBUILD gson-2.10.2_pre20231128.ebuild 2355 BLAKE2B 1e5938480b49458d72080b3d1af9fd6fdfd89558f2e34ea04886a0b73beb378da46d457e0d74d74333af85472f6f7d888c870239a4400ce4ea651e402865a535 SHA512 e3c9499f2660d75eb3ddf356ec47abc4089de3e06f5ce97db1a57c412474404fc7341cad2eeaf11b0441c58d5e7cdc51a83217328c3162add55efd389356cd86 +EBUILD gson-2.10.2_pre20231128.ebuild 2351 BLAKE2B 9425f0f87e1790c08dbadfb2317c857d6ad12d03cf6171ffe645d2c405e108ab4dda167b82c2b7c9203539b758382c9494a3c6351dedeb422778403e909761ef SHA512 92c22523077009d0cdb0ce5a897f3bf171e60cba16b8b9b8d94a67edf846cdaadd57b2b1ea29037717d510536cfd68aa50b24452c2ab4efea44a307f84eff95c MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504 diff --git a/dev-java/gson/gson-2.10.1.ebuild b/dev-java/gson/gson-2.10.1.ebuild deleted file mode 100644 index 96e7d452fb78..000000000000 --- a/dev-java/gson/gson-2.10.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 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.code.gson:gson:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Gson JSON library" -HOMEPAGE="https://github.com/google/gson" -SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz" -S="${WORKDIR}/gson-gson-parent-${PV}/gson" - -LICENSE="Apache-2.0" -SLOT="2.6" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-17:*" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( - ../CHANGELOG.md - ../GsonDesignDocument.md - ../README.md - ../Troubleshooting.md - ../UserGuide.md -) - -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-templates" -) - -JAVA_TEST_EXCLUDES=( - # requires the test class to be obfuscated using proguard which we do not have atm - "com.google.gson.functional.EnumWithObfuscatedTest" - # FAILURES!!! - # Tests run: 1258, Failures: 2 - # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) - # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest - "com.google.gson.regression.OSGiTest" -) -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - java-pkg-2_src_prepare - sed -e "s/\${project.version}/${PV}/g" \ - -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ - || die "Failed to set version" - # error: records are not supported in -source 8 - # This test would pass "OK (25 tests)" only with >=jre-17 - # pom.xml, lines 20-22 - rm src/test/java/com/google/gson/functional/Java17RecordTest.java || die -} diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128.ebuild index a8544b4d9312..a8894239bea7 100644 --- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild +++ b/dev-java/gson/gson-2.10.2_pre20231128.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ S="${WORKDIR}/gson-${MY_COMMIT}/gson" LICENSE="Apache-2.0" SLOT="2.6" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" dev-java/error-prone-annotations:0 |