1 |
commit: 7b490ae7ac0d197451a5dd6905d025d8eea67588 |
2 |
Author: Denis Reva <denis7774 <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Apr 23 12:37:08 2020 +0000 |
4 |
Commit: Denis Reva <denis7774 <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Apr 23 12:37:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7b490ae7 |
7 |
|
8 |
dev-java/openjdk-sts-bin: 13 version EOL, 14 fixes |
9 |
|
10 |
Java 13 version support is now EOL: |
11 |
https://www.oracle.com/java/technologies/java-se-support-roadmap.html |
12 |
Fixed openjdk-sts-bin:14 |
13 |
|
14 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
15 |
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com> |
16 |
|
17 |
dev-java/openjdk-sts-bin/Manifest | 4 - |
18 |
.../files/openjdk-sts-bin-13.env.sh | 16 --- |
19 |
.../openjdk-sts-bin-13.0.2_p8.ebuild | 115 --------------------- |
20 |
....ebuild => openjdk-sts-bin-14.0.1_p7-r1.ebuild} | 0 |
21 |
4 files changed, 135 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/openjdk-sts-bin/Manifest b/dev-java/openjdk-sts-bin/Manifest |
24 |
index d7c5db3..5bc3b90 100644 |
25 |
--- a/dev-java/openjdk-sts-bin/Manifest |
26 |
+++ b/dev-java/openjdk-sts-bin/Manifest |
27 |
@@ -1,7 +1,3 @@ |
28 |
-DIST OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz 206018212 BLAKE2B 90d550d74e53362cbae4a623250d22bff65dcf74898c3a6076d4fbe77cc98ffe35bc4ecd5f44fc785e4247e5989236bb54444c5269cdcc4fa16f09fab6de3adb SHA512 ca4386dd7366617e15b501841fbf03d06e891a9cfa75e63347108c9eac1010cb2d9479aafb86f796b7bdd0ab9806f1c2d77d73105b5b49434d99ee4777f9daca |
29 |
-DIST OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz 191743541 BLAKE2B 5ffd9fd462addc0766e88ded1b3c4b7d982ae3bf4946576c9a2d36a5297c4488dfa4f1c7e771bdaa190ad847db1aafc37582b0729a70df9d1fbfa31d8ed6dc64 SHA512 943860efdd55c486422c78d159dabb50b41d3a4fb7e1056286263677debef1e620947743e549f3f9587ef4e928bf050ce2f0bf77c2cf7bdbff1e93bb49cdbc87 |
30 |
-DIST OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz 190310065 BLAKE2B 0cb13abcdb530a43037e3c5a36bc28cbf47c6d7eb33689adb4a0aab587d623c033a026f404d7ccc3cac3c6252b64c60e7d6ef1aaa26a266daf1cc82461b7d008 SHA512 bec72df21cfd33b8ee87b95676946e45017bb97fcb7f5a0080487cd21c0182da586d1ee0114cdf79d8fd2b803a5f47ff56d21d1604ecf81b838ec06c1a3d744a |
31 |
-DIST OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz 207518686 BLAKE2B 7c632b0ef75fef9490e789e2d89874c19db050c8e0f763f35f5d29164263c25be79b09cb5be141301af3de7529b7f28c9dc7c63a909e502fd00a7b96d12093ea SHA512 9e2698fab54e5cd2d56c6456102760321d01ac15bf8bd97ae96069676a22284bf4d08daa1a41f2c33d761dd067bb8ec176eb37848dae3290df374d06631d5d1c |
32 |
DIST OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.1_7.tar.gz 208386883 BLAKE2B 00a6ce2846c13c343457f9285b249712a5a04830ba343b524b1ee4278be94c0350ca785158fd416e3b8ffe3f054b480b6a0f8ca57b2d2e9b78306e2f66dc0e12 SHA512 867ba2fa5beaf9fc94912808316c571ef3998fcbec08834ea7f8b179fb96e39b7c6a2348764ed073f784c71e5bd91d8ca39380fe24fcb7fa4006a2660534910f |
33 |
DIST OpenJDK14U-jdk_arm_linux_hotspot_14.0.1_7.tar.gz 189019016 BLAKE2B 6ce755a4569034054df8fccffc5ea9358b1b46445a358fd7883cabb215b4723233c457858eeda045a092d0fac344354753b563e5c79d38134d894c9599c3f8c5 SHA512 94acf0d0625b414e85e66f83cd722c8587774141e7b92a5f9f4c610bcc97baf4f476085b4d3ed556fb296dc15675067b01aea4ed330a523618f94e61a41ce147 |
34 |
DIST OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.1_7.tar.gz 192632592 BLAKE2B 6861a6f6d03e4d563d756763443caa2f69b290f84fb51d629362e9007f0307b4e5c1e955003c24b2e5c99fadc8cd4061a38a91057495ea98403dfe6450549315 SHA512 6d34673224403760c3b4f90798b143576a56d4367e58b9498f7d7faf969fe90ac65331c5f642abce9779f9879ce70bfce5e565ca89bf28dfa46931e8122c70ee |
35 |
|
36 |
diff --git a/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-13.env.sh b/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-13.env.sh |
37 |
deleted file mode 100644 |
38 |
index 1def83a..0000000 |
39 |
--- a/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-13.env.sh |
40 |
+++ /dev/null |
41 |
@@ -1,16 +0,0 @@ |
42 |
-# Copyright 1999-2020 Gentoo Authors |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-VERSION="AdoptOpenJDK ${PV}" |
46 |
-JAVA_HOME="${EPREFIX}/opt/${P}" |
47 |
-JDK_HOME="${EPREFIX}/opt/${P}" |
48 |
-JAVAC="\${JAVA_HOME}/bin/javac" |
49 |
-PATH="\${JAVA_HOME}/bin" |
50 |
-ROOTPATH="\${JAVA_HOME}/bin" |
51 |
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" |
52 |
-MANPATH="" |
53 |
-PROVIDES_TYPE="JDK JRE" |
54 |
-PROVIDES_VERSION="${SLOT}" |
55 |
-BOOTCLASSPATH="" |
56 |
-GENERATION="2" |
57 |
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
58 |
|
59 |
diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild |
60 |
deleted file mode 100644 |
61 |
index 44907ee..0000000 |
62 |
--- a/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild |
63 |
+++ /dev/null |
64 |
@@ -1,115 +0,0 @@ |
65 |
-# Copyright 1999-2020 Gentoo Authors |
66 |
-# Distributed under the terms of the GNU General Public License v2 |
67 |
- |
68 |
-EAPI=6 |
69 |
- |
70 |
-inherit java-vm-2 toolchain-funcs eapi7-ver |
71 |
- |
72 |
-abi_uri() { |
73 |
- echo "${2-$1}? ( |
74 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
75 |
- )" |
76 |
-} |
77 |
- |
78 |
-MY_PV=${PV/_p/+} |
79 |
-SLOT=13 |
80 |
-#Some people like AndrewAmmerlaan reports that SLOT="$(ver_cut 1)" is not detected correctly. So I had to hardcode that. |
81 |
- |
82 |
-SRC_URI=" |
83 |
- $(abi_uri arm) |
84 |
- $(abi_uri aarch64 arm64) |
85 |
- $(abi_uri ppc64le ppc64) |
86 |
- $(abi_uri x64 amd64) |
87 |
-" |
88 |
- |
89 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported" |
90 |
-HOMEPAGE="https://adoptopenjdk.net" |
91 |
-LICENSE="GPL-2-with-classpath-exception" |
92 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
93 |
-IUSE="alsa cups examples -gentoo-vm headless-awt source" |
94 |
- |
95 |
-RDEPEND=" |
96 |
- media-libs/fontconfig:1.0 |
97 |
- media-libs/freetype:2 |
98 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
99 |
- >=sys-libs/glibc-2.29-r7:* |
100 |
- sys-libs/zlib |
101 |
- alsa? ( media-libs/alsa-lib ) |
102 |
- cups? ( net-print/cups ) |
103 |
- !headless-awt? ( |
104 |
- x11-libs/libX11 |
105 |
- x11-libs/libXext |
106 |
- x11-libs/libXi |
107 |
- x11-libs/libXrender |
108 |
- x11-libs/libXtst |
109 |
- )" |
110 |
- |
111 |
-RESTRICT="preserve-libs splitdebug" |
112 |
-QA_PREBUILT="*" |
113 |
- |
114 |
-S="${WORKDIR}/jdk-${MY_PV}" |
115 |
- |
116 |
-pkg_pretend() { |
117 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
118 |
- die "These binaries require a hardfloat system." |
119 |
- fi |
120 |
-} |
121 |
- |
122 |
-src_install() { |
123 |
- local dest="/opt/${P}" |
124 |
- local ddest="${ED%/}/${dest#/}" |
125 |
- |
126 |
- # Not sure why they bundle this as it's commonly available and they |
127 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
128 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
129 |
- rm -vf lib/libfreetype.so || die |
130 |
- |
131 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
132 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
133 |
- if ! use alsa ; then |
134 |
- rm -v lib/libjsound.* || die |
135 |
- fi |
136 |
- |
137 |
- if ! use examples ; then |
138 |
- rm -vr demo/ || die |
139 |
- fi |
140 |
- |
141 |
- if use headless-awt ; then |
142 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
143 |
- fi |
144 |
- |
145 |
- if ! use source ; then |
146 |
- rm -v lib/src.zip || die |
147 |
- fi |
148 |
- |
149 |
- rm -v lib/security/cacerts || die |
150 |
- dosym ../../../../etc/ssl/certs/java/cacerts \ |
151 |
- "${dest}"/lib/security/cacerts |
152 |
- |
153 |
- dodir "${dest}" |
154 |
- cp -pPR * "${ddest}" || die |
155 |
- |
156 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
157 |
- java-vm_set-pax-markings "${ddest}" |
158 |
- java-vm_revdep-mask |
159 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
160 |
-} |
161 |
- |
162 |
-pkg_postinst() { |
163 |
- java-vm-2_pkg_postinst |
164 |
- |
165 |
- if use gentoo-vm ; then |
166 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
167 |
- ewarn "recognised by the system. If ${P} is set for system scope" |
168 |
- ewarn "this will almost certainly break" |
169 |
- ewarn "many java ebuilds as they are not ready for ${P}" |
170 |
- ewarn "You may enable it only for desired users via eselect java-vm" |
171 |
- ewarn "Example| larry# eselect java-vm set openjdk-bin-${SLOT}" |
172 |
- else |
173 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
174 |
- ewarn "will not be recognised by the system. For example, simply calling" |
175 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
176 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
177 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
178 |
- fi |
179 |
-} |
180 |
|
181 |
diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-14.0.1_p7.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-14.0.1_p7-r1.ebuild |
182 |
similarity index 100% |
183 |
rename from dev-java/openjdk-sts-bin/openjdk-sts-bin-14.0.1_p7.ebuild |
184 |
rename to dev-java/openjdk-sts-bin/openjdk-sts-bin-14.0.1_p7-r1.ebuild |