summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-05-18 11:37:20 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-05-18 11:37:20 +0000
commit2e16fef953f19e4fa5f89435028aedcfe7fea123 (patch)
treea77ac435940ca722477abb2fda57cc570590d51f /dev-java
parentDEPEND on splitted ant. (diff)
downloadhistorical-2e16fef953f19e4fa5f89435028aedcfe7fea123.tar.gz
historical-2e16fef953f19e4fa5f89435028aedcfe7fea123.tar.bz2
historical-2e16fef953f19e4fa5f89435028aedcfe7fea123.zip
Use ANT_TASKS for jarjar.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/cglib/ChangeLog5
-rw-r--r--dev-java/cglib/cglib-2.2_beta1.ebuild11
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 87b87ff71142..3162fa01a7d8 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/cglib
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.27 2007/04/26 20:12:33 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.28 2007/05/18 11:37:20 betelgeuse Exp $
+
+ 18 May 2007; Petteri Räty <betelgeuse@gentoo.org> cglib-2.2_beta1.ebuild:
+ Use ANT_TASKS for jarjar.
26 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
cglib-2.0.2-r2.ebuild, cglib-2.1.3.ebuild, cglib-2.2_beta1.ebuild:
diff --git a/dev-java/cglib/cglib-2.2_beta1.ebuild b/dev-java/cglib/cglib-2.2_beta1.ebuild
index 11e4465758ec..853116c78acf 100644
--- a/dev-java/cglib/cglib-2.2_beta1.ebuild
+++ b/dev-java/cglib/cglib-2.2_beta1.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/cglib/cglib-2.2_beta1.ebuild,v 1.3 2007/04/26 20:12:33 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2_beta1.ebuild,v 1.4 2007/05/18 11:37:20 betelgeuse Exp $
JAVA_PKG_IUSE="doc source"
@@ -13,11 +13,11 @@ LICENSE="Apache-1.1"
SLOT="2.2"
KEYWORDS="~x86 ~amd64"
COMMON_DEP="=dev-java/asm-2.2*
- dev-java/ant-core"
+ >=dev-java/ant-core-1.7.0"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
- dev-java/jarjar
+ >=dev-java/jarjar-0.9
${COMMON_DEP}"
IUSE=""
@@ -32,11 +32,12 @@ src_unpack() {
java-pkg_jar-from asm-2.2 asm-util.jar
java-pkg_jar-from asm-2.2 asm-commons.jar
java-pkg_jar-from ant-core ant.jar
- java-pkg_jar-from --build-only jarjar-1
}
+ANT_TASKS="jarjar-1"
+
src_install() {
- java-pkg_newjar dist/${PN}-${PV}.jar ${PN}.jar
+ java-pkg_newjar dist/${P}.jar ${PN}.jar
java-pkg_newjar dist/${PN}-nodep-${PV}.jar ${PN}-nodep.jar
dodoc NOTICE README || die