Version bump, bug #193024. Also fixes bug #186941.

(Portage version: 2.1.3.11)

6 files changed, 128 insertions, 140 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 48c829d22109..94d613abf617 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.53 2007/07/29 12:04:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.54 2007/10/05 19:48:44 caster Exp $
+
+*jabref-2.3_beta2 (05 Oct 2007)
+
+  05 Oct 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/jabref-2.1-classpath_cleanup.patch,
+  -files/jabref-2.1-fix_jarbundler.patch,
+  +files/jabref-2.3_beta2-jgoodies-forms.patch, +jabref-2.3_beta2.ebuild:
+  Version bump, bug #193024. Also fixes bug #186941.
 
   29 Jul 2007; Vlastimil Babka <caster@gentoo.org> jabref-2.2.ebuild:
   Force jgoodies-forms version to be <1.1.0 as a temporary workaround of bug
diff --git a/app-text/jabref/files/digest-jabref-2.3_beta2 b/app-text/jabref/files/digest-jabref-2.3_beta2
new file mode 100644
index 000000000000..ee032c886ce6
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-2.3_beta2
@@ -0,0 +1,3 @@
+MD5 c8fc2e3fd62be40327c1f09fc5b25a6f JabRef-2.3b2-src.tar.bz2 4229979
+RMD160 f3132bc3bc8c77f382fde128fd75582e23915752 JabRef-2.3b2-src.tar.bz2 4229979
+SHA256 6c7ded7b1c089e9c075dad82914336910db1a095ec90687b243fd682ebbfa6ae JabRef-2.3b2-src.tar.bz2 4229979
diff --git a/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch b/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch
deleted file mode 100644
index 6ca18c41277e..000000000000
--- a/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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
deleted file mode 100644
index fa37b73d0e97..000000000000
--- a/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/jabref-2.3_beta2-jgoodies-forms.patch b/app-text/jabref/files/jabref-2.3_beta2-jgoodies-forms.patch
new file mode 100644
index 000000000000..8852ba390a86
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.3_beta2-jgoodies-forms.patch
@@ -0,0 +1,42 @@
+diff --git a/src/java/net/sf/jabref/EntryEditorTab.java b/src/java/net/sf/jabref/EntryEditorTab.java
+index 6b8a8f4..041fcd6 100644
+--- a/src/java/net/sf/jabref/EntryEditorTab.java
++++ b/src/java/net/sf/jabref/EntryEditorTab.java
+@@ -133,7 +133,7 @@ public class EntryEditorTab {
+         String rowSpec = sb.toString();
+ 
+         DefaultFormBuilder builder = new DefaultFormBuilder
+-                (panel, new FormLayout(colSpec, rowSpec));
++                (new FormLayout(colSpec, rowSpec), panel);
+ 
+         for (int i = 0; i < fields.length; i++) {
+             // Create the text area:
+diff --git a/src/java/net/sf/jabref/external/DroppedFileHandler.java b/src/java/net/sf/jabref/external/DroppedFileHandler.java
+index 84527c4..a606c4a 100644
+--- a/src/java/net/sf/jabref/external/DroppedFileHandler.java
++++ b/src/java/net/sf/jabref/external/DroppedFileHandler.java
+@@ -65,8 +65,8 @@ public class DroppedFileHandler {
+         grp.add(moveRadioButton);
+         copyRadioButton.setSelected(true);
+ 
+-        DefaultFormBuilder builder = new DefaultFormBuilder(optionsPanel, new FormLayout(
+-            "left:pref", ""));
++        DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("left:pref", ""),
++			optionsPanel);
+         builder.append(linkInPlace);
+         builder.append(destDirLabel);
+         builder.append(copyRadioButton);
+diff --git a/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java b/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
+index 5724dde..4a5b409 100644
+--- a/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
++++ b/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
+@@ -86,8 +86,7 @@ public class FileLinksUpgradeWarning implements PostOpenAction {
+         sb.append("</html>");
+ 
+         JPanel message = new JPanel();
+-        DefaultFormBuilder b = new DefaultFormBuilder(message,
+-                new FormLayout("left:pref", ""));
++        DefaultFormBuilder b = new DefaultFormBuilder(new FormLayout("left:pref", ""), message);
+         b.append(new JLabel(sb.toString()));
+         b.nextLine();
+         if (offerChangeSettings) {
diff --git a/app-text/jabref/jabref-2.3_beta2.ebuild b/app-text/jabref/jabref-2.3_beta2.ebuild
new file mode 100644
index 000000000000..bc57a8be6eb0
--- /dev/null
+++ b/app-text/jabref/jabref-2.3_beta2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.3_beta2.ebuild,v 1.1 2007/10/05 19:48:44 caster Exp $
+
+JAVA_PKG_IUSE="doc"
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="GUI frontend for BibTeX, written in Java"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="dev-java/spin
+	>=dev-java/glazedlists-1.5.0
+	>=dev-java/antlr-2.7.3
+	>=dev-java/jgoodies-forms-1.0.5
+	>=dev-java/jgoodies-looks-2.0
+	>=dev-java/microba-0.4.3
+	dev-java/jempbox
+	dev-java/pdfbox"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# moves jarbundler definition to where it's needed (not by us)
+	# don't call unjarlib, don't want to absorb deps
+	epatch "${FILESDIR}/${PN}-2.2-build.xml.patch"
+	# support >=jgoodies-forms-1.1.0 - bug #186941 - sent also upstream
+	epatch "${FILESDIR}/${P}-jgoodies-forms.patch"
+
+	mkdir libs
+	mv lib/antlr-3* libs/antlr3.jar
+	rm -v lib/*
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	local gcp=$(java-pkg_getjars antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox)
+	gcp="${gcp}:libs/antlr3.jar"
+	eant -Dgentoo.classpath="${gcp}" jars \
+		$(use_doc -Dbuild.javadocs=build/docs/api javadocs)
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+	java-pkg_dojar libs/antlr3.jar
+
+	use doc && java-pkg_dojavadoc build/docs/api
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} \
+		--main net.sf.jabref.JabRef
+
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png || die
+	make_desktop_entry jabref JabRef JabRef-icon.png Office
+}