From e050e57bc73b42f73ead76ea1517c77eea17ab45 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Wed, 28 Apr 2021 10:38:39 -0400 Subject: dev-java/*openjdk*: various fixes - merge SLOT envs into one, less work when bumping (we don't support 8 anyways) - sync ::gentoo --- dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild | 7 +++++-- dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild | 7 +++++-- dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild | 7 +++++-- dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) (limited to 'dev-java/openj9-openjdk') diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild index 63b091f..98aa764 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild @@ -33,6 +33,7 @@ IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap COMMON_DEPEND=" media-libs/freetype:2= media-libs/giflib:0/7 + media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib @@ -115,7 +116,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" fi } @@ -221,7 +222,9 @@ src_configure() { --with-extra-cxxflags="${CXXFLAGS}" --with-extra-ldflags="${LDFLAGS}" --with-stdc++lib=dynamic + --with-freetype=system --with-giflib=system + --with-harfbuzz=system --with-lcms=system --with-libjpeg=system --with-libpng=system @@ -244,7 +247,7 @@ src_configure() { ) if use javafx; then - local zip="${EROOT%/}/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 diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild index 3d7eacb..61efb07 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild @@ -33,6 +33,7 @@ IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap COMMON_DEPEND=" media-libs/freetype:2= media-libs/giflib:0/7 + media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib @@ -115,7 +116,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" fi } @@ -221,7 +222,9 @@ src_configure() { --with-extra-cxxflags="${CXXFLAGS}" --with-extra-ldflags="${LDFLAGS}" --with-stdc++lib=dynamic + --with-freetype=system --with-giflib=system + --with-harfbuzz=system --with-lcms=system --with-libjpeg=system --with-libpng=system @@ -244,7 +247,7 @@ src_configure() { ) if use javafx; then - local zip="${EROOT%/}/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 diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild index b7b09be..c92e490 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild @@ -33,6 +33,7 @@ IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap COMMON_DEPEND=" media-libs/freetype:2= media-libs/giflib:0/7 + media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib @@ -112,7 +113,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" fi } @@ -179,7 +180,9 @@ src_configure() { --with-extra-cxxflags="${CXXFLAGS}" --with-extra-ldflags="${LDFLAGS}" --with-stdc++lib=dynamic + --with-freetype=system --with-giflib=system + --with-harfbuzz=system --with-lcms=system --with-libjpeg=system --with-libpng=system @@ -202,7 +205,7 @@ src_configure() { ) if use javafx; then - local zip="${EROOT%/}/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 diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild index 05f21ae..f7ee71c 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild @@ -33,6 +33,7 @@ IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap COMMON_DEPEND=" media-libs/freetype:2= media-libs/giflib:0/7 + media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib @@ -112,7 +113,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" fi } @@ -179,7 +180,9 @@ src_configure() { --with-extra-cxxflags="${CXXFLAGS}" --with-extra-ldflags="${LDFLAGS}" --with-stdc++lib=dynamic + --with-freetype=system --with-giflib=system + --with-harfbuzz=system --with-lcms=system --with-libjpeg=system --with-libpng=system @@ -202,7 +205,7 @@ src_configure() { ) if use javafx; then - local zip="${EROOT%/}/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 -- cgit v1.2.3-70-g09d2