1 |
commit: 0f99ac29bef781d87cfe65e11b3efb284d0bd25a |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 22 01:27:44 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 22 01:28:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f99ac29 |
7 |
|
8 |
dev-java/openjdk-bin: drop 11.0.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.16 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjdk-bin/Manifest | 4 - |
14 |
dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild | 116 --------------------- |
15 |
2 files changed, 120 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
18 |
index 881896130de..0340512f06d 100644 |
19 |
--- a/dev-java/openjdk-bin/Manifest |
20 |
+++ b/dev-java/openjdk-bin/Manifest |
21 |
@@ -1,12 +1,8 @@ |
22 |
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz 194920675 BLAKE2B ad509e368aba7b5fce9e6212b296442bcd970f4dfe59e53dd13977da0137674fd85164657fa1abebfdcf58640ba511f1fcd30c46ec02a08edba5b498050bc60b SHA512 7fcd7c4eddcd9e2b6aa5cba69f2926a1131cd8246348f1a0c6575dca9c73b677d245fd8e12b1b41415aaf3dd0660581398f30c29503787e17428839e3fadf5b5 |
23 |
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz 195417692 BLAKE2B 7834b8d29535eebbd62b6e7d1de71a8d49ab323d64d60c7e7a2d54247236e4ff1628907f1cae0807d19292a888894e060175673499cf802ec1af1881eaeda4a5 SHA512 ba26ccd26990888c6905a52c706ddd06584d61cffd2cd0c2d8fd030c9cf23d0ac5518e50aba3c1949fd9fcc73ca3736659cdb5315c13279950504ba25a77aa70 |
24 |
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz 183239547 BLAKE2B 781647daac4ff5ac2e93a01aed93a6729c12611e1de75dafcc018c5222a442a846b9ccf8ec1e5381eb191ae2b8252a9878562843eb675299e96563c65e91f4bc SHA512 b2e2bb63706bfa197bb7ea5560dedb521666c52900c9ffe91ffcff5ddbf4e0cacdb4efddcc03081f06c9686e9451f27a905d731a3bccd8925c952ddde331eee4 |
25 |
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz 183456230 BLAKE2B 0ec2ac6e59012e047f5191baf1b289215bcf898238efbb0c2aacc6f0147aa2013ee70fdd31f10a89533de74940c9de3133d0a1f9b7c9f583ed9422923aee6884 SHA512 fa0c2014fcf0e6d221e1c06fcdcc0020cc8547fded6f74a9d7f0b64ea3b277c123530390b01291a4d3e36169bc1af40b797d75f60fca7af58d1d6e658c762f81 |
26 |
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1 |
27 |
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.4_11.tar.gz 181290255 BLAKE2B d8d25d71e790527c572c74f7a53317933b8a0801a8b3779daa9fe92bbe8b11fad74cf7e2e2a2194dc514930fba2c86fcdd630b06cdcd0dafa8fcecd5bac6be42 SHA512 5b50f0585ae09e1d446170b40728ad915b7da2c22341385a8b014ac09ca805acc413c840c6ea8bac4b579d418200208a53f98759b446a28ad3e28b0078190b50 |
28 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc80042702d6c77e35da5df0c1788709ddeaabb76fa940f4c705cf1801b27931bdd01558b4b4743b8e8acbebf62e1ebdcc7c81bbb286a288a816553ba2890531 SHA512 0392a68c90bd6cf7ed68a73d5420da0de207621f4203e38e24ebef8c52c8731d35b1ee2600636504ce12e553d059a590d40ad20184cfdd4dfe73fd2e2af3804e |
29 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0 |
30 |
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz 196818652 BLAKE2B f67327882afb3fdf0636d5e5262236376ed8f98eef2c8153457be0ab068a5abeb523a3873f43ced650ac623b90079d80f2a744beb8f410d8763ff7798d5980dc SHA512 8b42abedf935b8fb186a2efa11203231021417a745f03d557782aea6c5ce84f7b9fb126d3a00ac5159c349347a5d1cc9aa52b2378b2aec58d82f55a5fbcf471f |
31 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618 |
32 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43 |
33 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926 |
34 |
|
35 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild |
36 |
deleted file mode 100644 |
37 |
index c629d40f486..00000000000 |
38 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,116 +0,0 @@ |
41 |
-# Copyright 1999-2020 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 arm) |
59 |
- $(abi_uri aarch64 arm64) |
60 |
- $(abi_uri ppc64le ppc64) |
61 |
- $(abi_uri x64 amd64) |
62 |
-" |
63 |
- |
64 |
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
65 |
-HOMEPAGE="https://adoptopenjdk.net" |
66 |
-LICENSE="GPL-2-with-classpath-exception" |
67 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
68 |
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart" |
69 |
- |
70 |
-RDEPEND=" |
71 |
- media-libs/fontconfig:1.0 |
72 |
- media-libs/freetype:2 |
73 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
74 |
- >=sys-libs/glibc-2.2.5:* |
75 |
- sys-libs/zlib |
76 |
- alsa? ( media-libs/alsa-lib ) |
77 |
- cups? ( net-print/cups ) |
78 |
- doc? ( dev-java/java-sdk-docs:${SLOT} ) |
79 |
- selinux? ( sec-policy/selinux-java ) |
80 |
- !headless-awt? ( |
81 |
- x11-libs/libX11 |
82 |
- x11-libs/libXext |
83 |
- x11-libs/libXi |
84 |
- x11-libs/libXrender |
85 |
- x11-libs/libXtst |
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 |
-RESTRICT="preserve-libs splitdebug" |
92 |
-QA_PREBUILT="*" |
93 |
- |
94 |
-S="${WORKDIR}/jdk-${MY_PV}" |
95 |
- |
96 |
-pkg_pretend() { |
97 |
- if [[ "$(tc-is-softfloat)" != "no" ]]; then |
98 |
- die "These binaries require a hardfloat system." |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-src_install() { |
103 |
- local dest="/opt/${P}" |
104 |
- local ddest="${ED%/}/${dest#/}" |
105 |
- |
106 |
- # Not sure why they bundle this as it's commonly available and they |
107 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
108 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
109 |
- rm -vf lib/libfreetype.so || die |
110 |
- |
111 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
112 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
113 |
- if ! use alsa ; then |
114 |
- rm -v lib/libjsound.* || die |
115 |
- fi |
116 |
- |
117 |
- if ! use examples ; then |
118 |
- rm -vr demo/ || die |
119 |
- fi |
120 |
- |
121 |
- if use headless-awt ; then |
122 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
123 |
- fi |
124 |
- |
125 |
- if ! use source ; then |
126 |
- rm -v lib/src.zip || die |
127 |
- fi |
128 |
- |
129 |
- rm -v lib/security/cacerts || die |
130 |
- |
131 |
- dodir "${dest}" |
132 |
- cp -pPR * "${ddest}" || die |
133 |
- |
134 |
- dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
135 |
- |
136 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
137 |
- java-vm_set-pax-markings "${ddest}" |
138 |
- java-vm_revdep-mask |
139 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
140 |
-} |
141 |
- |
142 |
-pkg_postinst() { |
143 |
- java-vm-2_pkg_postinst |
144 |
- |
145 |
- if use gentoo-vm ; then |
146 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
147 |
- ewarn "recognised by the system. This will almost certainly break" |
148 |
- ewarn "many java ebuilds as they are not ready for openjdk-11" |
149 |
- else |
150 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
151 |
- ewarn "will not be recognised by the system. For example, simply calling" |
152 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
153 |
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its" |
154 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
155 |
- fi |
156 |
-} |