| 1 |
commit: 5b1e4a34bdfd1ecaf3e7d914195d8acaaf2ef905 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 30 18:47:58 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 30 18:50:50 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1e4a34 |
| 7 |
|
| 8 |
net-nds/jxplorer: EAPI-7 bump, add missing desktop.eclass |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../jxplorer/files/3.3-disable-jxworkbench.patch | 6 ++-- |
| 14 |
net-nds/jxplorer/jxplorer-3.3.1.2.ebuild | 41 +++++++++++----------- |
| 15 |
2 files changed, 23 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch |
| 18 |
index 302b37c0061..4b1009159f4 100644 |
| 19 |
--- a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch |
| 20 |
+++ b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch |
| 21 |
@@ -1,6 +1,6 @@ |
| 22 |
-diff -Nru /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java |
| 23 |
---- /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:53:59.869914047 +0300 |
| 24 |
-+++ src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:54:47.836311029 +0300 |
| 25 |
+diff -Nru a/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java |
| 26 |
+--- a/src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:53:59.869914047 +0300 |
| 27 |
++++ b/src/com/ca/directory/jxplorer/JXplorer.java 2012-07-31 14:54:47.836311029 +0300 |
| 28 |
@@ -502,7 +502,7 @@ |
| 29 |
|
| 30 |
// look for JXWorkBenchBrowser 'add on' module... |
| 31 |
|
| 32 |
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild |
| 33 |
index ff20bda345b..dbe5e1d8d05 100644 |
| 34 |
--- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild |
| 35 |
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild |
| 36 |
@@ -1,45 +1,44 @@ |
| 37 |
-# Copyright 1999-2020 Gentoo Authors |
| 38 |
+# Copyright 1999-2021 Gentoo Authors |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
|
| 41 |
-EAPI=5 |
| 42 |
+EAPI=7 |
| 43 |
|
| 44 |
JAVA_PKG_IUSE="doc source test" |
| 45 |
+inherit desktop java-pkg-2 java-ant-2 prefix virtualx |
| 46 |
|
| 47 |
-inherit java-pkg-2 java-ant-2 prefix virtualx |
| 48 |
- |
| 49 |
-DESCRIPTION="A fully functional ldap browser written in Java" |
| 50 |
+DESCRIPTION="Fully functional LDAP browser written in Java" |
| 51 |
HOMEPAGE="http://jxplorer.org/" |
| 52 |
SRC_URI="mirror://sourceforge/${PN}/${P}-project.zip" |
| 53 |
-LICENSE="CAOSL" |
| 54 |
+S="${WORKDIR}/${PN}" |
| 55 |
|
| 56 |
-IUSE="" |
| 57 |
+LICENSE="CAOSL" |
| 58 |
SLOT="0" |
| 59 |
+IUSE="" |
| 60 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 61 |
RESTRICT="test" |
| 62 |
|
| 63 |
-CDEPEND=" |
| 64 |
- >=dev-java/javahelp-2.0.02_p46:0" |
| 65 |
- |
| 66 |
-RDEPEND=" |
| 67 |
- ${CDEPEND} |
| 68 |
- >=virtual/jre-1.5" |
| 69 |
- |
| 70 |
-DEPEND=" |
| 71 |
- ${CDEPEND} |
| 72 |
+COMMON_DEPEND=" |
| 73 |
+ >=dev-java/javahelp-2.0.02_p46:0 |
| 74 |
+" |
| 75 |
+RDEPEND="${COMMON_DEPEND} |
| 76 |
+ >=virtual/jre-1.5 |
| 77 |
+" |
| 78 |
+DEPEND="${COMMON_DEPEND} |
| 79 |
virtual/jdk:1.8 |
| 80 |
- test? ( dev-java/junit:0 )" |
| 81 |
- |
| 82 |
-S="${WORKDIR}/${PN}" |
| 83 |
+ test? ( dev-java/junit:0 ) |
| 84 |
+" |
| 85 |
|
| 86 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
| 87 |
EANT_GENTOO_CLASSPATH="javahelp" |
| 88 |
EANT_TEST_ANT_TASKS="ant-junit" |
| 89 |
|
| 90 |
+PATCHES=( "${FILESDIR}"/3.3-disable-jxworkbench.patch ) |
| 91 |
+ |
| 92 |
src_prepare() { |
| 93 |
- epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch |
| 94 |
+ default |
| 95 |
|
| 96 |
rm -v jars/*.jar || die |
| 97 |
- sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die |
| 98 |
+ sed -i -e 's/<fileset dir="${jasper}.*//g' build.xml || die |
| 99 |
|
| 100 |
if use test; then |
| 101 |
EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit) |
Archives