diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-11-06 17:23:38 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-11-06 17:23:38 +0000 |
| commit | 4d584e67b069c7e9c6fd5d322cb814effcca6f62 (patch) | |
| tree | 2931d1a44ff6b756a84be25a78aacbb9fdcf4e09 /dev-java/avalon-logkit | |
| parent | Version bump, thanks to Marat Radchenko <marat@slonopotamus.org> in bug #1761... (diff) | |
| download | gentoo-2-4d584e67b069c7e9c6fd5d322cb814effcca6f62.tar.gz gentoo-2-4d584e67b069c7e9c6fd5d322cb814effcca6f62.tar.bz2 gentoo-2-4d584e67b069c7e9c6fd5d322cb814effcca6f62.zip | |
Revbump with patch to allow compiling with java6.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/avalon-logkit')
| -rw-r--r-- | dev-java/avalon-logkit/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild (renamed from dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild) | 22 |
2 files changed, 17 insertions, 13 deletions
diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog index 7c87a21ee5fe..4b10f6fc56ab 100644 --- a/dev-java/avalon-logkit/ChangeLog +++ b/dev-java/avalon-logkit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/avalon-logkit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.71 2009/11/06 17:13:53 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.72 2009/11/06 17:23:38 caster Exp $ + +*avalon-logkit-2.1-r4 (06 Nov 2009) + + 06 Nov 2009; Vlastimil Babka <caster@gentoo.org> + -avalon-logkit-2.1-r2.ebuild, +avalon-logkit-2.1-r4.ebuild: + Revbump with patch to allow compiling with java6. *avalon-logkit-1.2.2 (06 Nov 2009) diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild index 8128882b5b04..53259fbc3eb9 100644 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild @@ -1,41 +1,39 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild,v 1.8 2008/05/11 16:14:39 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild,v 1.1 2009/11/06 17:23:38 caster Exp $ +EAPI=2 JAVA_PKG_IUSE="doc source test" + inherit java-pkg-2 java-ant-2 DESCRIPTION="Easy-to-use Java logging toolkit" HOMEPAGE="http://avalon.apache.org/" SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" LICENSE="Apache-2.0" SLOT="2.0" IUSE="" COMMON_DEP=" dev-java/log4j - dev-java/sun-jms + java-virtuals/jms java-virtuals/javamail =dev-java/servletapi-2.4*" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" # Doesn't like 1.6 changes to JDBC -DEPEND="|| ( - =virtual/jdk-1.5* - =virtual/jdk-1.4* - ) +DEPEND=">=virtual/jdk-1.4 test? ( =dev-java/junit-3* dev-java/ant-junit ) ${COMMON_DEP}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { + epatch "${FILESDIR}/${PN}-1.2.2-java6.patch" java-ant_ignore-system-classes @@ -45,7 +43,7 @@ src_unpack() { mkdir -p target/lib || die cd target/lib || die java-pkg_jar-from servletapi-2.4 - java-pkg_jar-from sun-jms + java-pkg_jar-from jms java-pkg_jar-from --virtual javamail java-pkg_jar-from log4j java-pkg_filter-compiler jikes |