Version bump. Add association to bib files to the .desktop entry.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 22 insertions, 24 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index ff320afa03c1..05a7b77d5cb8 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/jabref
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.79 2009/08/02 10:32:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.80 2009/10/02 20:30:13 caster Exp $
+
+*jabref-2.6_beta (02 Oct 2009)
+
+  02 Oct 2009; Vlastimil Babka <caster@gentoo.org> -jabref-2.4.2.ebuild,
+  +jabref-2.6_beta.ebuild:
+  Version bump. Add association to bib files to the .desktop entry.
 
   02 Aug 2009; Markus Meier <maekke@gentoo.org> jabref-2.5.ebuild:
   amd64/x86 stable, bug #279666
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 20b7ecfce174..99ab22375812 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jabref-2.2-build.xml.patch 1034 RMD160 9821c42b83d8d181bb90478671ddbf05336991c4 SHA1 b42a04ba198e621b599e9fc86137efe4cb2f893d SHA256 4e7d5ab982989c0b824c8795c709fb6ffb25f1c9c414a231bbd228b1fde12435
 AUX jabref-2.4-build.xml.patch 1353 RMD160 7e68d278117434a7774d6c1768486dc20a15b4f6 SHA1 8f9d862f6967af5ebd1060976ceb2a2fd64a9c8a SHA256 d369747567bdeb9a79b4e22a40aec6d66e6789f03e52139a0687b9fb20be374a
 DIST JabRef-2.3.1-src.tar.bz2 4434828 RMD160 f5f1b55a541dd39c45cafece2b0e0b9fc0aabecc SHA1 0f5379dd9e1d8622d88a3f02d79f52b092f990d2 SHA256 e30bc9b1a5e3c88c36babcaed36c97d3d8d99c968b5a2822c6289fc7e0cfd06f
-DIST JabRef-2.4.2-src.tar.bz2 6903387 RMD160 200c98803948d3c9791f084d9d02655bc72f154b SHA1 71d299fe2a7459f14b2d8352102d2c58518c6a0c SHA256 00ddb982e7da45cfbd1e23a2d7a016222b84109222480d2bdbff86aab1247c4a
 DIST JabRef-2.5-src.tar.bz2 6580719 RMD160 e1d4e7a934299f5049559bc35fc889a76b497afb SHA1 b7b05dfe2c696a32a06034c79201e939ba54d815 SHA256 725ef36d0701ddbabdf64391479b62957927fa1ef29106405d4058145d78437c
+DIST JabRef-2.6b-src.tar.bz2 6576491 RMD160 11d83de9a473bb54fbdf6443e8748a048a664057 SHA1 aa37779d33dee99170b024fc82ab454ceb06ba6a SHA256 6aca6895ff146c2117a0be48796fa50ad1a083f5ddd63e0bb3b94c285aaff82a
 EBUILD jabref-2.3.1.ebuild 1775 RMD160 91a40180d3496809c8a1bd1484a41c7464ac704b SHA1 59850c0b911a2f685f540ae9ca8b4ae9449f2eff SHA256 2adecf9308ee6b7d7468b555a589e3d6927b3771387dd1316db79716eb59fcb3
-EBUILD jabref-2.4.2.ebuild 2222 RMD160 ed515588b9ec0113fe57eea58db00e87d0f7f425 SHA1 2354d51c5fea07cf9ca39422f2ce313e08b396f0 SHA256 8aad179fe9f133755f44ec272dd05ac8a5109217ec8e6f3f7781833c4d68ed62
 EBUILD jabref-2.5.ebuild 2278 RMD160 4209befda6e9860e9cd910500c3b66de6144d630 SHA1 13fc89639bd03eab21e4cbc3b37e9558204d03e4 SHA256 4929da032936b48d5c462c0343347705827c0690f9af28b4bd162c6748879a17
-MISC ChangeLog 11167 RMD160 7816c385d0bb95d59d2f14f01086ea1ae3fb842e SHA1 93c5db13a54a79673328f0231dad2a0f4d7dcefa SHA256 b9a9d1940b466362268d935c11b15de330d2f70e4198d0a0cf00d7892a3c3127
+EBUILD jabref-2.6_beta.ebuild 2368 RMD160 b39bd2066636161028ccd02396101c92eb1a883d SHA1 69ebdfab86b00506553e6260e0b41d839c325448 SHA256 cac33634c3502e0ceab021c3f9416a4ffd5edc5735761fc1ba09b8ba6f3b5d97
+MISC ChangeLog 11368 RMD160 606aff957348bc4f77500dcd5075d679a344e23e SHA1 6d117e38acde9542a286bf07bc19e9682b831264 SHA256 7bcb08b7254211cbbecbd63a88a1c74b5e00170caf3e9f7ab2b21977cb3f82a6
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp1a4IACgkQkKaRLQcq0GK7jwCfZWjG9YBPwvyZa9A4r6LXHxWt
-Se4An27OFVhg+CDRGoeQup6figGWjFUb
-=5MB5
------END PGP SIGNATURE-----
diff --git a/app-text/jabref/jabref-2.4.2.ebuild b/app-text/jabref/jabref-2.6_beta.ebuild
index 31e9e981b5f6..81aaf72a488e 100644
--- a/app-text/jabref/jabref-2.4.2.ebuild
+++ b/app-text/jabref/jabref-2.6_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.4.2.ebuild,v 1.6 2009/07/04 16:03:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.6_beta.ebuild,v 1.1 2009/10/02 20:30:13 caster Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mysql"
 
 CDEPEND="dev-java/spin:0
@@ -31,27 +31,28 @@ CDEPEND="dev-java/spin:0
 	dev-java/jpfcodegen:0
 	mysql? ( dev-java/jdbc-mysql:0 )"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${CDEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_prepare() {
+java_prepare() {
 	# moves jarbundler definition to where it's needed (not by us)
 	# don't call unjarlib, don't want to absorb deps
 	# failonerror in jpfcodegen
 	epatch "${FILESDIR}/${PN}-2.4-build.xml.patch"
 
+	# bug #268252
+	java-ant_xml-rewrite -f build.xml -d -e javac -a encoding -v UTF-8
+
 	mkdir libs || die
 	mv lib/antlr-3.0b5.jar libs/ || die
 
 	rm -v lib/*.jar lib/plugin/*.jar \
 		src/java/net/sf/jabref/plugin/core/generated/*.java || die
-
-	java-utils-2_src_prepare
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -75,11 +76,12 @@ src_install() {
 	java-pkg_dolauncher ${PN} \
 		--main net.sf.jabref.JabRef
 
-	java-pkg_register-optional-dependency jdbc-mysql
-
 	dodir /usr/share/${PN}/lib/plugins
 	keepdir /usr/share/${PN}/lib/plugins
 
+	java-pkg_register-optional-dependency jdbc-mysql
+
 	newicon src/images/JabRef-icon-48.png JabRef-icon.png || die
-	make_desktop_entry jabref JabRef JabRef-icon Office
+	make_desktop_entry ${PN} JabRef JabRef-icon Office
+	echo "MimeType=text/x-bibtex" >> "${D}/usr/share/applications/${PN}-${PN}.desktop"
 }