From 8e0eb0ad3dfbe366fbb79e93dd4e27dff301ed50 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 22 May 2022 00:40:12 +0000 Subject: Adding metadata --- dev-java/ant-core/ant-core-1.10.9-r4.ebuild | 159 ---------------------------- dev-java/ant-core/ant-core-1.10.9-r5.ebuild | 159 ++++++++++++++++++++++++++++ dev-java/openjdk/Manifest | 2 + dev-java/openjdk/openjdk-17.0.3_p7.ebuild | 8 +- 4 files changed, 168 insertions(+), 160 deletions(-) delete mode 100644 dev-java/ant-core/ant-core-1.10.9-r4.ebuild create mode 100644 dev-java/ant-core/ant-core-1.10.9-r5.ebuild (limited to 'dev-java') diff --git a/dev-java/ant-core/ant-core-1.10.9-r4.ebuild b/dev-java/ant-core/ant-core-1.10.9-r4.ebuild deleted file mode 100644 index 9efad621827e..000000000000 --- a/dev-java/ant-core/ant-core-1.10.9-r4.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Don't depend on itself. -JAVA_ANT_DISABLE_ANT_CORE_DEP="true" - -# Rewriting build.xml files for the testcases has no use at the moment. -JAVA_PKG_BSFIX_ALL="no" -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.ant:ant:1.10.9" - -inherit java-pkg-2 java-ant-2 prefix - -MY_P="apache-ant-${PV}" - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" -HOMEPAGE="https://ant.apache.org/" -SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -CDEPEND=">=virtual/jdk-1.9:*" -DEPEND="${CDEPEND} - doc? ( - dev-java/bcel:0 - dev-java/bsf:2.3 - dev-java/commons-logging:0 - dev-java/commons-net:0 - dev-java/jakarta-activation-api:1 - dev-java/jakarta-regexp:1.4 - dev-java/jakarta-oro:2.0 - dev-java/jdepend:0 - dev-java/jsch:0 - dev-java/log4j-12-api:2 - dev-java/javax-mail:0 - dev-java/sun-jai-bin:0 - dev-java/xalan:0 - dev-java/xml-commons-resolver:0 - dev-java/xz-java:0 - )" -RDEPEND="${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -PATCHES=( - "${WORKDIR}/${PV}-build.patch" - "${WORKDIR}/${PV}-launch.patch" -) - -src_prepare() { - default - - eprefixify "${S}/src/script/ant" - - # Fixes bug 556008. - java-ant_xml-rewrite -f build.xml \ - -c -e javadoc \ - -a failonerror \ - -v "false" - - # See bug #196080 for more details. - java-ant_bsfix_one build.xml - java-pkg-2_src_prepare - - # Remove JDK9+ stuff - einfo "Removing JDK9+ classes (Jmod and Link)" - rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java -} - -src_compile() { - export ANT_HOME="" - # Avoid error message that package ant-core was not found - export ANT_TASKS="none" - - local bsyscp - - # This ensures that when building ant with bootstrapped ant, - # only the source is used for resolving references, and not - # the classes in bootstrapped ant but jikes in kaffe has issues with this... - if ! java-pkg_current-vm-matches kaffe; then - bsyscp="-Dbuild.sysclasspath=ignore" - fi - - CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal || - die "build failed" - - if use doc; then - # All Java packages imported by the source files need to present in - # the classpath, otherwise it would be https://bugs.gentoo.org/780531 - local doc_deps=( - bcel - bsf-2.3 - commons-logging - commons-net - jakarta-activation-api-1 - jakarta-oro-2.0 - jakarta-regexp-1.4 - jdepend - jsch - log4j-12-api-2 - javax-mail - sun-jai-bin - xalan - xml-commons-resolver - xz-java - ) - for dep in "${doc_deps[@]}"; do - java-pkg_jar-from --build-only --into lib/optional/ "${dep}" - done - # This file imports netrexx.lang.Rexx, which is not available - # from ::gentoo. Fortunately, there is not a dev-java/ant-* - # package for it, so even if we could generate documentation - # for it, it would be irrelevant - rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java || - die "Failed to remove Java source file blocking Javadoc generation" - ./build.sh ${bsyscp} javadocs || die "Javadoc build failed" - fi -} - -src_install() { - dodir /usr/share/ant/lib - - for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do - java-pkg_dojar build/lib/${jar} - dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} - done - - dobin src/script/ant - - dodir /usr/share/${PN}/bin - for each in antRun antRun.pl runant.pl runant.py ; do - dobin "${S}/src/script/${each}" - dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} - done - dosym ../${PN}/bin /usr/share/ant/bin - - insinto /usr/share/${PN} - doins -r dist/etc - dosym ../${PN}/etc /usr/share/ant/etc - - echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" - doenvd "${T}/20ant" - - dodoc NOTICE README WHATSNEW KEYS - - if use doc; then - dodoc -r manual/* - java-pkg_dojavadoc --symlink manual/api build/javadocs - fi - - use source && java-pkg_dosrc src/main/* -} diff --git a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild new file mode 100644 index 000000000000..f7540588ca05 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Don't depend on itself. +JAVA_ANT_DISABLE_ANT_CORE_DEP="true" + +# Rewriting build.xml files for the testcases has no use at the moment. +JAVA_PKG_BSFIX_ALL="no" +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.ant:ant:1.10.9" + +inherit java-pkg-2 java-ant-2 prefix + +MY_P="apache-ant-${PV}" + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" +HOMEPAGE="https://ant.apache.org/" +SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 + https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +CDEPEND=">=virtual/jdk-1.8:*" +DEPEND="${CDEPEND} + doc? ( + dev-java/bcel:0 + dev-java/bsf:2.3 + dev-java/commons-logging:0 + dev-java/commons-net:0 + dev-java/jakarta-activation-api:1 + dev-java/jakarta-regexp:1.4 + dev-java/jakarta-oro:2.0 + dev-java/jdepend:0 + dev-java/jsch:0 + dev-java/log4j-12-api:2 + dev-java/javax-mail:0 + dev-java/sun-jai-bin:0 + dev-java/xalan:0 + dev-java/xml-commons-resolver:0 + dev-java/xz-java:0 + )" +RDEPEND="${CDEPEND}" + +S="${WORKDIR}/${MY_P}" + +RESTRICT="test" + +PATCHES=( + "${WORKDIR}/${PV}-build.patch" + "${WORKDIR}/${PV}-launch.patch" +) + +src_prepare() { + default + + eprefixify "${S}/src/script/ant" + + # Fixes bug 556008. + java-ant_xml-rewrite -f build.xml \ + -c -e javadoc \ + -a failonerror \ + -v "false" + + # See bug #196080 for more details. + java-ant_bsfix_one build.xml + java-pkg-2_src_prepare + + # Remove JDK9+ stuff + einfo "Removing JDK9+ classes (Jmod and Link)" + rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java +} + +src_compile() { + export ANT_HOME="" + # Avoid error message that package ant-core was not found + export ANT_TASKS="none" + + local bsyscp + + # This ensures that when building ant with bootstrapped ant, + # only the source is used for resolving references, and not + # the classes in bootstrapped ant but jikes in kaffe has issues with this... + if ! java-pkg_current-vm-matches kaffe; then + bsyscp="-Dbuild.sysclasspath=ignore" + fi + + CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal || + die "build failed" + + if use doc; then + # All Java packages imported by the source files need to present in + # the classpath, otherwise it would be https://bugs.gentoo.org/780531 + local doc_deps=( + bcel + bsf-2.3 + commons-logging + commons-net + jakarta-activation-api-1 + jakarta-oro-2.0 + jakarta-regexp-1.4 + jdepend + jsch + log4j-12-api-2 + javax-mail + sun-jai-bin + xalan + xml-commons-resolver + xz-java + ) + for dep in "${doc_deps[@]}"; do + java-pkg_jar-from --build-only --into lib/optional/ "${dep}" + done + # This file imports netrexx.lang.Rexx, which is not available + # from ::gentoo. Fortunately, there is not a dev-java/ant-* + # package for it, so even if we could generate documentation + # for it, it would be irrelevant + rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java || + die "Failed to remove Java source file blocking Javadoc generation" + ./build.sh ${bsyscp} javadocs || die "Javadoc build failed" + fi +} + +src_install() { + dodir /usr/share/ant/lib + + for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do + java-pkg_dojar build/lib/${jar} + dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} + done + + dobin src/script/ant + + dodir /usr/share/${PN}/bin + for each in antRun antRun.pl runant.pl runant.py ; do + dobin "${S}/src/script/${each}" + dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} + done + dosym ../${PN}/bin /usr/share/ant/bin + + insinto /usr/share/${PN} + doins -r dist/etc + dosym ../${PN}/etc /usr/share/ant/etc + + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" + doenvd "${T}/20ant" + + dodoc NOTICE README WHATSNEW KEYS + + if use doc; then + dodoc -r manual/* + java-pkg_dojavadoc --symlink manual/api build/javadocs + fi + + use source && java-pkg_dosrc src/main/* +} diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 47027360af4b..f78ee85760bb 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -2,6 +2,7 @@ DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb DIST openjdk-11.0.14_p9.tar.gz 122803178 BLAKE2B 521d7829b34fa4f9a143c51d61c339c8c7455f12c4f04eda4fdd687dafa842f2a1b1adfe2e897fecdfa4e1c3ee484ec0e3aaf38ab9246f20cd24e7185db6ba25 SHA512 3285d13ba0fbbfd4f1a676b0f099b0742527ff556edfc3387913b59b64126bdfecd2697d7ac83634ed7160adf46edca3b5b2c33d94e9dca068752da5b9d70837 DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67 DIST openjdk-17.0.2_p8.tar.gz 104741920 BLAKE2B 749b1699f1b4b2bb6ee1139ceb704ba3b3f3789770176e5f0dc4b1d5ce5c2887514fc3c256a64f2ad9bb017339c20ef10110f35b523ee1edcd62924e41f44f03 SHA512 8eeb8b56410178179cc95aa02b0bf827fac3fbf6242a905502a6594763be809a727e55e87866ac65be56c22d6f78ec0c483bdaab9411f07d4b160c49b06921fa +DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 5c3b43f160009144636becd6aae19559e8f03e4d6461f89c1b6c472e63c6f4c2c6064bb3dc24c825814e7d6cc927f66fe96793bd2c71a80e2b535eec0f685278 SHA512 1c2de73051a665ada6a12bb6f92f18b1d9366990cea403063d20937ac97c288f923746a0d094273ad7f7238cef1ebe1790c0f0ffe7e7acc07ad08ebc6a7ea085 DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c DIST openjdk-8.322_p06.tar.gz 88114268 BLAKE2B 206b8373bacd829682e9203d9fbb14240994b63b7ddb3675cd3380ee7a4ab9c9016cdcc278b63d3110652ad02587d3c7965bc9865fed6c9ddd720e79bb917c71 SHA512 877b56bb11daf7295bd08d2a310cb4dc0478ac7465d4e7f88ba9b9ab2715761b2e83d2e47fb03dc82ec1f1651c9c0772f048360e1f71c0f91a19bda4b46cbcfc DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa @@ -11,3 +12,4 @@ DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829 DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30ee60446993bf5dcf0fa10b8b668ebec637ea02b458a472c642f22740e18f28cbf9923ea4cceb17702115c038b13137442e5f0572477d37f12f SHA512 92e0343f493d094300911625a561f42c47402ca4cdbd2ac18414089e8ed8a50ca58f02ec1ef9a3dce017ab7af99a22ab465ddf732ab9e55728e2b146de56fba7 DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26 +DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild index 9868acbeda61..7ee5a1d3d7e4 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild @@ -8,6 +8,7 @@ inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing # variable name format: _XPAK ARM64_XPAK="17.0.2_p8" # musl bootstrap install PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball +RISCV_XPAK="17.0.3_p7" X86_XPAK="17.0.1_p12" # Usage: bootstrap_uri [extracond] @@ -37,11 +38,13 @@ SRC_URI=" $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) $(bootstrap_uri x86 ${X86_XPAK}) + $(bootstrap_uri riscv ${RISCV_XPAK}) ) + riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz ) " LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" @@ -165,6 +168,7 @@ pkg_setup() { } src_prepare() { + use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch default chmod +x configure || die } @@ -213,6 +217,8 @@ src_configure() { $(tc-is-clang && echo "--with-toolchain-type=clang") ) + use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) + if use javafx; then local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" if [[ -r ${zip} ]]; then -- cgit v1.3.1