From 162945d2a91899b637bbb9e163b406350de12906 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Oct 2021 19:43:03 +0100 Subject: gentoo resync : 30.10.2021 --- dev-java/Manifest.gz | Bin 76126 -> 76127 bytes dev-java/avalon-framework/Manifest | 3 +- .../avalon-framework-4.2.0-r2.ebuild | 40 -------------- .../avalon-framework-4.2.0-r3.ebuild | 43 +++++++++++++++ dev-java/avalon-framework/files/4.2.0-enum.patch | 23 ++++++++ dev-java/commons-csv/Manifest | 4 +- dev-java/commons-csv/commons-csv-1.8.ebuild | 58 --------------------- dev-java/commons-csv/commons-csv-1.9.0.ebuild | 2 +- dev-java/ecj-gcj/files/ecj-gcj.in | 0 9 files changed, 70 insertions(+), 103 deletions(-) delete mode 100644 dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild create mode 100644 dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild create mode 100644 dev-java/avalon-framework/files/4.2.0-enum.patch delete mode 100644 dev-java/commons-csv/commons-csv-1.8.ebuild mode change 100755 => 100644 dev-java/ecj-gcj/files/ecj-gcj.in (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index aee689e194d3..d680f9173eb9 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest index 36dc152d5b88..e49bf3cb109f 100644 --- a/dev-java/avalon-framework/Manifest +++ b/dev-java/avalon-framework/Manifest @@ -1,4 +1,5 @@ +AUX 4.2.0-enum.patch 1086 BLAKE2B 1489abf0aa325060472d55762bc2014bac3c1d5571fddb40ef835be1f59106d0279433eee5e59bcb8e7eef30cd2c2272a840796ce221a490d82f20826ce9a5dc SHA512 076b0c68930da7161ec8068347d05eebc01570b62194126ae28c47af4a559e0d059bf94bb04829dc792441bd6187eba093b966d09b73c45bcdbd05e05f4ad9fc AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671 -EBUILD avalon-framework-4.2.0-r2.ebuild 979 BLAKE2B 0167018c458b2611ac2ae2b8fb3aab70791126fa5a7dbfc0bc6e485e119aeb1bd50c52d14d457eb34375b0f711fdbe7588fa81dc57b0fef29e7f5d4b9774be24 SHA512 a95563add2e7484edf89c8b2a82ed477dddb35a746ece4e14f26d2dc9a23ae60c146ac1abcd145192139500c22206223286866ca73b39c32bb354d961a79a3d4 +EBUILD avalon-framework-4.2.0-r3.ebuild 1029 BLAKE2B 60706532d259ddbcdd8b6ebeb2126ff077ef7bea9c58fa9bb099eeee6220de0c712522836231d5dcd8a92bbeb64e305fb682be9f650de67ab920f547174bfb39 SHA512 025746f61148812020d60cca71f2c5425569d10cc8a47b71ace3e7898fa872bd116f53dd3e92dcf28268ecd8a08e5e338526438b933f8e228d66dd72d6346876 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild deleted file mode 100644 index b04d776db7a1..000000000000 --- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 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="Avalon Framework" -HOMEPAGE="http://avalon.apache.org/" -SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.2" -KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -CDEPEND="dev-java/avalon-logkit:2.0 - dev-java/log4j:0" -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 - ${CDEPEND}" - -S="${WORKDIR}/${PN}" - -java_prepare() { - cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml" - local libs="log4j,avalon-logkit-2.0" - echo "classpath=$(java-pkg_getjars ${libs})" > build.properties -} - -src_install() { - java-pkg_dojar "${S}"/dist/avalon-framework.jar - - dodoc NOTICE.TXT - use doc && java-pkg_dojavadoc target/docs - use source && java-pkg_dosrc impl/src/java/* -} diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild new file mode 100644 index 000000000000..23b8c1a9113b --- /dev/null +++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Avalon Framework" +HOMEPAGE="https://avalon.apache.org/" +SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="4.2" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + +CDEPEND="dev-java/avalon-logkit:2.0 + dev-java/log4j:0" + +RDEPEND=">=virtual/jre-1.8:* + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.8:* + ${CDEPEND}" + +S="${WORKDIR}/${PN}" + +PATCHES=( "${FILESDIR}"/4.2.0-enum.patch ) + +src_prepare() { + default + cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml" + local libs="log4j,avalon-logkit-2.0" + echo "classpath=$(java-pkg_getjars ${libs})" > build.properties +} + +src_install() { + java-pkg_dojar "${S}"/dist/avalon-framework.jar + + dodoc NOTICE.TXT + use doc && java-pkg_dojavadoc target/docs + use source && java-pkg_dosrc impl/src/java/* +} diff --git a/dev-java/avalon-framework/files/4.2.0-enum.patch b/dev-java/avalon-framework/files/4.2.0-enum.patch new file mode 100644 index 000000000000..d4f4d2fcf692 --- /dev/null +++ b/dev-java/avalon-framework/files/4.2.0-enum.patch @@ -0,0 +1,23 @@ +diff --git a/api/src/java/org/apache/avalon/framework/.Enum.java.swp b/api/src/java/org/apache/avalon/framework/.Enum.java.swp +deleted file mode 100644 +index 1eb30e7..0000000 +Binary files a/api/src/java/org/apache/avalon/framework/.Enum.java.swp and /dev/null differ +diff --git a/api/src/java/org/apache/avalon/framework/Enum.java b/api/src/java/org/apache/avalon/framework/Enum.java +index 6ceba68..37c2aec 100644 +--- a/api/src/java/org/apache/avalon/framework/Enum.java ++++ b/api/src/java/org/apache/avalon/framework/Enum.java +@@ -126,11 +126,11 @@ public abstract class Enum + if( !(o instanceof Enum) ) + return false; + +- final Enum enum = (Enum)o; ++ final Enum enum_ = (Enum)o; + +- if( !getClass().equals( enum.getClass() ) ) ++ if( !getClass().equals( enum_.getClass() ) ) + return false; +- if( m_name != null ? !m_name.equals( enum.m_name ) : enum.m_name != null ) ++ if( m_name != null ? !m_name.equals( enum_.m_name ) : enum_.m_name != null ) + return false; + + return true; diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest index 45e8678465db..9754c4a0f8dd 100644 --- a/dev-java/commons-csv/Manifest +++ b/dev-java/commons-csv/Manifest @@ -1,5 +1,3 @@ -DIST commons-csv-1.8-sources.tar.gz 36962976 BLAKE2B 6b3ee00a9e6185b30aa5dd4cb8be684740ce9e61c38a5e3596b0e96da9674b05494b6996a4d39b88412f0cd333ec3d6c5b2c0e10171a5e9d3b6e8925107aa3e9 SHA512 e0a7f7dbb0bf381f0f8f703e0ccb689f96c0a610b7afbd771cfeecab7042416f6dddc15c0a6e9a23f157da87c2bf3f16efb2e2aeb135ef1ac8c7306659936443 DIST commons-csv-1.9.0-sources.tar.gz 36975991 BLAKE2B b2e2091556f3766968dbe660e4059f491eedc458d3c15c0372770d144737ab3ddcc78ff36f674759bde8aa9690e4bbe14866f8546e1de3b67498736678650697 SHA512 4610197fbbf1b3fb3ff19ff8f5ee0ffe945c34c05e3db71b89156bf17aa7f6b2816ddace85457fec82cb22337f777e08eac5984d7299e702b537f0d242d368d8 -EBUILD commons-csv-1.8.ebuild 1708 BLAKE2B 6f19376dfe068931da7e8e4bc8eae0c0ee41027e8a68b1be717c021dfda126e5522ca4ea523af83e68272992ef69b86458e5f779e13506c4fcf1f32abb5f5e4e SHA512 baf9e2a304b60f6d625586e320394126bdda69ef9468d7713eeb8308f2fb59121ada4b302cc4832f7125ddc0f521a3dcba9282a7e9d3e63a32ca222aae22afd8 -EBUILD commons-csv-1.9.0.ebuild 1664 BLAKE2B ffdb6806d079715a3f5de3b663b4bb69a17a6127084336705afe5fa0e3261f7b29213e8a372de34c7db6129670637256e13cd748255639e72cb8259346b4f478 SHA512 7e81f9241f272625bb34d1ba5dae272197e904f95ad77eba04ca0f3021cb1fa785f9b90827c2da64043b2a8b64e509ef3a5554d0ecb831b77a187057ee53cb00 +EBUILD commons-csv-1.9.0.ebuild 1661 BLAKE2B 4bd0b3540b07053ff1b9c4b9ebddb59ee8cff2bc7c2871d4052e244785df81a7276bfe7fb993b68d38f69c33da766d7c1e20e3b702120cc960f98ea87d81132a SHA512 462a73faa494fdc97de3b591e3b1544d0c6c49868eb1f26b878d1dca64b972a48d7a36c73772b6fc7ffa17f2ab800c44209512d82cfa71de9bbcb767eaebc9e4 MISC metadata.xml 416 BLAKE2B 193c84e7cdd7d31c475be29d0f00c44f86dba7226d4c9d3de052b9ecc8e2dae8fe9b402cdd797b04d714253591b39b3f858be13caf0584b1e67f6756cbae7bce SHA512 9c3695f3b80d8efb699cf1f1b8801aa173480a71604abdcc8cf3d093f9631fbf0ef2c6cfbf22ae106831b0b58747219184966904b9c3622c1ce424d4325e18b6 diff --git a/dev-java/commons-csv/commons-csv-1.8.ebuild b/dev-java/commons-csv/commons-csv-1.8.ebuild deleted file mode 100644 index 2bfad6f75733..000000000000 --- a/dev-java/commons-csv/commons-csv-1.8.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.dkm.cz/apache//commons/csv/source/commons-csv-1.8-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-csv-1.8.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.commons:commons-csv:1.8" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Simple interface for reading and writing CSV files of various types." -HOMEPAGE="https://commons.apache.org/proper/commons-csv/" -SRC_URI="https://mirror.dkm.cz/apache//commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# missing test deps -RESTRICT="test" - -# Compile dependencies -# POM: pom.xml -# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!! -# test? commons-io:commons-io:2.6 -> >=dev-java/commons-io-2.8.0:1 -# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6 -# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.6.0 -> !!!groupId-not-found!!! -# test? org.mockito:mockito-core:3.2.4 -> !!!suitble-mavenVersion-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - >=dev-java/commons-io-2.8.0:1 - >=dev-java/commons-lang-3.12.0:3.6 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${P}-src" - -DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ) - -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS=( - "src/main/resources" -) - -JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild index 7ba31d2d1582..f7048a2fa233 100644 --- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild +++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-csv/" SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" # missing test deps RESTRICT="test" diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in old mode 100755 new mode 100644 -- cgit v1.2.3