Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/
Date: Mon, 27 Jan 2020 20:53:34
Message-Id: 1580158375.620acfba497e31a8ac19ad5a1cbcc4a0bb8b6447.gyakovlev@gentoo
1 commit: 620acfba497e31a8ac19ad5a1cbcc4a0bb8b6447
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 27 20:40:49 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 20:52:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=620acfba
7
8 dev-java/openjdk-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-bin/openjdk-bin-11.0.5_p10.ebuild | 4 ++--
14 dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild | 4 ++--
15 dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild | 4 ++--
16 dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild | 4 ++--
17 dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild | 4 ++--
18 5 files changed, 10 insertions(+), 10 deletions(-)
19
20 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
21 index 52b3d9d67df..50bf2b6b9cc 100644
22 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
23 +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
24 @@ -86,12 +86,12 @@ src_install() {
25 fi
26
27 rm -v lib/security/cacerts || die
28 + dosym ../../../../etc/ssl/certs/java/cacerts \
29 + "${dest}"/lib/security/cacerts
30
31 dodir "${dest}"
32 cp -pPR * "${ddest}" || die
33
34 - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
35 -
36 use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
37 java-vm_set-pax-markings "${ddest}"
38 java-vm_revdep-mask
39
40 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
41 index c629d40f486..a8cbd6ba1b4 100644
42 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
43 +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
44 @@ -87,12 +87,12 @@ src_install() {
45 fi
46
47 rm -v lib/security/cacerts || die
48 + dosym ../../../../etc/ssl/certs/java/cacerts \
49 + "${dest}"/lib/security/cacerts
50
51 dodir "${dest}"
52 cp -pPR * "${ddest}" || die
53
54 - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
55 -
56 use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
57 java-vm_set-pax-markings "${ddest}"
58 java-vm_revdep-mask
59
60 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
61 index 1c48331fa58..49f6e257858 100644
62 --- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
63 +++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
64 @@ -80,12 +80,12 @@ src_install() {
65 fi
66
67 rm -v jre/lib/security/cacerts || die
68 + dosym ../../../../../etc/ssl/certs/java/cacerts \
69 + "${dest}"/jre/lib/security/cacerts
70
71 dodir "${dest}"
72 cp -pPR * "${ddest}" || die
73
74 - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
75 -
76 use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
77 java-vm_set-pax-markings "${ddest}"
78 java-vm_revdep-mask
79
80 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
81 index 9225c3e2202..f4558fbf91e 100644
82 --- a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
83 +++ b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
84 @@ -80,12 +80,12 @@ src_install() {
85 fi
86
87 rm -v jre/lib/security/cacerts || die
88 + dosym ../../../../../etc/ssl/certs/java/cacerts \
89 + "${dest}"/jre/lib/security/cacerts
90
91 dodir "${dest}"
92 cp -pPR * "${ddest}" || die
93
94 - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
95 -
96 use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
97 java-vm_set-pax-markings "${ddest}"
98 java-vm_revdep-mask
99
100 diff --git a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
101 index c3d90d685e6..01ed27ee1ac 100644
102 --- a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
103 +++ b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
104 @@ -78,12 +78,12 @@ src_install() {
105 fi
106
107 rm -v jre/lib/security/cacerts || die
108 + dosym ../../../../../etc/ssl/certs/java/cacerts \
109 + "${dest}"/jre/lib/security/cacerts
110
111 dodir "${dest}"
112 cp -pPR * "${ddest}" || die
113
114 - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
115 -
116 java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
117 java-vm_set-pax-markings "${ddest}"
118 java-vm_revdep-mask