gentoo resync : 10.11.2019

5 files changed, 4 insertions, 92 deletions

diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index eecb5b863034..77d271aa7885 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,8 +1,6 @@
 AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
 DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.1.5-r1.ebuild 938 BLAKE2B 8a90f236e04c7426b8355a2be582ad63cdae1f51aca3ccae040a8516f36c0d15f1ad31836640b0e34890737ddd0845ce46e4008f240120ffb5f407fca794eed0 SHA512 0fc9453981fc142476db62e1870a3cf9a307a101cd591456226d8a2e590df78c6eb3f5ca1250b2180fb5b997b9c220331be6db4e7bffbcc660c3ab21f23c3c3e
-EBUILD avalon-framework-4.1.5-r2.ebuild 914 BLAKE2B 26937446350fe6414acbf0b1be55fee5bfb39735d47df274a2fa08a1f93f983f3ceff905a0644c59c0bd2a791df3644a36cea8163b2d650dbd18e85446cdabdf SHA512 bd0da169742a646e2f1394c7fc44fb9a94cc0074d90343666e078b8a467dffa57873638649bbadfae18b89383247da8e725af6adb9e507ecfc6a68d1d0e728bf
-EBUILD avalon-framework-4.2.0-r1.ebuild 1028 BLAKE2B e50a838974b65e28852713104412f87871a2faae183dc1bcee5711f56a63c460052e9c28d4cd4fb52333fd43bcbb16229726638c307ac1a99bc4f2ad92e231b7 SHA512 3816f82e7a60b4deaf313b0f6258a5af0815e2f2852e7ec62c06d85b1fabb54a82745202545150b755dc693996bca04595c5bab7b4fc4084a3dd409cbbacf576
-EBUILD avalon-framework-4.2.0-r2.ebuild 1000 BLAKE2B 8fe088a40db9d861defc7711a701dcdd82340b7808c9dbac59d0a11f06d5c2081b934cc475e6d19f4b4c5d19ab3b23692916750111d024aa6f6edd87a4735f53 SHA512 efbcddb1ef8ac8ac21efb7a096d9921c423f6a69fdd6a18af1742ae063dcf83f8031cb84928b9a958e1b981cd268c4150ddbc75cb67d66ab19978c38b4465452
+EBUILD avalon-framework-4.1.5-r2.ebuild 912 BLAKE2B 21826ee57ae0b7416c9f788023df6ddef04179b7f57fb92c6cdc95996e44c89f2c8a3a5e0b447c41484aba6aa512369a652dd73987911165425de90bba6516a5 SHA512 f9bf863f6bddf52aed8b471916c6e4ea97dd6140820081235011ffeebe1331c337deb11762f1f1b0457490296827532dcd173ab352da732c311ff02ef795b992
+EBUILD avalon-framework-4.2.0-r2.ebuild 998 BLAKE2B 4ec6b85a20b7364367715cc157a2f1850729cdfd31c75aabece68039e1a8680b02a445ccc1f728595e4ed1e38c319d40f52c903e3d45fb84a2653bb33c2ddb89 SHA512 3952ee84211430b442e245ba912c46e9fd9f78b5236b2a0a51cea9df0f7d0fe05f0bc38ebf3388cc2ca84db7f6e9d58bb466664e09b67fa61445ede78541c69b
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
deleted file mode 100644
index 437f5b34706d..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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.1"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-COMMON_DEP="
-	=dev-java/avalon-logkit-2*
-	>=dev-java/log4j-1.2.9"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp "${FILESDIR}"/build.xml ./build.xml || die "ANT update failure!"
-	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
-
-	use doc && java-pkg_dojavadoc "${S}"/target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
index 7e5dfc7ae7a9..55985d937eb6 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.1"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
deleted file mode 100644
index 3e4cd5c81682..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="=dev-java/avalon-logkit-2*
-	>=dev-java/log4j-1.2.9"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp "${FILESDIR}/build.xml" ./build.xml || die "ANT update failure!"
-	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 || die
-	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-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index a401ed26401c..ba8118af4f5f 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -13,7 +13,7 @@ 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 ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0