summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-07-21 10:14:11 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-07-21 10:14:11 +0000
commit14698c3d2f49e5a6192f61ff678c688b2ddfd50d (patch)
tree3739597160ff3fc9a1023bab89c333b70ec10241 /dev-java/jgoodies-forms
parentAdd dependencies needed for examples and use java-pkg_doexamples. (diff)
downloadgentoo-2-14698c3d2f49e5a6192f61ff678c688b2ddfd50d.tar.gz
gentoo-2-14698c3d2f49e5a6192f61ff678c688b2ddfd50d.tar.bz2
gentoo-2-14698c3d2f49e5a6192f61ff678c688b2ddfd50d.zip
Ebuild clean up and fix doc installation.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'dev-java/jgoodies-forms')
-rw-r--r--dev-java/jgoodies-forms/ChangeLog6
-rw-r--r--dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild25
2 files changed, 17 insertions, 14 deletions
diff --git a/dev-java/jgoodies-forms/ChangeLog b/dev-java/jgoodies-forms/ChangeLog
index d622406416dc..570af514a606 100644
--- a/dev-java/jgoodies-forms/ChangeLog
+++ b/dev-java/jgoodies-forms/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jgoodies-forms
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.11 2007/05/23 17:17:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.12 2007/07/21 10:14:11 betelgeuse Exp $
+
+ 21 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+ jgoodies-forms-1.0.7.ebuild:
+ Ebuild clean up and fix doc installation.
23 May 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
index e527af67dded..ac07dd3965a5 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild,v 1.3 2006/12/09 09:20:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.7.ebuild,v 1.4 2007/07/21 10:14:11 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2 eutils
@@ -14,39 +16,36 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_P}.zip"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
DEPEND=">=virtual/jdk-1.4
- >=dev-java/ant-core-1.4
- app-arch/unzip
- source? ( app-arch/zip )"
+ app-arch/unzip"
RDEPEND=">=virtual/jre-1.4"
S="${WORKDIR}/${MY_PN}-${PV}"
src_unpack() {
unpack ${A} || die "Unpack failed"
- cd ${S}
+ cd "${S}"
# Remove the packaged jars
- rm *.jar || die "em failed"
+ rm -v *.jar || die "rm failed"
# No support for junit tests yet
- rm -rf ${S}/src/test
+ rm -rf "${S}/src/test" || die
# patch the build.xml:
epatch "${FILESDIR}/${P}-build.xml.patch"
}
-src_compile() {
- eant jar $(use_doc)
-}
+# Comes in the tarball
+EANT_DOC_TARGET=""
src_install() {
java-pkg_dojar build/${MY_PN}.jar
dodoc RELEASE-NOTES.txt README.html
- use doc && java-pkg_dohtml -r build/doc
+ use doc && java-pkg_dohtml -r docs/*
use source && java-pkg_dosrc src/{core,extras}/com
}