From 83d72c4379dae6a8abf035c780a971735553bede Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [feature/flatten]" Date: Mon, 19 Oct 2020 12:30:12 +0000 Subject: Updating liguros repo --- dev-java/hamcrest-core/Manifest | 2 +- dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild | 35 -------- dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild | 35 ++++++++ dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild | 54 +++++++++++++ dev-java/hamcrest-core/hamcrest-core-1.3.ebuild | 54 ------------- dev-java/hamcrest-generator/Manifest | 1 - .../hamcrest-generator/files/1.1-build.xml.patch | 93 ---------------------- .../hamcrest-generator-1.1.ebuild | 52 ------------ .../hamcrest-generator-1.3-r1.ebuild | 52 ------------ .../hamcrest-generator-1.3-r2.ebuild | 52 ++++++++++++ .../oracle-javamail-1.5.6-r1.ebuild | 45 +++++++++++ 11 files changed, 187 insertions(+), 288 deletions(-) delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild create mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild create mode 100644 dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.3.ebuild delete mode 100644 dev-java/hamcrest-generator/files/1.1-build.xml.patch delete mode 100644 dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild delete mode 100644 dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild create mode 100644 dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild create mode 100644 dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild (limited to 'dev-java') diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest index de8ba1660830..6c4ab7fb2a33 100644 --- a/dev-java/hamcrest-core/Manifest +++ b/dev-java/hamcrest-core/Manifest @@ -1,2 +1,2 @@ DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 -DIST hamcrest-core-1.1.zip 1344232 BLAKE2B de9d346ff12ff29c4d1a13138eb8a80a527865b003f5d738cdfba4927714170720e2a778aecefeb895b82d0c40feeb1980c2ae5ab17a7caf2c27e19a0fcf6188 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b +DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild deleted file mode 100644 index 78621915ae72..000000000000 --- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zip -> ${P}.zip" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris" -IUSE="" - -RDEPEND=" - >=virtual/jre-1.6" - -DEPEND=" - >=virtual/jdk-1.6 - source? ( app-arch/zip )" - -S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" - -JAVA_SRC_DIR="${PN}/src" - -java_prepare() { - java-pkg_clean -} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild new file mode 100644 index 000000000000..b5d72a4ea12b --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris" +IUSE="" + +RDEPEND=" + >=virtual/jre-1.8" + +DEPEND=" + virtual/jdk:1.8 + source? ( app-arch/zip )" + +S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}" + +JAVA_SRC_DIR="${PN}/src" + +java_prepare() { + java-pkg_clean +} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild new file mode 100644 index 000000000000..f6a4828bbca6 --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" + +DEPEND="virtual/jdk:1.8 + ~dev-java/hamcrest-generator-${PV}:1.3 + userland_GNU? ( sys-apps/findutils )" + +RDEPEND=">=virtual/jre-1.8" + +JAVA_ANT_REWRITE_CLASSPATH="true" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" + +EANT_BUILD_TARGET="core" + +java_prepare() { + # Empty out the contents of the generator target; it has already been built. + epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch" + + # Fix problems with Javadoc target. + epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" + + local cp="build/${P}.jar" + cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})" + EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}" +} + +src_install() { + java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar + + dodoc README.txt CHANGES.txt + + use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild deleted file mode 100644 index c57f1153be9d..000000000000 --- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Core library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" - -LICENSE="BSD-2" -SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" - -DEPEND=">=virtual/jdk-1.5 - ~dev-java/hamcrest-generator-${PV} - userland_GNU? ( sys-apps/findutils )" - -RDEPEND=">=virtual/jre-1.5" - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" - -EANT_BUILD_TARGET="core" - -java_prepare() { - # Empty out the contents of the generator target; it has already been built. - epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch" - - # Fix problems with Javadoc target. - epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch" - - find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" - - local cp="build/${P}.jar" - cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})" - EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}" -} - -src_install() { - java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents - use source && java-pkg_dosrc ${PN}/src/main/java/org -} diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest index 086c45b53bc3..480364f4e8f4 100644 --- a/dev-java/hamcrest-generator/Manifest +++ b/dev-java/hamcrest-generator/Manifest @@ -1,2 +1 @@ -DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch deleted file mode 100644 index c8f087ba8f12..000000000000 --- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml -index f819d3d..18fba83 100644 ---- a/hamcrest-1.1/build.xml -+++ b/hamcrest-1.1/build.xml -@@ -28,18 +28,6 @@ - classpath=" - lib/generator/qdox-1.6.1.jar; - "/> -- -- -- -- -- -- -- - - - - - -- -- -- -- -+ -+ -+ -+ - -@@ -121,7 +109,7 @@ - destjar="build/hamcrest-unit-test-${version}.jar" - classpath=" - build/hamcrest-core-${version}.jar; -- build/hamcrest-library-${version}.jar; -+ build/hamcrest-library-${version}.jar; - build/hamcrest-text-${version}.jar; - build/hamcrest-integration-${version}.jar; - build/hamcrest-generator-${version}.jar"/> -@@ -164,7 +152,7 @@ - - - -- -+ - - - -@@ -221,7 +209,7 @@ - - - -- -+ - - - -@@ -251,14 +239,10 @@ - - - -- -- -- -- - - - - - - -- -+ diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild deleted file mode 100644 index 19e54674594e..000000000000 --- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" - -CDEPEND="dev-java/qdox:1.6" - -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( sys-apps/findutils ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -EANT_BUILD_TARGET="generator" -EANT_TEST_TARGET="unit-test" -EANT_EXTRA_ARGS="-Dversion=${PV}" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar" - -java_prepare() { - epatch "${FILESDIR}"/${PV}-build.xml.patch - - find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files" - - # These jars must be symlinked. Specifying them using gentoo.classpath - # does not work. - java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar -} - -src_install() { - java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use source && java-pkg_dosrc ${PN}/src/main/java/org -} diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild deleted file mode 100644 index 14529ec5b9f8..000000000000 --- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="hamcrest" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" - -LICENSE="BSD-2" -SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" - -CDEPEND=">=dev-java/qdox-1.12-r1:1.12" - -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( sys-apps/findutils ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -EANT_BUILD_TARGET="generator" -EANT_EXTRA_ARGS="-Dversion=${PV}" - -java_prepare() { - # Don't include source in JAR. If a Gentoo user wants the source the source - # USE flag will be enabled. - epatch "${FILESDIR}/${P}-no_jarjar.patch" - - find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files" - - # These jars must be symlinked. Specifying them using gentoo.classpath - # does not work. - java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar -} - -src_install() { - java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use source && java-pkg_dosrc ${PN}/src/main/java/org -} diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild new file mode 100644 index 000000000000..ddc289d736b6 --- /dev/null +++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +JAVA_PKG_IUSE="source test" + +inherit java-pkg-2 java-ant-2 + +MY_PN="hamcrest" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions" +HOMEPAGE="https://github.com/hamcrest" +SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos" + +CDEPEND=">=dev-java/qdox-1.12-r1:1.12" + +DEPEND=">=virtual/jdk-1.8 + userland_GNU? ( sys-apps/findutils ) + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.8 + ${CDEPEND}" + +EANT_BUILD_TARGET="generator" +EANT_EXTRA_ARGS="-Dversion=${PV}" + +java_prepare() { + # Don't include source in JAR. If a Gentoo user wants the source the source + # USE flag will be enabled. + epatch "${FILESDIR}/${P}-no_jarjar.patch" + + find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files" + + # These jars must be symlinked. Specifying them using gentoo.classpath + # does not work. + java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar +} + +src_install() { + java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar + + dodoc README.txt CHANGES.txt + + use source && java-pkg_dosrc ${PN}/src/main/java/org +} diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild new file mode 100644 index 000000000000..c8d1d9a1a116 --- /dev/null +++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-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-ant-2 + +DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications" +HOMEPAGE="https://java.net/projects/javamail/pages/Home" +SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip" + +# either of these +LICENSE="CDDL GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="virtual/jdk:1.8" +RDEPEND="virtual/jre:1.8" + +S="${WORKDIR}" + +src_unpack() { + default + + # build.xml expects it here + mkdir -p legal/src/main/resources/META-INF || die + cp mail/src/main/resources/META-INF/LICENSE.txt \ + legal/src/main/resources/META-INF || die +} + +EANT_DOC_TARGET="docs" +EANT_EXTRA_ARGS="-Dspec.dir=doc/spec" +JAVA_PKG_BSFIX="off" #https://bugs.gentoo.org/698954 + +src_install() { + java-pkg_dojar target/release/mail.jar + + dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt + dohtml -r doc/release/{*.html,images} + + use doc && java-pkg_dojavadoc target/release/docs/javadocs + use source && java-pkg_dosrc mail/src/main/java +} -- cgit v1.3.1