1 |
commit: 92d608866b0e5063e75687332e4374a75d1309f5 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 8 21:06:15 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 8 21:10:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d60886 |
7 |
|
8 |
dev-java/openjdk-bin: drop old :8 |
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 | 2 - |
14 |
dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild | 102 ---------------------- |
15 |
dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild | 102 ---------------------- |
16 |
3 files changed, 206 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
19 |
index 6db9d67d1c2..68f9aa20baf 100644 |
20 |
--- a/dev-java/openjdk-bin/Manifest |
21 |
+++ b/dev-java/openjdk-bin/Manifest |
22 |
@@ -6,7 +6,5 @@ DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd |
23 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz 195592867 BLAKE2B 91593fc849e558abf965ecfeadefbeab464e1c4562ec57d0bb6dcb9c17525a7cf37593d8fa2146d4545122a634d22c46764af32a124a0e17621da8b643c2770d SHA512 976874e04df71f747a5a7a78081b5989adfcf783b5642d3a0ca2ab2a98547fbe9495dce57b8eda69240f1850bead7bdd6cd59bf9f53ba70400e0806e0950866d |
24 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a |
25 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2 |
26 |
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u202b08.tar.gz 101497437 BLAKE2B 4fdc659f9cc50fd968cd339cf24780cd0097286fe3004669972b925fa5c8bbd0e6024587f761ef05ec170c4caa6a915f9f748badd021fae6eb669aa613e1c90d SHA512 42991d2203d51492090e92ee4c7600e7b0ab613550d925f52dd7c7c3b796f9bd36e7284d55540b661a5175064d714267cddd786d81aeda358feda3927e3676e3 |
27 |
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027 |
28 |
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz 104336613 BLAKE2B 3bf42af57707a057077969487f66c32289d0dc96639aee553b18812262d517b07a8e80e3351a4b22731569c7d7c1443d8018d05a41a26abf844a1a2950e7c368 SHA512 8e04d22fe03d2ab92e48fbbfe7d6015d9062d8e767d55ca9235e02b39841236d47b8977ae0252d5f4351a4c5fe082d377e2f8978156cf73c0208028a422e5e4c |
29 |
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz 104368598 BLAKE2B 0c16398c1e962e53316eb9301a8ebb6dc7b37ef812d3b65719c239f392074fcba999fca8442cc52a0b067eb4761b0477e9da243d0d84a2e2ded1d883614d15b3 SHA512 7674f26bbc69535c1d06d7364f515ddd00f1f43f6fb76c806c56cd3b379e03047084fbf6439e375cf57257b8a1fdf94702ba063bf843793b009a76fb449a5cc9 |
30 |
|
31 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild |
32 |
deleted file mode 100644 |
33 |
index d214f0e0b45..00000000000 |
34 |
--- a/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,102 +0,0 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-inherit eapi7-ver java-vm-2 |
43 |
- |
44 |
-abi_uri() { |
45 |
- echo "${2-$1}? ( |
46 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz |
47 |
- )" |
48 |
-} |
49 |
- |
50 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
51 |
-SLOT="$(ver_cut 1)" |
52 |
- |
53 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
54 |
-HOMEPAGE="https://adoptopenjdk.net" |
55 |
-SRC_URI=" |
56 |
- $(abi_uri x64 amd64) |
57 |
- $(abi_uri ppc64le ppc64) |
58 |
-" |
59 |
- |
60 |
-LICENSE="GPL-2-with-classpath-exception" |
61 |
-KEYWORDS="~amd64 ~ppc64" |
62 |
- |
63 |
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart" |
64 |
- |
65 |
-RDEPEND=" |
66 |
- media-libs/fontconfig:1.0 |
67 |
- media-libs/freetype:2 |
68 |
- >=sys-libs/glibc-2.2.5:* |
69 |
- sys-libs/zlib |
70 |
- alsa? ( media-libs/alsa-lib ) |
71 |
- cups? ( net-print/cups ) |
72 |
- doc? ( dev-java/java-sdk-docs:1.${SLOT} ) |
73 |
- selinux? ( sec-policy/selinux-java ) |
74 |
- !headless-awt? ( |
75 |
- x11-libs/libX11 |
76 |
- x11-libs/libXext |
77 |
- x11-libs/libXi |
78 |
- x11-libs/libXrender |
79 |
- x11-libs/libXtst |
80 |
- )" |
81 |
- |
82 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
83 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
84 |
- |
85 |
-RESTRICT="preserve-libs splitdebug" |
86 |
-QA_PREBUILT="*" |
87 |
- |
88 |
-S="${WORKDIR}/jdk${MY_PV}" |
89 |
- |
90 |
-src_install() { |
91 |
- local dest="/opt/${P}" |
92 |
- local ddest="${ED}${dest#/}" |
93 |
- |
94 |
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die |
95 |
- |
96 |
- # this does not exist on arm64 hence -f |
97 |
- rm -fv jre/lib/*/libfreetype.so* || die |
98 |
- |
99 |
- if ! use alsa ; then |
100 |
- rm -v jre/lib/*/libjsoundalsa.so* || die |
101 |
- fi |
102 |
- |
103 |
- if ! use examples ; then |
104 |
- rm -vr sample || die |
105 |
- fi |
106 |
- |
107 |
- if use headless-awt ; then |
108 |
- rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ |
109 |
- {,jre/}bin/policytool bin/appletviewer || die |
110 |
- fi |
111 |
- |
112 |
- if ! use source ; then |
113 |
- rm -v src.zip || die |
114 |
- fi |
115 |
- |
116 |
- dodir "${dest}" |
117 |
- cp -pPR * "${ddest}" || die |
118 |
- |
119 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
120 |
- java-vm_set-pax-markings "${ddest}" |
121 |
- java-vm_revdep-mask |
122 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
123 |
-} |
124 |
- |
125 |
-pkg_postinst() { |
126 |
- java-vm-2_pkg_postinst |
127 |
- |
128 |
- if use gentoo-vm ; then |
129 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
130 |
- ewarn "recognised by the system. This will almost certainly break things." |
131 |
- else |
132 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
133 |
- ewarn "will not be recognised by the system. For example, simply calling" |
134 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
135 |
- ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its" |
136 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
137 |
- fi |
138 |
-} |
139 |
|
140 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild |
141 |
deleted file mode 100644 |
142 |
index d214f0e0b45..00000000000 |
143 |
--- a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,102 +0,0 @@ |
146 |
-# Copyright 1999-2019 Gentoo Authors |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=6 |
150 |
- |
151 |
-inherit eapi7-ver java-vm-2 |
152 |
- |
153 |
-abi_uri() { |
154 |
- echo "${2-$1}? ( |
155 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz |
156 |
- )" |
157 |
-} |
158 |
- |
159 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
160 |
-SLOT="$(ver_cut 1)" |
161 |
- |
162 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
163 |
-HOMEPAGE="https://adoptopenjdk.net" |
164 |
-SRC_URI=" |
165 |
- $(abi_uri x64 amd64) |
166 |
- $(abi_uri ppc64le ppc64) |
167 |
-" |
168 |
- |
169 |
-LICENSE="GPL-2-with-classpath-exception" |
170 |
-KEYWORDS="~amd64 ~ppc64" |
171 |
- |
172 |
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart" |
173 |
- |
174 |
-RDEPEND=" |
175 |
- media-libs/fontconfig:1.0 |
176 |
- media-libs/freetype:2 |
177 |
- >=sys-libs/glibc-2.2.5:* |
178 |
- sys-libs/zlib |
179 |
- alsa? ( media-libs/alsa-lib ) |
180 |
- cups? ( net-print/cups ) |
181 |
- doc? ( dev-java/java-sdk-docs:1.${SLOT} ) |
182 |
- selinux? ( sec-policy/selinux-java ) |
183 |
- !headless-awt? ( |
184 |
- x11-libs/libX11 |
185 |
- x11-libs/libXext |
186 |
- x11-libs/libXi |
187 |
- x11-libs/libXrender |
188 |
- x11-libs/libXtst |
189 |
- )" |
190 |
- |
191 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
192 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
193 |
- |
194 |
-RESTRICT="preserve-libs splitdebug" |
195 |
-QA_PREBUILT="*" |
196 |
- |
197 |
-S="${WORKDIR}/jdk${MY_PV}" |
198 |
- |
199 |
-src_install() { |
200 |
- local dest="/opt/${P}" |
201 |
- local ddest="${ED}${dest#/}" |
202 |
- |
203 |
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die |
204 |
- |
205 |
- # this does not exist on arm64 hence -f |
206 |
- rm -fv jre/lib/*/libfreetype.so* || die |
207 |
- |
208 |
- if ! use alsa ; then |
209 |
- rm -v jre/lib/*/libjsoundalsa.so* || die |
210 |
- fi |
211 |
- |
212 |
- if ! use examples ; then |
213 |
- rm -vr sample || die |
214 |
- fi |
215 |
- |
216 |
- if use headless-awt ; then |
217 |
- rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ |
218 |
- {,jre/}bin/policytool bin/appletviewer || die |
219 |
- fi |
220 |
- |
221 |
- if ! use source ; then |
222 |
- rm -v src.zip || die |
223 |
- fi |
224 |
- |
225 |
- dodir "${dest}" |
226 |
- cp -pPR * "${ddest}" || die |
227 |
- |
228 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
229 |
- java-vm_set-pax-markings "${ddest}" |
230 |
- java-vm_revdep-mask |
231 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
232 |
-} |
233 |
- |
234 |
-pkg_postinst() { |
235 |
- java-vm-2_pkg_postinst |
236 |
- |
237 |
- if use gentoo-vm ; then |
238 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
239 |
- ewarn "recognised by the system. This will almost certainly break things." |
240 |
- else |
241 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
242 |
- ewarn "will not be recognised by the system. For example, simply calling" |
243 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
244 |
- ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its" |
245 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
246 |
- fi |
247 |
-} |