diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2006-12-26 18:12:06 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2006-12-26 18:12:06 +0000 |
| commit | 51214e3dbb6a34ff2293fb284475de52be68a297 (patch) | |
| tree | 2c2af42acd30131b5da2580854fa4a6e2a90311d /dev-java/commons-jelly | |
| parent | Remove old versions (and old patches); fix quoting of patches names; block me... (diff) | |
| download | gentoo-2-51214e3dbb6a34ff2293fb284475de52be68a297.tar.gz gentoo-2-51214e3dbb6a34ff2293fb284475de52be68a297.tar.bz2 gentoo-2-51214e3dbb6a34ff2293fb284475de52be68a297.zip | |
Always needs junit and commons-logging to compile. Relaxed commons-jexl dependency for upcoming version bump and cleaned the ebuild.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'dev-java/commons-jelly')
| -rw-r--r-- | dev-java/commons-jelly/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild | 29 |
2 files changed, 18 insertions, 18 deletions
diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog index 80a7699e54af..97f643474f99 100644 --- a/dev-java/commons-jelly/ChangeLog +++ b/dev-java/commons-jelly/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-jelly # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.4 2006/11/30 15:30:43 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.5 2006/12/26 18:12:06 betelgeuse Exp $ + + 26 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> + commons-jelly-1.0-r1.ebuild: + Always needs junit and commons-logging to compile. Relaxed commons-jexl + dependency for upcoming version bump and cleaned the ebuild. 30 Nov 2006; Vlastimil Babka <caster@gentoo.org> -commons-jelly-1.0.ebuild, commons-jelly-1.0-r1.ebuild: diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild index 8ac699b3aaaa..635a41e8e2d9 100644 --- a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild +++ b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.2 2006/11/30 15:30:43 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.3 2006/12/26 18:12:06 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -21,20 +21,18 @@ RDEPEND=">=virtual/jre-1.4 dev-java/commons-discovery dev-java/forehead dev-java/jakarta-jstl - =dev-java/commons-jexl-1.0* + dev-java/commons-jexl =dev-java/commons-beanutils-1.6* dev-java/commons-collections =dev-java/dom4j-1* =dev-java/jaxen-1.1* - >=dev-java/xerces-2.7" + >=dev-java/xerces-2.7 + dev-java/junit + dev-java/commons-logging" DEPEND=">=virtual/jdk-1.4 dev-java/ant-core - test? ( - dev-java/junit - dev-java/ant-tasks - dev-java/commons-logging - ) + test? ( dev-java/ant-tasks ) ${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -51,18 +49,15 @@ src_unpack() { java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0 java-pkg_jar-from commons-beanutils-1.6,commons-collections java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2 - - if use test; then - java-pkg_jar-from commons-logging - fi + java-pkg_jar-from commons-logging,junit } src_compile() { - local antflags="-Dlibdir=lib jar" - use doc && antflags="${antflags} javadoc" - use test && antflags="${antflags} test" + eant -Dlibdir=lib jar $(use_doc) +} - eant ${antflags} || die "Ant failed" +src_test() { + eant test -Dlibdir=lib } src_install() { @@ -70,6 +65,6 @@ src_install() { dodoc NOTICE.txt README.txt RELEASE-NOTES.txt - use doc && java-pkg_dohtml -r dist/docs/api + use doc && java-pkg_dojavadoc dist/docs/api use source && java-pkg_dosrc src/java/* } |