Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/
Date: Thu, 05 Mar 2020 05:27:01
Message-Id: 1583385704.9000e9a5c4201660b39d3821a6c8dc77b912541d.gyakovlev@gentoo
1 commit: 9000e9a5c4201660b39d3821a6c8dc77b912541d
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 5 05:21:44 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 05:21:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9000e9a5
7
8 dev-java/openjdk-bin: 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-bin/Manifest | 3 -
14 dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild | 115 ---------------------
15 2 files changed, 118 deletions(-)
16
17 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
18 index 7a59b95f5d0..4e081b78f3f 100644
19 --- a/dev-java/openjdk-bin/Manifest
20 +++ b/dev-java/openjdk-bin/Manifest
21 @@ -1,9 +1,6 @@
22 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz 195417692 BLAKE2B 7834b8d29535eebbd62b6e7d1de71a8d49ab323d64d60c7e7a2d54247236e4ff1628907f1cae0807d19292a888894e060175673499cf802ec1af1881eaeda4a5 SHA512 ba26ccd26990888c6905a52c706ddd06584d61cffd2cd0c2d8fd030c9cf23d0ac5518e50aba3c1949fd9fcc73ca3736659cdb5315c13279950504ba25a77aa70
23 -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz 183456230 BLAKE2B 0ec2ac6e59012e047f5191baf1b289215bcf898238efbb0c2aacc6f0147aa2013ee70fdd31f10a89533de74940c9de3133d0a1f9b7c9f583ed9422923aee6884 SHA512 fa0c2014fcf0e6d221e1c06fcdcc0020cc8547fded6f74a9d7f0b64ea3b277c123530390b01291a4d3e36169bc1af40b797d75f60fca7af58d1d6e658c762f81
24 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1
25 -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc80042702d6c77e35da5df0c1788709ddeaabb76fa940f4c705cf1801b27931bdd01558b4b4743b8e8acbebf62e1ebdcc7c81bbb286a288a816553ba2890531 SHA512 0392a68c90bd6cf7ed68a73d5420da0de207621f4203e38e24ebef8c52c8731d35b1ee2600636504ce12e553d059a590d40ad20184cfdd4dfe73fd2e2af3804e
26 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0
27 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618
28 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43
29 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
30 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz 104544830 BLAKE2B 9ccf24a2409da8989e2bf9c9dbca9176036b179a25b0e21df3d4532b7144edbf57dc45b739c6d0891251d2e6caa00f8eab664670602b004549a5c13a1d7dd133 SHA512 3bf3272b19c73652b485df1293f27ce1daa32be690bef053ff7df164f9ac73aa197f4d4ee782aafe410e5e81b1d0db005c4f16d601668b777f49a7d524ab5ef2
31
32 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
33 deleted file mode 100644
34 index ced0929e899..00000000000
35 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
36 +++ /dev/null
37 @@ -1,115 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=6
42 -
43 -inherit java-vm-2 toolchain-funcs
44 -
45 -abi_uri() {
46 - echo "${2-$1}? (
47 - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
48 - )"
49 -}
50 -
51 -MY_PV=${PV/_p/+}
52 -SLOT=${MY_PV%%[.+]*}
53 -
54 -SRC_URI="
55 - $(abi_uri arm)
56 - $(abi_uri ppc64le ppc64)
57 - $(abi_uri x64 amd64)
58 -"
59 -
60 -DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
61 -HOMEPAGE="https://adoptopenjdk.net"
62 -LICENSE="GPL-2-with-classpath-exception"
63 -KEYWORDS="~amd64 ~arm ~ppc64"
64 -IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart"
65 -
66 -RDEPEND="
67 - media-libs/fontconfig:1.0
68 - media-libs/freetype:2
69 - >=sys-apps/baselayout-java-0.1.0-r1
70 - >=sys-libs/glibc-2.2.5:*
71 - sys-libs/zlib
72 - alsa? ( media-libs/alsa-lib )
73 - cups? ( net-print/cups )
74 - doc? ( dev-java/java-sdk-docs:${SLOT} )
75 - selinux? ( sec-policy/selinux-java )
76 - !headless-awt? (
77 - x11-libs/libX11
78 - x11-libs/libXext
79 - x11-libs/libXi
80 - x11-libs/libXrender
81 - x11-libs/libXtst
82 - )"
83 -
84 -PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
85 - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
86 -
87 -RESTRICT="preserve-libs splitdebug"
88 -QA_PREBUILT="*"
89 -
90 -S="${WORKDIR}/jdk-${MY_PV}"
91 -
92 -pkg_pretend() {
93 - if [[ "$(tc-is-softfloat)" != "no" ]]; then
94 - die "These binaries require a hardfloat system."
95 - fi
96 -}
97 -
98 -src_install() {
99 - local dest="/opt/${P}"
100 - local ddest="${ED%/}/${dest#/}"
101 -
102 - # Not sure why they bundle this as it's commonly available and they
103 - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
104 - # also has an explicit dependency while Oracle seemingly dlopens it.
105 - rm -vf lib/libfreetype.so || die
106 -
107 - # Oracle and IcedTea have libjsoundalsa.so depending on
108 - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
109 - if ! use alsa ; then
110 - rm -v lib/libjsound.* || die
111 - fi
112 -
113 - if ! use examples ; then
114 - rm -vr demo/ || die
115 - fi
116 -
117 - if use headless-awt ; then
118 - rm -v lib/lib*{[jx]awt,splashscreen}* || die
119 - fi
120 -
121 - if ! use source ; then
122 - rm -v lib/src.zip || die
123 - fi
124 -
125 - rm -v lib/security/cacerts || die
126 - dosym ../../../../etc/ssl/certs/java/cacerts \
127 - "${dest}"/lib/security/cacerts
128 -
129 - dodir "${dest}"
130 - cp -pPR * "${ddest}" || die
131 -
132 - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
133 - java-vm_set-pax-markings "${ddest}"
134 - java-vm_revdep-mask
135 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
136 -}
137 -
138 -pkg_postinst() {
139 - java-vm-2_pkg_postinst
140 -
141 - if use gentoo-vm ; then
142 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
143 - ewarn "recognised by the system. This will almost certainly break"
144 - ewarn "many java ebuilds as they are not ready for openjdk-11"
145 - else
146 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
147 - ewarn "will not be recognised by the system. For example, simply calling"
148 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
149 - ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
150 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
151 - fi
152 -}