diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-compress/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/commons-compress/commons-compress-1.20.ebuild | 41 | ||||
| -rw-r--r-- | dev-java/jakartaee-migration/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild | 54 | ||||
| -rw-r--r-- | dev-java/jakartaee-migration/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-java/junit/junit-4.13.1.ebuild | 25 | ||||
| -rw-r--r-- | dev-java/junit/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-java/openjdk-bin/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild | 73 | ||||
| -rw-r--r-- | dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild | 70 | ||||
| -rw-r--r-- | dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/tomcat-servlet-api/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild | 103 |
13 files changed, 321 insertions, 66 deletions
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index 917a541bdd40..cbff7f678bef 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1 +1,2 @@ DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910 +DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild new file mode 100644 index 000000000000..f20803df625f --- /dev/null +++ b/dev-java/commons-compress/commons-compress-1.20.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirrors.supportex.net/apache//commons/compress/source/commons-compress-1.20-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-compress-1.20.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.commons:commons-compress:1.20" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java API for working with archive files" +HOMEPAGE="https://commons.apache.org/proper/commons-compress/" +SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +CDEPEND=" + dev-java/brotli-dec:0 + dev-java/xz-java:0 + dev-java/zstd-jni:0 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CDEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND}" + +S="${WORKDIR}/${P}-src" + +JAVA_ENCODING="iso-8859-1" + +JAVA_GENTOO_CLASSPATH="brotli-dec,xz-java,zstd-jni" +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest new file mode 100644 index 000000000000..6d2f38a8b361 --- /dev/null +++ b/dev-java/jakartaee-migration/Manifest @@ -0,0 +1 @@ +DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105 SHA512 c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f diff --git a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild new file mode 100644 index 000000000000..7815b0e6bc20 --- /dev/null +++ b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jakartaee-migration-0.2.0.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.tomcat:jakartaee-migration:0.2.0" +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" + +CDEPEND=" + dev-java/ant-core:0 + >=dev-java/bcel-6.5.0:0 + >=dev-java/commons-compress-1.20:0 + dev-java/commons-io:1 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${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" +) diff --git a/dev-java/jakartaee-migration/metadata.xml b/dev-java/jakartaee-migration/metadata.xml new file mode 100644 index 000000000000..e25b5c52aab3 --- /dev/null +++ b/dev-java/jakartaee-migration/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild index 60c035757c38..72680398bed2 100644 --- a/dev-java/junit/junit-4.13.1.ebuild +++ b/dev-java/junit/junit-4.13.1.ebuild @@ -11,26 +11,31 @@ MAVEN_ID="junit:junit:4.13.1" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit5/" SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz" -HOMEPAGE="http://junit.org/" + LICENSE="EPL-1.0" SLOT="4" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="examples" -CDEPEND="dev-java/hamcrest-core:1.3" - -RDEPEND=">=virtual/jre-1.8 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.8 - ${CDEPEND}" +DEPEND=" + dev-java/hamcrest-core:1.3 + dev-java/hamcrest-library:1.3 + " +RDEPEND="${DEPEND} + >=virtual/jre-1.8 + " +BDEPEND="${DEPEND} + >=virtual/jdk-1.8 + " S="${WORKDIR}/${MY_P}" JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3" +JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" -java_prepare() { +src_prepare() { + default rm -v lib/*.jar || die } diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml index 47444ccc1c7c..e26ffb35d946 100644 --- a/dev-java/junit/metadata.xml +++ b/dev-java/junit/metadata.xml @@ -6,7 +6,7 @@ <name>Java</name> </maintainer> <upstream> - <remote-id type="github">junit-team/junit</remote-id> + <remote-id type="github">junit-team/junit4</remote-id> <remote-id type="sourceforge">junit</remote-id> </upstream> <origin>gentoo-staging</origin> diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index d4839e93afe4..94d7de5e1029 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -6,6 +6,7 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz 176435718 BLAKE2B c99 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz 194069769 BLAKE2B b537bdf553b1da11c06ba8aed7f2baa498da384209b5c94b22995a6d05e1d83b4fee215c6c27e1975e6d2e04805916f85c8fa244f53a6f002d3eb42d56898b74 SHA512 993881259ba470030c589f272d239aa185b1b460c4d505a266cb99f7107de2aa646b3cb8bb8d38fa454d226228c6d3dd8245301c8535c7f6b3bec766cc555bf9 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727 +DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz 186160219 BLAKE2B 5a044db5ff02dadd8a1677254c8653e14f41e09e4180dc8726d35dd293193e8a332db54aede19d7a2c2bd3c3b3c799cb0faa315bfd9deda03c231fd01670ff61 SHA512 cd115893162a9db3e7e5763028a0040eb83773ae82cd056fdb9400ae3a2b720e7e1bee24a0251ea29eb01923400a1c459d3fbca08bf563d15f7434f5a4d6c69f DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6 @@ -13,3 +14,4 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz 102873064 BLAKE2B 2331a8c4fd404ea6d44ae5e9f168e7955b96888ebceaa0d72cc1ae044972869bdede26e1d69b926fbac1ad54cdfa4080b2dffd41e6667717a34ceb5da96c8eb3 SHA512 c56b4106f6f21c116d5229973f562e93aec91ae815b9f61291ae052540cd6c473ce74da9f9404c4d9028b313a70beae6bf328d2cdcc5c8ec8ebaca8d0fd3e892 +DIST OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz 101808251 BLAKE2B 7abcbe6b0f061f9b5d4cd4709fa2d6a53184c41a313a5bf861ff0796b2673bb2a8c783e56769aab20954258c5e505c6a057b3838408cc948500ea9f3e723f646 SHA512 7fb53d3cc6994d87769c53c992ef7fc4adf2488b6a0c41e3c2004ce334a86da7e9fb4955b58c9e06566c5999f317579736ad0f346dd8dd56037d3ec0d5689812 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild index 4583d7823353..3eaf868c6d29 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.10_p9.ebuild @@ -6,8 +6,13 @@ EAPI=6 inherit java-vm-2 toolchain-funcs abi_uri() { + local os=linux + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz )" } @@ -19,29 +24,32 @@ SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) + $(abi_uri x64 x64-macos) " DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" HOMEPAGE="https://adoptopenjdk.net" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos" IUSE="alsa cups +gentoo-vm headless-awt selinux source" RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) )" RESTRICT="preserve-libs splitdebug" @@ -55,23 +63,36 @@ pkg_pretend() { fi } +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + src_install() { local dest="/opt/${P}" local ddest="${ED%/}/${dest#/}" - # Not sure why they bundle this as it's commonly available and they - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea - # also has an explicit dependency while Oracle seemingly dlopens it. - rm -vf lib/libfreetype.so || die + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi fi if ! use source ; then diff --git a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild index 7bba13d4c195..861deb4537cb 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.282_p08.ebuild @@ -6,8 +6,13 @@ EAPI=6 inherit eapi7-ver java-vm-2 abi_uri() { + local os=linux + case ${2} in + *-macos) os=mac ;; + *-solaris) os=solaris ;; + esac echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${3-${MY_PV/-/}}.tar.gz + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz )" } @@ -24,29 +29,32 @@ SRC_URI=" $(abi_uri aarch64 arm64 jdk${MY_PV}) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) + $(abi_uri x64 x64-macos) " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos" IUSE="alsa cups examples headless-awt selinux source" RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - arm? ( dev-libs/libffi-compat:6 ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + arm? ( dev-libs/libffi-compat:6 ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) ) " @@ -60,6 +68,9 @@ src_unpack() { # 753575 if use arm; then mv -v "${S}"* "${S}" || die + elif [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable fi } @@ -69,20 +80,25 @@ src_install() { rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die - # this does not exist on arm64 hence -f - rm -fv jre/lib/*/libfreetype.so* || die + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # this does not exist on arm64 hence -f + rm -fv jre/lib/*/libfreetype.so* || die - if ! use alsa ; then - rm -v jre/lib/*/libjsoundalsa.so* || die - fi + if ! use alsa ; then + rm -v jre/lib/*/libjsoundalsa.so* || die + fi - if ! use examples ; then - rm -vr sample || die - fi + if ! use examples ; then + rm -vr sample || die + fi - if use headless-awt ; then - rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/policytool bin/appletviewer || die + if use headless-awt ; then + rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi fi if ! use source ; then diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild index b6dbedd21ac1..9ef2442e4438 100644 --- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild +++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="" RDEPEND=" diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index ac126779a47e..7fb99db4010a 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,4 +1,5 @@ DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53 +DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild new file mode 100644 index 000000000000..30dd1169f097 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-pkg-simple + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="5.0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}/" + +# we don't have the aQute.bnd.annotation.spi packaged +PATCHES=( + "${FILESDIR}/${PN}-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch" +) + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} |