diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-10-30 09:50:10 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-10-30 09:50:10 +0000 |
| commit | e08ef2001e9e040c94c32594d8e644117e0c0929 (patch) | |
| tree | 18069d5ffad0d5dc507f45d95c2cbcee47ccf251 /dev-java | |
| parent | d4a7f2a56c813fedd229bd6af662e28cdde3cc9e (diff) | |
| download | baldeagleos-repo-e08ef2001e9e040c94c32594d8e644117e0c0929.tar.gz baldeagleos-repo-e08ef2001e9e040c94c32594d8e644117e0c0929.tar.xz baldeagleos-repo-e08ef2001e9e040c94c32594d8e644117e0c0929.zip | |
Adding metadata
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild (renamed from dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild) | 15 | ||||
| -rw-r--r-- | dev-java/avalon-framework/files/4.2.0-enum.patch | 23 |
2 files changed, 32 insertions, 6 deletions
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild index b04d776db7a1..23b8c1a9113b 100644 --- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild +++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild @@ -1,31 +1,34 @@ # 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" inherit java-pkg-2 java-ant-2 DESCRIPTION="Avalon Framework" -HOMEPAGE="http://avalon.apache.org/" +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" -IUSE="" CDEPEND="dev-java/avalon-logkit:2.0 dev-java/log4j:0" -RDEPEND=">=virtual/jre-1.4 + +RDEPEND=">=virtual/jre-1.8:* ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 +DEPEND=">=virtual/jdk-1.8:* ${CDEPEND}" S="${WORKDIR}/${PN}" -java_prepare() { +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 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;
|