1 |
commit: fb97eb24ea70438a5fc9fc48ec80c5a3a42fb81e |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 5 05:23:05 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 5 05:23:05 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb97eb24 |
7 |
|
8 |
dev-java/openjdk: drop 11.0.5_p10 |
9 |
|
10 |
Package-Manager: Portage-2.3.92, Repoman-2.3.20 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjdk/Manifest | 1 - |
14 |
dev-java/openjdk/openjdk-11.0.5_p10.ebuild | 269 ----------------------------- |
15 |
2 files changed, 270 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest |
18 |
index 4df85245c73..0ccc4b34ecf 100644 |
19 |
--- a/dev-java/openjdk/Manifest |
20 |
+++ b/dev-java/openjdk/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6 |
23 |
DIST openjdk-11.0.6.tar.bz2 90755968 BLAKE2B 5bf23cc107ffae4cfc82be4f9b4b17de57575ee13e8fd461027e319a441c89c65fc852affb89f98a54307fa865ed5cdfb216809c6196866b31dfaa7011ad3d57 SHA512 d2296556c947c46883c16df3c1b7d809e6987dd6fd1a2667333e1245049560f3da744f6a51609a918cd9c509316b01160de2c080d5b9d3ed1af0b312dcbc575e |
24 |
DIST openjdk-8.222_p10.tar.bz2 452194 BLAKE2B aa5a19245e9b5f79da217ef4e8ff87acaf6b4c7b930a6cd1c7a00d2c6d50bb3168c41da1b18e8beb072a84bca7f3956e939edd9f5fd88899d2cc3fe754ff19f8 SHA512 08f92327732fb54df847fe0b3e49460bcdd25fe2aef7bc9545d75ab6504ab92452f8f5daede6040d28fd9b8347f49d658dc7bf88abc90235d6cf4a72cb44fbba |
25 |
DIST openjdk-8.232_p09.tar.bz2 453185 BLAKE2B 9f78dc3a482f42937c9f4ed30492cf8348c903c6a419a7f2644251f853f92e2e112f72c16848adcc7102f41e8f1249e35d7019bf0b5c5fd823e4f068650f36fd SHA512 31fbaf8334b3a40f491ae87aeec5698ebac334b8425147b8f8fa1a397e64f5bf7025d22dd5ecf7c7029c07ca40424f07ae139aa5d9737b20a6eeec2e9a1d835d |
26 |
|
27 |
diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild |
28 |
deleted file mode 100644 |
29 |
index e6429b52426..00000000000 |
30 |
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,269 +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 autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs |
39 |
- |
40 |
-MY_PV=${PV/_p/+} |
41 |
-SLOT=${MY_PV%%[.+]*} |
42 |
- |
43 |
-DESCRIPTION="Open source implementation of the Java programming language" |
44 |
-HOMEPAGE="https://openjdk.java.net" |
45 |
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2" |
46 |
- |
47 |
-LICENSE="GPL-2" |
48 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
49 |
- |
50 |
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" |
51 |
- |
52 |
-COMMON_DEPEND=" |
53 |
- media-libs/freetype:2= |
54 |
- media-libs/giflib:0/7 |
55 |
- media-libs/libpng:0= |
56 |
- media-libs/lcms:2= |
57 |
- sys-libs/zlib |
58 |
- virtual/jpeg:0= |
59 |
- systemtap? ( dev-util/systemtap ) |
60 |
-" |
61 |
- |
62 |
-# Many libs are required to build, but not to run, make is possible to remove |
63 |
-# by listing conditionally in RDEPEND unconditionally in DEPEND |
64 |
-RDEPEND=" |
65 |
- ${COMMON_DEPEND} |
66 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
67 |
- !headless-awt? ( |
68 |
- x11-libs/libX11 |
69 |
- x11-libs/libXext |
70 |
- x11-libs/libXi |
71 |
- x11-libs/libXrandr |
72 |
- x11-libs/libXrender |
73 |
- x11-libs/libXt |
74 |
- x11-libs/libXtst |
75 |
- ) |
76 |
- alsa? ( media-libs/alsa-lib ) |
77 |
- cups? ( net-print/cups ) |
78 |
- selinux? ( sec-policy/selinux-java ) |
79 |
-" |
80 |
- |
81 |
-DEPEND=" |
82 |
- ${COMMON_DEPEND} |
83 |
- app-arch/zip |
84 |
- media-libs/alsa-lib |
85 |
- net-print/cups |
86 |
- x11-base/xorg-proto |
87 |
- x11-libs/libX11 |
88 |
- x11-libs/libXext |
89 |
- x11-libs/libXi |
90 |
- x11-libs/libXrandr |
91 |
- x11-libs/libXrender |
92 |
- x11-libs/libXt |
93 |
- x11-libs/libXtst |
94 |
- javafx? ( dev-java/openjfx:${SLOT} ) |
95 |
- || ( |
96 |
- dev-java/openjdk-bin:${SLOT} |
97 |
- dev-java/openjdk:${SLOT} |
98 |
- ) |
99 |
-" |
100 |
- |
101 |
-PDEPEND=" |
102 |
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
103 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
104 |
-" |
105 |
- |
106 |
-REQUIRED_USE="javafx? ( alsa !headless-awt )" |
107 |
- |
108 |
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" |
109 |
- |
110 |
-# The space required to build varies wildly depending on USE flags, |
111 |
-# ranging from 2GB to 16GB. This function is certainly not exact but |
112 |
-# should be close enough to be useful. |
113 |
-openjdk_check_requirements() { |
114 |
- local M |
115 |
- M=2048 |
116 |
- M=$(( $(usex jbootstrap 2 1) * $M )) |
117 |
- M=$(( $(usex debug 3 1) * $M )) |
118 |
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) |
119 |
- |
120 |
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} |
121 |
-} |
122 |
- |
123 |
-pkg_pretend() { |
124 |
- openjdk_check_requirements |
125 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
126 |
-} |
127 |
- |
128 |
-pkg_setup() { |
129 |
- openjdk_check_requirements |
130 |
- java-vm-2_pkg_setup |
131 |
- |
132 |
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
133 |
- JAVA_PKG_WANT_SOURCE="${SLOT}" |
134 |
- JAVA_PKG_WANT_TARGET="${SLOT}" |
135 |
- |
136 |
- # The nastiness below is necessary while the gentoo-vm USE flag is |
137 |
- # masked. First we call java-pkg-2_pkg_setup if it looks like the |
138 |
- # flag was unmasked against one of the possible build VMs. If not, |
139 |
- # we try finding one of them in their expected locations. This would |
140 |
- # have been slightly less messy if openjdk-bin had been installed to |
141 |
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env |
142 |
- # file but disable it so that it would not normally be selectable. |
143 |
- |
144 |
- local vm |
145 |
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
146 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
147 |
- java-pkg-2_pkg_setup |
148 |
- return |
149 |
- fi |
150 |
- done |
151 |
- |
152 |
- if has_version --host-root dev-java/openjdk:${SLOT}; then |
153 |
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
154 |
- else |
155 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
156 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
157 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
158 |
- JDK_HOME=${JDK_HOME#*/} |
159 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
160 |
- export JDK_HOME |
161 |
- fi |
162 |
- fi |
163 |
-} |
164 |
- |
165 |
-src_prepare() { |
166 |
- default |
167 |
- chmod +x configure || die |
168 |
-} |
169 |
- |
170 |
-src_configure() { |
171 |
- # Work around stack alignment issue, bug #647954. in case we ever have x86 |
172 |
- use x86 && append-flags -mincoming-stack-boundary=2 |
173 |
- |
174 |
- # Enabling full docs appears to break doc building. If not |
175 |
- # explicitly disabled, the flag will get auto-enabled if pandoc and |
176 |
- # graphviz are detected. pandoc has loads of dependencies anyway. |
177 |
- |
178 |
- local myconf=( |
179 |
- --disable-ccache |
180 |
- --enable-full-docs=no |
181 |
- --with-boot-jdk="${JDK_HOME}" |
182 |
- --with-extra-cflags="${CFLAGS}" |
183 |
- --with-extra-cxxflags="${CXXFLAGS}" |
184 |
- --with-extra-ldflags="${LDFLAGS}" |
185 |
- --with-giflib=system |
186 |
- --with-lcms=system |
187 |
- --with-libjpeg=system |
188 |
- --with-libpng=system |
189 |
- --with-native-debug-symbols=$(usex debug internal none) |
190 |
- --with-vendor-name="Gentoo" |
191 |
- --with-vendor-url="https://gentoo.org" |
192 |
- --with-vendor-bug-url="https://bugs.gentoo.org" |
193 |
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" |
194 |
- --with-vendor-version-string="${PV}" |
195 |
- --with-version-pre="" |
196 |
- --with-version-string=${MY_PV%+*} |
197 |
- --with-version-build=${MY_PV#*+} |
198 |
- --with-zlib=system |
199 |
- --enable-dtrace=$(usex systemtap yes no) |
200 |
- --enable-headless-only=$(usex headless-awt yes no) |
201 |
- ) |
202 |
- |
203 |
- if use javafx; then |
204 |
- local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" |
205 |
- if [[ -r ${zip} ]]; then |
206 |
- myconf+=( --with-import-modules="${zip}" ) |
207 |
- else |
208 |
- die "${zip} not found or not readable" |
209 |
- fi |
210 |
- fi |
211 |
- |
212 |
- # PaX breaks pch, bug #601016 |
213 |
- if use pch && ! host-is-pax; then |
214 |
- myconf+=( --enable-precompiled-headers ) |
215 |
- else |
216 |
- myconf+=( --disable-precompiled-headers ) |
217 |
- fi |
218 |
- |
219 |
- ( |
220 |
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS |
221 |
- CFLAGS= CXXFLAGS= LDFLAGS= \ |
222 |
- CONFIG_SITE=/dev/null \ |
223 |
- econf "${myconf[@]}" |
224 |
- ) |
225 |
-} |
226 |
- |
227 |
-src_compile() { |
228 |
- local myemakeargs=( |
229 |
- JOBS=$(makeopts_jobs) |
230 |
- LOG=debug |
231 |
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror |
232 |
- $(usex doc docs '') |
233 |
- $(usex jbootstrap bootcycle-images product-images) |
234 |
- ) |
235 |
- emake "${myemakeargs[@]}" -j1 #nowarn |
236 |
-} |
237 |
- |
238 |
-src_install() { |
239 |
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}" |
240 |
- local ddest="${ED}${dest#/}" |
241 |
- |
242 |
- cd "${S}"/build/*-release/images/jdk || die |
243 |
- |
244 |
- # Create files used as storage for system preferences. |
245 |
- mkdir .systemPrefs || die |
246 |
- touch .systemPrefs/.system.lock || die |
247 |
- touch .systemPrefs/.systemRootModFile || die |
248 |
- |
249 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
250 |
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird. |
251 |
- if ! use alsa ; then |
252 |
- rm -v lib/libjsound.* || die |
253 |
- fi |
254 |
- |
255 |
- if ! use examples ; then |
256 |
- rm -vr demo/ || die |
257 |
- fi |
258 |
- |
259 |
- if ! use source ; then |
260 |
- rm -v lib/src.zip || die |
261 |
- fi |
262 |
- |
263 |
- rm -v lib/security/cacerts || die |
264 |
- |
265 |
- dodir "${dest}" |
266 |
- cp -pPR * "${ddest}" || die |
267 |
- |
268 |
- dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
269 |
- |
270 |
- # must be done before running itself |
271 |
- java-vm_set-pax-markings "${ddest}" |
272 |
- |
273 |
- einfo "Creating the Class Data Sharing archives and disabling usage tracking" |
274 |
- "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die |
275 |
- |
276 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
277 |
- java-vm_revdep-mask |
278 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
279 |
- |
280 |
- if use doc ; then |
281 |
- docinto html |
282 |
- dodoc -r "${S}"/build/*-release/images/docs/* |
283 |
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
284 |
- fi |
285 |
-} |
286 |
- |
287 |
-pkg_postinst() { |
288 |
- java-vm-2_pkg_postinst |
289 |
- |
290 |
- if use gentoo-vm ; then |
291 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
292 |
- ewarn "recognised by the system. This will almost certainly break" |
293 |
- ewarn "many java ebuilds as they are not ready for openjdk-11" |
294 |
- else |
295 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
296 |
- ewarn "will not be recognised by the system. For example, simply calling" |
297 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
298 |
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" |
299 |
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." |
300 |
- fi |
301 |
-} |