Version bump. Now with plugin manager and user installation in HOME, yay. Add mysql USE flag which pulls jdbc-mysql, also in 2.4.2. Fixes bug #252833.

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

3 files changed, 27 insertions, 14 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 0d527beaa28d..db1c30e830ee 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.71 2009/04/04 19:17:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.72 2009/04/23 13:43:37 caster Exp $
+
+*jabref-2.5_beta (23 Apr 2009)
+
+  23 Apr 2009; Vlastimil Babka <caster@gentoo.org> -jabref-2.4.1.ebuild,
+  jabref-2.4.2, +jabref-2.5_beta.ebuild:
+  Version bump. Now with plugin manager and user installation in HOME, yay.
+  Add mysql USE flag which pulls jdbc-mysql, also in 2.4.2. Fixes bug
+  #252833.
 
   04 Apr 2009; Markus Meier <maekke@gentoo.org> jabref-2.4.2.ebuild:
   amd64/x86 stable, bug #263647
diff --git a/app-text/jabref/jabref-2.4.2.ebuild b/app-text/jabref/jabref-2.4.2.ebuild
index e743b66ebb64..228b1d84183d 100644
--- a/app-text/jabref/jabref-2.4.2.ebuild
+++ b/app-text/jabref/jabref-2.4.2.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.2 2009/04/04 19:17:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.4.2.ebuild,v 1.3 2009/04/23 13:43:37 caster Exp $
 
 EAPI=2
 
@@ -28,7 +28,8 @@ CDEPEND="dev-java/spin:0
 	dev-java/pdfbox:0
 	dev-java/commons-logging:0
 	dev-java/jpf:1.5
-	dev-java/jpfcodegen:0"
+	dev-java/jpfcodegen:0
+	mysql? ( dev-java/jdbc-mysql:0 )"
 
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
@@ -74,6 +75,8 @@ 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
 
diff --git a/app-text/jabref/jabref-2.4.1.ebuild b/app-text/jabref/jabref-2.5_beta.ebuild
index d548a0342785..c8987ca07d80 100644
--- a/app-text/jabref/jabref-2.4.1.ebuild
+++ b/app-text/jabref/jabref-2.5_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1.ebuild,v 1.2 2008/10/12 09:26:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.5_beta.ebuild,v 1.1 2009/04/23 13:43:37 caster Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="mysql"
 
 CDEPEND="dev-java/spin:0
 	>=dev-java/glazedlists-1.7.0:0[java5]
@@ -27,7 +27,9 @@ CDEPEND="dev-java/spin:0
 	dev-java/jempbox:0
 	dev-java/pdfbox:0
 	dev-java/commons-logging:0
-	dev-java/jpf:1.5"
+	dev-java/jpf:1.5
+	dev-java/jpfcodegen:0
+	mysql? ( dev-java/jdbc-mysql:0 )"
 
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
@@ -37,7 +39,7 @@ DEPEND=">=virtual/jdk-1.5
 
 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
@@ -45,13 +47,9 @@ src_prepare() {
 
 	mkdir libs || die
 	mv lib/antlr-3.0b5.jar libs/ || die
-	mv lib/plugin/JPFCodeGen* libs/ || die
 
 	rm -v lib/*.jar lib/plugin/*.jar \
 		src/java/net/sf/jabref/plugin/core/generated/*.java || die
-
-	mv libs/JPFCodeGen* lib/plugin/ || die
-	java-utils-2_src_prepare
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -59,7 +57,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 src_compile() {
 	java-pkg_filter-compiler jikes
 
-	local gcp=$(java-pkg_getjars antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox,commons-logging,jpf-1.5)
+	local gcp=$(java-pkg_getjars --with-dependencies antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox,commons-logging,jpf-1.5,jpfcodegen)
 	gcp="${gcp}:libs/antlr-3.0b5.jar"
 	eant -Dgentoo.classpath="${gcp}" jars \
 		$(use_doc -Dbuild.javadocs=build/docs/api javadocs)
@@ -68,7 +66,6 @@ src_compile() {
 src_install() {
 	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
 	java-pkg_dojar libs/antlr-3.0b5.jar
-	java-pkg_dojar lib/plugin/JPFCodeGenerator-rt.jar
 
 	use doc && java-pkg_dojavadoc build/docs/api
 	dodoc src/txt/README
@@ -76,6 +73,11 @@ src_install() {
 	java-pkg_dolauncher ${PN} \
 		--main net.sf.jabref.JabRef
 
+	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
 }