From 72d7e048ae88be323a380e2eae52dfda0b2dc1c0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Mar 2024 18:45:56 +0000 Subject: gentoo auto-resync : 11:03:2024 - 18:45:56 --- dev-java/Manifest.gz | Bin 59150 -> 59148 bytes dev-java/jctools-core/Manifest | 2 +- dev-java/jctools-core/jctools-core-4.0.3.ebuild | 2 +- dev-java/openjfx/Manifest | 2 +- dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild | 231 ---------------------- dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild | 231 ++++++++++++++++++++++ dev-java/tomcat-native/Manifest | 2 +- dev-java/tomcat-native/tomcat-native-2.0.7.ebuild | 2 +- 8 files changed, 236 insertions(+), 236 deletions(-) delete mode 100644 dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild create mode 100644 dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index cd6c33bd1ab4..edd84d2d23a1 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index 4a790e7cd3bd..0c8a092e89c3 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -2,5 +2,5 @@ AUX jctools-core-4.0.3-increase-TEST_TIMEOUT.patch 855 BLAKE2B dab4a25c6de51cb86 DIST jctools-4.0.2.tar.gz 4237275 BLAKE2B 9bac4f8442f7a64aac47208ecf98799506244783d71a5444b6a3ff74ddca4e16232cf19dd5e7a9243dfcc3510674717982ef915759c8b6b2de74d4711d996302 SHA512 d19237929ab18360427efdf2844adc08589fc8ba2838b1f983118e1d6f1270bacad34477cb000e6bc85aeab38e7e337c397181b4351681f18977547c5b2e8f37 DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f EBUILD jctools-core-4.0.2.ebuild 2104 BLAKE2B bb49a9745ffcaa8d2823f4ede576b3d470f4a5e099a26ae5fa34bacca9baac6017c0c13de6a4d9be3312a0d0642adc98f91712f3f1e7e3e150fecc23e6c84e06 SHA512 3c8135965ed004db6b53d858223f121d090f1afd4c520a172ba7766c1fc226890484c9e06e059549c4583aa40b0c49982e7d249b756e9d3588ea00a426272d5c -EBUILD jctools-core-4.0.3.ebuild 1981 BLAKE2B a636b7d559a0722c719dcb41968ad3890aa8054525cbef34f26af080e56d3541b198834c4e23559f6471f0c26087ed490617f7e537dd958077a528a7494cd3f1 SHA512 d72b875431c3ed03e0e01c272ce7b6c27b10c1fec2a53e5afde6ee84b87c34d02d938f50be72508994d58747b3176cee0b112972f39e05216aa2c7d1e9f5a0f2 +EBUILD jctools-core-4.0.3.ebuild 1977 BLAKE2B b24a25fde4e2ba08cc26a29c804bb4684d5a7730ef4e0eb10c8748262944799517171541c2157ec43ef89792b620ce2159c0ae08784e8b6b323e45c9c9613104 SHA512 d1e2ef546b1942af85608d00be1c71e150a19bb9310f6d94dd1d26e083ef76e957af7d09e862f163db2d5306ee134183459e816e74c5ae860166a643aa7ead7b MISC metadata.xml 360 BLAKE2B 17c673e9f1a2114b2ba115cdd8f4240dc3731b26f7f5fef3a8ca2425192aece79740a7be59b030f79163c6ebece400940316991e34ec55c0e3490acd2fd8262d SHA512 ee2a7373801073e1c3af974bd937189f61e55af28ffd0a724d852da714e8b7abeb5375d377a7629a265c684880fb6a858358c63fe4434b768de9c92bfffe4637 diff --git a/dev-java/jctools-core/jctools-core-4.0.3.ebuild b/dev-java/jctools-core/jctools-core-4.0.3.ebuild index bd095315bc5c..5b54f3488a28 100644 --- a/dev-java/jctools-core/jctools-core-4.0.3.ebuild +++ b/dev-java/jctools-core/jctools-core-4.0.3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/JCTools-${PV}/jctools-core" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=" dev-java/osgi-annotation:0 diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 213e5b13a629..668eac8d1054 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -43,7 +43,7 @@ DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0 DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 EBUILD openjfx-11.0.11_p1-r1.ebuild 6572 BLAKE2B 0ef177a2b7de0722455433cc89535bc9a0f5c25be7260488e6e08859f375ade524b56469881b15cdb4a8359b5b23b2eef0b526c0a28b25ed04d7d67a29153f86 SHA512 65827cc97c0b6c56a7e4e186321542229bf9de5ff673309beb2ee7b4d37e004b07628eb0bdd251f9b8eee4f70e15eaec3b0a7724c3dfe47ab03372d4a9eb22ce -EBUILD openjfx-11.0.11_p1-r2.ebuild 6817 BLAKE2B eb20b117c350362f8b89e41cbf326bbcbbdb2723bcecc01b8a86ad30f62ba7445222e59d75263699a01ca157eeb0c161e331b5a38222f9632f65185c84024d16 SHA512 30119277d9a64d68e7e25cb0a7117ca638263f356b0f98f7d08142d31551137e5a665b88709477f6cc3d046fbab7253dfc875c387121edfd15c7f41430006082 +EBUILD openjfx-11.0.11_p1-r3.ebuild 6800 BLAKE2B 2d28577272cd1d8527485a3472c2bf7ccde5f72b4b65973e1addcf67324eff502483353a2611fa1f428cdd6416082c53017b14007bd35ead6ff693b48097e092 SHA512 d7dc44eacffd7b005798fb75da20d18ac787bfa15e01c35a0495477ecc2ac14c0cf3afc7aafa5f4f7e53257392b5804cb6844af87baca17fbc3f73610fbce1cf EBUILD openjfx-11.0.9_p0-r1.ebuild 6538 BLAKE2B 06a23d77d9190f339d4d52f918328c2d8cbfc6d113e06f700110fe0a04b305e913fe2557cb3efadacbeddc7ba69fa05f87c3198d05065e50c6d48cacf637bfed SHA512 a7b77c4f065a121b22874eb613e101d3708037776b85134ba411f07c25c1c160e7b0d55b057676e94e11f70a89944dc8587c2a1f453c1a32f1699b951fc12ee3 EBUILD openjfx-8.1000-r2.ebuild 5582 BLAKE2B 0071331e7290b18814249581f7733a01f5ce312656e623da110c7774db335f7a09178c6cbb46c5102a35545e3e890d6b98937c9ba552f2845fa0d86990d3daa6 SHA512 4af920664da56da987c1a031b6797817e9432a7d717245c9669fd3a63bf92a3f0b0b56b96394dc7ded612dfacdb8fc1c5d1df082152e75fd179ca7f5961e7c49 MISC metadata.xml 567 BLAKE2B d892bbd4cccfad57f17203e63e0cde8b8b8ccdda71de101f0fbd4fdf95a2490e43a7e50bac91a69956f125712b6af9d4a9f5bd586ad968af0d6586f5b6f4b6c8 SHA512 5884a9a487485c39816b58552e8b39c10474a3aebb0929845b3940d228a7d41080cc0515521d11b88533fcb34f94fef2742a9e39787146d02e46a9b594102912 diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild deleted file mode 100644 index 4f4331a06705..000000000000 --- a/dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="${PV/_p/+}" -SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.10.3" - -inherit flag-o-matic java-pkg-2 multiprocessing toolchain-funcs - -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 -" - -S="${WORKDIR}/rt-${MY_PV}" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64 ~ppc64" -IUSE="cpu_flags_x86_sse2 debug doc source +media" -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - -RDEPEND=" - app-accessibility/at-spi2-core - dev-java/swt:4.10[cairo,opengl] - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - media-libs/fontconfig:1.0 - media-libs/libjpeg-turbo - 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/opengl - doc? ( dev-java/openjdk:${SLOT}[doc] ) - !doc? ( - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - ) -" - -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 -" - -PATCHES=( - "${FILESDIR}"/11/disable-buildSrc-tests.patch - "${FILESDIR}"/11/glibc-compatibility.patch - "${FILESDIR}"/11/respect-user-cflags-11.0.11.patch - "${FILESDIR}"/11/use-system-swt-jar.patch - "${FILESDIR}"/11/wno-error-11.0.11.patch - "${FILESDIR}"/11/don-t-force-msse-11.0.11.patch - "${FILESDIR}"/11/disable-architecture-verification.patch - "${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch - "${FILESDIR}"/11/ffmpeg5.patch - "${FILESDIR}"/11/respect-cc.patch - "${FILESDIR}"/11/strip-blank-elements-flags.patch -) - -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" - #--debug - ) - - 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 -b dev-java/openjdk:${SLOT}; then - export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=true - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version -b 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=true - 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 - # This package is ridiculously brittle and fails when building e.g. - # bundled gstreamer with LTO. - filter-lto - tc-export AR CC CXX - - # FIXME: still calls pkg-config etc by name without chost prefix - # FIXME: should we enable webkit? doubt so - - # build is very sensitive to doc presence, take extra steps - if use doc; then - local jdk_doc - if has_version -b dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${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.11_p1-r3.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild new file mode 100644 index 000000000000..55962035a564 --- /dev/null +++ b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild @@ -0,0 +1,231 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="${PV/_p/+}" +SLOT="${MY_PV%%[.+]*}" +EGRADLE_VER="4.10.3" + +inherit flag-o-matic java-pkg-2 multiprocessing toolchain-funcs + +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 +" + +S="${WORKDIR}/rt-${MY_PV}" + +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="-* ~amd64 ~ppc64" +IUSE="cpu_flags_x86_sse2 debug doc source +media" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" + +RDEPEND=" + app-accessibility/at-spi2-core + dev-java/swt:4.10[cairo,opengl] + dev-libs/glib:2 + dev-libs/libxml2:2 + dev-libs/libxslt + media-libs/freetype:2 + media-libs/fontconfig:1.0 + media-libs/libjpeg-turbo + 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/opengl + doc? ( dev-java/openjdk:${SLOT}[doc] ) + !doc? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + ) +" + +DEPEND="${RDEPEND} + app-arch/unzip + app-arch/zip + dev-java/ant:0 + dev-java/antlr:0 + dev-java/antlr:3.5 + dev-java/hamcrest-core:0 + dev-java/stringtemplate:0 + virtual/ttf-fonts + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/11/disable-buildSrc-tests.patch + "${FILESDIR}"/11/glibc-compatibility.patch + "${FILESDIR}"/11/respect-user-cflags-11.0.11.patch + "${FILESDIR}"/11/use-system-swt-jar.patch + "${FILESDIR}"/11/wno-error-11.0.11.patch + "${FILESDIR}"/11/don-t-force-msse-11.0.11.patch + "${FILESDIR}"/11/disable-architecture-verification.patch + "${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch + "${FILESDIR}"/11/ffmpeg5.patch + "${FILESDIR}"/11/respect-cc.patch + "${FILESDIR}"/11/strip-blank-elements-flags.patch +) + +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" + #--debug + ) + + 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 -b dev-java/openjdk:${SLOT}; then + export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} + export JDK_HOME="${JAVA_HOME}" + export ANT_RESPECT_JAVA_HOME=true + else + if [[ ${MERGE_TYPE} != "binary" ]]; then + JDK_HOME=$(best_version -b 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=true + 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 + # This package is ridiculously brittle and fails when building e.g. + # bundled gstreamer with LTO. + filter-lto + tc-export AR CC CXX + + # FIXME: still calls pkg-config etc by name without chost prefix + # FIXME: should we enable webkit? doubt so + + # build is very sensitive to doc presence, take extra steps + if use doc; then + local jdk_doc + if has_version -b dev-java/openjdk:${SLOT}[doc]; then + jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${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/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index ef2b6094204d..abd7cc63b46e 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -6,5 +6,5 @@ DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915 DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605 EBUILD tomcat-native-1.2.39.ebuild 2146 BLAKE2B 9c99bb18856dbd741b1caae954437dcc49e288194fed98af8ac820f862a8ecabd7928222a5447299a9cc18ac2bc1c09ea6fd68345aa4de7427163c1912d97192 SHA512 d19631cd46ded750fce4d76193021408082556feb350e9d79ae4a70f10d4ea5bab33971d5459797d893b107f85ec535196bcc65109a74d8fee9009c6928f6455 EBUILD tomcat-native-2.0.6.ebuild 1964 BLAKE2B 99aadb668c45fd8d805d32c86f607178ebd05364034e23c88cad331f5f5c7398eb47e7680754d39ca80f1bdc1ad131a52029cdcf77918c506708cd73b4947265 SHA512 4c2bc42abec62e65c67572d4564f2318e4d16b76cfbe4604a5f2d41b5dbc38196d596efcdebb6652de16497d1b81c115afa52ad487405e20922f5acd7649aff6 -EBUILD tomcat-native-2.0.7.ebuild 1965 BLAKE2B c987d1fa2a83b6c0daa11eeccb0ac3907c21cd49f08233b7a106eac0fc68c14bc078a170e56489e9e83172cf226c0f18095077db7133a0213273d9defea000ed SHA512 711d892028fad445335962913a0f609aaa4c26d1a05dfbdf4ba9239a506c6ae18bd402306edb56873a616494fb438f08e1a464a8329a1cb635169c20a4169bb7 +EBUILD tomcat-native-2.0.7.ebuild 1964 BLAKE2B 20268866489e1a85e741358b2fea72449b1acb35a00cfaccb8483d8025579450c61762ca4547616148dbdad89a14cfaf7c8457342f4748619cb7a07cb7670170 SHA512 dcca9bd56e243dd7c6d619b0dc2659ffe6d4a2a808e02af06799f5640e6a0fb54d16b01d7744b4d382659c67731dd8db7c7bdca849a1ee643fa19ad9235c8d73 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc diff --git a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild index 03965f330c13..9507ee4750e0 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t )" S=${WORKDIR}/${P}-src/native -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" LICENSE="Apache-2.0" SLOT="2" IUSE="static-libs" -- cgit v1.2.3