Fix missing jdk14logger (bug #208098), a regression of fix for bug #200918. The -r5 is based on current stable -r2 and straight stabled because -r2 got broken after its stabling and without revbump. The -r6 is based on -r4 and has also EAPI=1 slot deps and few other style tweaks.

(Portage version: 2.1.4, RepoMan options: --force)

5 files changed, 147 insertions, 1 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index fa38a0f3288e..5662479021f5 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.56 2008/01/14 16:22:37 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.57 2008/01/30 17:30:30 caster Exp $
+
+*commons-logging-1.1-r6 (30 Jan 2008)
+*commons-logging-1.1-r5 (30 Jan 2008)
+
+  30 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  +commons-logging-1.1-r5.ebuild, +commons-logging-1.1-r6.ebuild:
+  Fix missing jdk14logger (bug #208098), a regression of fix for bug #200918.
+  The -r5 is based on current stable -r2 and straight stabled because -r2 got
+  broken after its stabling and without revbump. The -r6 is based on -r4 and
+  has also EAPI=1 slot deps and few other style tweaks.
 
 *commons-logging-1.1-r4 (14 Jan 2008)
 
diff --git a/dev-java/commons-logging/commons-logging-1.1-r5.ebuild b/dev-java/commons-logging/commons-logging-1.1-r5.ebuild
new file mode 100644
index 000000000000..555600ae09f9
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.1-r5.ebuild
@@ -0,0 +1,63 @@
+# 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-r5.ebuild,v 1.1 2008/01/30 17:30:30 caster 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.4
+	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
+	log4j? ( =dev-java/log4j-1.2* )
+	servletapi? ( =dev-java/servletapi-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.4
+	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"
+
+	# bug 200918
+	java-ant_ignore-system-classes
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+	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 servletapi-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/commons-logging-1.1-r6.ebuild b/dev-java/commons-logging/commons-logging-1.1-r6.ebuild
new file mode 100644
index 000000000000..4af70645051a
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.1-r6.ebuild
@@ -0,0 +1,67 @@
+# 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-r6.ebuild,v 1.1 2008/01/30 17:30:30 caster Exp $
+
+EAPI="1"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+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"
+
+COMMON_DEP="
+	avalon-logkit? ( dev-java/avalon-logkit:1.2 )
+	log4j? ( dev-java/log4j:0 )
+	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*
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+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"
+
+	# bug 200918
+	java-ant_ignore-system-classes
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+	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_getjar --virtual servlet-api-2.3 servlet.jar)" >> 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-osgi_newjar-fromfile "target/${P}.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
+	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-r5 b/dev-java/commons-logging/files/digest-commons-logging-1.1-r5
new file mode 100644
index 000000000000..05732717d805
--- /dev/null
+++ b/dev-java/commons-logging/files/digest-commons-logging-1.1-r5
@@ -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
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.1-r6 b/dev-java/commons-logging/files/digest-commons-logging-1.1-r6
new file mode 100644
index 000000000000..05732717d805
--- /dev/null
+++ b/dev-java/commons-logging/files/digest-commons-logging-1.1-r6
@@ -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