6 files changed, 165 insertions, 5 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/Manifest b/dev-java/commons-logging/Manifest
index ece8d47d00c6..daf336b9b8ca 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -23,10 +23,18 @@ EBUILD commons-logging-1.1-r4.ebuild 2312 RMD160 d6ce968d9d064cfb09779c507e44f35
 MD5 6945348317d5ff1d8a3e5217aa2d160b commons-logging-1.1-r4.ebuild 2312
 RMD160 d6ce968d9d064cfb09779c507e44f3585f5f4bda commons-logging-1.1-r4.ebuild 2312
 SHA256 532f974f3ac3cb6a723960852c3d3fc3c07cd95b58786904cf2ae260a6aaf1bc commons-logging-1.1-r4.ebuild 2312
-MISC ChangeLog 7935 RMD160 cd86f91ed74107e35f7e7be7b18a0440605314a4 SHA1 287746a672c37c4b97de2b915189f3afc97a10aa SHA256 f8f0c9f33d8a2ae5e1500665f20fc20f3b2b3653cec9423b103b2ec37b4fbd53
-MD5 d2ee0fcf276e63f70f43aa80075303b7 ChangeLog 7935
-RMD160 cd86f91ed74107e35f7e7be7b18a0440605314a4 ChangeLog 7935
-SHA256 f8f0c9f33d8a2ae5e1500665f20fc20f3b2b3653cec9423b103b2ec37b4fbd53 ChangeLog 7935
+EBUILD commons-logging-1.1-r5.ebuild 2293 RMD160 4a35efc9e573034de6930826b789ff93f75b8ab6 SHA1 e40320346f66b25cb7788db65e4e8291f726db99 SHA256 88f57d45719e33fd946edfcf165a27ee1f3f5968deb1e5ebb6c2d9b016629938
+MD5 ae287953f12209f679c1d596864f596b commons-logging-1.1-r5.ebuild 2293
+RMD160 4a35efc9e573034de6930826b789ff93f75b8ab6 commons-logging-1.1-r5.ebuild 2293
+SHA256 88f57d45719e33fd946edfcf165a27ee1f3f5968deb1e5ebb6c2d9b016629938 commons-logging-1.1-r5.ebuild 2293
+EBUILD commons-logging-1.1-r6.ebuild 2394 RMD160 92718e0a82f74671dbfaefaeb762bf37d5c9229e SHA1 05a4836026a2b9149758da993d449cc15a41ed17 SHA256 ea8a7bf0dee9cf071051b33c770946289ed7c88ef88be02d13aeee24826564f7
+MD5 07caf932d1e7376b6435479d2b9123c8 commons-logging-1.1-r6.ebuild 2394
+RMD160 92718e0a82f74671dbfaefaeb762bf37d5c9229e commons-logging-1.1-r6.ebuild 2394
+SHA256 ea8a7bf0dee9cf071051b33c770946289ed7c88ef88be02d13aeee24826564f7 commons-logging-1.1-r6.ebuild 2394
+MISC ChangeLog 8418 RMD160 f2b261bfa2646e3baa01af295e23bc9394cdcaf6 SHA1 b6beb726960735bb0ddf967971d4462917ec37b2 SHA256 d17f7574f6b356fb8d093f41f8b79de9a211fd24e1736743979ead60dd6ddc71
+MD5 31129161ff11c8fce5a111d381adf975 ChangeLog 8418
+RMD160 f2b261bfa2646e3baa01af295e23bc9394cdcaf6 ChangeLog 8418
+SHA256 d17f7574f6b356fb8d093f41f8b79de9a211fd24e1736743979ead60dd6ddc71 ChangeLog 8418
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -40,3 +48,9 @@ SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/di
 MD5 dbd98438b253a99ade9f91d18702be61 files/digest-commons-logging-1.1-r4 271
 RMD160 9d76f4289df7607857eb75a355c863f71888e879 files/digest-commons-logging-1.1-r4 271
 SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/digest-commons-logging-1.1-r4 271
+MD5 dbd98438b253a99ade9f91d18702be61 files/digest-commons-logging-1.1-r5 271
+RMD160 9d76f4289df7607857eb75a355c863f71888e879 files/digest-commons-logging-1.1-r5 271
+SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/digest-commons-logging-1.1-r5 271
+MD5 dbd98438b253a99ade9f91d18702be61 files/digest-commons-logging-1.1-r6 271
+RMD160 9d76f4289df7607857eb75a355c863f71888e879 files/digest-commons-logging-1.1-r6 271
+SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/digest-commons-logging-1.1-r6 271
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