Version bump, bug #245207. No more bundling of jpfcodegen.

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64)

3 files changed, 89 insertions, 73 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 7d0e21500775..1452091ba1fb 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.67 2008/10/12 09:26:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.68 2008/12/23 11:35:31 caster Exp $
+
+*jabref-2.4.2 (23 Dec 2008)
+
+  23 Dec 2008; Vlastimil Babka <caster@gentoo.org> -jabref-2.3.ebuild,
+  +jabref-2.4.2.ebuild:
+  Version bump, bug #245207. No more bundling of jpfcodegen.
 
   12 Oct 2008; Vlastimil Babka <caster@gentoo.org> jabref-2.4.1.ebuild:
   Restore ~x86
diff --git a/app-text/jabref/jabref-2.3.ebuild b/app-text/jabref/jabref-2.3.ebuild
deleted file mode 100644
index dbf0e95faa41..000000000000
--- a/app-text/jabref/jabref-2.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.3.ebuild,v 1.5 2008/02/29 17:51:16 carlo Exp $
-
-JAVA_PKG_IUSE="doc"
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="GUI frontend for BibTeX, written in Java"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-CDEPEND="dev-java/spin
-	>=dev-java/glazedlists-1.5.0
-	>=dev-java/antlr-2.7.3
-	>=dev-java/jgoodies-forms-1.1.0
-	>=dev-java/jgoodies-looks-2.0
-	>=dev-java/microba-0.4.3
-	dev-java/jempbox
-	dev-java/pdfbox"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# moves jarbundler definition to where it's needed (not by us)
-	# don't call unjarlib, don't want to absorb deps
-	epatch "${FILESDIR}/${PN}-2.2-build.xml.patch"
-
-	mkdir libs
-	mv lib/antlr-3* libs/antlr3.jar
-	rm -v lib/*
-
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-
-	local gcp=$(java-pkg_getjars antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox)
-	gcp="${gcp}:libs/antlr3.jar"
-	eant -Dgentoo.classpath="${gcp}" jars \
-		$(use_doc -Dbuild.javadocs=build/docs/api javadocs)
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-	java-pkg_dojar libs/antlr3.jar
-
-	use doc && java-pkg_dojavadoc build/docs/api
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} \
-		--main net.sf.jabref.JabRef
-
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png || die
-	make_desktop_entry jabref JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.4.2.ebuild b/app-text/jabref/jabref-2.4.2.ebuild
new file mode 100644
index 000000000000..e2f13eeb8bdb
--- /dev/null
+++ b/app-text/jabref/jabref-2.4.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.4.2.ebuild,v 1.1 2008/12/23 11:35:31 caster Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc"
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="GUI frontend for BibTeX, written in Java"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/spin:0
+	>=dev-java/glazedlists-1.7.0:0[java5]
+	>=dev-java/antlr-2.7.3:0[java]
+	>=dev-java/jgoodies-forms-1.1.0:0
+	dev-java/jgoodies-looks:2.0
+	>=dev-java/microba-0.4.3:0
+	dev-java/jempbox:0
+	dev-java/pdfbox:0
+	dev-java/commons-logging:0
+	dev-java/jpf:1.5
+	dev-java/jpfcodegen:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# moves jarbundler definition to where it's needed (not by us)
+	# don't call unjarlib, don't want to absorb deps
+	# failonerror in jpfcodegen
+	epatch "${FILESDIR}/${PN}-2.4-build.xml.patch"
+
+	mkdir libs || die
+	mv lib/antlr-3.0b5.jar libs/ || die
+
+	rm -v lib/*.jar lib/plugin/*.jar \
+		src/java/net/sf/jabref/plugin/core/generated/*.java || die
+
+	java-utils-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	local gcp=$(java-pkg_getjars --with-dependencies antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox,commons-logging,jpf-1.5,jpfcodegen)
+	gcp="${gcp}:libs/antlr-3.0b5.jar"
+	eant -Dgentoo.classpath="${gcp}" jars \
+		$(use_doc -Dbuild.javadocs=build/docs/api javadocs)
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+	java-pkg_dojar libs/antlr-3.0b5.jar
+
+	use doc && java-pkg_dojavadoc build/docs/api
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} \
+		--main net.sf.jabref.JabRef
+
+	dodir /usr/share/${PN}/lib/plugins
+	keepdir /usr/share/${PN}/lib/plugins
+
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png || die
+	make_desktop_entry jabref JabRef JabRef-icon Office
+}