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: Tue, 01 Oct 2019 23:57:52
Message-Id: 1569974233.e9a6d1212d79051345f131a6571e014843d6fb74.gyakovlev@gentoo
1 commit: e9a6d1212d79051345f131a6571e014843d6fb74
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 1 23:56:51 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 1 23:57:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a6d121
7
8 dev-java/openjdk-bin: drop 11.0.3_p7-r1
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 dev-java/openjdk-bin/Manifest | 4 -
14 .../openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild | 115 ---------------------
15 2 files changed, 119 deletions(-)
16
17 diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
18 index 9fe1c2bc293..285c14acdcd 100644
19 --- a/dev-java/openjdk-bin/Manifest
20 +++ b/dev-java/openjdk-bin/Manifest
21 @@ -1,10 +1,6 @@
22 -DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz 194142513 BLAKE2B 1809ee89a4dd31d5453d15b0e3672e1d4a9e1e4573954a8dcf793cb4f837ca4bb44eab73fb685896273fa5301011d671568cb7648c0c5095659f5441a559bfad SHA512 22964e4b0819eb214f378969501b9ad67e39f4efeb7425245022f7eae804386a5e0c7a8139a5df604efd649ff1d551323e6b08299ce0e3f71719e3cd120d7b91
23 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz 194920675 BLAKE2B ad509e368aba7b5fce9e6212b296442bcd970f4dfe59e53dd13977da0137674fd85164657fa1abebfdcf58640ba511f1fcd30c46ec02a08edba5b498050bc60b SHA512 7fcd7c4eddcd9e2b6aa5cba69f2926a1131cd8246348f1a0c6575dca9c73b677d245fd8e12b1b41415aaf3dd0660581398f30c29503787e17428839e3fadf5b5
24 -DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz 174868718 BLAKE2B 74c482d6cdc4066e4c8fbc93ab7f44165dc55c360d7cab36228032b76073217546e046e0556ae9aac3de05a69e860aa06d3a55d9f2aac1e8ccce1b650f45b464 SHA512 053787da52083f8e4cfd808205a965486d88f6e61117119ee7a5c359eb02564e581f0111ee9738feed3424eb8abc55e9e8d94d6558a63b3be7150361aaa39a89
25 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz 183239547 BLAKE2B 781647daac4ff5ac2e93a01aed93a6729c12611e1de75dafcc018c5222a442a846b9ccf8ec1e5381eb191ae2b8252a9878562843eb675299e96563c65e91f4bc SHA512 b2e2bb63706bfa197bb7ea5560dedb521666c52900c9ffe91ffcff5ddbf4e0cacdb4efddcc03081f06c9686e9451f27a905d731a3bccd8925c952ddde331eee4
26 -DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz 180425080 BLAKE2B 77f571a145e837c80da49a2ef8d20089b24ec23abf8078cc5781762ec9b88038d4c47c9d36766195c2f96809c98e4706b249c14518ef450b1fbfb100ba8c49d8 SHA512 6b7542fcbd9b727e93a2c2e157ecd52fb27db74d67cc98fb713eed531c7ea4420fdae2e420131b3d046e6ad2bccb2f91461928750e7b9c4274984a983293be8a
27 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.4_11.tar.gz 181290255 BLAKE2B d8d25d71e790527c572c74f7a53317933b8a0801a8b3779daa9fe92bbe8b11fad74cf7e2e2a2194dc514930fba2c86fcdd630b06cdcd0dafa8fcecd5bac6be42 SHA512 5b50f0585ae09e1d446170b40728ad915b7da2c22341385a8b014ac09ca805acc413c840c6ea8bac4b579d418200208a53f98759b446a28ad3e28b0078190b50
28 -DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a
29 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz 196818652 BLAKE2B f67327882afb3fdf0636d5e5262236376ed8f98eef2c8153457be0ab068a5abeb523a3873f43ced650ac623b90079d80f2a744beb8f410d8763ff7798d5980dc SHA512 8b42abedf935b8fb186a2efa11203231021417a745f03d557782aea6c5ce84f7b9fb126d3a00ac5159c349347a5d1cc9aa52b2378b2aec58d82f55a5fbcf471f
30 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
31 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a783edcd00820e7db92c11d2707331e9aecd352802b8cd0fe565eb42620d179e2decc32452a94bff4951b9f1fe9e276b773135d316847c215f7f42e24a7c SHA512 691ff8e2f2b8d7d3004fd11470cc881a8a7d3b60eed6007986db7ee8561bc41c3508b3c9b8f4da4a298a84e3023fd9b874f9d8f20664d89ce63cdb760f554465
32
33 diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
34 deleted file mode 100644
35 index dfe0d4c44d1..00000000000
36 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
37 +++ /dev/null
38 @@ -1,115 +0,0 @@
39 -# Copyright 1999-2019 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -
44 -inherit java-vm-2
45 -
46 -abi_uri() {
47 - echo "${2-$1}? (
48 - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
49 - )"
50 -}
51 -
52 -MY_PV=${PV/_p/+}
53 -SLOT=${MY_PV%%[.+]*}
54 -
55 -SRC_URI="
56 - $(abi_uri arm)
57 - $(abi_uri aarch64 arm64)
58 - $(abi_uri ppc64le ppc64)
59 - $(abi_uri x64 amd64)
60 -"
61 -
62 -DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
63 -HOMEPAGE="https://adoptopenjdk.net"
64 -LICENSE="GPL-2-with-classpath-exception"
65 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
66 -IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
67 -
68 -RDEPEND="
69 - media-libs/fontconfig:1.0
70 - media-libs/freetype:2
71 - >=sys-apps/baselayout-java-0.1.0-r1
72 - >=sys-libs/glibc-2.2.5:*
73 - sys-libs/zlib
74 - alsa? ( media-libs/alsa-lib )
75 - cups? ( net-print/cups )
76 - doc? ( dev-java/java-sdk-docs:${SLOT} )
77 - selinux? ( sec-policy/selinux-java )
78 - !headless-awt? (
79 - x11-libs/libX11
80 - x11-libs/libXext
81 - x11-libs/libXi
82 - x11-libs/libXrender
83 - x11-libs/libXtst
84 - )"
85 -
86 -PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
87 - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
88 -
89 -RESTRICT="preserve-libs splitdebug"
90 -QA_PREBUILT="*"
91 -
92 -S="${WORKDIR}/jdk-${MY_PV}"
93 -
94 -pkg_pretend() {
95 - if [[ "$(tc-is-softfloat)" != "no" ]]; then
96 - die "These binaries require a hardfloat system."
97 - fi
98 -}
99 -
100 -src_install() {
101 - local dest="/opt/${P}"
102 - local ddest="${ED%/}/${dest#/}"
103 -
104 - # Not sure why they bundle this as it's commonly available and they
105 - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
106 - # also has an explicit dependency while Oracle seemingly dlopens it.
107 - rm -vf lib/libfreetype.so || die
108 -
109 - # Oracle and IcedTea have libjsoundalsa.so depending on
110 - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
111 - if ! use alsa ; then
112 - rm -v lib/libjsound.* || die
113 - fi
114 -
115 - if ! use examples ; then
116 - rm -vr demo/ || die
117 - fi
118 -
119 - if use headless-awt ; then
120 - rm -v lib/lib*{[jx]awt,splashscreen}* || die
121 - fi
122 -
123 - if ! use source ; then
124 - rm -v lib/src.zip || die
125 - fi
126 -
127 - mv lib/security/cacerts lib/security/cacerts.orig || die
128 -
129 - dodir "${dest}"
130 - cp -pPR * "${ddest}" || die
131 -
132 - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
133 -
134 - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
135 - java-vm_set-pax-markings "${ddest}"
136 - java-vm_revdep-mask
137 - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
138 -}
139 -
140 -pkg_postinst() {
141 - java-vm-2_pkg_postinst
142 -
143 - if use gentoo-vm ; then
144 - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
145 - ewarn "recognised by the system. This will almost certainly break things."
146 - else
147 - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
148 - ewarn "will not be recognised by the system. For example, simply calling"
149 - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
150 - ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
151 - ewarn "absolute location under ${EPREFIX}/opt/${P}."
152 - fi
153 -}