commit: 5b1e4a34bdfd1ecaf3e7d914195d8acaaf2ef905
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 18:47:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 18:50:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1e4a34
net-nds/jxplorer: EAPI-7 bump, add missing desktop.eclass
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../jxplorer/files/3.3-disable-jxworkbench.patch | 6 ++--
net-nds/jxplorer/jxplorer-3.3.1.2.ebuild | 41 +++++++++++-----------
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
index 302b37c0061..4b1009159f4 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.2.ebuild
b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
index ff20bda345b..dbe5e1d8d05 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"
+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)
