gentoo resync : 14.07.2018

4 files changed, 104 insertions, 0 deletions

diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
new file mode 100644
index 000000000000..beb1269a4f67
--- /dev/null
+++ b/dev-java/avalon-logkit/Manifest
@@ -0,0 +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 1403 BLAKE2B c7886b499be92a24d299f86c040709a387caa925fd8db8c0676d2046b9e5a80053ffa3f32fc197dffca18829de1047f56c2bd048ccc7d41c87d029b42cfebf8e SHA512 132b042be721384a2686cd483aefcfd10236c58dd8fc0560d415d6f8fd3d5b913f67eadd6eca1a689cfce3a244f7c8875b7f5c2128f1d53c8612dcd8ae21a255
+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-r8.ebuild
new file mode 100644
index 000000000000..4db25f78e353
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+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"
+
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+CDEPEND="
+	dev-java/log4j:0
+	java-virtuals/jms:0
+	dev-java/oracle-javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+java_prepare() {
+	# Doesn't like 1.6 / 1.7 changes to JDBC
+	epatch "${FILESDIR}/${P}-java7.patch"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite \
+		-f build.xml \
+		-c -e available \
+		-a classpathref \
+		-v 'build.classpath' || die
+
+	java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch
new file mode 100644
index 000000000000..cb2611bf0de4
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch
@@ -0,0 +1,30 @@
+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");
++    }
+ }
diff --git a/dev-java/avalon-logkit/metadata.xml b/dev-java/avalon-logkit/metadata.xml
new file mode 100644
index 000000000000..37998bf40746
--- /dev/null
+++ b/dev-java/avalon-logkit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>