diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-07-23 13:40:43 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-07-23 13:40:43 +0000 |
| commit | 0d9a32816e3c0d439552d89e27eff28958ece7bb (patch) | |
| tree | ea4e99ae5bd3928376c57a6ae0eac9567c9b15bd /dev-java/commons-vfs | |
| parent | 659a8f0e2192ea921947b129036460b1598da20f (diff) | |
| download | baldeagleos-repo-0d9a32816e3c0d439552d89e27eff28958ece7bb.tar.gz baldeagleos-repo-0d9a32816e3c0d439552d89e27eff28958ece7bb.tar.xz baldeagleos-repo-0d9a32816e3c0d439552d89e27eff28958ece7bb.zip | |
Adding metadata
Diffstat (limited to 'dev-java/commons-vfs')
| -rw-r--r-- | dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild (renamed from dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild) | 41 | ||||
| -rw-r--r-- | dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch | 10 |
2 files changed, 26 insertions, 25 deletions
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild index e8991f3641cf..8f5598d5645b 100644 --- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild +++ b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild @@ -1,9 +1,9 @@ -# 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" +JAVA_PKG_IUSE="source" inherit java-pkg-2 java-ant-2 @@ -22,25 +22,19 @@ CDEPEND=" dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 - dev-java/jsch:0 - " + dev-java/jsch:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:*" -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" -S="${WORKDIR}/${P}/core" - -java_prepare() { - epatch "${FILESDIR}"/${P}-incompatibility.patch - - cp "${FILESDIR}"/${P}-build.xml build.xml || die +PATCHES=( + "${FILESDIR}"/${P}-incompatibility.patch +) - java-ant_rewrite-classpath - java-ant_ignore-system-classes -} +S="${WORKDIR}/${P}/core" EANT_GENTOO_CLASSPATH=" ant-core @@ -61,9 +55,18 @@ EANT_EXTRA_ARGS="-Dlibdir=${T}" # ANT_TASKS="ant-junit" eant test #} +src_prepare() { + default + cp "${FILESDIR}"/${P}-build.xml build.xml || die + + java-ant_rewrite-classpath + java-ant_ignore-system-classes +} + src_install() { java-pkg_newjar target/*.jar - use doc && java-pkg_dojavadoc target/site/apidocs + # [javadoc] No javadoc created, no need to post-process anything +# use doc && java-pkg_dojavadoc target/site/apidocs use source && java-pkg_dosrc src/main/java } diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch index 298503ec6153..59e2f287afdd 100644 --- a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch +++ b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch @@ -1,6 +1,5 @@ -diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java ---- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:28:39.072739044 +0200 -+++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:30:24.799404027 +0200 +--- a/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:28:39.072739044 +0200 ++++ b/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:30:24.799404027 +0200 @@ -50,7 +50,7 @@ { try @@ -10,9 +9,8 @@ diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/Exception if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE)) { if (DomUtil.hasChildElement(error, "exception", null)) -diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java ---- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:28:39.072739044 +0200 -+++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:31:02.449403426 +0200 +--- a/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:28:39.072739044 +0200 ++++ b/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:31:02.449403426 +0200 @@ -63,6 +63,7 @@ import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod; import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod; |