commit: c1585dc1cda6e1076ea4ae181949c0ff1583e5c5 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Oct 28 11:04:50 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Oct 29 16:23:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1585dc1
dev-java/avalon-framework: min java 1.8 + EAPI 7 Closes: https://bugs.gentoo.org/784839 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/22739 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../avalon-framework-4.2.0-r3.ebuild | 43 ++++++++++++++++++++++ dev-java/avalon-framework/files/4.2.0-enum.patch | 23 ++++++++++++ 2 files changed, 66 insertions(+) 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 00000000000..23b8c1a9113 --- /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 00000000000..d4f4d2fcf69 --- /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;
