Version bump, bug #236505. Bundles jpfcodegen for now due to unavailable homepage. Had to drop keywords for new dep.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1-perfctr x86_64

4 files changed, 128 insertions, 12 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 30e6c2b00328..0617052f2123 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,13 @@
 # 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.65 2008/05/02 09:31:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.66 2008/10/11 22:06:17 caster Exp $
+
+*jabref-2.4.1 (11 Oct 2008)
+
+  11 Oct 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/jabref-2.4-build.xml.patch, +jabref-2.4.1.ebuild:
+  Version bump, bug #236505. Bundles jpfcodegen for now due to unavailable
+  homepage. Had to drop keywords for new dep.
 
   02 May 2008; Christian Faulhammer <opfer@gentoo.org> jabref-2.3.1.ebuild:
   stable x86, bug 219635
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 78746ef26f30..69d77cb39885 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 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
-MISC ChangeLog 9007 RMD160 2ad551423485d4e120da9a6256531db914e7aa11 SHA1 95a142bba9eda62425be789c4dd239023089f662 SHA256 f49efb39a03a53af86cf96ccc81ac42f88f77415281d42ba24d67d8f32d2d7ff
+EBUILD jabref-2.4.1.ebuild 2131 RMD160 be275e09f29965aa8c5499c2d3f1c4778c6800e8 SHA1 82ed44eaaa77552d91f85aec1c01d905ef0a3327 SHA256 d4d250c15adc8f6c2ac64ea2b0e7ac7f7296b498f4222d5a56d1a1658fe9aa94
+MISC ChangeLog 9269 RMD160 b3865efc944b4e5c874436593bfb9fc25513aedf SHA1 22ee77fea24e5401e383a26b29c3d34aba5e5b81 SHA256 6ebec85b56468314fcb7f30347f007df8ae847612de80adc357f25f7181df023
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkga34MACgkQNQqtfCuFneNcogCfY/VeCSqoMEMer2zQL6QFV2O2
-dv0An17YvbTMhppiw3g59+hh830NANXW
-=fDlD
------END PGP SIGNATURE-----
diff --git a/app-text/jabref/files/jabref-2.4-build.xml.patch b/app-text/jabref/files/jabref-2.4-build.xml.patch
new file mode 100644
index 000000000000..b8a44bc8ffe6
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.4-build.xml.patch
@@ -0,0 +1,35 @@
+--- build.xml	2008-09-17 22:45:35.000000000 +0200
++++ build.xml	2008-09-17 22:46:39.000000000 +0200
+@@ -171,7 +171,7 @@
+ 
+ 	<!-- Run the JPF Code Generator -->
+ 	<target name="generate" unless="needsNoRegenerate">
+-		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true">
++		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true" failonerror="true">
+ 			<arg value="${plugin.dir}" />
+ 			<classpath refid="codegenerator" />
+ 		</java>
+@@ -217,7 +217,7 @@
+ 	</target>
+ 
+ 	<!-- Jars up project -->
+-	<target name="jars" depends="build, unjarlib">
++	<target name="jars" depends="build">
+ 		<mkdir dir="${build.lib}" />
+ 		<mkdir dir="${build.tmp}" />
+ 		<jar destfile="${build.lib}/${build.jar}">
+@@ -403,6 +403,7 @@
+ 
+ 
+ 	<target name="osxjar">
++		<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+ 		<jarbundler dir="${build.lib}" name="JabRef" mainclass="net.sf.jabref.JabRef" jars="${build.lib}/${build.jar}" icon="${images.dir}/JabRef-Logo.icns" version="${jabref.version}" jvmversion="1.4+" stubfile="${lib.dir}/JavaApplicationStub" />
+ 	</target>
+ 
+@@ -611,6 +612,5 @@
+ 		</jalopy>
+ 	</target>
+ 
+-	<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+ 
+ </project>
diff --git a/app-text/jabref/jabref-2.4.1.ebuild b/app-text/jabref/jabref-2.4.1.ebuild
new file mode 100644
index 000000000000..83b78002b105
--- /dev/null
+++ b/app-text/jabref/jabref-2.4.1.ebuild
@@ -0,0 +1,81 @@
+# 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.1.ebuild,v 1.1 2008/10/11 22:06:17 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"
+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"
+
+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
+	mv lib/plugin/JPFCodeGen* libs/ || die
+
+	rm -v lib/*.jar lib/plugin/*.jar \
+		src/java/net/sf/jabref/plugin/core/generated/*.java || die
+
+	mv libs/JPFCodeGen* lib/plugin/ || die
+	java-utils-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	local gcp=$(java-pkg_getjars antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox,commons-logging,jpf-1.5)
+	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
+	java-pkg_dojar lib/plugin/JPFCodeGenerator-rt.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
+}