commit: be2e3eb6c123acbc2a63e34bc8b36c32aa2a660a Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Mar 17 22:05:05 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Mar 17 22:06:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2e3eb6
dev-java/avalon-logkit: Remove old Package-Manager: portage-2.2.28 dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild | 61 --------------------- dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild | 57 -------------------- dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild | 62 ---------------------- .../files/avalon-logkit-1.2.2-java6.patch | 17 ------ 4 files changed, 197 deletions(-) diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild deleted file mode 100644 index ad10b34..0000000 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -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 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -LICENSE="Apache-2.0" -SLOT="2.0" -IUSE="" - -COMMON_DEP=" - dev-java/log4j - java-virtuals/jms - java-virtuals/javamail - =dev-java/servletapi-2.4*" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" -# Doesn't like 1.6 changes to JDBC -DEPEND=">=virtual/jdk-1.4 - test? ( - =dev-java/junit-3* - dev-java/ant-junit - ) - ${COMMON_DEP}" - -java_prepare() { - 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 - - mkdir -p target/lib || die - cd target/lib || die - java-pkg_jar-from servletapi-2.4 - java-pkg_jar-from jms - java-pkg_jar-from --virtual javamail - java-pkg_jar-from log4j - java-pkg_filter-compiler jikes -} - -src_test() { - java-pkg_jar-from --into target/lib junit - ANT_TASKS="ant-junit" eant 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/avalon-logkit-2.1-r6.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild deleted file mode 100644 index d948aac..0000000 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -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 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -LICENSE="Apache-2.0" -SLOT="2.0" -IUSE="" - -COMMON_DEP=" - dev-java/log4j:0 - java-virtuals/jms:0 - java-virtuals/javamail:0 - java-virtuals/servlet-api:3.0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.4" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.4 - 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" - -EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-2.5" - -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/avalon-logkit-2.1-r7.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild deleted file mode 100644 index aa5aa3f..0000000 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ~ppc64 ~x86 ~x86-fbsd ~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 - java-virtuals/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" - -EANT_GENTOO_CLASSPATH="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-1.2.2-java6.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch deleted file mode 100644 index 07c4930..0000000 --- a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Patch by Vlastimil Babka <cas...@gentoo.org> -# Straightforward compatilibity with java6 interface extensions ---- src/java/org/apache/log/output/db/DefaultDataSource.java.orig 2009-11-06 18:03:16.000000000 +0100 -+++ src/java/org/apache/log/output/db/DefaultDataSource.java 2009-11-06 18:04:05.000000000 +0100 -@@ -149,4 +149,12 @@ - { - 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); -+ } - }
