From 0c3f976d92b16790467ff122f6c0a1630aa449b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Tue, 13 Feb 2007 19:26:49 +0000 Subject: [PATCH] Fix dev-java/avalon-logkit dependency atom to not match 1.2.2 so that the package move from dev-java/avalon-logkit-bin to dev-java/avalon-logkit does not break things. Package-Manager: portage-2.1.2-r9 --- dev-java/commons-codec/ChangeLog | 8 +++++++- dev-java/commons-codec/commons-codec-1.3-r1.ebuild | 6 ++---- dev-java/commons-codec/commons-codec-1.3.ebuild | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dev-java/commons-codec/ChangeLog b/dev-java/commons-codec/ChangeLog index 655e48f02a96..33c624cb0c2c 100644 --- a/dev-java/commons-codec/ChangeLog +++ b/dev-java/commons-codec/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/commons-codec # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.20 2007/02/13 19:19:48 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.21 2007/02/13 19:26:49 betelgeuse Exp $ + + 13 Feb 2007; Petteri Räty + commons-codec-1.3.ebuild, commons-codec-1.3-r1.ebuild: + Fix dev-java/avalon-logkit dependency atom to not match 1.2.2 so that the + package move from dev-java/avalon-logkit-bin to dev-java/avalon-logkit does + not break things. 13 Feb 2007; Petteri Räty metadata.xml, commons-codec-1.3.ebuild, commons-codec-1.3-r1.ebuild: diff --git a/dev-java/commons-codec/commons-codec-1.3-r1.ebuild b/dev-java/commons-codec/commons-codec-1.3-r1.ebuild index bc158d615496..0deddc985ac0 100644 --- a/dev-java/commons-codec/commons-codec-1.3-r1.ebuild +++ b/dev-java/commons-codec/commons-codec-1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3-r1.ebuild,v 1.3 2007/02/13 19:19:48 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3-r1.ebuild,v 1.4 2007/02/13 19:26:49 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="doc source" RDEPEND=">=virtual/jre-1.3 - =dev-java/avalon-logkit-1.2* + ~dev-java/avalon-logkit-1.2 dev-java/log4j" DEPEND=">=virtual/jdk-1.3 @@ -35,8 +35,6 @@ src_unpack() { echo "final.name=commons-codec" >> build.properties } -EANT_BUILD_TARGET="compile" - src_install() { java-pkg_dojar output/dist/${PN}.jar diff --git a/dev-java/commons-codec/commons-codec-1.3.ebuild b/dev-java/commons-codec/commons-codec-1.3.ebuild index d3bec5583aaf..6529b117132d 100644 --- a/dev-java/commons-codec/commons-codec-1.3.ebuild +++ b/dev-java/commons-codec/commons-codec-1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3.ebuild,v 1.9 2007/02/13 19:19:48 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3.ebuild,v 1.10 2007/02/13 19:26:49 betelgeuse Exp $ inherit java-pkg @@ -14,7 +14,7 @@ KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="doc jikes source" RDEPEND=">=virtual/jre-1.3 - =dev-java/avalon-logkit-1.2* + ~dev-java/avalon-logkit-1.2 dev-java/log4j" DEPEND=">=virtual/jdk-1.3 -- 2.26.2