summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-01-26 18:24:57 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-01-26 18:24:57 +0000
commit8403aea26dc4c5656928b4c5184bff0b897b5275 (patch)
tree622f4f7489f1741df0755c1b15d38d44da9ea9a5
parentMarked stable on amd64 Mark stable; there are themes that don't work with 2.16.0 (diff)
downloadgentoo-2-8403aea26dc4c5656928b4c5184bff0b897b5275.tar.gz
gentoo-2-8403aea26dc4c5656928b4c5184bff0b897b5275.tar.bz2
gentoo-2-8403aea26dc4c5656928b4c5184bff0b897b5275.zip
Ebuild cleanup. Use dojavadoc.
(Portage version: 2.1.2-r4)
-rw-r--r--dev-java/commons-beanutils/ChangeLog6
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild14
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild14
3 files changed, 15 insertions, 19 deletions
diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index 8584d2f3e334..d4f66dd27ce8 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,10 @@
# 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.31 2007/01/11 13:18:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.32 2007/01/26 18:24:57 betelgeuse Exp $
+
+ 26 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+ commons-beanutils-1.6.1-r3.ebuild, commons-beanutils-1.7.0-r2.ebuild:
+ Ebuild cleanup. Use dojavadoc.
11 Jan 2007; Markus Rothe <corsair@gentoo.org>
commons-beanutils-1.6.1-r3.ebuild, commons-beanutils-1.7.0-r2.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 77acb3dd6881..bc0b33b7f604 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,6 @@
# 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.6 2007/01/11 13:18:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.7 2007/01/26 18:24:57 betelgeuse Exp $
inherit java-pkg-2 java-ant-2
@@ -27,22 +27,18 @@ S="${WORKDIR}/${P}-src"
src_unpack() {
unpack ${A}
- cd ${S}
+ 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
}
-src_compile() {
- eant $(use_doc) jar
-}
-
src_install() {
java-pkg_dojar dist/${PN}*.jar
- dodoc RELEASE-NOTES.txt
- java-pkg_dohtml STATUS.html PROPOSAL.html
+ dodoc RELEASE-NOTES.txt ||
+ dohtml STATUS.html PROPOSAL.html || die
- use doc && java-pkg_dohtml -r dist/docs/*
+ use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/org
}
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
index 37286ea3beae..f248ed6f5cda 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
@@ -1,6 +1,6 @@
# 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.7.0-r2.ebuild,v 1.6 2007/01/11 13:18:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild,v 1.7 2007/01/26 18:24:57 betelgeuse Exp $
inherit java-pkg-2 java-ant-2
@@ -27,22 +27,18 @@ S="${WORKDIR}/${P}-src"
src_unpack() {
unpack ${A}
- cd ${S}
+ 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
}
-src_compile() {
- eant $(use_doc) jar
-}
-
src_install() {
java-pkg_dojar dist/${PN}*.jar
- dodoc RELEASE-NOTES.txt
- java-pkg_dohtml STATUS.html PROPOSAL.html
+ dodoc RELEASE-NOTES.txt || die
+ dohtml STATUS.html PROPOSAL.html || die
- use doc && java-pkg_dohtml -r dist/docs/*
+ use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/*
}