1 |
commit: b23bc861f39deb14bf42041e97c875de6b073a9f |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 9 18:51:07 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 9 19:02:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23bc861 |
7 |
|
8 |
dev-java/openjdk: 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/Manifest | 1 - |
14 |
dev-java/openjdk/openjdk-11.0.2_p7.ebuild | 212 ------------------------------ |
15 |
2 files changed, 213 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest |
18 |
index e3f30ccfa0e..724c3f51a78 100644 |
19 |
--- a/dev-java/openjdk/Manifest |
20 |
+++ b/dev-java/openjdk/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952 |
23 |
DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684 |
24 |
DIST openjdk-8.212_p03.tar.bz2 451800 BLAKE2B f8466a0d99650a07e3ff21e8dc06252ef9d31ce15e22c6ede15fc4c7b1633820e84e67aa501e816101c6bd473293fb897645b2df1530d8f7b81c6e8e6d38ce3a SHA512 ccc642da05aa00cfcc46c1eb759391dd2242218b7392bced77481600aa15b3b1d0a0c03380f59b6a6d038311721f249de1a6b116c6f651193cfb57b89fba4866 |
25 |
DIST openjdk-corba-8.212_p03.tar.bz2 1033709 BLAKE2B f59b294e62425b63e881ed5534ae9beb3cc51351ff197995503671ec52ad82e34e145f8c9790dc88e4f452b4e09af80143fd0f7e0fda588b00eed08d4b2bc861 SHA512 3a786a372ab6b849a6ccd944cdfdc0aa9994a6a9f4d52afccad7d6b187e46a1fd0be30bde3da1eb03988034c36b4590b55379819245fb6f5ed4d75a958e9caa3 |
26 |
|
27 |
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild |
28 |
deleted file mode 100644 |
29 |
index b03e8a2da40..00000000000 |
30 |
--- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,212 +0,0 @@ |
33 |
-# Copyright 1999-2019 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 ~arm64 ~ppc64" |
49 |
- |
50 |
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart" |
51 |
- |
52 |
-CDEPEND=" |
53 |
- media-libs/freetype:2= |
54 |
- sys-libs/zlib |
55 |
- systemtap? ( dev-util/systemtap ) |
56 |
- !headless-awt? ( |
57 |
- x11-libs/libX11 |
58 |
- x11-libs/libXext |
59 |
- x11-libs/libXi |
60 |
- x11-libs/libXrender |
61 |
- x11-libs/libXt |
62 |
- x11-libs/libXtst |
63 |
- ) |
64 |
-" |
65 |
- |
66 |
-# cups and alsa required to build, but not to run, make is possible to remove |
67 |
-RDEPEND=" |
68 |
- ${CDEPEND} |
69 |
- alsa? ( media-libs/alsa-lib ) |
70 |
- cups? ( net-print/cups ) |
71 |
- selinux? ( sec-policy/selinux-java ) |
72 |
-" |
73 |
- |
74 |
-DEPEND=" |
75 |
- ${CDEPEND} |
76 |
- app-arch/zip |
77 |
- media-libs/alsa-lib |
78 |
- net-print/cups |
79 |
- !headless-awt? ( |
80 |
- x11-base/xorg-proto |
81 |
- ) |
82 |
- || ( |
83 |
- dev-java/openjdk-bin:${SLOT} |
84 |
- dev-java/openjdk:${SLOT} |
85 |
- ) |
86 |
-" |
87 |
- |
88 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
89 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
90 |
- |
91 |
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" |
92 |
- |
93 |
-# The space required to build varies wildly depending on USE flags, |
94 |
-# ranging from 2GB to 16GB. This function is certainly not exact but |
95 |
-# should be close enough to be useful. |
96 |
-openjdk_check_requirements() { |
97 |
- local M |
98 |
- M=2048 |
99 |
- M=$(( $(usex jbootstrap 2 1) * $M )) |
100 |
- M=$(( $(usex debug 3 1) * $M )) |
101 |
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) |
102 |
- |
103 |
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} |
104 |
-} |
105 |
- |
106 |
-pkg_pretend() { |
107 |
- openjdk_check_requirements |
108 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
109 |
-} |
110 |
- |
111 |
-pkg_setup() { |
112 |
- openjdk_check_requirements |
113 |
- java-vm-2_pkg_setup |
114 |
- |
115 |
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
116 |
- JAVA_PKG_WANT_SOURCE="${SLOT}" |
117 |
- JAVA_PKG_WANT_TARGET="${SLOT}" |
118 |
- |
119 |
- # The nastiness below is necessary while the gentoo-vm USE flag is |
120 |
- # masked. First we call java-pkg-2_pkg_setup if it looks like the |
121 |
- # flag was unmasked against one of the possible build VMs. If not, |
122 |
- # we try finding one of them in their expected locations. This would |
123 |
- # have been slightly less messy if openjdk-bin had been installed to |
124 |
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env |
125 |
- # file but disable it so that it would not normally be selectable. |
126 |
- |
127 |
- local vm |
128 |
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
129 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
130 |
- java-pkg-2_pkg_setup |
131 |
- return |
132 |
- fi |
133 |
- done |
134 |
- |
135 |
- if has_version --host-root dev-java/openjdk:${SLOT}; then |
136 |
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
137 |
- else |
138 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
139 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
140 |
- JDK_HOME=${JDK_HOME#*/} |
141 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
142 |
- export JDK_HOME |
143 |
- fi |
144 |
-} |
145 |
- |
146 |
-src_prepare() { |
147 |
- default |
148 |
- chmod +x configure || die |
149 |
-} |
150 |
- |
151 |
-src_configure() { |
152 |
- # Work around stack alignment issue, bug #647954. in case we ever have x86 |
153 |
- use x86 && append-flags -mincoming-stack-boundary=2 |
154 |
- |
155 |
- # Enabling full docs appears to break doc building. If not |
156 |
- # explicitly disabled, the flag will get auto-enabled if pandoc and |
157 |
- # graphviz are detected. pandoc has loads of dependencies anyway. |
158 |
- # currently it still bundles lcms libpng giflib and libjpeg. |
159 |
- |
160 |
- local myconf=( |
161 |
- --disable-ccache |
162 |
- --enable-full-docs=no |
163 |
- --with-boot-jdk="${JDK_HOME}" |
164 |
- --with-extra-cflags="${CFLAGS}" |
165 |
- --with-extra-cxxflags="${CXXFLAGS}" |
166 |
- --with-extra-ldflags="${LDFLAGS}" |
167 |
- --with-native-debug-symbols=$(usex debug internal none) |
168 |
- --with-version-pre=gentoo |
169 |
- --with-version-string=${MY_PV%+*} |
170 |
- --with-version-build=${MY_PV#*+} |
171 |
- --with-zlib=system |
172 |
- --enable-dtrace=$(usex systemtap yes no) |
173 |
- --enable-headless-only=$(usex headless-awt yes no) |
174 |
- ) |
175 |
- |
176 |
- # PaX breaks pch, bug #601016 |
177 |
- if use pch && ! host-is-pax; then |
178 |
- myconf+=( --enable-precompiled-headers ) |
179 |
- else |
180 |
- myconf+=( --disable-precompiled-headers ) |
181 |
- fi |
182 |
- |
183 |
- ( |
184 |
- unset _JAVA_OPTIONS JAVA JAVAC XARGS |
185 |
- CFLAGS= CXXFLAGS= LDFLAGS= \ |
186 |
- CONFIG_SITE=/dev/null \ |
187 |
- econf "${myconf[@]}" |
188 |
- ) |
189 |
-} |
190 |
- |
191 |
-src_compile() { |
192 |
- emake -j1 \ |
193 |
- $(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \ |
194 |
- JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror |
195 |
-} |
196 |
- |
197 |
-src_install() { |
198 |
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}" |
199 |
- local ddest="${ED}${dest#/}" |
200 |
- |
201 |
- cd "${S}"/build/*-release/images/jdk || die |
202 |
- |
203 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
204 |
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird. |
205 |
- if ! use alsa ; then |
206 |
- rm -v lib/libjsound.* || die |
207 |
- fi |
208 |
- |
209 |
- if ! use examples ; then |
210 |
- rm -vr demo/ || die |
211 |
- fi |
212 |
- |
213 |
- if ! use source ; then |
214 |
- rm -v lib/src.zip || die |
215 |
- fi |
216 |
- |
217 |
- dodir "${dest}" |
218 |
- cp -pPR * "${ddest}" || die |
219 |
- |
220 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
221 |
- java-vm_set-pax-markings "${ddest}" |
222 |
- java-vm_revdep-mask |
223 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
224 |
- |
225 |
- if use doc ; then |
226 |
- insinto /usr/share/doc/${PF}/html |
227 |
- doins -r "${S}"/build/*-release/images/docs/* |
228 |
- fi |
229 |
-} |
230 |
- |
231 |
-pkg_postinst() { |
232 |
- java-vm-2_pkg_postinst |
233 |
- |
234 |
- if use gentoo-vm ; then |
235 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
236 |
- ewarn "recognised by the system. This will almost certainly break things." |
237 |
- else |
238 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
239 |
- ewarn "will not be recognised by the system. For example, simply calling" |
240 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
241 |
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" |
242 |
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." |
243 |
- fi |
244 |
-} |