commit: 058aae49c68c2e4c30961da6c15fa4b95b0b1cde Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Thu May 9 21:43:21 2019 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu May 9 23:04:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=058aae49
dev-java/openjdk-bin: revbump :11, use system-wide ca-certificates Bug: https://bugs.gentoo.org/682308 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> ...penjdk-bin-11.0.3_p7.ebuild => openjdk-bin-11.0.3_p7-r1.ebuild} | 7 ++++++- dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild similarity index 92% copy from dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild copy to dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild index ad6e3e5d68c..a70143ee9f5 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild @@ -29,6 +29,7 @@ IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +we RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 + >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) @@ -53,7 +54,7 @@ S="${WORKDIR}/jdk-${MY_PV}" src_install() { local dest="/opt/${P}" - local ddest="${ED}${dest#/}" + 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 @@ -78,9 +79,13 @@ src_install() { rm -v lib/src.zip || die fi + mv lib/security/cacerts lib/security/cacerts.orig || die + dodir "${dest}" cp -pPR * "${ddest}" || die + dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild index ad6e3e5d68c..aa4a0aeb2e8 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild @@ -53,7 +53,7 @@ S="${WORKDIR}/jdk-${MY_PV}" src_install() { local dest="/opt/${P}" - local ddest="${ED}${dest#/}" + 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 @@ -78,9 +78,13 @@ src_install() { rm -v lib/src.zip || die fi + mv lib/security/cacerts lib/security/cacerts.orig || die + dodir "${dest}" cp -pPR * "${ddest}" || die + dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask
