From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- dev-java/commons-vfs/Manifest | 4 +- dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild | 69 --------------------- dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild | 72 ++++++++++++++++++++++ .../files/commons-vfs-2.0-incompatibility.patch | 10 ++- 4 files changed, 78 insertions(+), 77 deletions(-) delete mode 100644 dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild create mode 100644 dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild (limited to 'dev-java/commons-vfs') diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest index f9020e6424b1..cd1283bfc878 100644 --- a/dev-java/commons-vfs/Manifest +++ b/dev-java/commons-vfs/Manifest @@ -1,7 +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 +AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d 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 962 BLAKE2B a14b7e3b69aac36f0c3f99d4b3ef842e48d2997193b74be6610df3e885ff1f4d19a4faa2bd9e69310327a4e20115a7c07d7a91f87e629ecd96ec786fec96cb07 SHA512 02230fc7312f024e751e3873ded62d30c1bde28a36a2ee62f425118b582c3d7cd4cef931f235a8459f0b11975096fe325b7405bd15781f1ef03d2203002b4acd -EBUILD commons-vfs-2.0-r1.ebuild 1555 BLAKE2B 6b63d2ba8e44911ee0bbb849b2818b9db99c7e054d5fa4c8f70d1a041f8ee6c32ce34ed94e4e5b6ea135c803b4b1cdf1b842f9a7fd1a6ed6fcac3ddf2d34a371 SHA512 717232ee5632658753e44637acd0edc9424782311bc370ffc2f3dd494ca46c188d79347dc67c1ea67c658809170fb452f4d522bd3d60029d0d3fa0a8b07f945b +EBUILD commons-vfs-2.0-r2.ebuild 1631 BLAKE2B 9febe1a1166ca72b1d0c1804fe4713a265e02482091304f68ae1382141a32e8c1ff68ce8ccc07f2782896516b6bf3e3cdbda4bb3daa9f4bc7ea534b996cfc1a5 SHA512 7c315b76f89ca88c8a3d24f925eb4b6eb33413bc6873aa72b5cbdafacbf1764bba6c2aa06a107995b2f2e08c68071f6c95a13790552ae33745d5db4d54ee8539 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1 diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild deleted file mode 100644 index e8991f3641cf..000000000000 --- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 ~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 - " - -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/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild new file mode 100644 index 000000000000..8f5598d5645b --- /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 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; -- cgit v1.2.3