diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-04-28 10:38:39 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-04-28 10:39:49 -0400 |
| commit | e050e57bc73b42f73ead76ea1517c77eea17ab45 (patch) | |
| tree | 11c06baf764b616d3091b6a5a7a159782e2c7952 /dev-java/openjdk-bin | |
| parent | 8c919cbaa0a6511c8b8c333142a309ffd4995624 (diff) | |
| download | gentoo-overlay-e050e57bc73b42f73ead76ea1517c77eea17ab45.tar.xz gentoo-overlay-e050e57bc73b42f73ead76ea1517c77eea17ab45.zip | |
dev-java/*openjdk*: various fixes
- merge SLOT envs into one, less work when bumping (we don't support 8
anyways)
- sync ::gentoo
Diffstat (limited to 'dev-java/openjdk-bin')
| -rw-r--r-- | dev-java/openjdk-bin/files/openjdk-bin.env.sh (renamed from dev-java/openjdk-bin/files/openjdk-bin-16.env.sh) | 0 | ||||
| -rw-r--r-- | dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild | 7 |
2 files changed, 1 insertions, 6 deletions
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-16.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh index 9e9c5ec..9e9c5ec 100644 --- a/dev-java/openjdk-bin/files/openjdk-bin-16.env.sh +++ b/dev-java/openjdk-bin/files/openjdk-bin.env.sh diff --git a/dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild index 6a82f20..8682e0f 100644 --- a/dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild @@ -60,11 +60,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 @@ -89,7 +84,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |