gentoo resync : 28.04.2021

5 files changed, 27 insertions, 168 deletions

diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index e7d4552d3405..485ba09c44d0 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -1,10 +1,6 @@
-AUX 3.3-disable-jxworkbench.patch 507 BLAKE2B ea412c4eab6d71fa11e6b165d5cc68d3678a81675cd94f9b8c1d115cd4dc1f1cdaefa85a6775368bcaeca1fb905bb86b43e446d6840525b99f8be356f336ece4 SHA512 b89c2b1831de506e437c4094ee0312a06280e5ddf88ba4882a22f9a2e2c8422a28ab7c47ebd75b52c9c303645b46b90b69a0f0d37bd17e1994683b5fa6070a0a
+AUX 3.3-disable-jxworkbench.patch 475 BLAKE2B cee976aa6468def72fe0dcfaf6d68a3377f26a3ec07697b373c2ca5e1529688fbbc014675c5263a7fadb116cc1fced9680317a08d842ef74f269d3d553f173cc SHA512 07e7a464140fa14085dac6b7e31368ddda2168d915c5b8bd4ff985a54f415c8e0a98f028752cea2fd9eaf097ecefb8f923956b19b2611b751fbe95cc33c6b7d1
 AUX build.xml 1871 BLAKE2B 0edb1b98c8b2f8b2de5996b1ce8ef8558d08fdff034d5187460a3d6a01962bf01f4c3d4bfa02d320e80445b61f3b49291825ccfa413d7f7dd7438e285c41d34c SHA512 39434bad8cb85692fe65feb927ba675135e0da5401518f22ff6a17c1edfea950342bde9f7530cd48e603f41547451020aa4e0c96dbbf664548cd812ce777fa00
 AUX jxplorer-3-pre 663 BLAKE2B d7311e13b367c74af7ebc005c15ef14af80057c995f2d30dd684a49c09c10e165d5c18721f7c266ff4066a904f0ad34e3570e250ebebe2b8486fe54cd7d26875 SHA512 11acb8c28a063825678ec3fe7bafc1cd1d0f99c96d49e62500d06b0584967017efb050c561826ce8b6db8a73da66ea1742f4a361fddc4e17abddad5174106f9f
-DIST jxplorer-3.3.1-project.zip 4500476 BLAKE2B 6e5fb357c19ab9fd8a40f38d01fc650b793e8a6058c5e94336a46690283afb8e8a0a489cbab225da8f85f10d9a54fe938cab752b3648264d43c751441fd0991a SHA512 a40bfd8a4c868a1ced1e31d45298916b4371ae781521755d784e4c027781d298f066af5390918b42024022cff5d3f0ab6a79bc6b15a1ff0adcfc1e8b79a67ca9
-DIST jxplorer-3.3.1.1-project.zip 4566815 BLAKE2B 420277d44da94d5c54b0ac4a1bb67381785a4f4270be9ce1e5a07da00d7056bde8ab799a524e891176229579085e606482357f11d5567024017119ff09492995 SHA512 aa7c1c976f5987055abeb97aba865e9cdbc657d5baca199ff83c97ac5017c9d48869c8ee6346a7cf07b236b04059043256d0545c7b6cc37d97c81de2f9015d03
 DIST jxplorer-3.3.1.2-project.zip 4625538 BLAKE2B b1bfb552dd4524f4d0fde4ff15617bf3e50629c0f879f05ee87c9f301afa9a5a4c544c8bb85d5b9639fe809f030752f9e96c321a4e6d20fda7aa55097363bdeb SHA512 6c95de48b2abd41a4926de3bd9bd203e266676028e12d1f1c93d8ef6f10b233eefcb122c8c075d6758b43c85e30fdc4b01d55811e5fcbdcd64d353c6f0fef94a
-EBUILD jxplorer-3.3.1.1.ebuild 1645 BLAKE2B 9d50c7a71c4ee02d8e0a265a799add552bc076f12dccc111118c51d52e97fe590dc2548cee65a193445f065bfb9ece012a157a0f089202c8b00fb65708916b53 SHA512 7e7e43e8af0add77baa0bb11a5f78f0fa7a050b6c8b1096c2970d22cfd48f3aac016e51481dcd4c98afd2ba5aa7d77e83cf9d86cd7f1d2b7b2753a3a679bd4a6
-EBUILD jxplorer-3.3.1.2.ebuild 1680 BLAKE2B 5a2327c75dab4c6b05804a0ab00c4d0791987bf1d3267c04899ca76916c9b64ffc88bbc2ae3dc41e6a88b05b4cde8ecfa61ba8ef1b4d7cf6a24172562a7f1a94 SHA512 571ce1951eaa38cb8e3386b76c142806673125583071425e8c5d71d74b32657004ac49470728932398bb9ae6ca24a7c7f7d65b64c3e406f27a1199ddf6b70d2f
-EBUILD jxplorer-3.3.1.ebuild 1643 BLAKE2B 3db5aa47b60b5bf64c061394ed80dac93cadf4690b89c3103b8a61c810b58c0c261874533101a95347af7897417aa3e0149606716628dcdb4ef5f79b32b1687f SHA512 6be611580e3e5ecb6d0df336be48bfeab0c054db5c3644417e564146f14db8d2dc60ff725ff38684000f855ee8fda59c00697d9bd35a2292253025b55b39f06d
+EBUILD jxplorer-3.3.1.2.ebuild 1708 BLAKE2B acf35724b8fb16f5dd53da77aa0329f64324fb02acf0127130262e6df4d350a1b0dda00ba7a4dc1438ef7b050b2816c40debe9a4a7da6ba827e7da200a5988ab SHA512 e542a1e5dd0584c38d78f992eb95f4f2709bb9fe979b14c6fada97d571942f1b6dfb195d3967be6f2a0d19fa7079ed5ce6bff0b8326e2a7dd0374d8dbfc72b7e
 MISC metadata.xml 314 BLAKE2B f90c3010c15a26ffb04114d4049aadedb720df7d6bf04801603d6fb4f63331d6a5f7b135d4d926e0cbc8504849c1677b04b9d61e0fe67ee97ec41d5e30375b88 SHA512 28b10ef2e247491aac4d9868d8c42ccef74abdc9806820b84a29d479e8f53218e1aab497c3f450c289cacf40ea8fbd193a508203ffc915ad2fb7582258bc7d96
diff --git a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
index 302b37c0061f..4b1009159f46 100644
--- a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
+++ b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
@@ -1,6 +1,6 @@
-diff -Nru /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java
---- /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:53:59.869914047 +0300
-+++ src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:54:47.836311029 +0300
+diff -Nru a/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java
+--- a/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:53:59.869914047 +0300
++++ b/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:54:47.836311029 +0300
 @@ -502,7 +502,7 @@
  
          // look for JXWorkBenchBrowser 'add on' module...
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
deleted file mode 100644
index c780b19b163a..000000000000
--- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in java"
-HOMEPAGE="http://jxplorer.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
-LICENSE="CAOSL"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.5
-	>=dev-java/javahelp-2.0.02_p46:0"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="javahelp"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-src_prepare() {
-	rm -v jars/*.jar || die
-	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
-
-	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
-
-	if use test ; then
-		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
-	else
-		find . -iname '*Test*.java' -delete || die
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
-}
-
-src_install() {
-	java-pkg_dojar jars/${PN}.jar
-
-	insinto /usr/share/${PN}
-	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
-
-	dodoc README*.TXT
-
-	# By default the config dir is ${HOME}/jxplorer
-	java-pkg_dolauncher ${PN} \
-		--main com.ca.directory.jxplorer.JXplorer \
-		--pwd '"${HOME}/.jxplorer"' \
-		-pre "${FILESDIR}/${PN}-3-pre"
-
-	eprefixify "${ED}/usr/bin/${PN}"
-
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc docs/api
-
-	make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System
-}
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
index ff20bda345bc..bb3b3a84fc6d 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
@@ -1,45 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+inherit desktop java-pkg-2 java-ant-2 prefix virtualx
 
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in Java"
+DESCRIPTION="Fully functional LDAP browser written in Java"
 HOMEPAGE="http://jxplorer.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-project.zip"
-LICENSE="CAOSL"
+S="${WORKDIR}/${PN}"
 
-IUSE=""
+LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"
 
-CDEPEND="
-	>=dev-java/javahelp-2.0.02_p46:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="
-	${CDEPEND}
+COMMON_DEPEND="
+	>=dev-java/javahelp-2.0.02_p46:0
+"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5
+"
+DEPEND="${COMMON_DEPEND}
 	virtual/jdk:1.8
-	test? ( dev-java/junit:0 )"
-
-S="${WORKDIR}/${PN}"
+	test? ( dev-java/junit:0 )
+"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_GENTOO_CLASSPATH="javahelp"
 EANT_TEST_ANT_TASKS="ant-junit"
 
+PATCHES=( "${FILESDIR}"/3.3-disable-jxworkbench.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
+	default
 
 	rm -v jars/*.jar || die
-	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
+	sed -i -e 's/<fileset dir="${jasper}.*//g' build.xml || die
 
 	if use test; then
 		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
@@ -49,7 +48,7 @@ src_prepare() {
 }
 
 src_test() {
-	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
+	VIRTUALX_COMMAND="java-pkg-2_src_test" virtx emake -j1
 }
 
 src_install() {
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
deleted file mode 100644
index 8c647ff0f984..000000000000
--- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in java"
-HOMEPAGE="http://jxplorer.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
-LICENSE="CAOSL"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.5
-	>=dev-java/javahelp-2.0.02_p46:0"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="javahelp"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-src_prepare() {
-	rm -v jars/*.jar || die
-	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
-
-	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
-
-	if use test ; then
-		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
-	else
-		find . -iname '*Test*.java' -delete || die
-	fi
-}
-
-src_test() {
-	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
-}
-
-src_install() {
-	java-pkg_dojar jars/${PN}.jar
-
-	insinto /usr/share/${PN}
-	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
-
-	dodoc README*.TXT
-
-	# By default the config dir is ${HOME}/jxplorer
-	java-pkg_dolauncher ${PN} \
-		--main com.ca.directory.jxplorer.JXplorer \
-		--pwd '"${HOME}/.jxplorer"' \
-		-pre "${FILESDIR}/${PN}-3-pre"
-
-	eprefixify "${ED}/usr/bin/${PN}"
-
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc docs/api
-
-	make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System
-}