From b2434258e95a83bb316a87b8b532fcc14823f103 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Tue, 28 Jan 2020 00:53:42 -0800 Subject: dev-java/openjdk: QA: fix dosym usage Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev --- dev-java/openjdk/openjdk-11.0.5_p10.ebuild | 4 ++-- dev-java/openjdk/openjdk-11.0.6.ebuild | 4 ++-- dev-java/openjdk/openjdk-8.222_p10.ebuild | 2 +- dev-java/openjdk/openjdk-8.232_p09.ebuild | 2 +- dev-java/openjdk/openjdk-8.242.ebuild | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'dev-java') diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild index 8be378782e3e..e6429b524269 100644 --- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild @@ -233,7 +233,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" @@ -248,7 +248,7 @@ src_install() { if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild index dc940a8919c6..c5cf008ef3e2 100644 --- a/dev-java/openjdk/openjdk-11.0.6.ebuild +++ b/dev-java/openjdk/openjdk-11.0.6.ebuild @@ -233,7 +233,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" @@ -248,7 +248,7 @@ src_install() { if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild index 7f674fb94cc4..1374a9be223f 100644 --- a/dev-java/openjdk/openjdk-8.222_p10.ebuild +++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild @@ -226,7 +226,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild index 4fa1e0c103a0..b3cd4c5a8eac 100644 --- a/dev-java/openjdk/openjdk-8.232_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild @@ -226,7 +226,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild index 803f0b77b68d..b1a5c2322839 100644 --- a/dev-java/openjdk/openjdk-8.242.ebuild +++ b/dev-java/openjdk/openjdk-8.242.ebuild @@ -200,7 +200,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts + dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" -- cgit v1.2.3-65-gdbad