From b052eb0cab865b79857ab28decf05c62378f41ae Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 14 Aug 2021 14:22:33 -0400 Subject: dev-java/openj9-openjdk{,-jre}-bin: don't rm freetype apparently fixed in semeru versions --- .../openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild | 5 ----- .../openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild index 75b829d..2473ff0 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild @@ -70,11 +70,6 @@ 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. - do_rm 'lib/libfreetype.*' - # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. if ! use alsa ; then diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild index 1e3225a..206c839 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild @@ -55,11 +55,6 @@ 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 - # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. if ! use alsa ; then -- cgit v1.2.3-54-g00ecf