Switched to java-virtual/servlet-api

(Portage version: 2.1.4_rc14)

3 files changed, 71 insertions, 2 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 0c45fdf29881..9075813d5bd2 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-logging
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.53 2007/12/15 20:11:52 betelgeuse Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.54 2008/01/11 08:12:29 wltjr Exp $
+
+*commons-logging-1.1-r3 (11 Jan 2008)
+
+  11 Jan 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +commons-logging-1.1-r3.ebuild:
+  Switched to java-virtual/servlet-api
 
   15 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
   commons-logging-1.1-r2.ebuild:
diff --git a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild b/dev-java/commons-logging/commons-logging-1.1-r3.ebuild
new file mode 100644
index 000000000000..52c1999f3168
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.1-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild,v 1.1 2008/01/11 08:12:29 wltjr Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
+HOMEPAGE="http://jakarta.apache.org/commons/logging/"
+SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
+
+RDEPEND=">=virtual/jre-1.3
+	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
+	log4j? ( =dev-java/log4j-1.2* )
+	servletapi? ( =java-virtuals/servlet-api-2.3* )
+	avalon-framework? ( =dev-java/avalon-framework-4.2* )"
+# ATTENTION: Add this when log4j-1.3 is out
+#	=dev-java/log4j-1.3*
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}-src/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	# TODO file upstream -nichoj
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	java-ant_ignore-system-classes
+
+	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" > build.properties
+	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
+	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
+	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+	use servletapi && echo "servletapi.jar=$(java-pkg_getjars --virtual servlet-api-2.3)" >> build.properties
+	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+	java-pkg_filter-compiler jikes ecj-3.2
+}
+
+EANT_BUILD_TARGET="compile"
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml PROPOSAL.html STATUS.html || die
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.1-r3 b/dev-java/commons-logging/files/digest-commons-logging-1.1-r3
new file mode 100644
index 000000000000..05732717d805
--- /dev/null
+++ b/dev-java/commons-logging/files/digest-commons-logging-1.1-r3
@@ -0,0 +1,3 @@
+MD5 6e8ec63e4904d3e894081fd60010d876 commons-logging-1.1-src.tar.gz 173556
+RMD160 5764ee09a541365adee55aded1a9ba8908deea0d commons-logging-1.1-src.tar.gz 173556
+SHA256 56aa7d3f2ab3d50798ce618d6dd60ed6814287f7cc25802d403cd3083238c5fa commons-logging-1.1-src.tar.gz 173556