1 |
commit: b315599362a6b912211fc3cd2faa7c2aa160d17a |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 8 21:20:19 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 8 21:20:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3155993 |
7 |
|
8 |
dev-java/openjdk-jre-bin: 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-jre-bin/Manifest | 1 - |
14 |
.../openjdk-jre-bin-11.0.2_p9.ebuild | 93 ---------------------- |
15 |
2 files changed, 94 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest |
18 |
index c36e43eb5cd..6b6003e0823 100644 |
19 |
--- a/dev-java/openjdk-jre-bin/Manifest |
20 |
+++ b/dev-java/openjdk-jre-bin/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz 41525058 BLAKE2B da456e8415ef45d07968c12082f2351910284b47bac92a952d4962fbc4c63cb2fa006696b6b175e0d1073b1fca76cca61460465d0959afe80d2f5ce9006d9350 SHA512 96b527be34c49e6351bed0d000153c1bc9491cf89f8a7f90190feccd2984cce1e3d18747e108d476c4417f15947d436f20cd34fe88f8126edecf4a789d725b0a |
23 |
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz 41732132 BLAKE2B 9d3bd543fec6eb6c30eabbbb3ca6073365c5b8900dff9af47cfba5569ecfc33a8e2562ed3f8cf4940b2a7d7c427e48164a94fce1f72c8e98fa7f0fc32d923237 SHA512 b7232a3c75a8c4e67f51bd95c8441026b2bfef29cc779768a5f2d300208dc569d672402e06a2d6c6f512450723bc0631c5a18cde80cbc1ec2028c123607df30f |
24 |
DIST OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz 40871242 BLAKE2B 8a6eee7f7465cbccc575e44ab08d6a3d2cedc32954475ea71064a4b6d4379927a795225fed7394922bdaa2a425efb6966d6a0126a55a0fa0e68dc0eeb7a6e935 SHA512 3b0c560cce673fa0e9506c18c4a25b56e26c8ccd7874098f55c37f1a556387b4c2d3ba81ef0368cc666178028eef0fd7beac6307588628c8c8c051381a21366f |
25 |
|
26 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild |
27 |
deleted file mode 100644 |
28 |
index 1f10efc0264..00000000000 |
29 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,93 +0,0 @@ |
32 |
-# Copyright 1999-2019 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
- |
37 |
-inherit java-vm-2 |
38 |
- |
39 |
-abi_uri() { |
40 |
- echo "${2-$1}? ( |
41 |
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz |
42 |
- )" |
43 |
-} |
44 |
- |
45 |
-MY_PV=${PV/_p/+} |
46 |
-SLOT=${MY_PV%%[.+]*} |
47 |
- |
48 |
-SRC_URI=" |
49 |
- $(abi_uri x64 amd64) |
50 |
-" |
51 |
- |
52 |
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" |
53 |
-HOMEPAGE="https://adoptopenjdk.net" |
54 |
-LICENSE="GPL-2-with-classpath-exception" |
55 |
-KEYWORDS="~amd64" |
56 |
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart" |
57 |
- |
58 |
-RDEPEND=" |
59 |
- media-libs/fontconfig:1.0 |
60 |
- media-libs/freetype:2 |
61 |
- >net-libs/libnet-1.1 |
62 |
- >=sys-libs/glibc-2.2.5:* |
63 |
- sys-libs/zlib |
64 |
- alsa? ( media-libs/alsa-lib ) |
65 |
- cups? ( net-print/cups ) |
66 |
- selinux? ( sec-policy/selinux-java ) |
67 |
- !headless-awt? ( |
68 |
- x11-libs/libX11 |
69 |
- x11-libs/libXext |
70 |
- x11-libs/libXi |
71 |
- x11-libs/libXrender |
72 |
- x11-libs/libXtst |
73 |
- )" |
74 |
- |
75 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
76 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" |
77 |
- |
78 |
-RESTRICT="preserve-libs splitdebug" |
79 |
-QA_PREBUILT="*" |
80 |
- |
81 |
-S="${WORKDIR}/jdk-${MY_PV}-jre" |
82 |
- |
83 |
-src_install() { |
84 |
- local dest="/opt/${P}" |
85 |
- local ddest="${ED}${dest#/}" |
86 |
- |
87 |
- # Not sure why they bundle this as it's commonly available and they |
88 |
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea |
89 |
- # also has an explicit dependency while Oracle seemingly dlopens it. |
90 |
- rm -vf lib/libfreetype.so || die |
91 |
- |
92 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
93 |
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. |
94 |
- if ! use alsa ; then |
95 |
- rm -v lib/libjsound.* || die |
96 |
- fi |
97 |
- |
98 |
- if use headless-awt ; then |
99 |
- rm -v lib/lib*{[jx]awt,splashscreen}* || die |
100 |
- fi |
101 |
- |
102 |
- dodir "${dest}" |
103 |
- cp -pPR * "${ddest}" || die |
104 |
- |
105 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
106 |
- java-vm_set-pax-markings "${ddest}" |
107 |
- java-vm_revdep-mask |
108 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
109 |
-} |
110 |
- |
111 |
-pkg_postinst() { |
112 |
- java-vm-2_pkg_postinst |
113 |
- |
114 |
- if use gentoo-vm ; then |
115 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" |
116 |
- ewarn "recognised by the system. This will almost certainly break things." |
117 |
- else |
118 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" |
119 |
- ewarn "will not be recognised by the system. For example, simply calling" |
120 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
121 |
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its" |
122 |
- ewarn "absolute location under ${EPREFIX}/opt/${P}." |
123 |
- fi |
124 |
-} |