new upstream version, fixes #88752

Package-Manager: portage-2.0.51.19

5 files changed, 151 insertions, 6 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 2a1a95ce8103..68c64da142b3 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.27 2005/04/04 15:00:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.28 2005/04/11 19:09:18 luckyduck Exp $
+
+*jabref-1.7.1 (11 Apr 2005)
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jabref-1.7.1-nojarbundler.patch, +jabref-1.7.1.ebuild:
+  new upstream version, fixes #88752
 
   04 Apr 2005; Thomas Matthijs <axxo@gentoo.org> jabref-1.6.ebuild,
   jabref-1.7.ebuild:
@@ -17,6 +23,10 @@
   added ~ppc keyword
 
   03 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> jabref-1.7.ebuild:
+  and back again since another ebuild was broken, in this case i am not the one
+  who broke it :)
+
+  03 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> jabref-1.7.ebuild:
   changed a jar-from call to reflect the fact that the forms.jar is installed
   with a version number in the filename
 
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 62b36f8ca19a..12197be660d6 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 6642081408f66c248d56cef094457800 jabref-1.7.1.ebuild 1530
 MD5 edca60023f5698ecb5c42fcedbb7335d jabref-1.7.ebuild 1523
 MD5 ab01553b8ff2277c51dab82ee934f2ca jabref-1.6.ebuild 1349
-MD5 9b6158b74e607208b62380e0f7c06766 ChangeLog 3146
+MD5 277c8d4be4a9f80aab8a2368258cbd54 ChangeLog 3504
 MD5 cc17dbe257be6932f361acfed83e1eb3 jabref-1.5.ebuild 1170
 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 cbea44f392d5789051292d363744705c files/digest-jabref-1.7.1 70
 MD5 1f8c47f49e81868dd718727defee12fa files/digest-jabref-1.5 68
 MD5 a6ad712fbe4fb345a95ff1a70c128a16 files/digest-jabref-1.6 68
 MD5 d229ae67e003f0be52f27a896f6bdeac files/digest-jabref-1.7 68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCUVaR/rLF9B432nYRAvF9AJ97fDQjwACFbtdiZs/bveRErogfdACgnXq/
-RqY8esoMBxI80zB22dtu628=
-=p+Vf
+iD8DBQFCWst406ebR+OMO78RAnHgAJ9mXyPpR670f3XYvlhoUbtNySXWkACeM2Eu
+CGdxzfWd75EYM60b9OBlkH0=
+=ZVQ5
 -----END PGP SIGNATURE-----
diff --git a/app-text/jabref/files/digest-jabref-1.7.1 b/app-text/jabref/files/digest-jabref-1.7.1
new file mode 100644
index 000000000000..22c859b3e1f5
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-1.7.1
@@ -0,0 +1 @@
+MD5 ba5e9d2baacb9e15312b8b9ce65f2bfa JabRef-1.7.1.src.tar.bz2 1721793
diff --git a/app-text/jabref/files/jabref-1.7.1-nojarbundler.patch b/app-text/jabref/files/jabref-1.7.1-nojarbundler.patch
new file mode 100644
index 000000000000..e23f7fcf756c
--- /dev/null
+++ b/app-text/jabref/files/jabref-1.7.1-nojarbundler.patch
@@ -0,0 +1,75 @@
+--- build.xml.orig	2005-04-11 20:54:08.000000000 +0200
++++ build.xml	2005-04-11 20:55:04.000000000 +0200
+@@ -62,9 +62,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" />
+ 
+ 
+ 
+@@ -73,6 +70,7 @@
+ 		<pathelement path="${build.classes}" />
+ 		<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
+ 		<pathelement location="${library.directory}/commons-logging.jar" />
++		<pathelement location="${library.directory}/forms.jar" />
+ 		<fileset dir="${library.directory}">
+ 			<include name="*.jar" />
+ 		</fileset>
+@@ -92,11 +90,11 @@
+ 			<exclude name="tests/**"/>
+ 			<classpath>
+ 				<pathelement path="${build.classes}" />
+-				<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
++				<pathelement location="${library.directory}/commons-httpclient.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}/looks.jar" />
++				<pathelement location="${library.directory}/forms.jar" />
+ 				<pathelement location="${library.directory}/spin.jar" />
+ 			</classpath>
+ 		</javac>
+@@ -150,12 +148,6 @@
+                         <fileset dir="${library.directory}">
+                             <include name="EndNote.zip" />
+                         </fileset>
+-			<fileset dir="${txt.dir}">
+-				<include name="gpl.txt" />
+-				<include name="lesser.txt" />
+-				<include name="apache-license.txt" />
+-				<include name="README" />
+-			</fileset>
+ 			<manifest>
+ 				<attribute name="Main-Class" value="net.sf.jabref.JabRef" />
+ 			</manifest>
+@@ -225,12 +217,12 @@
+ 	<!-- Unpacks jar needed jar files from lib directory into temp directory. -->
+ 	<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-httpclient.jar" dest="${build.tmp}" />
+ 		<unjar src="${library.directory}/commons-logging.jar" dest="${build.tmp}" />
+ 		<unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
+ 		<!--                <unjar src="${library.directory}/plastic-1.2.1.jar" dest="${build.classes}" />-->
+-		<unjar src="${library.directory}/looks-1.2.2.jar" dest="${build.tmp}" />
+-		<unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
++		<unjar src="${library.directory}/looks.jar" dest="${build.tmp}" />
++		<unjar src="${library.directory}/forms.jar" dest="${build.tmp}" />
+ 		<unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />
+ 		<delete dir="${build.tmp}/META-INF"/>
+ 	</target>
+@@ -360,8 +352,8 @@
+ 				<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}/looks-1.2.2.jar" />
++				<pathelement location="${library.directory}/looks.jar" />
++				<pathelement location="${library.directory}/looks.jar" />
+ 				<pathelement location="${library.directory}/spin.jar" />
+ 			</classpath>
+ 
diff --git a/app-text/jabref/jabref-1.7.1.ebuild b/app-text/jabref/jabref-1.7.1.ebuild
new file mode 100644
index 000000000000..c82e98703d74
--- /dev/null
+++ b/app-text/jabref/jabref-1.7.1.ebuild
@@ -0,0 +1,56 @@
+# 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.7.1.ebuild,v 1.1 2005/04/11 19:09:18 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}.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*"
+
+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}
+}