gentoo resync : 02.12.2017

2 files changed, 0 insertions, 31 deletions

diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 3bcba4dee97d..334eedc27f93 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,3 @@
-AUX avalon-logkit-1.2.2-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a WHIRLPOOL 8fdd0206c2b65c2a8626331ea07b8e5668ef9b2c841ce20ae85459bc8e128c4096c2091f05ad7e92b7c9c769ba0ad485738f7078ce5f205fa38e21d9a1ca1b47
 EBUILD avalon-logkit-2.1-r8.ebuild 1413 BLAKE2B 45508e4a0b334959506546284b303d5afc5c83a8472d28a7b0107a74b09db1639492fcd872c54e93b93b302f149f8f46a7fb8684e7a45448ea01f59681c82ced SHA512 aecf4b592f090b545e71e50158e96b7d3a1450814d46a28976482337b075bb13315d2dbdd76360f29306ac4aefd8d07fb8b38f72b803ef42f4bcba0abe33eb7b
diff --git a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
deleted file mode 100644
index cb2611bf0de4..000000000000
--- a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java
---- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java	2005-08-30 05:03:49.000000000 +0300
-+++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java	2011-09-27 08:27:49.313005212 +0300
-@@ -20,7 +20,9 @@
- import java.sql.Connection;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import javax.sql.DataSource;
-+import java.util.logging.Logger;
- 
- /**
-  * A basic datasource that doesn't do any pooling but just wraps
-@@ -111,4 +113,16 @@
-     {
-         m_logWriter = logWriter;
-     }
-+
-+    public boolean isWrapperFor(Class cls) {
-+        return false;
-+    }
-+ 
-+    public Object unwrap(Class cls) throws SQLException {
-+        throw new SQLException("Not a wrapper for " + cls);
-+    }
-+    
-+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+        throw new SQLFeatureNotSupportedException("Not a supported feature");
-+    }
- }