summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-05-17 20:16:39 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-05-17 20:16:39 +0000
commita7c91b737a7a9811bdd48250ddefcf73889c55ca (patch)
tree0a263daab7978ea4330cca34d66cb7289bac5663 /dev-java
parentNew package. Bug #150406 (diff)
downloadgentoo-2-a7c91b737a7a9811bdd48250ddefcf73889c55ca.tar.gz
gentoo-2-a7c91b737a7a9811bdd48250ddefcf73889c55ca.tar.bz2
gentoo-2-a7c91b737a7a9811bdd48250ddefcf73889c55ca.zip
Use EANT_GENTOO_CLASSPATH so that emerge doesn't fail when commons-collections has more than one jar.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/commons-beanutils/ChangeLog7
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild12
2 files changed, 12 insertions, 7 deletions
diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index c6e0dd41a344..d82648a225ee 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/commons-beanutils
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.36 2007/02/11 12:23:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.37 2007/05/17 20:16:39 betelgeuse Exp $
+
+ 17 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+ commons-beanutils-1.6.1-r3.ebuild:
+ Use EANT_GENTOO_CLASSPATH so that emerge doesn't fail when
+ commons-collections has more than one jar.
11 Feb 2007; Vlastimil Babka <caster@gentoo.org>
-commons-beanutils-1.6.1-r2.ebuild, -commons-beanutils-1.7.0-r1.ebuild:
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
index d134bf82e358..56ea013b3ab9 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.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/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.10 2007/02/10 18:59:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.11 2007/05/17 20:16:39 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -19,8 +21,6 @@ COMMON_DEP="
RDEPEND=">=virtual/jre-1.3
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.3
- dev-java/ant-core
- source? ( app-arch/zip )
${COMMON_DEP}"
S="${WORKDIR}/${P}-src"
@@ -28,11 +28,11 @@ S="${WORKDIR}/${P}-src"
src_unpack() {
unpack ${A}
cd "${S}"
-
- echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties
- echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+ java-ant_rewrite-classpath
}
+EANT_GENTOO_CLASSPATH="commons-collections,commons-logging"
+
src_install() {
java-pkg_dojar dist/${PN}*.jar