summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/cglib/ChangeLog5
-rw-r--r--dev-java/cglib/cglib-2.2_beta1.ebuild19
-rw-r--r--dev-java/jarjar/ChangeLog5
-rw-r--r--dev-java/jarjar/jarjar-0.6-r1.ebuild11
4 files changed, 24 insertions, 16 deletions
diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 35f594f8ffe8..29d4fd520a0b 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.22 2007/02/18 10:10:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.23 2007/04/20 14:25:43 betelgeuse Exp $
+
+ 20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> cglib-2.2_beta1.ebuild:
+ Add dev-java/ant-core to RDEPEND.
18 Feb 2007; nixnut <nixnut@gentoo.org> cglib-2.0.2-r2.ebuild:
Stable on ppc wrt bug 163646
diff --git a/dev-java/cglib/cglib-2.2_beta1.ebuild b/dev-java/cglib/cglib-2.2_beta1.ebuild
index f7e95b067ebb..416b195e4ba7 100644
--- a/dev-java/cglib/cglib-2.2_beta1.ebuild
+++ b/dev-java/cglib/cglib-2.2_beta1.ebuild
@@ -1,6 +1,8 @@
# 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.1 2007/01/15 00:55:21 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2_beta1.ebuild,v 1.2 2007/04/20 14:25:43 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 java-ant-2
@@ -10,23 +12,22 @@ HOMEPAGE="http://cglib.sourceforge.net"
LICENSE="Apache-1.1"
SLOT="2.2"
KEYWORDS="~x86 ~amd64"
-COMMON_DEP="=dev-java/asm-2.2*"
+COMMON_DEP="=dev-java/asm-2.2*
+ dev-java/ant-core"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
- source? ( app-arch/zip )
- >=dev-java/ant-core-1.5
dev-java/jarjar
${COMMON_DEP}"
-IUSE="doc source"
+IUSE=""
S=${WORKDIR}
src_unpack() {
- jar xf ${DISTDIR}/${A} || die "failed to unpack"
+ jar xf "${DISTDIR}/${A}" || die "failed to unpack"
- cd ${S}/lib
- rm -f *.jar
+ cd "${S}/lib"
+ rm -v *.jar || die
java-pkg_jar-from asm-2.2 asm.jar
java-pkg_jar-from asm-2.2 asm-util.jar
java-pkg_jar-from asm-2.2 asm-commons.jar
@@ -38,6 +39,6 @@ src_install() {
java-pkg_newjar dist/${PN}-${PV}.jar ${PN}.jar
java-pkg_newjar dist/${PN}-nodep-${PV}.jar ${PN}-nodep.jar
- dodoc NOTICE README
+ dodoc NOTICE README || die
use doc && java-pkg_dohtml -r docs/*
}
diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog
index 02c010b908b9..d2ee55cb5276 100644
--- a/dev-java/jarjar/ChangeLog
+++ b/dev-java/jarjar/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jarjar
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.11 2007/03/01 12:38:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.12 2007/04/20 14:20:58 betelgeuse Exp $
+
+ 20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jarjar-0.6-r1.ebuild:
+ Add dev-java/ant-core to RDEPEND.
01 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> jarjar-0.6-r1.ebuild:
Marked stable on amd64 for bug #168864.
diff --git a/dev-java/jarjar/jarjar-0.6-r1.ebuild b/dev-java/jarjar/jarjar-0.6-r1.ebuild
index 214925879a70..ab7d8409dad3 100644
--- a/dev-java/jarjar/jarjar-0.6-r1.ebuild
+++ b/dev-java/jarjar/jarjar-0.6-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.6-r1.ebuild,v 1.6 2007/03/01 12:38:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.6-r1.ebuild,v 1.7 2007/04/20 14:20:58 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 java-ant-2
@@ -10,16 +12,15 @@ HOMEPAGE="http://jarjar.sourceforge.net"
LICENSE="GPL-2"
SLOT="1"
KEYWORDS="amd64 x86"
-IUSE="doc source"
+IUSE=""
COMMON_DEP="
=dev-java/asm-2.0*
- =dev-java/gnu-regexp-1*"
+ =dev-java/gnu-regexp-1*
+ dev-java/ant-core"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
- >=dev-java/ant-core-1.4
- source? ( app-arch/zip )
${COMMON_DEP}"
# FIXME looks like it bundles stuff from dev-java/java-getopt, ie