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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64

4 files changed, 92 insertions, 76 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/Manifest b/app-text/jabref/Manifest
index 39ecdfe88255..7631a2441b38 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,10 +1,10 @@
 AUX jabref-2.2-build.xml.patch 1034 RMD160 9821c42b83d8d181bb90478671ddbf05336991c4 SHA1 b42a04ba198e621b599e9fc86137efe4cb2f893d SHA256 4e7d5ab982989c0b824c8795c709fb6ffb25f1c9c414a231bbd228b1fde12435
 AUX jabref-2.4-build.xml.patch 1353 RMD160 7e68d278117434a7774d6c1768486dc20a15b4f6 SHA1 8f9d862f6967af5ebd1060976ceb2a2fd64a9c8a SHA256 d369747567bdeb9a79b4e22a40aec6d66e6789f03e52139a0687b9fb20be374a
-DIST JabRef-2.3-src.tar.bz2 4423952 RMD160 d74740fcf7aebe4c93627b8457ffa6c596ef9cc8 SHA1 d861bee5f73a17ab925c81f51931c122fc7b3c90 SHA256 cc61db942009a725aec6210417ccd64bc46e78441b966f8dbf23d65e2c193cfa
 DIST JabRef-2.3.1-src.tar.bz2 4434828 RMD160 f5f1b55a541dd39c45cafece2b0e0b9fc0aabecc SHA1 0f5379dd9e1d8622d88a3f02d79f52b092f990d2 SHA256 e30bc9b1a5e3c88c36babcaed36c97d3d8d99c968b5a2822c6289fc7e0cfd06f
 DIST JabRef-2.4.1-src.tar.bz2 6897235 RMD160 2dadb30ba1242cd85ae89b41ccc25d706445a816 SHA1 e537f582bf3e9f1baffd93cfbe5add2916bc8aa2 SHA256 689df6cc6e086259d55c8d05860e6a05deb8efed0ab7c791f95c5e54404b883b
+DIST JabRef-2.4.2-src.tar.bz2 6903387 RMD160 200c98803948d3c9791f084d9d02655bc72f154b SHA1 71d299fe2a7459f14b2d8352102d2c58518c6a0c SHA256 00ddb982e7da45cfbd1e23a2d7a016222b84109222480d2bdbff86aab1247c4a
 EBUILD jabref-2.3.1.ebuild 1759 RMD160 577e01da145051c408c1f8827fdcfb4f36fb4f7d SHA1 38cecdf8a5999e03fbbc1cf41e43ffab2b311f5c SHA256 22dbe34ec12a9a333bd6ab39acd8ce2516ea59ed3daec87a1bcb1445ff9cd442
-EBUILD jabref-2.3.ebuild 1757 RMD160 95ac1f1d434e61a124a73b17f948f02233ad6faa SHA1 5d8f11a84d7e55df969efd64a747ccaa063d5a22 SHA256 ffb51d5e9fb87beeefc3f4ea4c635fd8377ae833d6f991d6c2641b69a508fafc
 EBUILD jabref-2.4.1.ebuild 2136 RMD160 a41940b06df1844fda4551b421902a30190aee8d SHA1 cb808c6c231ff982ab66ba2e2db90e96caf7a28b SHA256 462f30e9fd57ef3ade7d6edb00717bc85ef92341fc49ef495966e9b1235bbd68
-MISC ChangeLog 9357 RMD160 02f7c73c395f1a91cd47ba04ba60f64893fd62ee SHA1 d0967563b9f1b7244b19170b209620abd548c4c2 SHA256 89bcdaac8a0a437ce2025daf00c335d91bb5568ee77a1873f56bfabaa7027666
+EBUILD jabref-2.4.2.ebuild 2134 RMD160 f0a25c9120c206cc0d6441723d4b010977c14437 SHA1 ab9e6b1934a897949fb5639f37784c5372c47d4d SHA256 d308d237e199403b740e852907ed11011b77552bc823262ff0b445a82b5ecef4
+MISC ChangeLog 9543 RMD160 d73f1d52e28d151a0c8cbfce280d34a221c8c1f5 SHA1 b99b3c817466bdec852c4105e655fd8339a19231 SHA256 e6db2a9f272f121ddcf8b0c376121f9c7b0c76d9d7cadc7bcad76f4b05ff4542
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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
+}