diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2021-10-28 13:04:50 +0200 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2021-10-29 18:23:39 +0200 |
| commit | c1585dc1cda6e1076ea4ae181949c0ff1583e5c5 (patch) | |
| tree | d490f8ff39460a0c4edcb4bdd43f9405a6ac6bb6 /dev-java/avalon-framework/files | |
| parent | media-sound/terminatorx: removed obsolete 4.0.1-r2 (diff) | |
| download | gentoo-c1585dc1cda6e1076ea4ae181949c0ff1583e5c5.tar.gz gentoo-c1585dc1cda6e1076ea4ae181949c0ff1583e5c5.tar.bz2 gentoo-c1585dc1cda6e1076ea4ae181949c0ff1583e5c5.zip | |
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@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22739
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/avalon-framework/files')
| -rw-r--r-- | dev-java/avalon-framework/files/4.2.0-enum.patch | 23 |
1 files changed, 23 insertions, 0 deletions
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;
|