From 22556625ff9ef6f9199d3738109cfecc87fdf23e Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Mon, 25 Apr 2022 12:50:33 +0000 Subject: Adding metadata --- .../jackson-annotations-2.13.2.ebuild | 2 +- dev-java/jackson-core/jackson-core-2.13.2.ebuild | 2 +- .../jackson-databind-2.13.2.ebuild | 2 +- .../jackson-dataformat-xml-2.13.2.ebuild | 2 +- .../jackson-dataformat-yaml-2.13.2.ebuild | 2 +- .../jackson-module-jakarta-xmlbind-2.13.2.ebuild | 2 +- .../files/openjdk-jre-bin-11.env.sh | 6 +- .../openjdk-jre-bin-11.0.14_p9-r1.ebuild | 83 ++++++++++++++++++++++ .../openjdk-jre-bin-11.0.14_p9.ebuild | 83 ---------------------- dev-java/snakeyaml/snakeyaml-1.30.ebuild | 2 +- 10 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild delete mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild (limited to 'dev-java') diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild index 23203a3c856e..e541f94795aa 100644 --- a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild +++ b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jackson-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.2.ebuild index 64ba5d3a18a4..c2173100ddb1 100644 --- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild +++ b/dev-java/jackson-core/jackson-core-2.13.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild index 05626030f801..5826d61a8652 100644 --- a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild +++ b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo RESTRICT="test" diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild index 9e36ecb02c81..9cc5a3516982 100644 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild +++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild index 652a6f610e57..5e7ee94446b8 100644 --- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild +++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild index 6a110123e23f..21f14cb2d1d2 100644 --- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild +++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # We don't have jaxb-runtime:3.0.1 RESTRICT="test" diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild new file mode 100644 index 000000000000..d7a2d14be024 --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=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 + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + 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 + + # 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 + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild deleted file mode 100644 index d7a2d14be024..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 - -abi_uri() { - echo "${2-$1}? ( - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz - )" -} - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -SRC_URI=" - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >net-libs/libnet-1.1 - >=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 - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${MY_PV}-jre" - -src_install() { - local dest="/opt/${PN}-${SLOT}" - 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 - - # 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 - fi - - rm -v lib/security/cacerts || die - dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild index 5ec91647ff0a..744f8fd305d2 100644 --- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild +++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # Compile dependencies # POM: pom.xml -- cgit v1.3