From 73a1be2bfcd97b44f7c6a9ae0a8fef5f10871410 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 3 Mar 2024 19:20:36 +0000 Subject: Adding metadata --- dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +- dev-java/ant/ant-1.10.14-r2.ebuild | 2 +- dev-java/antunit/antunit-1.4.1-r1.ebuild | 2 +- .../commons-httpclient-3.1-r3.ebuild | 2 +- dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild | 2 +- .../jakartaee-migration-1.0.7-r1.ebuild | 94 ---------------------- dev-java/javacc/javacc-5.0-r5.ebuild | 2 +- dev-java/leiningen-bin/Manifest | 2 - dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild | 62 -------------- dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild | 3 + dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild | 3 + dev-java/openjdk/openjdk-21.0.1_p12.ebuild | 3 + dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +- 13 files changed, 16 insertions(+), 165 deletions(-) delete mode 100644 dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild delete mode 100644 dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild (limited to 'dev-java') diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild index db4cfbb97de3..9d093f51c4dd 100644 --- a/dev-java/ant-core/ant-core-1.10.14.ebuild +++ b/dev-java/ant-core/ant-core-1.10.14.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" DEPEND=" ~dev-java/ant-${PV}:0 diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild b/dev-java/ant/ant-1.10.14-r2.ebuild index 86d121ae7f7e..15e5f18bcc6d 100644 --- a/dev-java/ant/ant-1.10.14-r2.ebuild +++ b/dev-java/ant/ant-1.10.14-r2.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4 junitlauncher log4j oro regexp resolver testutil xalan xz" diff --git a/dev-java/antunit/antunit-1.4.1-r1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild index e859fb18c06b..54627c2705f2 100644 --- a/dev-java/antunit/antunit-1.4.1-r1.ebuild +++ b/dev-java/antunit/antunit-1.4.1-r1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/apache-ant-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )" diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild index 8fddddf7510f..f84ff3079a14 100644 --- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild +++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" # Tests run: 2036, Failures: 91 RESTRICT="test" diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild index c26b4f6b5b7e..fe353b76dd9e 100644 --- a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild +++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" CP_DEPEND=" >=dev-java/ant-1.10.14:0 diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild deleted file mode 100644 index 021d35532658..000000000000 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.7" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9" -HOMEPAGE="https://tomcat.apache.org" -SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" - -# Common dependencies -# POM: pom.xml -# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0 -# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!! - -CDEPEND=" - dev-java/ant-core:0 - dev-java/bcel:0 - dev-java/commons-compress:0 - dev-java/commons-io:1 -" - -# Compile dependencies -# POM: pom.xml -# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!! -# POM: pom.xml -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 - -# we need jdk-11 just for some tests as those need stuff from newer jdk, -# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8 -# with tests disabled -# see bug https://bugs.gentoo.org/910499 - -DEPEND=" - >=virtual/jdk-11:* - ${CDEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${P}" - -JAVA_LAUNCHER_FILENAME="${PN}" - -JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1" -JAVA_SRC_DIR="src/main/java" -JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) -JAVA_TEST_EXCLUDES=( - "org.apache.tomcat.jakartaee.TesterConstants" -) - -src_prepare() { - default - sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties -} - -src_test() { - # we need to create jar files for the tests the same way as it's done using pom.xml - local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") - mkdir -p generated-test/META-INF || die - pushd generated-test || die - echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF - ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die - jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die - ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die - jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die - for enc in rsa dsa ec; do - cp hellocgi.jar hellocgi-signed-${enc}.jar || die - jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die - done - popd - - java-pkg-simple_src_test -} diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild index a30bdb682c9e..f3373d984632 100644 --- a/dev-java/javacc/javacc-5.0-r5.ebuild +++ b/dev-java/javacc/javacc-5.0-r5.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" CDEPEND="dev-java/junit:0" diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest index e926bd0e5d8e..5398cd76cfcd 100644 --- a/dev-java/leiningen-bin/Manifest +++ b/dev-java/leiningen-bin/Manifest @@ -2,5 +2,3 @@ DIST leiningen-2.11.1-standalone.jar 16481190 BLAKE2B 62f77411cc1d76ef15a7dee318 DIST leiningen-2.11.1.sh 7467 BLAKE2B 7c82fde4cca990ef31fe6e207c872d6cfad69d0afc906119d069140831dc9e66e4fab8742c610eb922b14a3f4dec3c525c8a0598e426d78830d4136bace7a0f6 SHA512 9399bd4f37a9326d928b73c2f43b438545ea1c87942c365a86958345e95f86059d2d6fa18a68b20cc615193f69909620089c6f7aa8b8ab22c9fbc0f04852f6a5 DIST leiningen-2.11.2-standalone.jar 16481883 BLAKE2B 556e9fdcd5f8c14e046ff8e12f9c5d52c214f0c7cf8af9469e140dc21187a0cb2d5acc02b0ab48b110278d5143cdeef2b4eb8d2945d5acaf568cfe35e1877c04 SHA512 a49e82acccdaae4f619796adf1ef9d0cfc4998c01f4c918520bb3f757b9f7808fb5c65241f79aea730d1e90181c9c2983b7219ef0893103f7abcedf94afcafd5 DIST leiningen-2.11.2.sh 7467 BLAKE2B bfd9031e1f0c2b8cedf435832f2da5f45ac4c9fbdb2684f4900b43e62c3ffec03781ca2491f1a305c480a7fa8bf5cccf9e934ecc12e6e0ce1da539d9d8fe01dd SHA512 b4e0c553148f81bced1d8df09811f337352149bba879b0828fdeb6efd176fcebf0c4f263a5c8b74241b6a2dd7df52d932271cbf8f11f71279b498f8a9e2399b4 -DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd -DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492 diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild deleted file mode 100644 index 182f3392805f..000000000000 --- a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 - -MY_PN="${PN%-bin}" -MY_PNV="${MY_PN}-${PV}" - -DESCRIPTION="Automate Clojure projects without setting your hair on fire" -HOMEPAGE="https://leiningen.org/" -SRC_URI=" - https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.jar - https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh -" - -LICENSE="EPL-1.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~x86 ~x64-macos" - -RDEPEND=">=virtual/jre-1.8" -DEPEND=">=virtual/jdk-1.8" - -RESTRICT="test" - -src_unpack() { - mkdir -p "${S}" || die "Can't mkdir ${S}" - cd "${S}" || die "Can't enter ${S}" - for file in ${A}; do - einfo "Copying ${file}" - cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}" - done -} - -src_prepare() { - einfo "Copying leinrc" - cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc" - einfo "Patching leinrc" - sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc" - - einfo "Renaming lein-pkg" - # Rename generically to help user patching - mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein" - - einfo "Patching lein" - java-pkg_init_paths_ - sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \ - || die "Can't patch LEIN_JAR in lein" - - default -} - -src_compile() { :; } - -src_install() { - dobin "${S}/lein" - java-pkg_newjar "${MY_PNV}-standalone.jar" - insinto /etc - doins "${S}/leinrc" - fperms 0644 "/etc/leinrc" -} diff --git a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild index 36fec8b7b302..e05303dde86e 100644 --- a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild @@ -167,6 +167,9 @@ src_configure() { # Work around stack alignment issue, bug #647954. use x86 && append-flags -mincoming-stack-boundary=2 + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + # Work around -fno-common ( GCC10 default ), bug #713180 append-flags -fcommon diff --git a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild index 3f1d61a220af..b7024ebb2a6b 100644 --- a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild @@ -185,6 +185,9 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + # Work around -fno-common ( GCC10 default ), bug #713180 append-flags -fcommon diff --git a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild index df6a3e6a4ed3..7ba18116be89 100644 --- a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild +++ b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild @@ -178,6 +178,9 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + # Work around -fno-common ( GCC10 default ), bug #713180 append-flags -fcommon diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild index e62e034435de..83f112e34a65 100644 --- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild +++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}" LICENSE="Apache-2.0" SLOT="1.1" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" CP_DEPEND="dev-java/osgi-core:0" -- cgit v1.3