diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-02-03 01:40:19 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-02-03 01:40:19 +0000 |
| commit | 8b9e4732d08bc7692d417d575f0c8f9174305d7c (patch) | |
| tree | cef2171016272bb60bb815cddeda7e0eec44fcfd /dev-java/openjdk | |
| parent | a8c33b9a1bf1951a8fb10a0b62da55d1eca71c09 (diff) | |
| download | baldeagleos-repo-8b9e4732d08bc7692d417d575f0c8f9174305d7c.tar.gz baldeagleos-repo-8b9e4732d08bc7692d417d575f0c8f9174305d7c.tar.xz baldeagleos-repo-8b9e4732d08bc7692d417d575f0c8f9174305d7c.zip | |
Adding metadata
Diffstat (limited to 'dev-java/openjdk')
| -rw-r--r-- | dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 18 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-8.322_p06.ebuild | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild index d19762d50c4a..1860867bf6bb 100644 --- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild @@ -40,7 +40,7 @@ SRC_URI=" " LICENSE="GPL-2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild index 84cd3b373f53..8f6a2ebb74a4 100644 --- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK ARM64_XPAK="17.0.2_p8" # musl bootstrap install @@ -31,7 +31,7 @@ SLOT="$(ver_cut 1)" DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.java.net" SRC_URI=" - https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz + https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz !system-bootstrap? ( $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) @@ -41,7 +41,7 @@ SRC_URI=" " LICENSE="GPL-2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" @@ -148,14 +148,14 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then + if has_version dev-java/openjdk:${SLOT}; then export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} elif use !system-bootstrap ; then local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" else if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) + JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} @@ -214,7 +214,7 @@ src_configure() { ) if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" if [[ -r ${zip} ]]; then myconf+=( --with-import-modules="${zip}" ) else @@ -249,7 +249,7 @@ src_compile() { src_install() { local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" + local ddest="${ED}/${dest#/}" cd "${S}"/build/*-release/images/jdk || die @@ -277,7 +277,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild index 13484eea8343..939553c1795e 100644 --- a/dev-java/openjdk/openjdk-8.322_p06.ebuild +++ b/dev-java/openjdk/openjdk-8.322_p06.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net" SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source" COMMON_DEPEND=" |