Updating liguros repo

8 files changed, 57 insertions, 158 deletions

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-r3.ebuild
index 78621915ae72..b5d72a4ea12b 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ 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"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,10 +20,10 @@ KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 DEPEND="
-	>=virtual/jdk-1.6
+	virtual/jdk:1.8
 	source? ( app-arch/zip )"
 
 S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
index c57f1153be9d..f6a4828bbca6 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,11 +19,11 @@ 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}
+DEPEND="virtual/jdk:1.8
+	~dev-java/hamcrest-generator-${PV}:1.3
 	userland_GNU? ( sys-apps/findutils )"
 
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.8"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
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;

-                      "/>

--        <taskdef name="jarjar"

--                 classname="com.tonicsystems.jarjar.JarJarTask"

--                 classpath="lib/generator/jarjar-1.0rc3.jar"/>

--        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care

--             about it's existence. Uses JarJar to place classes under a different package

--             to prevent conflict. -->

--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

--            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>

--            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>

--            <rule pattern="com.thoughtworks.qdox.**"

--                  result="org.hamcrest.generator.qdox.@1"/>

--        </jarjar>

-     </target>

- 

-     <target name="core"

-@@ -94,16 +82,16 @@
-                      classpath="build/hamcrest-core-${version}.jar"/>

-     </target>

- 

--    <target name="text"
--            depends="core, library"
--            description="Build text pattern matcher">
--        <java-to-jar srcdir="hamcrest-text/src/main/java"
--                     destjar="build/hamcrest-text-${version}.jar"
--                     classpath="
--                        build/hamcrest-core-${version}.jar;
--                        build/hamcrest-library-${version}.jar"/>
--    </target>
--	
-+    <target name="text"

-+            depends="core, library"

-+            description="Build text pattern matcher">

-+        <java-to-jar srcdir="hamcrest-text/src/main/java"

-+                     destjar="build/hamcrest-text-${version}.jar"

-+                     classpath="

-+                        build/hamcrest-core-${version}.jar;

-+                        build/hamcrest-library-${version}.jar"/>

-+    </target>

-+	

-     <target name="integration"

-             depends="core, library"

-             description="Build integration with external tools">

-@@ -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 @@
-         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">

-             <zipfileset src="build/hamcrest-core-${version}.jar"/>

-             <zipfileset src="build/hamcrest-library-${version}.jar"/>

--            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+            <zipfileset src="build/hamcrest-text-${version}.jar"/>

-             <zipfileset src="build/hamcrest-generator-${version}.jar"/>

-             <zipfileset src="build/hamcrest-integration-${version}.jar"/>

-         </jar>

-@@ -221,7 +209,7 @@
- 

- 			<packageset dir="hamcrest-core/src/main/java"/>

- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>

--			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>

- 			<packageset dir="hamcrest-integration/src/main/java"/>

- 			<packageset dir="build/generated-code"/>

- 			

-@@ -251,14 +239,10 @@
-                 </classpath>

-             </javac>

-             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>

--            <!-- Put Java source in Jars for user's convenience. -->

--            <copy todir="build/temp/@{destjar}.contents">

--                <fileset dir="@{srcdir}"/>

--            </copy>

-             <jar jarfile="@{destjar}">

-                 <fileset dir="build/temp/@{destjar}.contents"/>

-             </jar>

-         </sequential>

-     </macrodef>

- 

--</project>
-+</project>

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-r2.ebuild
index 14529ec5b9f8..ddc289d736b6 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,11 +21,11 @@ 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
+DEPEND=">=virtual/jdk-1.8
 	userland_GNU? ( sys-apps/findutils )
 	${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"
 
 EANT_BUILD_TARGET="generator"
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
+}