diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-04-26 21:24:26 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-04-26 21:24:26 +0000 |
| commit | 7cbf4f849e785720b2fed578f442b4d18be2451a (patch) | |
| tree | 9ee5c7f91b531ba3ad46975b1b3b15c4a0ff6cc0 | |
| parent | remove 1.226, 250 is as stable as 226. Add patch for 'group with', fixes Bug ... (diff) | |
| download | gentoo-2-7cbf4f849e785720b2fed578f442b4d18be2451a.tar.gz gentoo-2-7cbf4f849e785720b2fed578f442b4d18be2451a.tar.bz2 gentoo-2-7cbf4f849e785720b2fed578f442b4d18be2451a.zip | |
Add missing junit dep, minor style tweaks.
(Portage version: 2.1.2.4)
| -rw-r--r-- | dev-java/xjavadoc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/dev-java/xjavadoc/ChangeLog b/dev-java/xjavadoc/ChangeLog index 931b63e4af08..a0ca2aa41828 100644 --- a/dev-java/xjavadoc/ChangeLog +++ b/dev-java/xjavadoc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/xjavadoc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.10 2007/04/14 19:43:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/ChangeLog,v 1.11 2007/04/26 21:24:26 caster Exp $ + + 26 Apr 2007; Vlastimil Babka <caster@gentoo.org> xjavadoc-1.1-r1.ebuild: + Add missing junit dep, minor style tweaks. 14 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> xjavadoc-1.1-r1.ebuild: Migrate to splitted ant. diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild index 503994cc6599..f6a5635ddb82 100644 --- a/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild +++ b/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild @@ -1,7 +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/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.5 2007/04/14 19:43:33 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavadoc/xjavadoc-1.1-r1.ebuild,v 1.6 2007/04/26 21:24:26 caster Exp $ +JAVA_PKG_IUSE="source" inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet" @@ -12,36 +13,34 @@ SRC_URI="mirror://sourceforge/xdoclet/${P}-src.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="source" +IUSE="" -COMMON_DEPEND="dev-java/commons-collections" +COMMON_DEPEND="dev-java/commons-collections + =dev-java/junit-3*" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" DEPEND=">=virtual/jdk-1.4 || ( dev-java/ant-nodeps dev-java/ant-tasks ) dev-java/javacc - ${COMMON_DEPEND} - source? ( app-arch/zip )" + ${COMMON_DEPEND}" src_unpack() { unpack ${A} - cd "${S}" + # remove the junit tests, would need xdoclet, causing circular dep epatch ${FILESDIR}/${P}-nojunit.patch cd "${S}/lib" rm -v *.jar || die - java-pkg_jar-from commons-collections + java-pkg_jar-from commons-collections,junit java-pkg_jar-from --build-only javacc } -src_compile() { - ANT_TASKS="ant-nodeps" eant jar -} +EANT_ANT_TASKS="ant-nodeps" src_install() { java-pkg_dojar target/${PN}.jar - use source && java-pkg_dosrc ${S}/src/* + use source && java-pkg_dosrc src/* } |