1 |
commit: 9690cd3adfcbc8866037ddc81d80775ce7918a96 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 22:54:51 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 22:58:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9690cd3a |
7 |
|
8 |
dev-java/openjfx: drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjfx/Manifest | 1 - |
14 |
dev-java/openjfx/openjfx-11.0.8_p2.ebuild | 222 ------------------------------ |
15 |
2 files changed, 223 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest |
18 |
index 108107cc51d..1b63e285337 100644 |
19 |
--- a/dev-java/openjfx/Manifest |
20 |
+++ b/dev-java/openjfx/Manifest |
21 |
@@ -7,5 +7,4 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60 |
22 |
DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea |
23 |
DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 |
24 |
DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 |
25 |
-DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d |
26 |
DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 |
27 |
|
28 |
diff --git a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 5f211eba215..00000000000 |
31 |
--- a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,222 +0,0 @@ |
34 |
-# Copyright 2019-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-MY_PV="${PV/_p/+}" |
40 |
-SLOT="${MY_PV%%[.+]*}" |
41 |
-EGRADLE_VER="4.8" |
42 |
- |
43 |
-inherit flag-o-matic java-pkg-2 multiprocessing |
44 |
- |
45 |
-DESCRIPTION="Java OpenJFX client application platform" |
46 |
-HOMEPAGE="https://openjfx.io" |
47 |
- |
48 |
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 |
49 |
- https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip |
50 |
- https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar |
51 |
- https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar |
52 |
- https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar |
53 |
- https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar |
54 |
- https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar |
55 |
- https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar |
56 |
- https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar |
57 |
- https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar |
58 |
-" |
59 |
- |
60 |
-LICENSE="GPL-2-with-classpath-exception" |
61 |
-KEYWORDS="-* ~amd64" |
62 |
- |
63 |
-IUSE="cpu_flags_x86_sse2 debug doc source +media" |
64 |
- |
65 |
-RDEPEND=" |
66 |
- dev-java/swt:4.10[cairo,opengl] |
67 |
- dev-libs/atk |
68 |
- dev-libs/glib:2 |
69 |
- dev-libs/libxml2:2 |
70 |
- dev-libs/libxslt |
71 |
- media-libs/freetype:2 |
72 |
- media-libs/fontconfig:1.0 |
73 |
- media-video/ffmpeg:0= |
74 |
- x11-libs/gdk-pixbuf |
75 |
- x11-libs/gtk+:2 |
76 |
- x11-libs/gtk+:3 |
77 |
- x11-libs/cairo[glib] |
78 |
- x11-libs/libX11 |
79 |
- x11-libs/libXtst |
80 |
- x11-libs/libXxf86vm |
81 |
- x11-libs/pango |
82 |
- virtual/jpeg |
83 |
- virtual/opengl |
84 |
- || ( |
85 |
- dev-java/openjdk-bin:${SLOT}[doc?] |
86 |
- dev-java/openjdk:${SLOT}[doc?] |
87 |
- ) |
88 |
-" |
89 |
- |
90 |
-DEPEND="${RDEPEND} |
91 |
- app-arch/unzip |
92 |
- app-arch/zip |
93 |
- >=dev-java/ant-core-1.10.7-r1:0 |
94 |
- dev-java/antlr:0 |
95 |
- dev-java/antlr:3.5 |
96 |
- dev-java/hamcrest-core:0 |
97 |
- dev-java/stringtemplate:0 |
98 |
- virtual/ttf-fonts |
99 |
- virtual/pkgconfig |
100 |
-" |
101 |
- |
102 |
-REQUIRED_USE="cpu_flags_x86_sse2" |
103 |
- |
104 |
-PATCHES=( |
105 |
- "${FILESDIR}"/11/disable-buildSrc-tests.patch |
106 |
- "${FILESDIR}"/11/glibc-compatibility.patch |
107 |
- "${FILESDIR}"/11/respect-user-cflags.patch |
108 |
- "${FILESDIR}"/11/use-system-swt-jar.patch |
109 |
- "${FILESDIR}"/11/wno-error.patch |
110 |
-) |
111 |
- |
112 |
-S="${WORKDIR}/rt-${MY_PV}" |
113 |
- |
114 |
-egradle() { |
115 |
- local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" |
116 |
- local gradle="${GRADLE_HOME}/bin/gradle" |
117 |
- local gradle_args=( |
118 |
- --info |
119 |
- --stacktrace |
120 |
- --no-build-cache |
121 |
- --no-daemon |
122 |
- --offline |
123 |
- --gradle-user-home "${T}/gradle_user_home" |
124 |
- --project-cache-dir "${T}/gradle_project_cache" |
125 |
- ) |
126 |
- |
127 |
- export GRADLE_HOME |
128 |
- |
129 |
- # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist |
130 |
- unset ANT_HOME |
131 |
- |
132 |
- einfo "gradle "${gradle_args[@]}" ${@}" |
133 |
- # TERM needed, otherwise gradle may fail on terms it does not know about |
134 |
- TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" |
135 |
-} |
136 |
- |
137 |
-pkg_setup() { |
138 |
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
139 |
- JAVA_PKG_WANT_SOURCE="${SLOT}" |
140 |
- JAVA_PKG_WANT_TARGET="${SLOT}" |
141 |
- |
142 |
- # The nastiness below is necessary while the gentoo-vm USE flag is |
143 |
- # masked. First we call java-pkg-2_pkg_setup if it looks like the |
144 |
- # flag was unmasked against one of the possible build VMs. If not, |
145 |
- # we try finding one of them in their expected locations. This would |
146 |
- # have been slightly less messy if openjdk-bin had been installed to |
147 |
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env |
148 |
- # file but disable it so that it would not normally be selectable. |
149 |
- |
150 |
- local vm |
151 |
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
152 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
153 |
- java-pkg-2_pkg_setup |
154 |
- return |
155 |
- fi |
156 |
- done |
157 |
- |
158 |
- if has_version --host-root dev-java/openjdk:${SLOT}; then |
159 |
- export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
160 |
- export JDK_HOME="${JAVA_HOME}" |
161 |
- export ANT_RESPECT_JAVA_HOME=ture |
162 |
- |
163 |
- else |
164 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
165 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
166 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
167 |
- JDK_HOME=${JDK_HOME#*/} |
168 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
169 |
- export JDK_HOME |
170 |
- export JAVA_HOME="${JDK_HOME}" |
171 |
- export ANT_RESPECT_JAVA_HOME=ture |
172 |
- fi |
173 |
- fi |
174 |
-} |
175 |
- |
176 |
-src_unpack() { |
177 |
- unpack "${P}.tar.bz2" |
178 |
- unpack "gradle-${EGRADLE_VER}-bin.zip" |
179 |
- |
180 |
- mkdir "${T}/jars" || die |
181 |
- |
182 |
- local line jar |
183 |
- for line in ${SRC_URI}; do |
184 |
- if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then |
185 |
- jar=$(basename "${BASH_REMATCH[-1]}") |
186 |
- cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die |
187 |
- fi |
188 |
- done |
189 |
-} |
190 |
- |
191 |
-src_prepare() { |
192 |
- default |
193 |
- |
194 |
- local d="${T}/jars" |
195 |
- |
196 |
- java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr |
197 |
- java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5 |
198 |
- java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate |
199 |
- java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core |
200 |
- |
201 |
- sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die |
202 |
-} |
203 |
- |
204 |
-src_configure() { |
205 |
- append-flags -Wno-error -fcommon |
206 |
- |
207 |
- #FIXME: still calls gcc, pkg-config etc by name without chost prefix |
208 |
- #FIXME: should we enable webkit? doubt so |
209 |
- |
210 |
- # build is very sensetive to doc presense, take extra steps |
211 |
- if use doc; then |
212 |
- local jdk_doc |
213 |
- if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then |
214 |
- jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" |
215 |
- elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then |
216 |
- jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" |
217 |
- fi |
218 |
- [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" |
219 |
- fi |
220 |
- |
221 |
- cat <<- _EOF_ > "${S}"/gradle.properties |
222 |
- COMPILE_TARGETS = linux |
223 |
- COMPILE_WEBKIT = false |
224 |
- COMPILE_MEDIA = $(usex media true false) |
225 |
- JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api |
226 |
- JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "") |
227 |
- BUILD_LIBAV_STUBS = false |
228 |
- GRADLE_VERSION_CHECK = false |
229 |
- LINT = none |
230 |
- CONF = $(usex debug DebugNative Release) |
231 |
- NUM_COMPILE_THREADS = $(makeopts_jobs) |
232 |
- JFX_DEPS_URL = ${T}/jars |
233 |
- COMPANY_NAME = "Gentoo" |
234 |
- _EOF_ |
235 |
-} |
236 |
- |
237 |
-src_compile() { |
238 |
- egradle zips $(usex doc "" "--exclude-task javadoc") |
239 |
-} |
240 |
- |
241 |
-src_install() { |
242 |
- if ! use source ; then |
243 |
- rm -v build/sdk/lib/src.zip || die |
244 |
- fi |
245 |
- |
246 |
- insinto "/usr/$(get_libdir)/${PN}-${SLOT}" |
247 |
- doins -r build/sdk/. |
248 |
- doins build/javafx-exports.zip |
249 |
- |
250 |
- if use doc; then |
251 |
- docinto html |
252 |
- dodoc -r build/javadoc/. |
253 |
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
254 |
- fi |
255 |
-} |