1 |
commit: 9700f30c9fb2daeec932ce024bfbd49408e780e1 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 31 08:31:22 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 31 08:31:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9700f30c |
7 |
|
8 |
dev-java/openjdk-jre-bin: stable latest, drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjdk-jre-bin/Manifest | 1 - |
14 |
.../openjdk-jre-bin-11.0.5_p10.ebuild | 97 ---------------------- |
15 |
.../openjdk-jre-bin-11.0.6_p10.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 99 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest |
19 |
index 55846b3e828..d3d74024c52 100644 |
20 |
--- a/dev-java/openjdk-jre-bin/Manifest |
21 |
+++ b/dev-java/openjdk-jre-bin/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz 42132415 BLAKE2B f857b9618f653ce3df1a1f6b3a3f3fd0ceaaa2d66b9d58872817fdbb7846195459b0fd1d79cddb444e0cd17faafc46bcea85fa22b810d2e93b95a9829da6dad5 SHA512 b13ee8af718c701195765eb6c36c8a6dfc32a5a39f8da4118db4e5ef8ab2012f8952cea73a964fcac079487b6372c0be727f0f2df43b948ccdd4663e6b327d1d |
24 |
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz 42198347 BLAKE2B e0022f46f0f3de41d28baf19bcea2c7d6237e80586b7a1e3fb2b97aced18d564fe03a6706b8a3fe97375ff6be395aceafd1e0dba6adaddaa7285b0b8eb24310b SHA512 0d1366c68ad12fafc76edddc7d385f612751182b5492cff4309d542a0e12b13c9b17ca89a0a8218ad0f8182b24285189158c43759db54645758c7ea8dc4d6ce9 |
25 |
DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index 33938cb1973..00000000000 |
30 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,97 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-inherit java-vm-2 |
39 |
- |
40 |
-abi_uri() { |
41 |
- echo "${2-$1}? ( |
42 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
43 |
- )" |
44 |
-} |
45 |
- |
46 |
-MY_PV=${PV/_p/+} |
47 |
-SLOT=${MY_PV%%[.+]*} |
48 |
- |
49 |
-SRC_URI=" |
50 |
- $(abi_uri x64 amd64) |
51 |
-" |
52 |
- |
53 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
54 |
-HOMEPAGE="https://adoptopenjdk.net" |
55 |
-LICENSE="GPL-2-with-classpath-exception" |
56 |
-KEYWORDS="~amd64" |
57 |
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- media-libs/fontconfig:1.0 |
61 |
- media-libs/freetype:2 |
62 |
- >net-libs/libnet-1.1 |
63 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
64 |
- >=sys-libs/glibc-2.2.5:* |
65 |
- sys-libs/zlib |
66 |
- alsa? ( media-libs/alsa-lib ) |
67 |
- cups? ( net-print/cups ) |
68 |
- selinux? ( sec-policy/selinux-java ) |
69 |
- !headless-awt? ( |
70 |
- x11-libs/libX11 |
71 |
- x11-libs/libXext |
72 |
- x11-libs/libXi |
73 |
- x11-libs/libXrender |
74 |
- x11-libs/libXtst |
75 |
- )" |
76 |
- |
77 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
78 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
79 |
- |
80 |
-RESTRICT="preserve-libs splitdebug" |
81 |
-QA_PREBUILT="*" |
82 |
- |
83 |
-S="${WORKDIR}/jdk-${MY_PV}-jre" |
84 |
- |
85 |
-src_install() { |
86 |
- local dest="/opt/${P}" |
87 |
- local ddest="${ED%/}/${dest#/}" |
88 |
- |
89 |
- # Not sure why they bundle this as it's commonly available and they |
90 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
91 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
92 |
- rm -vf lib/libfreetype.so || die |
93 |
- |
94 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
95 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
96 |
- if ! use alsa ; then |
97 |
- rm -v lib/libjsound.* || die |
98 |
- fi |
99 |
- |
100 |
- if use headless-awt ; then |
101 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
102 |
- fi |
103 |
- |
104 |
- rm -v lib/security/cacerts || die |
105 |
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
106 |
- |
107 |
- dodir "${dest}" |
108 |
- cp -pPR * "${ddest}" || die |
109 |
- |
110 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
111 |
- java-vm_set-pax-markings "${ddest}" |
112 |
- java-vm_revdep-mask |
113 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
114 |
-} |
115 |
- |
116 |
-pkg_postinst() { |
117 |
- java-vm-2_pkg_postinst |
118 |
- |
119 |
- if use gentoo-vm ; then |
120 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" |
121 |
- ewarn "recognised by the system. This will almost certainly break things." |
122 |
- else |
123 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" |
124 |
- ewarn "will not be recognised by the system. For example, simply calling" |
125 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
126 |
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its" |
127 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
128 |
- fi |
129 |
-} |
130 |
|
131 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild |
132 |
index 33938cb1973..ec55ede5233 100644 |
133 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild |
134 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild |
135 |
@@ -21,7 +21,7 @@ SRC_URI=" |
136 |
DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
137 |
HOMEPAGE="https://adoptopenjdk.net" |
138 |
LICENSE="GPL-2-with-classpath-exception" |
139 |
-KEYWORDS="~amd64" |
140 |
+KEYWORDS="amd64" |
141 |
IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart" |
142 |
|
143 |
RDEPEND=" |