Version bump, bug 199502.

(Portage version: 2.1.3.19)

7 files changed, 13 insertions, 127 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index ac145dbc448e..f1d0c78f9578 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2007/10/10 20:35:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.56 2007/11/18 11:54:28 caster Exp $
+
+*jabref-2.3 (18 Nov 2007)
+
+  18 Nov 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/jabref-2.3_beta2-jgoodies-forms.patch, -jabref-2.3_beta2.ebuild,
+  -jabref-2.3_beta3.ebuild, +jabref-2.3.ebuild:
+  Version bump, bug 199502.
 
 *jabref-2.3_beta3 (10 Oct 2007)
 
diff --git a/app-text/jabref/files/digest-jabref-2.3 b/app-text/jabref/files/digest-jabref-2.3
new file mode 100644
index 000000000000..696af639e612
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-2.3
@@ -0,0 +1,3 @@
+MD5 a19eaf653fc7d27a9f59b21a72f8dd24 JabRef-2.3-src.tar.bz2 4423952
+RMD160 d74740fcf7aebe4c93627b8457ffa6c596ef9cc8 JabRef-2.3-src.tar.bz2 4423952
+SHA256 cc61db942009a725aec6210417ccd64bc46e78441b966f8dbf23d65e2c193cfa JabRef-2.3-src.tar.bz2 4423952
diff --git a/app-text/jabref/files/digest-jabref-2.3_beta2 b/app-text/jabref/files/digest-jabref-2.3_beta2
deleted file mode 100644
index ee032c886ce6..000000000000
--- a/app-text/jabref/files/digest-jabref-2.3_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-jabref-2.3_beta3 b/app-text/jabref/files/digest-jabref-2.3_beta3
deleted file mode 100644
index c793d21eda60..000000000000
--- a/app-text/jabref/files/digest-jabref-2.3_beta3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5677265955b304a1b36d5eec85f95b95 JabRef-2.3b3-src.tar.bz2 4973017
-RMD160 1fc03fd21f30e99407a12c904b3eb5ca77bcf719 JabRef-2.3b3-src.tar.bz2 4973017
-SHA256 55daf2146fb47dd13675c06c097f7f4a6e8edcd4c916a6b0f195697927cf85b5 JabRef-2.3b3-src.tar.bz2 4973017
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
deleted file mode 100644
index 8852ba390a86..000000000000
--- a/app-text/jabref/files/jabref-2.3_beta2-jgoodies-forms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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.ebuild
index bc57a8be6eb0..fa281a3ffaa6 100644
--- a/app-text/jabref/jabref-2.3_beta2.ebuild
+++ b/app-text/jabref/jabref-2.3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.3.ebuild,v 1.1 2007/11/18 11:54:28 caster Exp $
 
 JAVA_PKG_IUSE="doc"
 inherit eutils java-pkg-2 java-ant-2
@@ -19,7 +19,7 @@ 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-forms-1.1.0
 	>=dev-java/jgoodies-looks-2.0
 	>=dev-java/microba-0.4.3
 	dev-java/jempbox
@@ -40,8 +40,6 @@ src_unpack() {
 	# 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
diff --git a/app-text/jabref/jabref-2.3_beta3.ebuild b/app-text/jabref/jabref-2.3_beta3.ebuild
deleted file mode 100644
index 29146fa55f6d..000000000000
--- a/app-text/jabref/jabref-2.3_beta3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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_beta3.ebuild,v 1.1 2007/10/10 20:35:37 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}/${PN}-2.3_beta2-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
-}