Version bump, bug 199502.

Package-Manager: portage-2.1.3.19

8 files changed, 25 insertions, 151 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/Manifest b/app-text/jabref/Manifest
index 753d106f62a4..4f8541a71442 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -2,29 +2,20 @@ AUX jabref-2.2-build.xml.patch 1034 RMD160 9821c42b83d8d181bb90478671ddbf0533699
 MD5 f02bc0280631c71ca769fa561ceaaea5 files/jabref-2.2-build.xml.patch 1034
 RMD160 9821c42b83d8d181bb90478671ddbf05336991c4 files/jabref-2.2-build.xml.patch 1034
 SHA256 4e7d5ab982989c0b824c8795c709fb6ffb25f1c9c414a231bbd228b1fde12435 files/jabref-2.2-build.xml.patch 1034
-AUX jabref-2.3_beta2-jgoodies-forms.patch 2138 RMD160 56195a6ebaa96a35dce2a16f754101b17b400cba SHA1 66da083a3e018fe3f051011d58ca51987f6a4b54 SHA256 5bb01c6efe9c589e811635bf6f76699c7e49740cb45708d0b2e5edb3dac72399
-MD5 5d6fbd60557bb809de66a6d42ff04cb9 files/jabref-2.3_beta2-jgoodies-forms.patch 2138
-RMD160 56195a6ebaa96a35dce2a16f754101b17b400cba files/jabref-2.3_beta2-jgoodies-forms.patch 2138
-SHA256 5bb01c6efe9c589e811635bf6f76699c7e49740cb45708d0b2e5edb3dac72399 files/jabref-2.3_beta2-jgoodies-forms.patch 2138
 DIST JabRef-2.2-src.tar.bz2 4150837 RMD160 0b087c1d5de65223f055822469a448e5e60129eb SHA1 9f44729b9e3f97ca6dec7b5416f620e4ec09b43e SHA256 96d6da2ce9893f5a117b4e3a748a6710b3b5dbf742382be9391d0867e11b0b38
-DIST JabRef-2.3b2-src.tar.bz2 4229979 RMD160 f3132bc3bc8c77f382fde128fd75582e23915752 SHA1 676f21db28f2ef7ebae7549223189dcbd1a91ff2 SHA256 6c7ded7b1c089e9c075dad82914336910db1a095ec90687b243fd682ebbfa6ae
-DIST JabRef-2.3b3-src.tar.bz2 4973017 RMD160 1fc03fd21f30e99407a12c904b3eb5ca77bcf719 SHA1 15cc0ceb907f82feb5ee6525531cf1b6ddae9a32 SHA256 55daf2146fb47dd13675c06c097f7f4a6e8edcd4c916a6b0f195697927cf85b5
+DIST JabRef-2.3-src.tar.bz2 4423952 RMD160 d74740fcf7aebe4c93627b8457ffa6c596ef9cc8 SHA1 d861bee5f73a17ab925c81f51931c122fc7b3c90 SHA256 cc61db942009a725aec6210417ccd64bc46e78441b966f8dbf23d65e2c193cfa
 EBUILD jabref-2.2.ebuild 1696 RMD160 9e2a722102ca59f2a65128730bd4cc8b9fa2edbe SHA1 fc82f71fee5d9ecf3f03eed610015772cc0dfe14 SHA256 07933b332e21bf40ff413485c5dbb69d4d4170b84bdc1038aa4e2441031e3254
 MD5 858d1bae4ccc656c3cbc55516d2d51fd jabref-2.2.ebuild 1696
 RMD160 9e2a722102ca59f2a65128730bd4cc8b9fa2edbe jabref-2.2.ebuild 1696
 SHA256 07933b332e21bf40ff413485c5dbb69d4d4170b84bdc1038aa4e2441031e3254 jabref-2.2.ebuild 1696
