Version bump, based on contributed ebuild from Christian Faulhammer <opfer@gentoo.org> in bug #122085. Dropping ~amd64 and ~ppc until new dependencies are keyworded and jabref rekeyworded.

(Portage version: 2.1.2_pre3-r9)

5 files changed, 218 insertions, 1 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 9e7e0d42aa35..59dd18d9945f 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.37 2006/03/12 16:53:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.38 2006/10/28 23:58:41 caster Exp $
+
+*jabref-2.1 (28 Oct 2006)
+
+  28 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/jabref-2.1-classpath_cleanup.patch,
+  +files/jabref-2.1-fix_jarbundler.patch, +jabref-2.1.ebuild:
+  Version bump, based on contributed ebuild from Christian Faulhammer
+  <opfer@gentoo.org> in bug #122085. Dropping ~amd64 and ~ppc until new
+  dependencies are keyworded and jabref rekeyworded.
 
   12 Mar 2006; <nichoj@gentoo.org> -files/jabref-1.7-nojarbundler.patch,
   -files/jabref-1.8_beta-nojarbundler.patch, -jabref-1.7.ebuild,
diff --git a/app-text/jabref/files/digest-jabref-2.1 b/app-text/jabref/files/digest-jabref-2.1
new file mode 100644
index 000000000000..419dca34ec08
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-2.1
@@ -0,0 +1,3 @@
+MD5 6e1e546fc36a1e504ffae4d603a7331d JabRef-2.1-src.tar.bz2 2574390
+RMD160 1d18c37b93731f10025550d0450d626f1eb76471 JabRef-2.1-src.tar.bz2 2574390
+SHA256 e23e8414ebd898952b7478cecafb3d5af7c223e558defd1876bea4e8f6b00843 JabRef-2.1-src.tar.bz2 2574390
diff --git a/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch b/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch
new file mode 100644
index 000000000000..6ca18c41277e
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch
@@ -0,0 +1,112 @@
+diff -uNr jabref-2.1-orig/build.xml jabref-2.1/build.xml
+--- jabref-2.1-orig/build.xml	2006-08-28 12:21:00.000000000 +1000
++++ jabref-2.1/build.xml	2006-08-28 12:11:50.000000000 +1000
+@@ -166,17 +166,7 @@
+                 <javac debug="off" 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-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/forms-1.0.4.jar" />
+-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+-                                <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
+-                                <pathelement location="${library.directory}/microba.jar" />
+-                        </classpath>
++			<classpath refid="classpath"/>
+                 </javac>
+         </target>
+ 
+@@ -185,14 +175,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-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+-                        </classpath>
++			<classpath refid="classpath"/>
+                 </javac>
+ 
+         </target>
+@@ -440,12 +423,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 -->
+@@ -476,12 +454,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}">
+@@ -493,12 +466,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
+@@ -516,12 +484,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}">
+@@ -539,16 +502,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-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/looks-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+-                        </classpath>
+-
++			<classpath refid="classpath"/>
+                         <!--<test name="tests.net.sf.jabref.export.layout.format.AuthorLastFirstAbbreviatorTester"/>-->
+                 </junit>
+         </target>
diff --git a/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch b/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch
new file mode 100644
index 000000000000..fa37b73d0e97
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch
@@ -0,0 +1,27 @@
+diff -uNr jabref-2.1-orig/build.xml jabref-2.1/build.xml
+--- jabref-2.1-orig/build.xml	2006-08-28 12:02:36.000000000 +1000
++++ jabref-2.1/build.xml	2006-08-28 12:05:21.000000000 +1000
+@@ -88,11 +88,6 @@
+         <property name="library.directory" value="lib" />
+ 
+ 
+-    <taskdef name="jarbundler"
+-                  classpath="${library.directory}/jarbundler-1.4.jar"
+-                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+-
+-
+         <!-- Build classpath -->
+         <path id="classpath">
+                 <pathelement path="${build.classes}" />
+@@ -423,7 +418,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-2.1.ebuild b/app-text/jabref/jabref-2.1.ebuild
new file mode 100644
index 000000000000..e932e1455953
--- /dev/null
+++ b/app-text/jabref/jabref-2.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.1.ebuild,v 1.1 2006/10/28 23:58:41 caster Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="GUI frontend for BibTeX, written in Java"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/spin
+	>=dev-java/glazedlists-1.5.0
+	>=dev-java/antlr-2.7.3
+	dev-java/jgoodies-forms
+	=dev-java/jgoodies-looks-2.0*
+	>=dev-java/microba-0.4.3"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4.1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# TODO submit upstream
+	epatch "${FILESDIR}/${PN}-2.1-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}/${PN}-2.1-classpath_cleanup.patch"
+
+	rm lib/*
+	cd lib
+
+	java-pkg_jar-from antlr
+	java-pkg_jar-from spin
+	java-pkg_jar-from glazedlists
+	java-pkg_jar-from jgoodies-looks-2.0
+	java-pkg_jar-from jgoodies-forms
+	java-pkg_jar-from microba
+
+}
+
+
+src_compile() {
+	eant jars $(use_doc -Dbuild.javadocs=build/docs/api javadocs)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	use doc && java-pkg_dohtml -r build/docs/api
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} \
+		--main net.sf.jabref.JabRef
+
+	newicon src/images/JabRef-icon.png JabRef-icon.png
+	make_desktop_entry jabref JabRef JabRef-icon.png Office
+}
\ No newline at end of file