From 73bd96ed33934ff555018f640c9ebd43b03f84f2 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [feature/flatten]" Date: Sun, 20 Sep 2020 07:05:16 +0000 Subject: Updating liguros repo --- dev-java/cpptasks/cpptasks-1.0_beta5.ebuild | 19 +-- .../glassfish-persistence-1.0-r1.ebuild | 28 +-- dev-java/java-sdk-docs/Manifest | 3 - .../java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild | 49 ------ dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild | 37 ---- dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild | 37 ---- dev-java/java-sdk-docs/metadata.xml | 6 - dev-java/jcodings/jcodings-1.0.11.ebuild | 5 +- dev-java/jcodings/jcodings-1.0.5.ebuild | 10 +- dev-java/jnlp-api/jnlp-api-6.0.18.ebuild | 7 +- dev-java/jzlib/Manifest | 3 +- dev-java/jzlib/jzlib-1.0.7-r2.ebuild | 14 +- dev-java/jzlib/jzlib-1.1.1.ebuild | 50 ------ dev-java/jzlib/jzlib-1.1.3-r1.ebuild | 50 ++++++ dev-java/jzlib/jzlib-1.1.3.ebuild | 48 ------ dev-java/miglayout/miglayout-4.0.ebuild | 23 ++- dev-java/odfdom/odfdom-0.8.6-r1.ebuild | 25 +-- dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild | 3 +- dev-java/openjfx/Manifest | 2 - .../11/disable-architecture-verification.patch | 33 ++++ dev-java/openjfx/files/11/don-t-force-msse.patch | 95 +++++++++++ .../openjfx/files/8/0001-don-t-force-msse.patch | 69 -------- dev-java/openjfx/openjfx-11.0.9_p0.ebuild | 19 ++- dev-java/openjfx/openjfx-8.202.ebuild | 187 --------------------- dev-java/openjfx/openjfx-8.999.ebuild | 1 + .../swt/files/as-needed-and-flag-fixes-3.6.patch | 8 +- dev-java/swt/swt-3.7.2-r3.ebuild | 37 ++-- dev-java/xsdlib/xsdlib-20090415.ebuild | 25 +-- 28 files changed, 298 insertions(+), 595 deletions(-) delete mode 100644 dev-java/java-sdk-docs/Manifest delete mode 100644 dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild delete mode 100644 dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild delete mode 100644 dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild delete mode 100644 dev-java/java-sdk-docs/metadata.xml delete mode 100644 dev-java/jzlib/jzlib-1.1.1.ebuild create mode 100644 dev-java/jzlib/jzlib-1.1.3-r1.ebuild delete mode 100644 dev-java/jzlib/jzlib-1.1.3.ebuild create mode 100644 dev-java/openjfx/files/11/disable-architecture-verification.patch create mode 100644 dev-java/openjfx/files/11/don-t-force-msse.patch delete mode 100644 dev-java/openjfx/files/8/0001-don-t-force-msse.patch delete mode 100644 dev-java/openjfx/openjfx-8.202.ebuild (limited to 'dev-java') diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild index 5ec0c7574dca..66aa1778de15 100644 --- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild +++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc source examples" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Ant-tasks to compile various source languages and produce executables" HOMEPAGE="https://sourceforge.net/projects/ant-contrib/" SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz" +S="${WORKDIR}/${P/_beta/b}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" CDEPEND=" dev-java/ant-core:0 @@ -24,18 +24,17 @@ RDEPEND="${CDEPEND} DEPEND="${CDEPEND} >=virtual/jdk-1.6" -S="${WORKDIR}/${P/_beta/b}" - -java_prepare() { - find -name '*.jar' -exec rm -v {} + || die -} - JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_BUILD_TARGET="jars" EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api" EANT_GENTOO_CLASSPATH="ant-core,xerces-2" +src_prepare() { + default + find -name '*.jar' -exec rm -v {} + || die +} + src_install() { java-pkg_dojar target/lib/${PN}.jar diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild index f7157f5db556..898ef4606059 100644 --- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild +++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild @@ -1,34 +1,34 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Glassfish implementation of persistence API" HOMEPAGE="https://glassfish.java.net/" SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip" +S="${WORKDIR}/glassfish" LICENSE="CDDL" SLOT="0" KEYWORDS="amd64 ~ppc64 x86" -IUSE="" - -RDEPEND=" - >=virtual/jre-1.5" -DEPEND=" - >=virtual/jdk-1.5 - app-arch/unzip" - -S="${WORKDIR}/glassfish" -java_prepare() { - epatch "${FILESDIR}"/${P}-python2.7-sax-parser.patch #414807 -} +BDEPEND="app-arch/unzip" +DEPEND=">=virtual/jdk-1.5" +RDEPEND=">=virtual/jre-1.5" EANT_BUILD_XML="persistence-api/build.xml" EANT_BUILD_TARGET="all" +PATCHES=( + "${FILESDIR}"/${P}-python2.7-sax-parser.patch +) + +src_prepare() { + default +} + src_install() { cd "${WORKDIR}"/publish/glassfish || die java-pkg_newjar lib/javaee.jar diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest deleted file mode 100644 index 57072c401c42..000000000000 --- a/dev-java/java-sdk-docs/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST jdk-11.0.5_doc-all.zip 51476228 BLAKE2B 4515b7aaba27446971047b4c95a8684951b5816db6d5220333377120461ae975994890442811789ed11377715466974645af2318f7daa636e092f2949a824eba SHA512 2e0a183e38f4ae5a95c1195b48be16489fde5f63a14a0566170f7fb2d4e10964b8d733fcfeca078304cd10ad98834992d7b86320ebf29000c9474b39d709a9ff -DIST jdk-8u202-docs-all.zip 93792495 BLAKE2B c1e3f6f5a713d55a62dc6ef0fd2bba5d30b094030e8438b73bd6bf9f27a7ec3bdb924d8251f99182eb62b470f177fdf84db23f57550bc9467a4a7c305190ad50 SHA512 ad8b51bbc705d46d47164918ce2d620cbadaf92a3fe56d72528f9cbc05da900309ecfef7ebf711e9474f292f744e2e33877cb7377e2e21a5a58e1922198be907 -DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild deleted file mode 100644 index bb76501888d2..000000000000 --- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html" - -[[ "$(ver_cut 4)" == 0 ]] \ - || MY_PV_EXT="u$(ver_cut 4)" - -MY_PV="$(ver_cut 2)${MY_PV_EXT}" - -DESCRIPTION="Oracle's documentation bundle (including API) for Java SE" -HOMEPAGE="https://download.oracle.com/javase/8/docs/" -SRC_URI="jdk-${MY_PV}-docs-all.zip" -LICENSE="oracle-java-documentation-8" -SLOT="1.8" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -RESTRICT="fetch" - -DEPEND="app-arch/unzip" - -S="${WORKDIR}/docs" - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from" - einfo "${DOWNLOAD_URL}" - einfo "by agreeing to the license and place it in your distfiles directory." - einfo "" - einfo "If you find the file on the download page replaced with a higher" - einfo "version, please report it in bug #67266 (link below)." - einfo "" - einfo "If emerge fails because of a checksum error, it is possible that" - einfo "the upstream release changed without renaming. Try downloading the file" - einfo "again (or a newer revision if available). Otherwise report this to" - einfo "https://bugs.gentoo.org/67266 and we will make a new revision." -} - -src_prepare() { - default - - # Don't need both .Z and .bz2 archives. - find -name "*.Z" -delete || die -} - -src_install() { - insinto /usr/share/doc/${PN}-${SLOT}/html - doins -r index.html */ -} diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild deleted file mode 100644 index 4ebb1e6d8d5b..000000000000 --- a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/documentation/jdk11-doc-downloads-5097203.html" - -SLOT="${PV%%.*}" -DESCRIPTION="Oracle's documentation bundle (including API) for Java SE" -HOMEPAGE="https://docs.oracle.com/javase/11" -SRC_URI="jdk-${PV}_doc-all.zip" -LICENSE="oracle-java-documentation-${SLOT}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -RESTRICT="fetch" - -DEPEND="app-arch/unzip" - -S="${WORKDIR}/docs" - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from" - einfo "${DOWNLOAD_URL}" - einfo "by agreeing to the license and place it in your distfiles directory." - einfo "" - einfo "If you find the file on the download page replaced with a higher" - einfo "version, please report it in bug #67266 (link below)." - einfo "" - einfo "If emerge fails because of a checksum error, it is possible that" - einfo "the upstream release changed without renaming. Try downloading the file" - einfo "again (or a newer revision if available). Otherwise report this to" - einfo "https://bugs.gentoo.org/67266 and we will make a new revision." -} - -src_install() { - insinto /usr/share/doc/${PN}-${SLOT}/html - doins -r index.html */ -} diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild deleted file mode 100644 index 7fba329b2417..000000000000 --- a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk9-doc-downloads-3850606.html" - -SLOT="${PV%%.*}" -DESCRIPTION="Oracle's documentation bundle (including API) for Java SE" -HOMEPAGE="https://docs.oracle.com/javase/9" -SRC_URI="jdk-${PV}_doc-all.zip" -LICENSE="oracle-java-documentation-${SLOT}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -RESTRICT="fetch" - -DEPEND="app-arch/unzip" - -S="${WORKDIR}/docs" - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from" - einfo "${DOWNLOAD_URL}" - einfo "by agreeing to the license and place it in your distfiles directory." - einfo "" - einfo "If you find the file on the download page replaced with a higher" - einfo "version, please report it in bug #67266 (link below)." - einfo "" - einfo "If emerge fails because of a checksum error, it is possible that" - einfo "the upstream release changed without renaming. Try downloading the file" - einfo "again (or a newer revision if available). Otherwise report this to" - einfo "https://bugs.gentoo.org/67266 and we will make a new revision." -} - -src_install() { - insinto /usr/share/doc/${PN}-${SLOT}/html - doins -r index.html */ -} diff --git a/dev-java/java-sdk-docs/metadata.xml b/dev-java/java-sdk-docs/metadata.xml deleted file mode 100644 index 3d4429370ed8..000000000000 --- a/dev-java/java-sdk-docs/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - gentoo-staging - diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild index 0800cfad7b1d..e1e86c7657f1 100644 --- a/dev-java/jcodings/jcodings-1.0.11.ebuild +++ b/dev-java/jcodings/jcodings-1.0.11.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc source test" @@ -24,7 +24,8 @@ DEPEND=">=virtual/jdk-1.5 S="${WORKDIR}/${PN}-${PN}-${PV}" -java_prepare() { +src_prepare() { + default cp "${FILESDIR}"/maven-build.xml build.xml || die } diff --git a/dev-java/jcodings/jcodings-1.0.5.ebuild b/dev-java/jcodings/jcodings-1.0.5.ebuild index 3d8343932380..4cfdfa2ba4b7 100644 --- a/dev-java/jcodings/jcodings-1.0.5.ebuild +++ b/dev-java/jcodings/jcodings-1.0.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc source" @@ -9,12 +9,11 @@ inherit java-pkg-2 java-ant-2 DESCRIPTION="Byte-based encoding support library for Java" HOMEPAGE="https://github.com/codehaus" -SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz" +SRC_URI="https://github.com/jruby/${PN}/archive/${PV}.tar.gz -> ${P}-git.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" RDEPEND=">=virtual/jre-1.5" DEPEND=">=virtual/jdk-1.5" @@ -24,7 +23,8 @@ src_unpack() { mv jruby-${PN}-* ${P} || die } -java_prepare() { +src_prepare() { + default cp "${FILESDIR}"/maven-build.xml build.xml || die } diff --git a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild index 58b4511ba677..86a6c0451433 100644 --- a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild +++ b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 + JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple DESCRIPTION="JNLP API classes, repackaged from the icedtea-web fork of netx" HOMEPAGE="https://jcp.org/en/jsr/detail?id=56" diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest index b73e08c7b396..c8b027b3b6e8 100644 --- a/dev-java/jzlib/Manifest +++ b/dev-java/jzlib/Manifest @@ -1,3 +1,2 @@ DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea -DIST jzlib-1.1.1.zip 105191 BLAKE2B ba2d53d2d2fb12de6ce6016b393a9147e0a0ffbed576940f629fae50bb60329d076d42a912897925517a2f6a75dca1fba4fc4836046152c45aafadd9e0983e8e SHA512 de76c008e640f17788c69ed2aae72cddbd0a72d039ce61169ca7af640571952080c48ec588b0fdb497a795d3f7644170ec541bdbe834b6b638e6260ffb57dc07 -DIST jzlib-1.1.3.zip 176747 BLAKE2B fb868a254e6beea192de9965bdb8c13313099efd68c0f11b6196c0b70d10bd189b6c82ef75c73376ec391b99e2c029b117cb51cee4bc9d6f888b400fe737c620 SHA512 844a157053a8d6c9b722e9c27e0f1520f3061d7e323f0e50d276c301477128f46dc7b1250c2ca337225690bc641b6f663ee76be8831b6e0c288438e64aa935b0 +DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild index 3781906a9d7a..6684759ecda4 100644 --- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild +++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source examples" @@ -14,14 +14,10 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" -RDEPEND=" - >=virtual/jre-1.6" - -DEPEND=" - source? ( app-arch/zip ) - >=virtual/jdk-1.6" +BDEPEND="source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.6" S="${WORKDIR}/${P}" diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild deleted file mode 100644 index 98987635a5c9..000000000000 --- a/dev-java/jzlib/jzlib-1.1.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="JZlib is a re-implementation of zlib in pure Java" -HOMEPAGE="https://www.jcraft.com/jzlib/" -SRC_URI="http://www.jcraft.com/${PN}/${P}.zip" - -LICENSE="BSD" -SLOT="1.1" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - >=virtual/jre-1.5" -DEPEND=" - >=virtual/jdk-1.5" -# test? ( -# dev-lang/scala -# dev-java/junit:4 )" -# Restrict test due to missing keywords for scala -RESTRICT="test" - -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src/main/java" - -java_prepare() { - # Maven not yet supported, use java-pkg-simple instead. - rm -v pom.xml || die -} - -src_test() { - local CP TESTS - CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die - TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die - - mkdir -p target/test || die - find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die - ejunit4 -classpath "target/test:${CP}" ${TESTS} -} - -src_install() { - java-pkg-simple_src_install - dodoc README ChangeLog - use examples && java-pkg_doexamples example -} diff --git a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild new file mode 100644 index 000000000000..2e11bc9021e8 --- /dev/null +++ b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="examples source test" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JZlib is a re-implementation of zlib in pure Java" +HOMEPAGE="https://www.jcraft.com/jzlib/" +SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="1.1.3" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + >=virtual/jre-1.5" +DEPEND=" + >=virtual/jdk-1.5" +# test? ( +# dev-lang/scala +# dev-java/junit:4 )" +# Restrict test due to missing keywords for scala +RESTRICT="test" + +S="${WORKDIR}/${P}" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + default + rm pom.xml || die +} + +src_test() { + local CP TESTS + CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die + TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die + + mkdir -p target/test || die + find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die + ejunit4 -classpath "target/test:${CP}" ${TESTS} +} + +src_install() { + java-pkg-simple_src_install + dodoc README ChangeLog + use examples && java-pkg_doexamples example +} diff --git a/dev-java/jzlib/jzlib-1.1.3.ebuild b/dev-java/jzlib/jzlib-1.1.3.ebuild deleted file mode 100644 index b0130b6a186c..000000000000 --- a/dev-java/jzlib/jzlib-1.1.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -JAVA_PKG_IUSE="examples source test" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="JZlib is a re-implementation of zlib in pure Java" -HOMEPAGE="https://www.jcraft.com/jzlib/" -SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.zip -> ${P}.zip" - -LICENSE="BSD" -SLOT="1.1.3" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - >=virtual/jre-1.5" -DEPEND=" - >=virtual/jdk-1.5" -# test? ( -# dev-lang/scala -# dev-java/junit:4 )" -# Restrict test due to missing keywords for scala -RESTRICT="test" - -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src/main/java" - -java_prepare() { - rm pom.xml || die -} - -src_test() { - local CP TESTS - CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die - TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die - - mkdir -p target/test || die - find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die - ejunit4 -classpath "target/test:${CP}" ${TESTS} -} - -src_install() { - java-pkg-simple_src_install - dodoc README ChangeLog - use examples && java-pkg_doexamples example -} diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild index 1aad5ff7ccd6..e25cacb7e69d 100644 --- a/dev-java/miglayout/miglayout-4.0.ebuild +++ b/dev-java/miglayout/miglayout-4.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc examples source" @@ -16,17 +16,22 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="swt" -COMMON_DEP=" - swt? ( dev-java/swt:3.7 )" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.5" -DEPEND="${COMMON_DEP} +COMMON_DEPEND="swt? ( dev-java/swt:3.7 )" +BDEPEND="app-arch/unzip" +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.5 +" +DEPEND=" + ${COMMON_DEPEND} >=virtual/jdk-1.5 - app-arch/unzip" +" S="${WORKDIR}" -java_prepare() { +src_prepare() { + default + mv net/miginfocom/{demo,examples} . || die mv demo/* examples || die diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild index 6e6c14b0d0d9..540a85c52068 100644 --- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild +++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc source test" @@ -13,11 +13,11 @@ SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-versio LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="" CDEPEND="dev-java/xerces:2 dev-java/xml-commons-external:1.4" +BDEPEND="app-arch/unzip" RDEPEND=">=virtual/jre-1.5 ${CDEPEND}" DEPEND=">=virtual/jdk-1.5 @@ -31,9 +31,13 @@ DEPEND=">=virtual/jdk-1.5 S="${WORKDIR}/${P}-sources" EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4" +EANT_BUILD_TARGET="package" +EANT_JAVADOC_TARGET="javadoc" +EANT_EXTRA_ARGS="-Dmaven.test.skip=true" +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4" JAVA_ANT_REWRITE_CLASSPATH="yes" -java_prepare() { +src_prepare() { cp "${FILESDIR}/build-${PV}.xml" build.xml || die mkdir lib || die @@ -43,17 +47,14 @@ java_prepare() { src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \ src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \ src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \ - src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java -} + src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java \ + || die -EANT_BUILD_TARGET="package" -EANT_JAVADOC_TARGET="javadoc" -EANT_EXTRA_ARGS="-Dmaven.test.skip=true" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4" + default +} src_test() { - EANT_EXTRA_ARGS="" \ - java-pkg-2_src_test + EANT_EXTRA_ARGS="" java-pkg-2_src_test } src_install() { diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild index 6037f69440ec..94b04394047d 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild @@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" HOMEPAGE="https://adoptopenjdk.net" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="alsa cups doc +gentoo-vm headless-awt selinux source" +IUSE="alsa cups +gentoo-vm headless-awt selinux source" RDEPEND=" media-libs/fontconfig:1.0 @@ -35,7 +35,6 @@ RDEPEND=" sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 82c29bc5bef8..71a68df134ff 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -1,7 +1,6 @@ DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086 DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11 DIST gradle-4.10.3-bin.zip 78422006 BLAKE2B f565e591751acb5b05c261b3d8dbc8e07f76b48c73516f6cb1b2846ebf0bbf38000b9a61790e9b3055bddd9f9846d61979d187f4a30c317a1de98546891d9d2d SHA512 fd3f4cfbd5262cc8514b7fb3e303ef46b9ca4b22901f1fe848ec4679f8d6bc283bde12ec584437624f0acf5486e5663966ad0736bf8ab341ac3e2667f514ceec -DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882 DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2 DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678 DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60c57489017985448ddff46bc8c527b72e615e5f28d0301c28dc8119f0e6c75f4e8a711df3e6aaa418190b8ac8d1857 SHA512 41a85eafde03718efba7cf22598a430efbc6a6a68cf68058988f9eff648d19faa6cc4cf68293fe6e39783a7636eae571f27e04006f4607250dd9f6642184c61d @@ -9,6 +8,5 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b 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.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 -DIST openjfx-8.202.tar.bz2 62024068 BLAKE2B 006d9a3922812b58a80b6c8e2c80d758b7e18375da5667141cd266b5ce6ae4859d95d7a6701031926db1ce12b5638dfc6ff710cbe8e6c0bc74f347dc0c5f167c SHA512 6759c6422bfc18f78877b13ac664da23c820e8c37f31f3b470760e344b2b6a18936c5a70e3a495addf2129c2548375dc5588147eb0cefbf41dae258ef0d8896c DIST openjfx-8.999-backports.tar.xz 2794912 BLAKE2B cdcef2e443dce274b90ce5d0d148e7d10e73eebd9a62ec1514bc13017defa624ce6486f00de80f03d055d2294c9656de9bd3965bb07393d4397a201023a52a69 SHA512 eabbce2f230ef37d392d564d272a95d0f5225cfad0441268b020200e63fbb15b1883df3f21b5f75e34e8b2cf61bc3d843451315a51f1ec2cd487abaae3ee7893 DIST openjfx-8.999.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 diff --git a/dev-java/openjfx/files/11/disable-architecture-verification.patch b/dev-java/openjfx/files/11/disable-architecture-verification.patch new file mode 100644 index 000000000000..9e5a3fc3b750 --- /dev/null +++ b/dev-java/openjfx/files/11/disable-architecture-verification.patch @@ -0,0 +1,33 @@ +From 715ea681d14364be4fb2bdda120f6bf9ebaa9d5e Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sat, 19 Sep 2020 18:38:05 -0700 +Subject: [PATCH] disable architecture verification + +--- + build.gradle | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build.gradle b/build.gradle +index 66a4b3c..f66ee01 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx" + // at present building on PI is not supported, but we would only need to make + // some changes on assumptions on what should be built (like SWT / Swing) and + // such and we could probably make it work. ++/* + if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}") + if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { + fail("Unknown and unsupported build architecture: $OS_ARCH") +@@ -310,7 +311,7 @@ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { + } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") { + fail("Unknown and unsupported build architecture: $OS_ARCH") + } +- ++*/ + + // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified, + // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, all of which may be specified +-- +2.28.0 + diff --git a/dev-java/openjfx/files/11/don-t-force-msse.patch b/dev-java/openjfx/files/11/don-t-force-msse.patch new file mode 100644 index 000000000000..f3d62c8e26f2 --- /dev/null +++ b/dev-java/openjfx/files/11/don-t-force-msse.patch @@ -0,0 +1,95 @@ +From cf60da4cb9429f01b5793b0116651e6766068e7b Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sat, 19 Sep 2020 18:30:58 -0700 +Subject: [PATCH] don't force -msse + +--- + .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - + .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - + .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- + .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- + .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - + .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- + 6 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +index f27b9479..4e229f20 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +@@ -23,7 +23,6 @@ CFLAGS := -fPIC \ + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +index 627865f9..a4d99299 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +@@ -20,7 +20,6 @@ CFLAGS := -fPIC \ + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +index 9f80434d..659ab1c1 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +@@ -30,8 +30,7 @@ CFLAGS += -fPIC \ + -DHAVE_STDINT_H \ + -DGSTREAMER_LITE \ + -DG_DISABLE_DEPRECATED \ +- -DOSX \ +- -msse2 ++ -DOSX + + ifeq ($(BUILD_TYPE), Release) + CFLAGS += -Os +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +index 2020404c..34bdf42c 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile ++++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +@@ -51,8 +51,7 @@ CFLAGS += -fPIC \ + -DHAVE_CONFIG_H \ + -DGSTREAMER_LITE \ + -DGST_REMOVE_DISABLED \ +- -DOSX \ +- -msse2 ++ -DOSX + + ifeq ($(BUILD_TYPE), Release) + CFLAGS += -Os +diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +index c9500236..175be13e 100644 +--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile ++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +@@ -43,7 +43,6 @@ ifdef HOST_COMPILE + -Wformat-security \ + -fstack-protector \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -DGSTREAMER_LITE + + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) +diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +index 5ffd9eac..a7b3ddbb 100644 +--- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile ++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +@@ -30,8 +30,7 @@ CFLAGS += -pipe \ + -fPIC \ + -Werror=implicit-function-declaration \ + -DTARGET_OS_MAC=1 \ +- -D_GNU_SOURCE \ +- -msse2 ++ -D_GNU_SOURCE + + ifeq ($(BUILD_TYPE), Release) + CFLAGS += -Os +-- +2.28.0 + diff --git a/dev-java/openjfx/files/8/0001-don-t-force-msse.patch b/dev-java/openjfx/files/8/0001-don-t-force-msse.patch deleted file mode 100644 index 0a114b039c3e..000000000000 --- a/dev-java/openjfx/files/8/0001-don-t-force-msse.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 6483d73551590e8036cd5ec6d317e8114b403f36 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Sun, 26 Apr 2020 20:57:39 -0700 -Subject: [PATCH] don't force msse - ---- - .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 - - modules/web/src/main/native/Tools/Scripts/webkitdirs.pm | 7 ------- - 4 files changed, 10 deletions(-) - -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index df9f7f21..f82f0537 100644 ---- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -@@ -28,7 +28,6 @@ CFLAGS = -fPIC \ - -Wformat-security \ - -Werror=implicit-function-declaration \ - -fstack-protector \ -- -msse2 \ - -fbuiltin \ - -DHAVE_STDINT_H \ - -DLINUX \ -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index fd3847d0..3887ac6d 100644 ---- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -@@ -25,7 +25,6 @@ CFLAGS = -fPIC \ - -Wformat-security \ - -Werror=implicit-function-declaration \ - -fstack-protector \ -- -msse2 \ - -fbuiltin \ - -DHAVE_STDINT_H \ - -DLINUX \ -diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -index 3d089501..10fad68f 100644 ---- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -@@ -44,7 +44,6 @@ ifdef HOST_COMPILE - -Wformat-security \ - -fstack-protector \ - -Werror=implicit-function-declaration \ -- -msse2 \ - -DGSTREAMER_LITE - - INCLUDES = $(BASE_INCLUDES) \ -diff --git a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm -index ced93727..b95062ea 100644 ---- a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm -+++ b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm -@@ -2192,13 +2192,6 @@ sub generateBuildSystemFromCMakeProject - my $cmakeSourceDir = isCygwin() ? windowsSourceDir() : sourceDir(); - push @args, '"' . $cmakeSourceDir . '"'; - -- # Compiler options to keep floating point values consistent -- # between 32-bit and 64-bit architectures. -- determineArchitecture(); -- if ($architecture eq "i686" && !isCrossCompilation() && !isAnyWindows()) { -- $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || ""); -- } -- - # We call system("cmake @args") instead of system("cmake", @args) so that @args is - # parsed for shell metacharacters. - my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " "; --- -2.26.2 - diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild index d9fd79845b49..119aa94597c6 100644 --- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild +++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild @@ -5,7 +5,7 @@ EAPI=6 MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.8" +EGRADLE_VER="4.10.3" inherit flag-o-matic java-pkg-2 multiprocessing @@ -25,7 +25,7 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" +KEYWORDS="-* ~amd64 ~ppc64" IUSE="cpu_flags_x86_sse2 debug doc source +media" @@ -48,9 +48,12 @@ RDEPEND=" x11-libs/pango virtual/jpeg virtual/opengl - || ( - dev-java/openjdk-bin:${SLOT}[doc?] - dev-java/openjdk:${SLOT}[doc?] + doc? ( dev-java/openjdk:${SLOT}[doc] ) + !doc? ( + || ( + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) ) " @@ -66,7 +69,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -REQUIRED_USE="cpu_flags_x86_sse2" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" PATCHES=( "${FILESDIR}"/11/disable-buildSrc-tests.patch @@ -74,6 +77,8 @@ PATCHES=( "${FILESDIR}"/11/respect-user-cflags.patch "${FILESDIR}"/11/use-system-swt-jar.patch "${FILESDIR}"/11/wno-error.patch + "${FILESDIR}"/11/don-t-force-msse.patch + "${FILESDIR}"/11/disable-architecture-verification.patch "${FILESDIR}/11/${PV}-version.patch" ) @@ -180,8 +185,6 @@ src_configure() { 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 diff --git a/dev-java/openjfx/openjfx-8.202.ebuild b/dev-java/openjfx/openjfx-8.202.ebuild deleted file mode 100644 index 11c3ab1cb412..000000000000 --- a/dev-java/openjfx/openjfx-8.202.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs - -MY_PV="$(ver_rs 1 'u' 2 '-' ${PV//p/b})-ga" -EGRADLE_VER="4.8" - -DESCRIPTION="Java OpenJFX 8 client application platform" -HOMEPAGE="https://openjfx.io" -SRC_URI=" - http://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip -" - -LICENSE="GPL-2-with-classpath-exception" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~ppc64" - -IUSE="debug doc media cpu_flags_x86_sse2" - -DEPEND=" - app-arch/unzip - >=dev-java/ant-core-1.8.2:0 - >=dev-java/antlr-2.7.7-r7:0 - dev-java/antlr:3 - dev-java/stringtemplate:0 - dev-java/swt:4.10[cairo,opengl] - sys-devel/bison - sys-devel/flex - virtual/jdk:1.8 - virtual/pkgconfig -" - -RDEPEND=" - dev-java/swt:4.10[cairo,opengl] - virtual/jre:1.8 -" - -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - -RESTRICT="test" # needs junit version we don't have, fragile - -# FIXME: majority of flags are honored, needs a bit more patching -QA_FLAGS_IGNORED=".*" - -S="${WORKDIR}/rt-${MY_PV}" - -JAVA_PKG_WANT_BUILD_VM="openjdk-8" -JAVA_PKG_WANT_SOURCE="1.8" -JAVA_PKG_WANT_TARGET="1.8" - -PATCHES=( - "${FILESDIR}"/8/99-sysdeps.patch - "${FILESDIR}"/8/disable-online-repos.patch - "${FILESDIR}"/8/respect_flags.patch - "${FILESDIR}"/8/0000-Fix-wait-call-in-PosixPlatform.patch - "${FILESDIR}"/8/0001-Change-Lucene.patch - "${FILESDIR}"/8/0003-fix-cast-between-incompatible-function-types.patch - "${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch - "${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch - "${FILESDIR}"/8/06-disable-architecture-verification.patch - "${FILESDIR}"/8/07-disable-assembler-on-unsupported-archs.patch - "${FILESDIR}"/8/10-javadoc-locale.patch - "${FILESDIR}"/8/Wno-error.patch - "${FILESDIR}"/8/0001-don-t-force-msse.patch - "${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.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" - ) - - 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" -} - -src_prepare() { - default - - # this will create local jar storage to be used as ivy repo - local d="${T}/jars" - mkdir "${d}" || die - - # we need jars subdir in every prokect so gradle can find them - # only system jars, no bundling - local target targets - targets=( - jars - buildSrc/jars - modules/{base,builders,controls,extensions,fxml}/jars - modules/{graphics,jmx,media,swing,swt,web,fxpackager}/jars - ) - einfo "Copying system jars" - for target in ${targets[@]}; do - ln -vs "${T}/jars" "${target}" || die - done - - local swt_file_name="$(java-pkg_getjars swt-4.10)" - java-pkg_jar-from --build-only --into "${d}" ant-core ant.jar ant-1.8.2.jar - java-pkg_jar-from --build-only --into "${d}" ant-core ant-launcher.jar ant-launcher-1.8.2.jar - java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar - java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar - java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar - java-pkg_jar-from --build-only --into "${d}" stringtemplate stringtemplate.jar stringtemplate-3.2.jar - sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name#/}\")#" "${S}"/build.gradle || die - - sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die -} - -src_configure() { - # see gradle.properties.template in ${S} - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - GRADLE_VERSION_CHECK = false - COMPILE_MEDIA = $(usex media true false) - COMPILE_WEBKIT = false - BUILD_JAVADOC = $(usex doc true false) - BUILD_SRC_ZIP = $(usex source true false) - FULL_TEST = false - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - _EOF_ - - local repostring=' - repositories { - ivy { - url file("${projectDir}/jars") - layout "pattern", { - artifact "[artifact]-[revision].[ext]" - artifact "[artifact].[ext]" - } - } - mavenLocal() - }' - - cat <<- _EOF_ > "${S}"/buildSrc/gentoo.gradle - ${repostring} - _EOF_ - - cat <<- _EOF_ > "${S}"/gentoo.gradle - ${repostring} - allprojects { - ${repostring} - } - _EOF_ - - echo "apply from: 'gentoo.gradle'" >> build.gradle || die - echo "apply from: 'gentoo.gradle'" >> buildSrc/build.gradle || die - sed -i 's/mavenCentral/mavenLocal/g' build.gradle || die - sed -i 's/mavenCentral/mavenLocal/g' buildSrc/build.gradle || die - -} - -src_compile() { - tc-export_build_env CC CXX PKG_CONFIG - rm -r tests buildSrc/src/test || die - egradle openExportLinux -} - -src_install() { - local dest="/usr/$(get_libdir)/openjdk-${SLOT}" - local ddest="${ED%/}/${dest#/}" - dodir "${dest}" - pushd build/export/sdk > /dev/null || die - cp -pPRv * "${ddest}" || die - popd > /dev/null || die -} diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.999.ebuild index 71f180d6d92c..b7520c0307b2 100644 --- a/dev-java/openjfx/openjfx-8.999.ebuild +++ b/dev-java/openjfx/openjfx-8.999.ebuild @@ -29,6 +29,7 @@ DEPEND=" >=dev-java/ant-core-1.8.2:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/antlr:3 + dev-java/openjdk:8 dev-java/stringtemplate:0 dev-java/swt:4.10[cairo,opengl] sys-devel/bison diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch index 16194fdc5f51..fba4a36aaf1c 100644 --- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch +++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch @@ -1,5 +1,5 @@ ---- make_linux.mak~ 2010-06-08 17:30:58.000000000 +0000 -+++ make_linux.mak 2010-08-09 22:48:01.515433721 +0000 +--- a/make_linux.mak 2010-06-08 17:30:58.000000000 +0000 ++++ b/make_linux.mak 2010-08-09 22:48:01.515433721 +0000 @@ -66,7 +66,7 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -124,8 +124,8 @@ glx.o: glx.c $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c ---- make_freebsd.mak~ 2010-06-08 17:30:58.000000000 +0000 -+++ make_freebsd.mak 2010-08-09 22:50:26.173246263 +0000 +--- a/make_freebsd.mak 2010-06-08 17:30:58.000000000 +0000 ++++ b/make_freebsd.mak 2010-08-09 22:50:26.173246263 +0000 @@ -64,7 +64,7 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild index 2e66e5aff04c..425056c04eae 100644 --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ b/dev-java/swt/swt-3.7.2-r3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi +inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs MY_PV="${PV/_rc/RC}" MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800" @@ -33,10 +33,12 @@ COMMON_DEPEND=" virtual/glu virtual/opengl )" -DEPEND="${COMMON_DEPEND} +BDEPEND=" app-arch/unzip - virtual/jdk:1.8 virtual/pkgconfig +" +DEPEND="${COMMON_DEPEND} + virtual/jdk:1.8 x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender @@ -48,7 +50,12 @@ RDEPEND="${COMMON_DEPEND} S="${WORKDIR}" # JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so" +QA_SONAME="usr/lib.*/libswt-.*.so" + +PATCHES=( + # Fix Makefiles to respect flags and work with --as-needed + "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch +) src_unpack() { local DISTFILE=${A} @@ -59,18 +66,17 @@ src_unpack() { rm -rf about_files/ || die } -java_prepare() { +src_prepare() { # Replace the build.xml to allow compilation without Eclipse tasks cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - # Fix Makefiles to respect flags and work with --as-needed - epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch - case ${ARCH} in - ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; - *) epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;; + ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; + *) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;; esac + + default } src_compile() { @@ -131,7 +137,7 @@ src_compile() { eant compile einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" + cp -i "${S}/version.txt" "${S}/build/version.txt" || die cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ "${S}/build/org/eclipse/swt/internal/" || die @@ -146,13 +152,14 @@ src_install() { sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF" - sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" + sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF" - sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" + sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" java-pkg_sointo /usr/$(get_libdir) java-pkg_doso *.so - dohtml about.html + docinto html + dodoc about.html } diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild index d1078f02acc8..ad5f45a237b1 100644 --- a/dev-java/xsdlib/xsdlib-20090415.ebuild +++ b/dev-java/xsdlib/xsdlib-20090415.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc source" @@ -14,33 +14,33 @@ SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip" LICENSE="BSD Apache-1.1" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" COMMON_DEP=" dev-java/xerces:2 dev-java/relaxng-datatype:0" +BDEPEND="app-arch/unzip" RDEPEND="${COMMON_DEP} >=virtual/jre-1.4" DEPEND="${COMMON_DEP} - >=virtual/jdk-1.4 - app-arch/unzip" + >=virtual/jdk-1.4" S="${WORKDIR}/${P}" -java_prepare() { - find -name '*.jar' -exec rm -v {} + || die -} - JAVA_SRC_DIR=( "src" "src-apache" ) JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2" +src_prepare() { + default + find -name '*.jar' -delete || die +} + src_compile() { java-pkg-simple_src_compile local dir; for dir in "${JAVA_SRC_DIR[@]}"; do pushd ${dir} > /dev/null || die - jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die - popd > /dev/null + jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die + popd > /dev/null || die done } @@ -48,5 +48,6 @@ src_install() { java-pkg-simple_src_install dodoc README.txt - dohtml HowToUse.html + docinto html + dodoc HowToUse.html } -- cgit v1.3.1