Uses java-osgi to create an OSGi compliant jar.

Package-Manager: portage-2.1.3.19

5 files changed, 93 insertions, 5 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 0f182f22e433..fa38a0f3288e 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.55 2008/01/12 15:13:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.56 2008/01/14 16:22:37 elvanor Exp $
+
+*commons-logging-1.1-r4 (14 Jan 2008)
+
+  14 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/commons-logging-1.1-manifest, +commons-logging-1.1-r4.ebuild:
+  Uses java-osgi to create an OSGi compliant jar.
 
   12 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   commons-logging-1.1-r3.ebuild:
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 2d008e8454bd..ece8d47d00c6 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -2,6 +2,10 @@ AUX commons-logging-1.1-gentoo.patch 927 RMD160 7504a6f319f1ca894b218d9d30641c23
 MD5 1abc54e325d1d636bfb36830bf3fab97 files/commons-logging-1.1-gentoo.patch 927
 RMD160 7504a6f319f1ca894b218d9d30641c23904f310d files/commons-logging-1.1-gentoo.patch 927
 SHA256 c50883be252e835335c142a6f84e0d21a32403873802eee04a89241ad0c79498 files/commons-logging-1.1-gentoo.patch 927
+AUX commons-logging-1.1-manifest 299 RMD160 9f2d1a8889f64a8bb23b6563d27c851a09b7adaa SHA1 3ad2a066fb45ebe6d994d27ef6d09c67b5d2536c SHA256 34a591ce9b09ae23258d1414958bb537fe85ffd421d4de97307985dcb6bbc99d
+MD5 d85097a38fb254493a4342bc4069f0a2 files/commons-logging-1.1-manifest 299
+RMD160 9f2d1a8889f64a8bb23b6563d27c851a09b7adaa files/commons-logging-1.1-manifest 299
+SHA256 34a591ce9b09ae23258d1414958bb537fe85ffd421d4de97307985dcb6bbc99d files/commons-logging-1.1-manifest 299
 AUX commons-logging-1.1-servletapi.patch 1988 RMD160 78c13fc15add613a1cb17d73c3a31c8ee1cc69bd SHA1 cab5198471596f46a2faae282e8c6a8f786cbf51 SHA256 836afb926d95aae2dcade9234179df3274402f19bbcc54d77a19e18af30317b3
 MD5 41b91178077c9e3dc891ece05c835d99 files/commons-logging-1.1-servletapi.patch 1988
 RMD160 78c13fc15add613a1cb17d73c3a31c8ee1cc69bd files/commons-logging-1.1-servletapi.patch 1988
@@ -15,10 +19,14 @@ EBUILD commons-logging-1.1-r3.ebuild 2246 RMD160 d6699923dc4be7bbe6bc2456d51b1d1
 MD5 09b7ea3133d7d0c760a9f616fd3a8063 commons-logging-1.1-r3.ebuild 2246
 RMD160 d6699923dc4be7bbe6bc2456d51b1d15b26ad76d commons-logging-1.1-r3.ebuild 2246
 SHA256 6889d8908e57b2e251007f4a5f1d423f57c00ce5818d2d6ae6ab02fceac1a6fa commons-logging-1.1-r3.ebuild 2246
-MISC ChangeLog 7716 RMD160 f209711536cbda5ac95470c3408529c2f553675f SHA1 41b8233c520cef841fb86573891cd920dea43a48 SHA256 a0b7f67df5df89752a9ac643550f15482160bcb373b337f353801794edfdb517
-MD5 f998ea6660830de3f4be991b21c893da ChangeLog 7716
-RMD160 f209711536cbda5ac95470c3408529c2f553675f ChangeLog 7716
-SHA256 a0b7f67df5df89752a9ac643550f15482160bcb373b337f353801794edfdb517 ChangeLog 7716
+EBUILD commons-logging-1.1-r4.ebuild 2312 RMD160 d6ce968d9d064cfb09779c507e44f3585f5f4bda SHA1 983c27d79be14106faf4ddb4513206d433a96da0 SHA256 532f974f3ac3cb6a723960852c3d3fc3c07cd95b58786904cf2ae260a6aaf1bc
+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
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,3 +37,6 @@ SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/di
 MD5 dbd98438b253a99ade9f91d18702be61 files/digest-commons-logging-1.1-r3 271
 RMD160 9d76f4289df7607857eb75a355c863f71888e879 files/digest-commons-logging-1.1-r3 271
 SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/digest-commons-logging-1.1-r3 271
+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
diff --git a/dev-java/commons-logging/commons-logging-1.1-r4.ebuild b/dev-java/commons-logging/commons-logging-1.1-r4.ebuild
new file mode 100644
index 000000000000..561ea2c93318
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.1-r4.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-r4.ebuild,v 1.1 2008/01/14 16:22:37 elvanor Exp $
+
+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 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_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/commons-logging-1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1-manifest
new file mode 100644
index 000000000000..09d24e8e88a7
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1-manifest
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Version: 1.1
+Export-Package: org.apache.commons.logging;version="1.1",org.apache.commons.logging.impl;version="1.1"
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.1-r4 b/dev-java/commons-logging/files/digest-commons-logging-1.1-r4
new file mode 100644
index 000000000000..05732717d805
--- /dev/null
+++ b/dev-java/commons-logging/files/digest-commons-logging-1.1-r4
@@ -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