diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-11-07 17:40:25 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-11-07 17:40:25 +0000 |
| commit | e1843f31ef6783d37884f56defbd40b2c7f5c877 (patch) | |
| tree | 537bb50272f69839092144c0addae032747f071e /dev-java | |
| parent | Re-Keywording for ppc. (diff) | |
| download | gentoo-2-e1843f31ef6783d37884f56defbd40b2c7f5c877.tar.gz gentoo-2-e1843f31ef6783d37884f56defbd40b2c7f5c877.tar.bz2 gentoo-2-e1843f31ef6783d37884f56defbd40b2c7f5c877.zip | |
Update deps to 1.5 jdk - bug #271797. Make hsqldb dep build-only.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jaxme/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jaxme/jaxme-0.5.2.ebuild | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog index a71ae2075d71..8cef4440e716 100644 --- a/dev-java/jaxme/ChangeLog +++ b/dev-java/jaxme/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jaxme # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.28 2009/05/23 00:55:55 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.29 2009/11/07 17:40:25 caster Exp $ + + 07 Nov 2009; Vlastimil Babka <caster@gentoo.org> jaxme-0.5.2.ebuild: + Update deps to 1.5 jdk - bug #271797. Make hsqldb dep build-only. *jaxme-0.5.2 (23 May 2009) diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild index b9c7cf204c14..80c6b2da8b2d 100644 --- a/dev-java/jaxme/jaxme-0.5.2.ebuild +++ b/dev-java/jaxme/jaxme-0.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.1 2009/05/23 00:55:55 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.2 2009/11/07 17:40:25 caster Exp $ EAPI="2" @@ -20,14 +20,14 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="" COMMON_DEP="dev-java/antlr:0[java] - dev-db/hsqldb:0 >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8 dev-java/xmldb:0" -RDEPEND=">=virtual/jre-1.4 +RDEPEND=">=virtual/jre-1.5 ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 +DEPEND=">=virtual/jdk-1.5 + dev-db/hsqldb:0 ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" @@ -39,7 +39,6 @@ java_prepare() { cd "${S}/prerequisites" rm *.jar java-pkg_jarfrom antlr - java-pkg_jarfrom hsqldb hsqldb.jar hsqldb-1.7.1.jar java-pkg_jarfrom junit java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar java-pkg_jarfrom xerces-2 @@ -47,6 +46,8 @@ java_prepare() { java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar java-pkg_jarfrom --build-only ant-core ant.jar ant.jar + # no linking to it, probably should be test only (FIXME) + java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar # Special case: jaxme uses ant/*.xml files, so rewriting them by hand # is better: |