diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-01 17:44:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-01 17:44:07 +0100 |
commit | 5bd02f229a9c4ce484e49ec36dcb1f4eb5dfcdae (patch) | |
tree | bd9151b602024702907ff1e5d953f6945b67f25c /dev-java | |
parent | b447ac3a6d1bb09ddb6a5686620670e223b37642 (diff) |
gentoo auto-resync : 01:10:2023 - 17:44:07
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/Manifest.gz | bin | 58127 -> 58122 bytes | |||
-rw-r--r-- | dev-java/openjfx/Manifest | 4 | ||||
-rw-r--r-- | dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild | 15 | ||||
-rw-r--r-- | dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild | 15 |
4 files changed, 14 insertions, 20 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 1e92034c8a24..811587ec5225 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 8242855ff0df..07d860014400 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -37,7 +37,7 @@ DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 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 6602 BLAKE2B abd5e2d7757b5ada08f8e5998e64c8cd1e2ca5d92cf41d5e8d17b4385d31359d1147fc77586d32825ae3fc58cf898078b461143bc2e2c8f2721cb28d49617ad6 SHA512 7fd2faea34f8e99ff83baf57eaf15ef95c1d7556bbd354c85dfeac3e3563b4b04ddfcd7a444e8aaf8241541dc7831276fda3d19f92c5a2a356c964de04796b59 -EBUILD openjfx-11.0.9_p0-r1.ebuild 6568 BLAKE2B 42d0eb52bc6844bff3215597ff061e2baacf497261b37559f1a824b12a247c2cd3583888dff6a9165c4cf21564b64a505842ba84972759ef6ed0b99df89bc4b3 SHA512 73a4a8a453825a28b72f0e05861d7c8b0f0f66ccf459e1fd3f49f470231850a2baa0851c25f0826d3c7883b5dfb3916cdd7e211845607fe1fdcc6af568666cf8 +EBUILD openjfx-11.0.11_p1-r1.ebuild 6572 BLAKE2B 0ef177a2b7de0722455433cc89535bc9a0f5c25be7260488e6e08859f375ade524b56469881b15cdb4a8359b5b23b2eef0b526c0a28b25ed04d7d67a29153f86 SHA512 65827cc97c0b6c56a7e4e186321542229bf9de5ff673309beb2ee7b4d37e004b07628eb0bdd251f9b8eee4f70e15eaec3b0a7724c3dfe47ab03372d4a9eb22ce +EBUILD openjfx-11.0.9_p0-r1.ebuild 6538 BLAKE2B 06a23d77d9190f339d4d52f918328c2d8cbfc6d113e06f700110fe0a04b305e913fe2557cb3efadacbeddc7ba69fa05f87c3198d05065e50c6d48cacf637bfed SHA512 a7b77c4f065a121b22874eb613e101d3708037776b85134ba411f07c25c1c160e7b0d55b057676e94e11f70a89944dc8587c2a1f453c1a32f1699b951fc12ee3 EBUILD openjfx-8.1000-r1.ebuild 5583 BLAKE2B 14e6cfe9ecf3d0a8d80593a7ef99b5f4fe0122270dd94fc4e01d868ddc2b6879b071fcd85f16a82af4efde828858bc2e8de8986639fc218e475a1a8186ed2167 SHA512 47ee853dc65f892c087ace044ff40d0d13b133fcfc3129835c8a710ac90eb903bbba523ea60b71e6d0c4e8cb8751d9c5e3b0fa674d595658baed469a26c68600 MISC metadata.xml 679 BLAKE2B 6197810f33cab61e844a41acb183754f4034020116507ae07db6ab81cf91e9088a4359b6c37d85de9130d835ad12f33da597f514248d6abe000ab2f5a1127627 SHA512 81e44c868178fb48e8182bc7b4eae21abd43ac561f0d819617d8fb1b5ed69d2cc02c2b97790ac957a3c9c07083c3ad93744294b52b971955a521596eb2421b0b diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild index 3263c68c1c08..34f91df33673 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild @@ -24,10 +24,12 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b 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 @@ -68,8 +70,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - PATCHES=( "${FILESDIR}"/11/disable-buildSrc-tests.patch "${FILESDIR}"/11/glibc-compatibility.patch @@ -82,8 +82,6 @@ PATCHES=( "${FILESDIR}"/11/ffmpeg5.patch ) -S="${WORKDIR}/rt-${MY_PV}" - egradle() { local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" local gradle="${GRADLE_HOME}/bin/gradle" @@ -128,14 +126,13 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then + 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 --host-root dev-java/openjdk-bin:${SLOT}) + 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*} @@ -183,7 +180,7 @@ src_configure() { # 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 + 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" diff --git a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild index 7fca74112cfd..0f4c3e85b629 100644 --- a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild @@ -24,10 +24,12 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b 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 @@ -68,8 +70,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - PATCHES=( "${FILESDIR}"/11/disable-buildSrc-tests.patch "${FILESDIR}"/11/glibc-compatibility.patch @@ -82,8 +82,6 @@ PATCHES=( "${FILESDIR}/11/${PV}-version.patch" ) -S="${WORKDIR}/rt-${MY_PV}" - egradle() { local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" local gradle="${GRADLE_HOME}/bin/gradle" @@ -128,14 +126,13 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then + 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 --host-root dev-java/openjdk-bin:${SLOT}) + 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*} @@ -183,7 +180,7 @@ src_configure() { # 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 + 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" |