1 |
commit: 9638d4a720ab17ca5822d1dc03a602f612b55333 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 8 21:09:06 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 8 21:10:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9638d4a7 |
7 |
|
8 |
dev-java/openjdk-bin: drop old :11 |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjdk-bin/Manifest | 6 -- |
14 |
dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild | 103 ---------------------- |
15 |
dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild | 103 ---------------------- |
16 |
3 files changed, 212 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
19 |
index 76a9b3d0d16..dcd35c52ece 100644 |
20 |
--- a/dev-java/openjdk-bin/Manifest |
21 |
+++ b/dev-java/openjdk-bin/Manifest |
22 |
@@ -1,11 +1,5 @@ |
23 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a |
24 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_9.tar.gz 194151421 BLAKE2B f2190472dc06a297ffd9fcdb69e6c432503599297ad61795ee6fe57fe7475b1bd8b32105b29da33324f74bd34de2050809362dc4cad0165fcbd09b88d75431ce SHA512 c4703e840aa719adb35e83286fb921a3e8feae08e5b483eae726c892ddbc2c312c43bec3ba093e124b8541d08e417e46dc4dd0de3d5b1aa00b253e1532d43edb |
25 |
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz 194142513 BLAKE2B 1809ee89a4dd31d5453d15b0e3672e1d4a9e1e4573954a8dcf793cb4f837ca4bb44eab73fb685896273fa5301011d671568cb7648c0c5095659f5441a559bfad SHA512 22964e4b0819eb214f378969501b9ad67e39f4efeb7425245022f7eae804386a5e0c7a8139a5df604efd649ff1d551323e6b08299ce0e3f71719e3cd120d7b91 |
26 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0 |
27 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_9.tar.gz 180384673 BLAKE2B 51cc7f53c371dc140f9cd17c3523251929e384ca73eb34c283b969be1b5c91b1ec15bf72fe08c80b141a96aa0de5dcb0c9631e2f776e123ad5a4059174dfbc1a SHA512 00ecb0fe1e5b4f682841eeda41525dc5a9205e55ec8ccb332aa1dc724499d2df927870c8b70da950384b50a8014bbd70d0025a5ce0ccb90bfc4df028e64613cb |
28 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz 180425080 BLAKE2B 77f571a145e837c80da49a2ef8d20089b24ec23abf8078cc5781762ec9b88038d4c47c9d36766195c2f96809c98e4706b249c14518ef450b1fbfb100ba8c49d8 SHA512 6b7542fcbd9b727e93a2c2e157ecd52fb27db74d67cc98fb713eed531c7ea4420fdae2e420131b3d046e6ad2bccb2f91461928750e7b9c4274984a983293be8a |
29 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc |
30 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz 195592867 BLAKE2B 91593fc849e558abf965ecfeadefbeab464e1c4562ec57d0bb6dcb9c17525a7cf37593d8fa2146d4545122a634d22c46764af32a124a0e17621da8b643c2770d SHA512 976874e04df71f747a5a7a78081b5989adfcf783b5642d3a0ca2ab2a98547fbe9495dce57b8eda69240f1850bead7bdd6cd59bf9f53ba70400e0806e0950866d |
31 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a |
32 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2 |
33 |
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027 |
34 |
|
35 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild |
36 |
deleted file mode 100644 |
37 |
index ad6e3e5d68c..00000000000 |
38 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,103 +0,0 @@ |
41 |
-# Copyright 1999-2019 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=6 |
45 |
- |
46 |
-inherit java-vm-2 |
47 |
- |
48 |
-abi_uri() { |
49 |
- echo "${2-$1}? ( |
50 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
51 |
- )" |
52 |
-} |
53 |
- |
54 |
-MY_PV=${PV/_p/+} |
55 |
-SLOT=${MY_PV%%[.+]*} |
56 |
- |
57 |
-SRC_URI=" |
58 |
- $(abi_uri x64 amd64) |
59 |
- $(abi_uri aarch64 arm64) |
60 |
- $(abi_uri ppc64le ppc64) |
61 |
-" |
62 |
- |
63 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
64 |
-HOMEPAGE="https://adoptopenjdk.net" |
65 |
-LICENSE="GPL-2-with-classpath-exception" |
66 |
-KEYWORDS="~amd64 ~arm64 ~ppc64" |
67 |
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart" |
68 |
- |
69 |
-RDEPEND=" |
70 |
- media-libs/fontconfig:1.0 |
71 |
- media-libs/freetype:2 |
72 |
- >=sys-libs/glibc-2.2.5:* |
73 |
- sys-libs/zlib |
74 |
- alsa? ( media-libs/alsa-lib ) |
75 |
- cups? ( net-print/cups ) |
76 |
- doc? ( dev-java/java-sdk-docs:${SLOT} ) |
77 |
- selinux? ( sec-policy/selinux-java ) |
78 |
- !headless-awt? ( |
79 |
- x11-libs/libX11 |
80 |
- x11-libs/libXext |
81 |
- x11-libs/libXi |
82 |
- x11-libs/libXrender |
83 |
- x11-libs/libXtst |
84 |
- )" |
85 |
- |
86 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
87 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
88 |
- |
89 |
-RESTRICT="preserve-libs splitdebug" |
90 |
-QA_PREBUILT="*" |
91 |
- |
92 |
-S="${WORKDIR}/jdk-${MY_PV}" |
93 |
- |
94 |
-src_install() { |
95 |
- local dest="/opt/${P}" |
96 |
- local ddest="${ED}${dest#/}" |
97 |
- |
98 |
- # Not sure why they bundle this as it's commonly available and they |
99 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
100 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
101 |
- rm -vf lib/libfreetype.so || die |
102 |
- |
103 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
104 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
105 |
- if ! use alsa ; then |
106 |
- rm -v lib/libjsound.* || die |
107 |
- fi |
108 |
- |
109 |
- if ! use examples ; then |
110 |
- rm -vr demo/ || die |
111 |
- fi |
112 |
- |
113 |
- if use headless-awt ; then |
114 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
115 |
- fi |
116 |
- |
117 |
- if ! use source ; then |
118 |
- rm -v lib/src.zip || die |
119 |
- fi |
120 |
- |
121 |
- dodir "${dest}" |
122 |
- cp -pPR * "${ddest}" || die |
123 |
- |
124 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
125 |
- java-vm_set-pax-markings "${ddest}" |
126 |
- java-vm_revdep-mask |
127 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
128 |
-} |
129 |
- |
130 |
-pkg_postinst() { |
131 |
- java-vm-2_pkg_postinst |
132 |
- |
133 |
- if use gentoo-vm ; then |
134 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
135 |
- ewarn "recognised by the system. This will almost certainly break things." |
136 |
- else |
137 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
138 |
- ewarn "will not be recognised by the system. For example, simply calling" |
139 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
140 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
141 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
142 |
- fi |
143 |
-} |
144 |
|
145 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild |
146 |
deleted file mode 100644 |
147 |
index ad6e3e5d68c..00000000000 |
148 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild |
149 |
+++ /dev/null |
150 |
@@ -1,103 +0,0 @@ |
151 |
-# Copyright 1999-2019 Gentoo Authors |
152 |
-# Distributed under the terms of the GNU General Public License v2 |
153 |
- |
154 |
-EAPI=6 |
155 |
- |
156 |
-inherit java-vm-2 |
157 |
- |
158 |
-abi_uri() { |
159 |
- echo "${2-$1}? ( |
160 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
161 |
- )" |
162 |
-} |
163 |
- |
164 |
-MY_PV=${PV/_p/+} |
165 |
-SLOT=${MY_PV%%[.+]*} |
166 |
- |
167 |
-SRC_URI=" |
168 |
- $(abi_uri x64 amd64) |
169 |
- $(abi_uri aarch64 arm64) |
170 |
- $(abi_uri ppc64le ppc64) |
171 |
-" |
172 |
- |
173 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
174 |
-HOMEPAGE="https://adoptopenjdk.net" |
175 |
-LICENSE="GPL-2-with-classpath-exception" |
176 |
-KEYWORDS="~amd64 ~arm64 ~ppc64" |
177 |
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart" |
178 |
- |
179 |
-RDEPEND=" |
180 |
- media-libs/fontconfig:1.0 |
181 |
- media-libs/freetype:2 |
182 |
- >=sys-libs/glibc-2.2.5:* |
183 |
- sys-libs/zlib |
184 |
- alsa? ( media-libs/alsa-lib ) |
185 |
- cups? ( net-print/cups ) |
186 |
- doc? ( dev-java/java-sdk-docs:${SLOT} ) |
187 |
- selinux? ( sec-policy/selinux-java ) |
188 |
- !headless-awt? ( |
189 |
- x11-libs/libX11 |
190 |
- x11-libs/libXext |
191 |
- x11-libs/libXi |
192 |
- x11-libs/libXrender |
193 |
- x11-libs/libXtst |
194 |
- )" |
195 |
- |
196 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
197 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
198 |
- |
199 |
-RESTRICT="preserve-libs splitdebug" |
200 |
-QA_PREBUILT="*" |
201 |
- |
202 |
-S="${WORKDIR}/jdk-${MY_PV}" |
203 |
- |
204 |
-src_install() { |
205 |
- local dest="/opt/${P}" |
206 |
- local ddest="${ED}${dest#/}" |
207 |
- |
208 |
- # Not sure why they bundle this as it's commonly available and they |
209 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
210 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
211 |
- rm -vf lib/libfreetype.so || die |
212 |
- |
213 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
214 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
215 |
- if ! use alsa ; then |
216 |
- rm -v lib/libjsound.* || die |
217 |
- fi |
218 |
- |
219 |
- if ! use examples ; then |
220 |
- rm -vr demo/ || die |
221 |
- fi |
222 |
- |
223 |
- if use headless-awt ; then |
224 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
225 |
- fi |
226 |
- |
227 |
- if ! use source ; then |
228 |
- rm -v lib/src.zip || die |
229 |
- fi |
230 |
- |
231 |
- dodir "${dest}" |
232 |
- cp -pPR * "${ddest}" || die |
233 |
- |
234 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
235 |
- java-vm_set-pax-markings "${ddest}" |
236 |
- java-vm_revdep-mask |
237 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
238 |
-} |
239 |
- |
240 |
-pkg_postinst() { |
241 |
- java-vm-2_pkg_postinst |
242 |
- |
243 |
- if use gentoo-vm ; then |
244 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
245 |
- ewarn "recognised by the system. This will almost certainly break things." |
246 |
- else |
247 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
248 |
- ewarn "will not be recognised by the system. For example, simply calling" |
249 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
250 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
251 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
252 |
- fi |
253 |
-} |