commit:     a0ae1d2f10373de2f5e991b915f6aa41b304220a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 20:50:58 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 20:52:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ae1d2f

dev-java/openjdk-jre-bin: QA fix absolute dosym

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

 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild | 3 +--
 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild | 3 +--
 dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild  | 2 ++
 dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild  | 4 ++--
 dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild 
b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
index 6908dd4a66c..33938cb1973 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
@@ -70,12 +70,11 @@ src_install() {
        fi
 
        rm -v lib/security/cacerts || die
+       dosym ../../../../etc/ssl/certs/java/cacerts 
"${dest}"/lib/security/cacerts
 
        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-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild 
b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
index 6908dd4a66c..33938cb1973 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
@@ -70,12 +70,11 @@ src_install() {
        fi
 
        rm -v lib/security/cacerts || die
+       dosym ../../../../etc/ssl/certs/java/cacerts 
"${dest}"/lib/security/cacerts
 
        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-jre-bin/openjdk-jre-bin-8.222_p10.ebuild 
b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
index ce2ae329460..89a6c444db4 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
@@ -71,6 +71,8 @@ src_install() {
        fi
 
        rm -v lib/security/cacerts || die
+       dosym ../../../../../etc/ssl/certs/java/cacerts \
+               "${dest}"/jre/lib/security/cacerts
 
        dodir "${dest}"
        cp -pPR * "${ddest}" || die

diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild 
b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
index 5c67ca6a621..9801e4fd060 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
@@ -71,12 +71,12 @@ src_install() {
        fi
 
        rm -v lib/security/cacerts || die
+       dosym ../../../../../etc/ssl/certs/java/cacerts \
+               "${dest}"/jre/lib/security/cacerts
 
        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-jre-bin/openjdk-jre-bin-8.242_p08.ebuild 
b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
index c19496184b2..64875594ac4 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
@@ -71,12 +71,12 @@ src_install() {
        fi
 
        rm -v lib/security/cacerts || die
+       dosym ../../../../../etc/ssl/certs/java/cacerts \
+               "${dest}"/jre/lib/security/cacerts
 
        dodir "${dest}"
        cp -pPR * "${ddest}" || die
 
-       dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts 
"${dest}"/lib/security/cacerts
-
        java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
        java-vm_set-pax-markings "${ddest}"
        java-vm_revdep-mask

Reply via email to