[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-vfs/, dev-java/commons-vfs/files/
commit: 0bdb61b1877b0d18f4bad87e7756e7d819d66061
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Apr 24 13:04:46 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Apr 25 12:11:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdb61b1
dev-java/commons-vfs: switch to java-pkg-simple
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36404
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild | 56 ++
.../commons-vfs/files/commons-vfs-2.0-utf8.patch | 13 +
2 files changed, 69 insertions(+)
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
new file mode 100644
index ..f2cbfd6d3ba5
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A single API for accessing various different file systems"
+HOMEPAGE="https://commons.apache.org/vfs/;
+SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz;
+S="${WORKDIR}/${P}/core"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
+ dev-java/commons-collections:0
+ dev-java/commons-logging:0
+ dev-java/commons-net:0
+ dev-java/commons-httpclient:3
+ dev-java/jackrabbit-webdav:0
+ dev-java/jsch:0"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-incompatibility.patch
+ "${FILESDIR}"/commons-vfs-2.0-utf8.patch
+)
+
+JAVA_RESOURCE_DIRS="resources/src/main/java"
+JAVA_SRC_DIR="src/main/java"
+
+# The build.xml is generated from maven and can't run the tests properly
+# Use maven test to execute these manually but that means downloading deps from
+# the internet. Also the tests need to login to some ftp servers and samba
+# shares so I doubt they work for everyone.
+#src_test() {
+# ANT_TASKS="ant-junit" eant test
+#}
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ mkdir resources || die
+ find src/main/java -type f ! -name '*.java' ! -name 'package.html' \
+ | xargs cp --parent -t resources || die
+}
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
new file mode 100644
index ..199fb380c3cb
--- /dev/null
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
+index bb8cc2a..1e26559 100644
+--- a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
+@@ -98,7 +98,7 @@ public interface FileSystemManager
+ FileObject resolveFile(String name, FileSystemOptions fileSystemOptions)
+ throws FileSystemException;
+
+-/** �
++/**
+ * Locates a file by name. The name is resolved as described
+ * above. That is, the name can be either
+ * an absolute URI, an absolute file name, or a relative path to
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-vfs/, dev-java/commons-vfs/files/
commit: e03e66ffca3c5aa9fe77feb8c083fd0307e23e2d
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Jul 22 08:53:35 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Jul 23 05:13:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03e66ff
dev-java/commons-vfs: EAPI 7, min java 1.8:*
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/21743/commits/43c26d97c141e9be516289e8b06472be4fc0d1a7
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild | 72 ++
.../files/commons-vfs-2.0-incompatibility.patch| 10 ++-
2 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
new file mode 100644
index 000..8f5598d5645
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A single API for accessing various different file systems"
+HOMEPAGE="http://commons.apache.org/vfs/;
+SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/commons-collections:0
+ dev-java/commons-logging:0
+ dev-java/commons-net:0
+ dev-java/commons-httpclient:3
+ dev-java/jackrabbit-webdav:0
+ dev-java/jsch:0"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-incompatibility.patch
+)
+
+S="${WORKDIR}/${P}/core"
+
+EANT_GENTOO_CLASSPATH="
+ ant-core
+ commons-collections
+ commons-logging
+ commons-net
+ commons-httpclient-3
+ jackrabbit-webdav
+ jsch
+"
+EANT_EXTRA_ARGS="-Dlibdir=${T}"
+
+# The build.xml is generated from maven and can't run the tests properly
+# Use maven test to execute these manually but that means downloading deps from
+# the internet. Also the tests need to login to some ftp servers and samba
+# shares so I doubt they work for everyone.
+#src_test() {
+# 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
+
+ # [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 298503ec615..59e2f287afd 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-vfs/, dev-java/commons-vfs/files/
commit: 36f2b5cea067d36780b7b1a46f8f6bd046b34410
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Nov 27 17:08:42 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Nov 27 17:09:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f2b5ce
dev-java/commons-vfs: Remove broken 1.0-r0
Package-Manager: portage-2.3.2
dev-java/commons-vfs/commons-vfs-1.0.ebuild | 64 -
dev-java/commons-vfs/files/1.0-noget.patch | 20 -
2 files changed, 84 deletions(-)
diff --git a/dev-java/commons-vfs/commons-vfs-1.0.ebuild
b/dev-java/commons-vfs/commons-vfs-1.0.ebuild
deleted file mode 100644
index 190800c..
--- a/dev-java/commons-vfs/commons-vfs-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="a single API for accessing various different file systems"
-HOMEPAGE="http://commons.apache.org/vfs/;
-SRC_URI="mirror://apache/jakarta/${PN/-//}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEP="
- dev-java/commons-logging
- dev-java/commons-net
- =dev-java/commons-httpclient-3*
- dev-java/jsch
- dev-java/commons-collections
- dev-java/ant-core"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/1.0-noget.patch"
- java-ant_rewrite-classpath
- java-ant_ignore-system-classes
-}
-
-EANT_GENTOO_CLASSPATH="
- commons-logging
- commons-net
- commons-httpclient-3
- jsch
- commons-collections
- ant-core
-"
-EANT_EXTRA_ARGS="-Dlibdir=${T}"
-
-# The build.xml is generated from maven and can't run the tests properly
-# Use maven test to execute these manually but that means downloading deps from
-# the internet. Also the tests need to login to some ftp servers and samba
-# shares so I doubt they work for everyone.
-#src_test() {
-# ANT_TASKS="ant-junit" eant test
-#}
-
-src_install() {
- java-pkg_newjar target/*.jar
- dodoc *.txt || die
- use doc && java-pkg_dojavadoc ./dist/docs/api
- use source && java-pkg_dosrc ./core/src/main/java
-}
diff --git a/dev-java/commons-vfs/files/1.0-noget.patch
b/dev-java/commons-vfs/files/1.0-noget.patch
deleted file mode 100644
index d1a6b56..
--- a/dev-java/commons-vfs/files/1.0-noget.patch
+++ /dev/null
@@ -1,20 +0,0 @@
build.xml.orig 2007-02-11 00:21:37.0 +0200
-+++ build.xml 2007-02-11 00:21:55.0 +0200
-@@ -86,7 +86,7 @@
-
-
-
--
-+
-
-
-
-@@ -191,7 +191,7 @@
-
-
-
--
-+
-
-
-
