From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 6 Apr 2022 22:33:41 +0100
Subject: gentoo resync : 06.04.2022

---
 dev-java/avalon-logkit/Manifest                    |  3 +-
 .../avalon-logkit/avalon-logkit-2.1-r12.ebuild     |  2 +-
 dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild | 63 ----------------------
 3 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild

(limited to 'dev-java/avalon-logkit')

diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 05999de5bcd1..a74298d37499 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,5 +1,4 @@
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r12.ebuild 2951 BLAKE2B 7e2ee819e01521f04dfd4f0dfec456273a24997f5f48df2a1671ea18836b74fa700c958f7beea3c08cdef34dd6876f5987527d3ceecd78447cd3a6e48e0de714 SHA512 6d283bb31bbc8b1a13ec0838d88583d4504f6824ee8c9379a0b267587dea8e0952b60acd3f1d709ea2c78bca2c2f452124e3426da449b2bc7ede61a497ef27bb
-EBUILD avalon-logkit-2.1-r9.ebuild 1445 BLAKE2B 87d3271023f53f5e275c18ae926768186de5122d9b548d26153117c7decadfe47d1b34c384915a03eb118e4215296b417ea2002b6e9c82a7b49c336f1b70d9a0 SHA512 bbd130e50d2da2fa59735aeff1a88bc46599236f3cfb7531d1f63a84d26f27d0066502a63c40fb910022f042b1b5d70e7d200a9071d1398309023ec59c22dc60
+EBUILD avalon-logkit-2.1-r12.ebuild 2947 BLAKE2B 307d1520249befe8cbf5e1af1d508ca2edc5fe5c969d2c775d872aa58acd11193c3b172442db3383037807cc40d05e588e1e9a9850e550d6381e21f01518da63 SHA512 8e8bdaceba8970a36aeb6964a172cec5425c684f15dcd1b3ea79ffe68f1130ab35729fe6557a60ef3956c3b07e386c79662f3952a8f7e54dbd9845d503958dff
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
index fadec3b6862a..ca7b6c624e4f 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="https://avalon.apache.org/closed.html"
 SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
deleted file mode 100644
index 3a719687e700..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-# NB: this project is dead and we should look into removing it from the tree.
-# Take a look at the homepage.
-DESCRIPTION="Easy-to-use Java logging toolkit"
-HOMEPAGE="https://avalon.apache.org/closed.html"
-SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-IUSE=""
-
-CDEPEND="
-	dev-java/log4j:0
-	java-virtuals/jms:0
-	dev-java/oracle-javamail:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-src_prepare() {
-	default
-	# Doesn't like 1.6 / 1.7 changes to JDBC
-	eapply "${FILESDIR}/${P}-java7.patch"
-
-	java-ant_ignore-system-classes
-
-	java-ant_xml-rewrite \
-		-f build.xml \
-		-c -e available \
-		-a classpathref \
-		-v 'build.classpath' || die
-
-	java-pkg_filter-compiler jikes
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-- 
cgit v1.2.3