summaryrefslogtreecommitdiff
path: root/dev-java/avalon-logkit
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-java/avalon-logkit
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-java/avalon-logkit')
-rw-r--r--dev-java/avalon-logkit/Manifest2
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild (renamed from dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild)15
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 4635523d3952..51c09a157b30 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +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-r8.ebuild 1389 BLAKE2B 7440cec67828be34bb23d118077063c83f4f6255dc97179c0582b8faac488648d064aa8e54f7f674f9f7d0c0eba8521644a7c86bb4443332680a73320cb9e17f SHA512 35e8a04aeda74b52514cc3272647199d192b3f16b273896fdcb2150359804e2c1ad09388a86a60886e9ae091291b936a3fbbf01682d5d71e0e0d427dcd64ccb3
+EBUILD avalon-logkit-2.1-r9.ebuild 1441 BLAKE2B 3bed0691e2f5c4129665612733dde3d231fbfb0f4a09b3ba858cfc80a75e9a35d4b134f1b3c41240ce0205811febbc36ae75648c1af8dae7bed83714315eccbe SHA512 bca49c8f24d197aa35f90636967572d9b398f6dedabe42f99882240de3cb7583b4c3f21cb17677211b8cad6589be7027bd096f1f5de132a230e28c031ed73ae1
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
index 35ac0446b01c..f66302f731e8 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
JAVA_PKG_IUSE="doc source test"
@@ -10,8 +10,8 @@ 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="http://avalon.apache.org/"
-SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+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 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
LICENSE="Apache-2.0"
@@ -24,16 +24,17 @@ CDEPEND="
dev-java/oracle-javamail:0
java-virtuals/servlet-api:3.0"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.8:*
test? (
dev-java/ant-junit:0
)"
-java_prepare() {
+src_prepare() {
+ default
# Doesn't like 1.6 / 1.7 changes to JDBC
- epatch "${FILESDIR}/${P}-java7.patch"
+ eapply "${FILESDIR}/${P}-java7.patch"
java-ant_ignore-system-classes