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.

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

4 files changed, 31 insertions, 28 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/Manifest b/app-text/jabref/Manifest
index fee394e408e8..530af6bfa7cc 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.1-src.tar.bz2 6897235 RMD160 2dadb30ba1242cd85ae89b41ccc25d706445a816 SHA1 e537f582bf3e9f1baffd93cfbe5add2916bc8aa2 SHA256 689df6cc6e086259d55c8d05860e6a05deb8efed0ab7c791f95c5e54404b883b
 DIST JabRef-2.4.2-src.tar.bz2 6903387 RMD160 200c98803948d3c9791f084d9d02655bc72f154b SHA1 71d299fe2a7459f14b2d8352102d2c58518c6a0c SHA256 00ddb982e7da45cfbd1e23a2d7a016222b84109222480d2bdbff86aab1247c4a
+DIST JabRef-2.5b-src.tar.bz2 7398732 RMD160 c6c515c8c76f6d7bd752ebfaa4b52ced94c2bc87 SHA1 4ea2cd55ca064de93db420ea25abb0c99f6a4845 SHA256 2263bb5ced8098aa31c7570f0cf6a8f407047dbbef9a57c7d419f3cf6b286fb9
 EBUILD jabref-2.3.1.ebuild 1775 RMD160 91a40180d3496809c8a1bd1484a41c7464ac704b SHA1 59850c0b911a2f685f540ae9ca8b4ae9449f2eff SHA256 2adecf9308ee6b7d7468b555a589e3d6927b3771387dd1316db79716eb59fcb3
-EBUILD jabref-2.4.1.ebuild 2136 RMD160 a41940b06df1844fda4551b421902a30190aee8d SHA1 cb808c6c231ff982ab66ba2e2db90e96caf7a28b SHA256 462f30e9fd57ef3ade7d6edb00717bc85ef92341fc49ef495966e9b1235bbd68
-EBUILD jabref-2.4.2.ebuild 2132 RMD160 1682ef5fbde014748e1a107a7b3eab4b2f2071ff SHA1 8685177aa1ee70d15a45097185b3616514638702 SHA256 5342554949705611f25458811b6a9c6cc6e4ea3f9aa02626f19e6a2da8b69e7e
-MISC ChangeLog 9870 RMD160 8b93445e10aaf6869a11d359ed9ad4021a0f1bf7 SHA1 1e7a772098be4ccfe310cd6ab011603277c8d098 SHA256 07c85459872aa905e38d7650e6114f5f0cc23ca42a7dadf35ca0acd2d0851275
+EBUILD jabref-2.4.2.ebuild 2217 RMD160 603b93a192fe8255c4ea8f003a5cc0ede50d8625 SHA1 696d1c1f98379e2a0cabdce1d51b0c1b0a88f0de SHA256 20a55dc3501f153c4a5d274cb7b881ad0073a3ee4814f7cbd3aa8368ed0dcf86
+EBUILD jabref-2.5_beta.ebuild 2201 RMD160 6af787957f59d0cdba0ea8ecbd522ac6755244b2 SHA1 c79b695017346f041e067f89f61b8b49df943302 SHA256 44eea99bea3f6ec1f9c95c47dec5c0a41a433131429b22b4abff6789995956f8
+MISC ChangeLog 10174 RMD160 96f0ab305b26a0a219837ff5f4c3676ed13405a3 SHA1 9bf57c969b102d7fc67cc8bffbd2cb23c8a98fbd SHA256 734216e9bc8500c0f65bad02cdd6907767deb3dacc9fd06feb6d0e463093525a
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknXskkACgkQkKaRLQcq0GLfQQCgmn2JqjU7S9ryljbBjgH15nab
-X2EAn3z9E39FsWsQAE682afLYTNcnR4m
-=Z2L6
------END PGP SIGNATURE-----
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
 }