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

(Portage version: 2.2_rc40/cvs/Linux x86_64)

2 files changed, 19 insertions, 11 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/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"
 }