diff options
| -rw-r--r-- | dev-java/commons-logging/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-logging/commons-logging-1.1-r5.ebuild | 63 | ||||
| -rw-r--r-- | dev-java/commons-logging/commons-logging-1.1-r6.ebuild | 67 |
3 files changed, 5 insertions, 131 deletions
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index 71864ae4306e..8273ceb68aa2 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,10 @@ # 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.64 2008/03/16 17:44:04 ken69267 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.65 2008/03/25 19:48:39 betelgeuse Exp $ + + 25 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> + -commons-logging-1.1-r5.ebuild, -commons-logging-1.1-r6.ebuild: + Delete old ebuilds. 16 Mar 2008; Kenneth Prugh <ken69267@gentoo.org> commons-logging-1.1.1.ebuild: diff --git a/dev-java/commons-logging/commons-logging-1.1-r5.ebuild b/dev-java/commons-logging/commons-logging-1.1-r5.ebuild deleted file mode 100644 index 555600ae09f9..000000000000 --- a/dev-java/commons-logging/commons-logging-1.1-r5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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 deleted file mode 100644 index 4af70645051a..000000000000 --- a/dev-java/commons-logging/commons-logging-1.1-r6.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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 -} |