New upstream version, fixes #95711.

(Portage version: 2.0.51.22-r1)

5 files changed, 127 insertions, 11 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 1cba8197f763..4a73915be40b 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.31 2005/05/27 21:03:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.32 2005/06/11 13:55:19 luckyduck Exp $
+
+*jabref-1.8_beta (11 Jun 2005)
+
+  11 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jabref-1.8_beta-nojarbundler.patch, +jabref-1.8_beta.ebuild:
+  New upstream version, fixes #95711.
 
 *jabref-1.7.1-r1 (27 May 2005)
 
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 7ef33c0186bd..0b94e0e82c6d 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 eecd18067cc0b09b3c67717855f0d0fb jabref-1.7.1-r1.ebuild 1643
 MD5 302e77b9eade9cbd2d536633152bc435 jabref-1.7.ebuild 1525
+MD5 ec7bb79c7c13fa974c09abce733cc326 jabref-1.8_beta.ebuild 1679
 MD5 f02102d2c1caf590c463927c75fca220 ChangeLog 3993
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 3d6ae9f90fac167b5ab3261cb88584d4 files/jabref-1.7-nojarbundler.patch 3153
 MD5 95ffcffd70b173a4f8956d0afdc47da4 files/jabref-1.7.1-nojarbundler.patch 3616
 MD5 d229ae67e003f0be52f27a896f6bdeac files/digest-jabref-1.7 68
 MD5 5b3028166c382f310e75f818ad5a744e files/digest-jabref-1.7.1-r1 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCl4tD06ebR+OMO78RApgbAJ9K+UAOPpYZIgfEE9MC9ot/f5fQkwCeLUS1
-8wSLKpV7zWCIjthqslcd/2w=
-=UNzs
------END PGP SIGNATURE-----
+MD5 3a9ac7073a9bf1e5846ffdc2bdf26c67 files/digest-jabref-1.8_beta 69
+MD5 280fb96a2fe36be70c17a115248befcf files/jabref-1.8_beta-nojarbundler.patch 2364
diff --git a/app-text/jabref/files/digest-jabref-1.8_beta b/app-text/jabref/files/digest-jabref-1.8_beta
new file mode 100644
index 000000000000..4fb884efd8b6
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-1.8_beta
@@ -0,0 +1 @@
+MD5 907e01c53dc9f27f81a479f0ecd2b4a2 JabRef-1.8b-src.tar.bz2 1668473
diff --git a/app-text/jabref/files/jabref-1.8_beta-nojarbundler.patch b/app-text/jabref/files/jabref-1.8_beta-nojarbundler.patch
new file mode 100644
index 000000000000..ebc19fcc3ebe
--- /dev/null
+++ b/app-text/jabref/files/jabref-1.8_beta-nojarbundler.patch
@@ -0,0 +1,54 @@
+--- build.xml.orig	2005-06-11 11:49:00.000000000 +0200
++++ build.xml	2005-06-11 11:51:40.000000000 +0200
+@@ -64,9 +64,6 @@
+         <!-- Set the properties for library directories -->
+         <property name="library.directory" value="lib" />
+ 
+-      <taskdef name="jarbundler"
+-                  classpath="${library.directory}/jarbundler-1.4.jar"
+-                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+ 
+ 
+ 
+@@ -85,12 +82,9 @@
+         <java classname="net.sf.jabref.JabRef" fork="true">
+         <classpath>
+             <pathelement location="${build.lib}/jabref.jar"/>
+-            <pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
+-            <pathelement location="${library.directory}/commons-logging.jar" />
+-            <pathelement location="${library.directory}/antlr.jar" />
+-            <pathelement location="${library.directory}/looks-1.2.2.jar" />
+-            <pathelement location="${library.directory}/forms-1.0.4.jar" />
+-            <pathelement location="${library.directory}/spin.jar" />
++		<fileset dir="${library.directory}">
++			<include name="*.jar" />
++		</fileset>
+         </classpath>
+          </java>
+     </target>
+@@ -105,12 +99,9 @@
+ 			<exclude name="tests/**"/>
+ 			<classpath>
+ 				<pathelement path="${build.classes}" />
+-				<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
+-				<pathelement location="${library.directory}/commons-logging.jar" />
+-				<pathelement location="${library.directory}/antlr.jar" />
+-				<pathelement location="${library.directory}/looks-1.2.2.jar" />
+-				<pathelement location="${library.directory}/forms-1.0.4.jar" />
+-				<pathelement location="${library.directory}/spin.jar" />
++		<fileset dir="${library.directory}">
++			<include name="*.jar" />
++		</fileset>
+ 			</classpath>
+ 		</javac>
+ 	</target>
+@@ -238,7 +229,8 @@
+         </target>
+ 
+         <!-- Unpacks jar needed jar files from lib directory into temp directory. -->
+-        <target name="unjarlib" description="Unpacks jars from library">
++	
++	<target name="unjarlib" description="Unpacks jars from library">
+                 <mkdir dir="${build.tmp}"/>
+                 <unjar src="${library.directory}/commons-httpclient-2.0.jar" dest="${build.tmp}" />
+                 <unjar src="${library.directory}/commons-logging.jar" dest="${build.tmp}" />
diff --git a/app-text/jabref/jabref-1.8_beta.ebuild b/app-text/jabref/jabref-1.8_beta.ebuild
new file mode 100644
index 000000000000..34378e81ccc2
--- /dev/null
+++ b/app-text/jabref/jabref-1.8_beta.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-1.8_beta.ebuild,v 1.1 2005/06/11 13:55:19 luckyduck Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="GUI frontend for BibTeX, written in Java"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${PV/_beta/b}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="jikes"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-1.4.1
+	jikes? ( dev-java/jikes )
+	dev-java/junit"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/spin
+	>=dev-java/antlr-2.7.3
+	=dev-java/jgoodies-forms-1*
+	=dev-java/jgoodies-looks-1.2*
+	>=dev-java/commons-logging-1.0.4
+	=dev-java/commons-httpclient-2*"
+
+S=${WORKDIR}/${P/_beta/b}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-nojarbundler.patch
+
+	cd ${S}/lib && rm -f *.jar
+	java-pkg_jar-from antlr
+	java-pkg_jar-from spin
+	java-pkg_jar-from jgoodies-looks-1.2
+	java-pkg_jar-from jgoodies-forms
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from commons-httpclient commons-httpclient.jar
+}
+
+
+src_compile() {
+	local antflags="jars"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	echo "#!/bin/bash" > ${PN}
+	echo '$(java-config -J) -classpath $(java-config -p commons-httpclient,commons-logging,antlr,jgoodies-forms,jgoodies-looks-1.2,spin,jabref) net.sf.jabref.JabRef "$@"' >> ${PN}
+
+	dobin ${PN}
+
+	newicon src/images/JabRef-icon.png JabRef-icon.png
+	make_desktop_entry jabref JabRef JabRef-icon.png Office
+}