| 1 |
commit: 058aae49c68c2e4c30961da6c15fa4b95b0b1cde |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 9 21:43:21 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 9 23:04:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=058aae49 |
| 7 |
|
| 8 |
dev-java/openjdk-bin: revbump :11, use system-wide ca-certificates |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/682308 |
| 11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
...penjdk-bin-11.0.3_p7.ebuild => openjdk-bin-11.0.3_p7-r1.ebuild} | 7 ++++++- |
| 15 |
dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild | 6 +++++- |
| 16 |
2 files changed, 11 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild |
| 19 |
similarity index 92% |
| 20 |
copy from dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild |
| 21 |
copy to dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild |
| 22 |
index ad6e3e5d68c..a70143ee9f5 100644 |
| 23 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild |
| 24 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild |
| 25 |
@@ -29,6 +29,7 @@ IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +we |
| 26 |
RDEPEND=" |
| 27 |
media-libs/fontconfig:1.0 |
| 28 |
media-libs/freetype:2 |
| 29 |
+ >=sys-apps/baselayout-java-0.1.0-r1 |
| 30 |
>=sys-libs/glibc-2.2.5:* |
| 31 |
sys-libs/zlib |
| 32 |
alsa? ( media-libs/alsa-lib ) |
| 33 |
@@ -53,7 +54,7 @@ S="${WORKDIR}/jdk-${MY_PV}" |
| 34 |
|
| 35 |
src_install() { |
| 36 |
local dest="/opt/${P}" |
| 37 |
- local ddest="${ED}${dest#/}" |
| 38 |
+ local ddest="${ED%/}/${dest#/}" |
| 39 |
|
| 40 |
# Not sure why they bundle this as it's commonly available and they |
| 41 |
# only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
| 42 |
@@ -78,9 +79,13 @@ src_install() { |
| 43 |
rm -v lib/src.zip || die |
| 44 |
fi |
| 45 |
|
| 46 |
+ mv lib/security/cacerts lib/security/cacerts.orig || die |
| 47 |
+ |
| 48 |
dodir "${dest}" |
| 49 |
cp -pPR * "${ddest}" || die |
| 50 |
|
| 51 |
+ dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 52 |
+ |
| 53 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 54 |
java-vm_set-pax-markings "${ddest}" |
| 55 |
java-vm_revdep-mask |
| 56 |
|
| 57 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild |
| 58 |
index ad6e3e5d68c..aa4a0aeb2e8 100644 |
| 59 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild |
| 60 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild |
| 61 |
@@ -53,7 +53,7 @@ S="${WORKDIR}/jdk-${MY_PV}" |
| 62 |
|
| 63 |
src_install() { |
| 64 |
local dest="/opt/${P}" |
| 65 |
- local ddest="${ED}${dest#/}" |
| 66 |
+ local ddest="${ED%/}/${dest#/}" |
| 67 |
|
| 68 |
# Not sure why they bundle this as it's commonly available and they |
| 69 |
# only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
| 70 |
@@ -78,9 +78,13 @@ src_install() { |
| 71 |
rm -v lib/src.zip || die |
| 72 |
fi |
| 73 |
|
| 74 |
+ mv lib/security/cacerts lib/security/cacerts.orig || die |
| 75 |
+ |
| 76 |
dodir "${dest}" |
| 77 |
cp -pPR * "${ddest}" || die |
| 78 |
|
| 79 |
+ dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
| 80 |
+ |
| 81 |
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 82 |
java-vm_set-pax-markings "${ddest}" |
| 83 |
java-vm_revdep-mask |
Archives