From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/commons-vfs/Manifest | 7 + dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild | 39 +++ dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild | 69 +++++ .../commons-vfs/files/commons-vfs-2.0-build.xml | 298 +++++++++++++++++++++ .../files/commons-vfs-2.0-incompatibility.patch | 41 +++ dev-java/commons-vfs/metadata.xml | 14 + 6 files changed, 468 insertions(+) create mode 100644 dev-java/commons-vfs/Manifest create mode 100644 dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild create mode 100644 dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild create mode 100644 dev-java/commons-vfs/files/commons-vfs-2.0-build.xml create mode 100644 dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch create mode 100644 dev-java/commons-vfs/metadata.xml (limited to 'dev-java/commons-vfs') diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest new file mode 100644 index 000000000000..00643efc7003 --- /dev/null +++ b/dev-java/commons-vfs/Manifest @@ -0,0 +1,7 @@ +AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab +AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70780ab68aacb5e6126df3e3f7b9f0bf8feae8e8809653c2a52eb09b58510944b87c1609d0120397ba7ac4f5d68317c18060a7d0b SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095 +DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1 +DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346 +EBUILD commons-vfs-1.0-r1.ebuild 926 BLAKE2B 015548e9af71869d3fbbcb86fd2b26357c134f9fc0eff582eda19bda7b57252e05242f519e7e62d5f6600e3df27c8a182c415e23dcd9ceb11b6463be1db583ca SHA512 fbb4861ec1710b7de93d5690be2fa91920833b3274f5d47a558c94c95a912083b494f6bc40d5606b4a2c07ce17d10c46d7ef41105034290beaa0cfc3671bb2f7 +EBUILD commons-vfs-2.0-r1.ebuild 1551 BLAKE2B 43e4cb03cff172de62bddc07ccc970de8cfa599084b3588c3cb7564cd1834b3ac8e65e673de534cd21ffdff0b4f5a4b30d1988de9c8e9b9d2952de7417d32530 SHA512 dc4545c9ff8170375a338780e6f7756e99a454e87d5eb9594367c08d1fc36001b681a760f521ff9c48441d337eefff505106e04acfe9cb79cc8dbcb38a52d758 +MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1 diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild new file mode 100644 index 000000000000..0387c4902d78 --- /dev/null +++ b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A single Java API for accessing various different file systems" +HOMEPAGE="https://commons.apache.org/vfs/" +SRC_URI="https://archive.apache.org/dist/${PN/-//}/source/${P}-src.tar.gz" # Not on Apache mirrors. +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" +RESTRICT="test" # Some failures, can't figure them out. + +CP_DEPEND=" + dev-java/ant-core:0 + dev-java/commons-collections:0 + dev-java/commons-httpclient:3 + dev-java/commons-logging:0 + dev-java/commons-net:0 + dev-java/jsch:0 +" + +RDEPEND=">=virtual/jre-1.7 + ${CP_DEPEND}" + +DEPEND=">=virtual/jdk-1.7 + ${CP_DEPEND}" + +S="${WORKDIR}/${P}-src" +JAVA_SRC_DIR="core/src/main" + +src_install() { + java-pkg-simple_src_install + dodoc {NOTICE,RELEASE_NOTES}.txt +} diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild new file mode 100644 index 000000000000..dfb280409533 --- /dev/null +++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +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/commons/vfs/source/${P}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~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 + " + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${P}/core" + +java_prepare() { + epatch "${FILESDIR}"/${P}-incompatibility.patch + + cp "${FILESDIR}"/${P}-build.xml build.xml || die + + java-ant_rewrite-classpath + java-ant_ignore-system-classes +} + +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_install() { + java-pkg_newjar target/*.jar + + 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-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml new file mode 100644 index 000000000000..753e93d669f2 --- /dev/null +++ b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000000..298503ec6153 --- /dev/null +++ b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch @@ -0,0 +1,41 @@ +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 +@@ -50,7 +50,7 @@ + { + try + { +- Element error = davExc.toXml(DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument()); ++ Element error = davExc.toXml(DomUtil.createDocument()); + 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 +@@ -63,6 +63,7 @@ + import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod; + import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod; + import org.apache.jackrabbit.webdav.property.DavProperty; ++import org.apache.jackrabbit.webdav.property.DavPropertyIterator; + import org.apache.jackrabbit.webdav.property.DavPropertyName; + import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; + import org.apache.jackrabbit.webdav.property.DavPropertySet; +@@ -294,7 +294,7 @@ + DavPropertySet properties = getProperties(fileName, PropFindMethod.PROPFIND_ALL_PROP, + new DavPropertyNameSet(), false); + @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances +- Iterator iter = properties.iterator(); ++ DavPropertyIterator iter = properties.iterator(); + while (iter.hasNext()) + { + DavProperty property = iter.next(); +@@ -302,7 +302,7 @@ + } + properties = getPropertyNames(fileName); + @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances +- Iterator iter2 = properties.iterator(); ++ DavPropertyIterator iter2 = properties.iterator(); + while (iter2.hasNext()) + { + DavProperty property = iter2.next(); diff --git a/dev-java/commons-vfs/metadata.xml b/dev-java/commons-vfs/metadata.xml new file mode 100644 index 000000000000..4591b9d5f08b --- /dev/null +++ b/dev-java/commons-vfs/metadata.xml @@ -0,0 +1,14 @@ + + + + + java@gentoo.org + Java + + + Commons VFS provides a single API for accessing various different file + systems. It presents a uniform view of the files from various different + sources, such as the files on local disk, on an HTTP server, or inside + a Zip archive. + + -- cgit v1.2.3