-EBUILD jabref-2.3_beta2.ebuild 1888 RMD160 76d1f1ab74a7407c6dcef744c62b0cc9099e450e SHA1 237461fadcbd8ea6ae1ff4aa1c743ee80058b589 SHA256 0d32dd5fa5dc5520fd510cd47d9d6b1e9bd36ffa717a3880d8cb712c13b36c82
-MD5 ff98e432c1965be17f96e9b72d76faa2 jabref-2.3_beta2.ebuild 1888
-RMD160 76d1f1ab74a7407c6dcef744c62b0cc9099e450e jabref-2.3_beta2.ebuild 1888
-SHA256 0d32dd5fa5dc5520fd510cd47d9d6b1e9bd36ffa717a3880d8cb712c13b36c82 jabref-2.3_beta2.ebuild 1888
-EBUILD jabref-2.3_beta3.ebuild 1899 RMD160 a0b51b7fe1d02344783fb747c0aa1c0c302ab7cb SHA1 9cd4d03a930b411d172744cf1df804b3c25f01e6 SHA256 4b7f68b400f81eb953f75f1ec0678a078ffb4d067b84b875c1bdb84aaf367105
-MD5 22be9e1d2156bcb08cf1e39025c8e780 jabref-2.3_beta3.ebuild 1899
-RMD160 a0b51b7fe1d02344783fb747c0aa1c0c302ab7cb jabref-2.3_beta3.ebuild 1899
-SHA256 4b7f68b400f81eb953f75f1ec0678a078ffb4d067b84b875c1bdb84aaf367105 jabref-2.3_beta3.ebuild 1899
-MISC ChangeLog 7799 RMD160 128ba73704100931f12eed67bb1b9bde46aed07b SHA1 a17231b00fa0728330599799f5f08ab405296f2d SHA256 6716211a944a9dda1a120a995cf622e410a83fcb415d7ab57d0dfd16d1e3076e
-MD5 f981005d9658e791c37dd4f4a5d8b4d6 ChangeLog 7799
-RMD160 128ba73704100931f12eed67bb1b9bde46aed07b ChangeLog 7799
-SHA256 6716211a944a9dda1a120a995cf622e410a83fcb415d7ab57d0dfd16d1e3076e ChangeLog 7799
+EBUILD jabref-2.3.ebuild 1765 RMD160 d63c59e28d1f9d7bcecb5168245badb0d38bffab SHA1 cd77c47e08ba34826b998ead6a29466c6f4ee0ed SHA256 c08cb4a7f264644b442a51f05496f63adcf0e26f1f055cdad7d789145b0faadc
+MD5 0117f063ef7b9d47512e6f8da846f46f jabref-2.3.ebuild 1765
+RMD160 d63c59e28d1f9d7bcecb5168245badb0d38bffab jabref-2.3.ebuild 1765
+SHA256 c08cb4a7f264644b442a51f05496f63adcf0e26f1f055cdad7d789145b0faadc jabref-2.3.ebuild 1765
+MISC ChangeLog 8028 RMD160 227a7fb5e128837a0ac1b430eb184a77796a9946 SHA1 35cd1bdf56276c0935611954641add1f7c3145c6 SHA256 ea8acfb6424f67356c75fed00145b2b4a576b2f12d47b2a537f7745a2de9664c
+MD5 cadea6ff494b6ff414cf9a5611242502 ChangeLog 8028
+RMD160 227a7fb5e128837a0ac1b430eb184a77796a9946 ChangeLog 8028
+SHA256 ea8acfb6424f67356c75fed00145b2b4a576b2f12d47b2a537f7745a2de9664c ChangeLog 8028
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -32,9 +23,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 25302568908d68b31ec8720cfc5c598d files/digest-jabref-2.2 250
 RMD160 8102e1e88f5b62e080d2b3ac7bbcf608f33a7d15 files/digest-jabref-2.2 250
 SHA256 4c24821b7dafac0fe55d7e9fa5776048b37cbda52ffbe5d7b822b9e193d1ba9a files/digest-jabref-2.2 250
-MD5 0675e9f71f33124acf1aa4c23b7cab9d files/digest-jabref-2.3_beta2 256
-RMD160 1a66cbd02c57ae81f41d26901e0c7d512575c2fb files/digest-jabref-2.3_beta2 256
-SHA256 af83e30b3b6021302cc7bbd806eee90f71114c8071e869611f4aae6c7862a267 files/digest-jabref-2.3_beta2 256
-MD5 b72a97a5a762d6109faa649d3a27ade0 files/digest-jabref-2.3_beta3 256
-RMD160 1ca964e804df2766ebbf6b27f694ad769d8e4fa5 files/digest-jabref-2.3_beta3 256
-SHA256 fd4e3ac5436b7e5ffa85ca1029680963e27b0b9a205c07c748ef3ee65316413a files/digest-jabref-2.3_beta3 256
+MD5 a9ad2975ee5ef1610c7cd28bad829c96 files/digest-jabref-2.3 250
+RMD160 b83377697f3de42faaeb034702e146a089a09cb2 files/digest-jabref-2.3 250
+SHA256 6a5ff09139cce9f179591924f349b00f61dcba365b5cb18202f61f56d1aa0385 files/digest-jabref-2.3 250
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
-}