new upstream version, added patch to remove jarbundler dependency which is only needed for macosx.

(Portage version: 2.0.51.19)

5 files changed, 130 insertions, 1 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index c6a23234c5eb..c5263482c6d3 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2005/01/28 14:57:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.21 2005/03/28 20:47:14 luckyduck Exp $
+
+*jabref-1.7 (28 Mar 2005)
+
+  28 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jabref-1.7-nojarbundler.patch, +jabref-1.7.ebuild:
+  new upstream version, added patch to remove jarbundler dependency which is
+  only needed for macosx.
 
   28 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jabref-1.6.ebuild:
   added missing junit depend. fixes #79776
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 5a4245eb2e0c..2ef72362554d 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,6 +1,9 @@
+MD5 2e68bc4c1b0169752ae041d800ff0321 jabref-1.7.ebuild 1467
 MD5 35816cc08aa80eba835f871625bfab25 jabref-1.6.ebuild 1361
 MD5 0e23fe2eeb13f48f16fd611e53daae08 ChangeLog 2189
 MD5 1b0f0fe8fbbc6763f897f6c9ba79ce36 jabref-1.5.ebuild 1239
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 3d6ae9f90fac167b5ab3261cb88584d4 files/jabref-1.7-nojarbundler.patch 3153
 MD5 1f8c47f49e81868dd718727defee12fa files/digest-jabref-1.5 68
 MD5 a6ad712fbe4fb345a95ff1a70c128a16 files/digest-jabref-1.6 68
+MD5 d229ae67e003f0be52f27a896f6bdeac files/digest-jabref-1.7 68
diff --git a/app-text/jabref/files/digest-jabref-1.7 b/app-text/jabref/files/digest-jabref-1.7
new file mode 100644
index 000000000000..dbb611226214
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-1.7
@@ -0,0 +1 @@
+MD5 1402f44d41f26ac422bec65ce1a19ccf JabRef-1.7-src.tar.bz2 1716324
diff --git a/app-text/jabref/files/jabref-1.7-nojarbundler.patch b/app-text/jabref/files/jabref-1.7-nojarbundler.patch
new file mode 100644
index 000000000000..118800d83436
--- /dev/null
+++ b/app-text/jabref/files/jabref-1.7-nojarbundler.patch
@@ -0,0 +1,62 @@
+--- build.xml.orig	2005-03-28 20:13:10.394118008 +0200
++++ build.xml	2005-03-28 21:20:41.274290616 +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>
+@@ -225,12 +223,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 +358,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.ebuild b/app-text/jabref/jabref-1.7.ebuild
new file mode 100644
index 000000000000..7b8177f3efbf
--- /dev/null
+++ b/app-text/jabref/jabref-1.7.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.ebuild,v 1.1 2005/03/28 20:47:14 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"
+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.0.5
+	=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 looks.jar
+	java-pkg_jar-from jgoodies-forms forms.jar
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from commons-httpclient commons-httpclient.jar
+}
+
+
+src_compile() {
+	local antflags="compile unjarlib jars"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	echo "#!/bin/sh" > ${PN}
+	echo '$(java-config -J) -jar $(java-config -p jabref)' '$*' >> ${PN}
+
+	dobin ${PN}
+}