version bump, thanks to Josh Nichols

(Portage version: 2.0.51.22-r2)

6 files changed, 214 insertions, 11 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 9b82637d20d8..29d50dca187b 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.33 2005/08/28 01:31:25 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.34 2005/09/11 13:40:15 axxo Exp $
+
+*jabref-1.8 (11 Sep 2005)
+
+  11 Sep 2005; Thomas Matthijs <axxo@gentoo.org>
+  +files/jabref-1.8-classpath_cleanup.patch,
+  +files/jabref-1.8-fix_jarbundler.patch, +jabref-1.8.ebuild:
+  version bump, thanks to Josh Nichols
 
   28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> jabref-1.7.1-r1.ebuild:
   Stable on amd64.
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 23faa89a45f6..93fd7599a9c9 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,21 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 faeb323c83319b1a5b34342cb9ea7f2f jabref-1.7.1-r1.ebuild 1646
 MD5 dd486b35ee2ca674a0b490d27f945d77 jabref-1.7.ebuild 1532
 MD5 451cda0c3d111590d6d0cd62de2d6659 jabref-1.8_beta.ebuild 1686
+MD5 87194ea9606fbf33610beb060be6fd75 jabref-1.8.ebuild 1805
 MD5 4e82f8fde81a74e7f2d11ca943df42f1 ChangeLog 4278
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 ecd0980ac0a8147eddf0141cb6735623 files/jabref-1.8-fix_jarbundler.patch 926
 MD5 3d6ae9f90fac167b5ab3261cb88584d4 files/jabref-1.7-nojarbundler.patch 3153
+MD5 280fb96a2fe36be70c17a115248befcf files/jabref-1.8-nojarbundler.patch 2364
 MD5 95ffcffd70b173a4f8956d0afdc47da4 files/jabref-1.7.1-nojarbundler.patch 3616
 MD5 d229ae67e003f0be52f27a896f6bdeac files/digest-jabref-1.7 68
