commit:     b2434258e95a83bb316a87b8b532fcc14823f103
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 08:53:42 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 08:55:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2434258

dev-java/openjdk: QA: fix dosym usage

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 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(-)

diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild 
b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
index 8be378782e3..e6429b52426 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 dc940a8919c..c5cf008ef3e 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 7f674fb94cc..1374a9be223 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 4fa1e0c103a..b3cd4c5a8ea 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 803f0b77b68..b1a5c232283 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}"

Reply via email to