From 094e2803b914141f95067a529883fee78a5e71c0 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Wed, 6 Feb 2008 15:25:30 +0000 Subject: Version bump (Portage version: 2.1.4.1) --- dev-java/commons-logging/ChangeLog | 11 +++- .../commons-logging/commons-logging-1.1.1.ebuild | 67 ++++++++++++++++++++++ .../files/commons-logging-1.1.1-gentoo.patch | 26 +++++++++ .../files/commons-logging-1.1.1-manifest | 8 +++ .../files/commons-logging-1.1.1-servletapi.patch | 46 +++++++++++++++ 5 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 dev-java/commons-logging/commons-logging-1.1.1.ebuild create mode 100644 dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch create mode 100644 dev-java/commons-logging/files/commons-logging-1.1.1-manifest create mode 100644 dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch (limited to 'dev-java/commons-logging') diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index 5662479021f5..f149459729f6 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,15 @@ # 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.57 2008/01/30 17:30:30 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.58 2008/02/06 15:25:30 fordfrog Exp $ + +*commons-logging-1.1.1 (06 Feb 2008) + + 06 Feb 2008; Miroslav Šulc + +files/commons-logging-1.1.1-gentoo.patch, + +files/commons-logging-1.1.1-manifest, + +files/commons-logging-1.1.1-servletapi.patch, + +commons-logging-1.1.1.ebuild: + Version bump *commons-logging-1.1-r6 (30 Jan 2008) *commons-logging-1.1-r5 (30 Jan 2008) diff --git a/dev-java/commons-logging/commons-logging-1.1.1.ebuild b/dev-java/commons-logging/commons-logging-1.1.1.ebuild new file mode 100644 index 000000000000..1d90ee8b72a3 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.1.1.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.1.ebuild,v 1.1 2008/02/06 15:25:30 fordfrog 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/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}-SNAPSHOT.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging" + java-pkg_newjar target/${PN}-api-${PV}-SNAPSHOT.jar ${PN}-api.jar + java-pkg_newjar target/${PN}-adapters-${PV}-SNAPSHOT.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.1-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch new file mode 100644 index 000000000000..6d468735d0e7 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch @@ -0,0 +1,26 @@ +--- build.xml.orig 2008-02-06 16:09:59.000000000 +0100 ++++ build.xml 2008-02-06 16:10:48.000000000 +0100 +@@ -785,4 +785,23 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest new file mode 100644 index 000000000000..382da7a047e5 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.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.1 +Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1" diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch new file mode 100644 index 000000000000..2c29fa544019 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch @@ -0,0 +1,46 @@ +--- build.xml.orig2 2008-02-06 16:13:45.000000000 +0100 ++++ build.xml 2008-02-06 16:16:48.000000000 +0100 +@@ -276,6 +276,11 @@ + classpathref="compile.classpath" + classname="org.apache.log.Logger"/> + ++ ++ ++ + +@@ -312,6 +317,13 @@ + + + ++ ++ ++ *** WARNING *** ++ ServletAPI not found: Cannot Build ServletContextCleaner ++ ++ ++ + + + *** WARNING *** +@@ -334,7 +346,7 @@ + + + ++ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/> + + +@@ -362,6 +374,8 @@ + + + ++ + +