| 1 |
commit: a0ae1d2f10373de2f5e991b915f6aa41b304220a |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 20:50:58 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 20:52:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ae1d2f |
| 7 |
|
| 8 |
dev-java/openjdk-jre-bin: QA fix absolute dosym |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild | 3 +-- |
| 14 |
dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild | 3 +-- |
| 15 |
dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild | 2 ++ |
| 16 |
dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild | 4 ++-- |
| 17 |
dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild | 4 ++-- |
| 18 |
5 files changed, 8 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index 6908dd4a66c..33938cb1973 100644 |
| 22 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild |
| 23 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild |
| 24 |
@@ -70,12 +70,11 @@ src_install() { |
| 25 |
fi |
| 26 |
|
| 27 |
rm -v lib/security/cacerts || die |
| 28 |
+ dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 29 |
|
| 30 |
dodir "${dest}" |
| 31 |
cp -pPR * "${ddest}" || die |
| 32 |
|
| 33 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 34 |
- |
| 35 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 36 |
java-vm_set-pax-markings "${ddest}" |
| 37 |
java-vm_revdep-mask |
| 38 |
|
| 39 |
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 |
| 40 |
index 6908dd4a66c..33938cb1973 100644 |
| 41 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild |
| 42 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild |
| 43 |
@@ -70,12 +70,11 @@ src_install() { |
| 44 |
fi |
| 45 |
|
| 46 |
rm -v lib/security/cacerts || die |
| 47 |
+ dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 48 |
|
| 49 |
dodir "${dest}" |
| 50 |
cp -pPR * "${ddest}" || die |
| 51 |
|
| 52 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 53 |
- |
| 54 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 55 |
java-vm_set-pax-markings "${ddest}" |
| 56 |
java-vm_revdep-mask |
| 57 |
|
| 58 |
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 |
| 59 |
index ce2ae329460..89a6c444db4 100644 |
| 60 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild |
| 61 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild |
| 62 |
@@ -71,6 +71,8 @@ src_install() { |
| 63 |
fi |
| 64 |
|
| 65 |
rm -v lib/security/cacerts || die |
| 66 |
+ dosym ../../../../../etc/ssl/certs/java/cacerts \ |
| 67 |
+ "${dest}"/jre/lib/security/cacerts |
| 68 |
|
| 69 |
dodir "${dest}" |
| 70 |
cp -pPR * "${ddest}" || die |
| 71 |
|
| 72 |
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 |
| 73 |
index 5c67ca6a621..9801e4fd060 100644 |
| 74 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild |
| 75 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild |
| 76 |
@@ -71,12 +71,12 @@ src_install() { |
| 77 |
fi |
| 78 |
|
| 79 |
rm -v lib/security/cacerts || die |
| 80 |
+ dosym ../../../../../etc/ssl/certs/java/cacerts \ |
| 81 |
+ "${dest}"/jre/lib/security/cacerts |
| 82 |
|
| 83 |
dodir "${dest}" |
| 84 |
cp -pPR * "${ddest}" || die |
| 85 |
|
| 86 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 87 |
- |
| 88 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 89 |
java-vm_set-pax-markings "${ddest}" |
| 90 |
java-vm_revdep-mask |
| 91 |
|
| 92 |
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 |
| 93 |
index c19496184b2..64875594ac4 100644 |
| 94 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild |
| 95 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild |
| 96 |
@@ -71,12 +71,12 @@ src_install() { |
| 97 |
fi |
| 98 |
|
| 99 |
rm -v lib/security/cacerts || die |
| 100 |
+ dosym ../../../../../etc/ssl/certs/java/cacerts \ |
| 101 |
+ "${dest}"/jre/lib/security/cacerts |
| 102 |
|
| 103 |
dodir "${dest}" |
| 104 |
cp -pPR * "${ddest}" || die |
| 105 |
|
| 106 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 107 |
- |
| 108 |
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 109 |
java-vm_set-pax-markings "${ddest}" |
| 110 |
java-vm_revdep-mask |
Archives