+MD5 008da3292b19b877ec94155af9f36be3 files/digest-jabref-1.8 68
+MD5 cfa957ae95e31719e0deeef0139b4fef files/jabref-1.8-classpath_cleanup.patch 6558
 MD5 5b3028166c382f310e75f818ad5a744e files/digest-jabref-1.7.1-r1 70
 MD5 3a9ac7073a9bf1e5846ffdc2bdf26c67 files/digest-jabref-1.8_beta 69
 MD5 280fb96a2fe36be70c17a115248befcf files/jabref-1.8_beta-nojarbundler.patch 2364
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDERP7ntT9W3vfTuoRAvL5AKCyWdPiyKLv7Ywkc8Ihd3i3nmh3OgCfZw9/
-u/gWnFNHal+BMI/S93dWsAI=
-=HAS9
------END PGP SIGNATURE-----
diff --git a/app-text/jabref/files/digest-jabref-1.8 b/app-text/jabref/files/digest-jabref-1.8
new file mode 100644
index 000000000000..7cf7d0b58554
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-1.8
@@ -0,0 +1 @@
+MD5 4f498ea7f949432cceda08f3d99edc2b JabRef-1.8-src.tar.bz2 1441172
diff --git a/app-text/jabref/files/jabref-1.8-classpath_cleanup.patch b/app-text/jabref/files/jabref-1.8-classpath_cleanup.patch
new file mode 100644
index 000000000000..873612407cc0
--- /dev/null
+++ b/app-text/jabref/files/jabref-1.8-classpath_cleanup.patch
@@ -0,0 +1,109 @@
+diff -ru jabref-1.8/build.xml jabref-1.8-patched/build.xml
+--- jabref-1.8/build.xml	2005-07-26 19:53:09.000000000 -0400
++++ jabref-1.8-patched/build.xml	2005-08-10 08:27:04.000000000 -0400
+@@ -117,15 +117,7 @@
+                 <javac debug="on" deprecation="on" destdir="${build.classes}" source="1.4" target="1.4">
+                         <src path="${java.dir}"/>
+                         <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" />
+-                        </classpath>
++                        <classpath refid="classpath"/>
+                 </javac>
+         </target>
+ 
+@@ -134,14 +126,7 @@
+                 <mkdir dir="${build.classes}" />
+                 <!--deprecation="on"-->
+                 <javac srcdir="${java.dir}/tests" debug="off" destdir="${build.classes}" source="1.4" target="1.4">
+-                        <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}/spin.jar" />
+-                        </classpath>
++                        <classpath refid="classpath"/>
+                 </javac>
+ 
+         </target>
+@@ -309,12 +294,7 @@
+         <target name="pmd" description="SOFTWAREDESIGN: Project Mess Detector !;-)">
+                 <echo>Checking Project Mess Detection (PMD) rulesets.</echo>
+                 <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
+-                        <classpath>
+-                                <pathelement path="${classpath}" />
+-                                <fileset dir="${library.directory}">
+-                                        <include name="*.jar" />
+-                                </fileset>
+-                        </classpath>
++                        <classpath refid="classpath"/>
+                 </taskdef>
+                 <!-- allowed Pretty Much Done rulsets -->
+                 <!-- rulesets/basic.xml -->
+@@ -345,12 +325,7 @@
+                 <echo>WARNING: use environment variable: ANT_OPTS=-Xmx512m or this task will fail.</echo>
+                 <echo>Checking for duplicated code using the Copy/Paste Detector (CPD).</echo>
+                 <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask">
+-                        <classpath>
+-                                <pathelement path="${classpath}" />
+-                                <fileset dir="${library.directory}">
+-                                        <include name="*.jar" />
+-                                </fileset>
+-                        </classpath>
++                        <classpath refid="classpath"/>
+                 </taskdef>
+                 <cpd format="text" minimumTokenCount="100" outputFile="${build.dir}/duplicated_code_report.txt">
+                         <fileset dir="${src.dir}">
+@@ -362,12 +337,7 @@
+ 
+         <target name="javancss" description="SOFTWAREDESIGN: Determining the NCSS and CCN code metrics for JOELib.">
+                 <taskdef name="javancss" classname="javancss.JavancssAntTask">
+-                        <classpath>
+-                                <pathelement path="${classpath}" />
+-                                <fileset dir="${library.directory}">
+-                                        <include name="*.jar" />
+-                                </fileset>
+-                        </classpath>
++                        <classpath refid="classpath"/>
+                 </taskdef>
+                 <echo>Cyclomatic
+ Complexity             Ease of       Risk
+@@ -385,12 +355,7 @@
+ 
+         <target name="jalopy" description="SOFTWAREDESIGN: source code formatter using the JOELib convention.">
+                 <taskdef name="jalopy" classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+-                        <classpath>
+-                                <pathelement path="${classpath}" />
+-                                <fileset dir="${library.directory}">
+-                                        <include name="*.jar" />
+-                                </fileset>
+-                        </classpath>
++                        <classpath refid="classpath"/>
+                 </taskdef>
+                 <jalopy fileformat="unix" convention="${src.dir}/java/jalopy.format.convention.xml" history="file" historymethod="adler32" loglevel="error" threads="2" classpathref="classpath" backup="bak">
+                         <fileset dir="${src.dir}">
+@@ -408,15 +373,7 @@
+                                 </fileset>
+                         </batchtest>
+ 
+-                        <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}/looks-1.2.2.jar" />
+-                                <pathelement location="${library.directory}/spin.jar" />
+-                        </classpath>
++                        <classpath refid="classpath"/>
+ 
+                         <!--<test name="tests.net.sf.jabref.export.layout.format.AuthorLastFirstAbbreviatorTester"/>-->
+                 </junit>
diff --git a/app-text/jabref/files/jabref-1.8-fix_jarbundler.patch b/app-text/jabref/files/jabref-1.8-fix_jarbundler.patch
new file mode 100644
index 000000000000..6272dca9e0e0
--- /dev/null
+++ b/app-text/jabref/files/jabref-1.8-fix_jarbundler.patch
@@ -0,0 +1,25 @@
+diff -ru jabref-1.8/build.xml jabref-1.8-patched/build.xml
+--- jabref-1.8/build.xml	2005-07-26 19:53:09.000000000 -0400
++++ jabref-1.8-patched/build.xml	2005-08-10 00:15:41.000000000 -0400
+@@ -78,9 +78,6 @@
+         <property name="library.directory" value="lib" />
+ 
+ 
+-    <taskdef name="jarbundler"
+-                  classpath="${library.directory}/jarbundler-1.4.jar"
+-                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+ 
+ 
+ 
+@@ -290,7 +287,10 @@
+ 
+ 
+         <target name="osxjar">
+-        <jarbundler dir="${build.lib}"
++		    <taskdef name="jarbundler"
++                  classpath="${library.directory}/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}/${jabref.bin}.jar"
diff --git a/app-text/jabref/jabref-1.8.ebuild b/app-text/jabref/jabref-1.8.ebuild
new file mode 100644
index 000000000000..50da777631d4
--- /dev/null
+++ b/app-text/jabref/jabref-1.8.ebuild
@@ -0,0 +1,66 @@
+# 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.ebuild,v 1.1 2005/09/11 13:40:15 axxo 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 doc"
+
+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*"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-core-1.4.1
+	jikes? ( dev-java/jikes )
+	dev-java/junit"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# TODO submit upstream
+	epatch ${FILESDIR}/${P}-fix_jarbundler.patch
+	# cleans up the way the classpath is setup in build.xml.
+	# in particular, it makes it use *.jar instead of particular files
+	epatch ${FILESDIR}/${P}-classpath_cleanup.patch
+
+	cd ${S}/lib && rm -f *.{zip,jar,class}
+	java-pkg_jar-from antlr
+	java-pkg_jar-from spin
+	java-pkg_jar-from jgoodies-looks-1.2
+	java-pkg_jar-from jgoodies-forms
+}
+
+
+src_compile() {
+	local antflags="jars"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} -Dbuild.javadocs=build/docs/api javadocs"
+	ant ${antflags} || die "Ant failed"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	use doc && java-pkg_dohtml -r build/docs/api
+	dodoc src/txt/README
+
+	echo "#!/bin/bash" > ${PN}
+	echo '$(java-config -J) -classpath $(java-config -p antlr,jgoodies-looks-1.2,jgoodies-forms,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
+}