summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text/jabref/jabref-2.1.ebuild')
-rw-r--r--app-text/jabref/jabref-2.1.ebuild31
1 files changed, 13 insertions, 18 deletions
diff --git a/app-text/jabref/jabref-2.1.ebuild b/app-text/jabref/jabref-2.1.ebuild
index 34d53c648d0e..98df4bf08712 100644
--- a/app-text/jabref/jabref-2.1.ebuild
+++ b/app-text/jabref/jabref-2.1.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/app-text/jabref/jabref-2.1.ebuild,v 1.6 2007/03/02 19:19:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.1.ebuild,v 1.7 2007/03/02 19:52:29 caster Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -13,30 +13,28 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="doc"
-RDEPEND=">=virtual/jre-1.4
- dev-java/spin
+CDEPEND="dev-java/spin
>=dev-java/glazedlists-1.5.0
>=dev-java/antlr-2.7.3
dev-java/jgoodies-forms
=dev-java/jgoodies-looks-2.0*
>=dev-java/microba-0.4.3"
-
-DEPEND="${RDEPEND}
- >=virtual/jdk-1.4
- >=dev-java/ant-core-1.4.1"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.4"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.4"
src_unpack() {
unpack ${A}
cd "${S}"
- # TODO submit upstream
- epatch "${FILESDIR}/${PN}-2.1-fix_jarbundler.patch"
+ # TODO submit upstream (was mailed after 2.2 release)
+ epatch "${FILESDIR}/${P}-fix_jarbundler.patch"
# cleans up the way the classpath is setup in build.xml.
# in particular, it makes it use *.jar instead of particular files
- epatch "${FILESDIR}/${PN}-2.1-classpath_cleanup.patch"
+ epatch "${FILESDIR}/${P}-classpath_cleanup.patch"
- rm lib/*
- cd lib
+ rm lib/* && cd lib
java-pkg_jar-from antlr
java-pkg_jar-from spin
@@ -44,18 +42,15 @@ src_unpack() {
java-pkg_jar-from jgoodies-looks-2.0
java-pkg_jar-from jgoodies-forms
java-pkg_jar-from microba
-
}
-
-src_compile() {
- eant jars $(use_doc -Dbuild.javadocs=build/docs/api javadocs)
-}
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="-Dbuild.javadocs=build/docs/api javadocs"
src_install() {
java-pkg_dojar build/lib/${PN}.jar
- use doc && java-pkg_dohtml -r build/docs/api
+ use doc && java-pkg_dojavadoc build/docs/api
dodoc src/txt/README
java-pkg_dolauncher ${PN} \