From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- dev-java/openjfx/Manifest | 4 +- dev-java/openjfx/openjfx-11.0.8_p2.ebuild | 222 ------------------------------ dev-java/openjfx/openjfx-11.0.9_p0.ebuild | 4 +- 3 files changed, 3 insertions(+), 227 deletions(-) delete mode 100644 dev-java/openjfx/openjfx-11.0.8_p2.ebuild (limited to 'dev-java/openjfx') diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 3dd98b603f18..eaf662fea9fb 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -13,8 +13,6 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 -DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 -EBUILD openjfx-11.0.8_p2.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b -EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B b64405041784dc2a1eaeca4ff789259378bd11428182aaa719d1def547194445b1c2e22efa20ba63546df7730b677319bd63e344a803e37c0cf7a22953682934 SHA512 b6b0f5a5b2829bd061f2f127be0489ced00fe0caf5e6ef40a7110ef3e1d2394e5ffcff95d6851ce84188375c5d152e327d40159e0c54670fbb7b8ab9eb59b852 +EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B a21489ee9fc2342d3c2cd5808cc2c3ba1567b96f8391b2356028a18ebf4e5c77e54d537dbaba74ebcdddc4a6d8ac6e4c6ace4f75749b7e6f8d0e5159afbc3835 SHA512 474743ff11d921b7654508e3ee9a2644cf7d1b1baeb5dc5b7348b6bd6bc84877354313bb62f64b84ccd27a68eb55690838170e1aadc510eeb6d0ebeb6d18bb0a MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d diff --git a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild deleted file mode 100644 index 5f211eba215c..000000000000 --- a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_p/+}" -SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.8" - -inherit flag-o-matic java-pkg-2 multiprocessing - -DESCRIPTION="Java OpenJFX client application platform" -HOMEPAGE="https://openjfx.io" - -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar - https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar - https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar - https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" - -IUSE="cpu_flags_x86_sse2 debug doc source +media" - -RDEPEND=" - dev-java/swt:4.10[cairo,opengl] - dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - media-libs/fontconfig:1.0 - media-video/ffmpeg:0= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/cairo[glib] - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/jpeg - virtual/opengl - || ( - dev-java/openjdk-bin:${SLOT}[doc?] - dev-java/openjdk:${SLOT}[doc?] - ) -" - -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip - >=dev-java/ant-core-1.10.7-r1:0 - dev-java/antlr:0 - dev-java/antlr:3.5 - dev-java/hamcrest-core:0 - dev-java/stringtemplate:0 - virtual/ttf-fonts - virtual/pkgconfig -" - -REQUIRED_USE="cpu_flags_x86_sse2" - -PATCHES=( - "${FILESDIR}"/11/disable-buildSrc-tests.patch - "${FILESDIR}"/11/glibc-compatibility.patch - "${FILESDIR}"/11/respect-user-cflags.patch - "${FILESDIR}"/11/use-system-swt-jar.patch - "${FILESDIR}"/11/wno-error.patch -) - -S="${WORKDIR}/rt-${MY_PV}" - -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - # TERM needed, otherwise gradle may fail on terms it does not know about - TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - fi - fi -} - -src_unpack() { - unpack "${P}.tar.bz2" - unpack "gradle-${EGRADLE_VER}-bin.zip" - - mkdir "${T}/jars" || die - - local line jar - for line in ${SRC_URI}; do - if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then - jar=$(basename "${BASH_REMATCH[-1]}") - cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die - fi - done -} - -src_prepare() { - default - - local d="${T}/jars" - - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5 - java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate - java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core - - sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die -} - -src_configure() { - append-flags -Wno-error -fcommon - - #FIXME: still calls gcc, pkg-config etc by name without chost prefix - #FIXME: should we enable webkit? doubt so - - # build is very sensetive to doc presense, take extra steps - if use doc; then - local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" - elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then - jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" - fi - [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" - fi - - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - COMPILE_WEBKIT = false - COMPILE_MEDIA = $(usex media true false) - JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api - JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "") - BUILD_LIBAV_STUBS = false - GRADLE_VERSION_CHECK = false - LINT = none - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - JFX_DEPS_URL = ${T}/jars - COMPANY_NAME = "Gentoo" - _EOF_ -} - -src_compile() { - egradle zips $(usex doc "" "--exclude-task javadoc") -} - -src_install() { - if ! use source ; then - rm -v build/sdk/lib/src.zip || die - fi - - insinto "/usr/$(get_libdir)/${PN}-${SLOT}" - doins -r build/sdk/. - doins build/javafx-exports.zip - - if use doc; then - docinto html - dodoc -r build/javadoc/. - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild index be554f4fb9cf..d9fd79845b49 100644 --- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild +++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild @@ -126,7 +126,7 @@ pkg_setup() { if has_version --host-root dev-java/openjdk:${SLOT}; then export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=ture + export ANT_RESPECT_JAVA_HOME=true else if [[ ${MERGE_TYPE} != "binary" ]]; then @@ -136,7 +136,7 @@ pkg_setup() { JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} export JDK_HOME export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=ture + export ANT_RESPECT_JAVA_HOME=true fi fi } -- cgit v1.2.3