Update glazedlists dep to reflect java5 flag removal.

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

5 files changed, 15 insertions, 100 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index e23d347031c1..8fd3fc45928e 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,10 @@
 # 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.82 2009/11/02 21:39:39 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.83 2010/02/10 23:34:57 caster Exp $
+
+  10 Feb 2010; Vlastimil Babka <caster@gentoo.org> jabref-2.5.ebuild,
+  -jabref-2.6_beta.ebuild, jabref-2.6_beta2.ebuild:
+  Update glazedlists dep to reflect java5 flag removal.
 
 *jabref-2.6_beta2 (02 Nov 2009)
 
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 20282cb3a455..2f99cda3a52c 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -2,11 +2,9 @@ AUX jabref-2.2-build.xml.patch 1034 RMD160 9821c42b83d8d181bb90478671ddbf0533699
 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.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
 DIST JabRef-2.6b2-src.tar.bz2 7397275 RMD160 b55022f435bdf09d01e5e8ef1966320bfb489dc3 SHA1 c250b9a71cae32b62efcad8740001c59012ef2b1 SHA256 014afd233900a9111cd97af91c6556aa35c061d0f9c2e34b2a85748c08c68fcf
 EBUILD jabref-2.3.1.ebuild 1775 RMD160 91a40180d3496809c8a1bd1484a41c7464ac704b SHA1 59850c0b911a2f685f540ae9ca8b4ae9449f2eff SHA256 2adecf9308ee6b7d7468b555a589e3d6927b3771387dd1316db79716eb59fcb3
-EBUILD jabref-2.5.ebuild 2284 RMD160 b91178fecf9a1950a7e0b807cfd2562e4a913fb1 SHA1 3315191bfe57b840fad3b3522c9e06d5981ce2ab SHA256 bf946286c971fac2d42b1100a5101b39a11f7965ad2d388e623ac9a4342a8475
-EBUILD jabref-2.6_beta.ebuild 2374 RMD160 6f2bc361901fa869abbeee1ec6af2768cb74bacf SHA1 87d69132e07f386efc8e99933d2cf4310350afae SHA256 74fe5a3feb5a3cc05e84dba9bd4823562794957805dff4436ffbf3f0c4c4eb05
-EBUILD jabref-2.6_beta2.ebuild 2374 RMD160 2f3324cf91886cb342591c0d9b3493af754a2906 SHA1 540d0093f6c453d49b83307392a205c856aa9296 SHA256 c1c3fc1ab2462bc27e17f6485b7396188a03d1ab73b23043fe20bdb9bd8971a3
-MISC ChangeLog 11625 RMD160 069a326ce997a792f67df8c393c5ccc1c6fdc0a2 SHA1 5040eea492f68834bbe6528cc491b6fe6bc07529 SHA256 fa2a4874ad8700e08b518c03706456c9b10019af85e44b113599cc033f36ffed
+EBUILD jabref-2.5.ebuild 2324 RMD160 9d78d706eb2f14f3780aafb2d22d32a3b7231db1 SHA1 28614cb783eb6f9b2251d75c0fcc88649495d11c SHA256 c6531e4c8a42575e6cd7f138f38fc0c67b6ecfda04f2fa470824293703384aac
+EBUILD jabref-2.6_beta2.ebuild 2415 RMD160 7a8f159825c8f414547dd54426dcfb2fba14bc0b SHA1 5e8cf44ea6b9d9acd53217475d93ab8e9bac97db SHA256 4ed59ddc8894a0a3079a369491b14083b775b116cef4d4347036c4fc71e12bf8
+MISC ChangeLog 11804 RMD160 5979138f10262ca0bdbdf9cc13c5cfa49d25121a SHA1 56ec8796e3ab8764b7a30a2ae2302d20d9179b30 SHA256 2160f63014193b8381cd0bd2df46f6a9a66414f0fc3539752030744c3fc04d6d
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/app-text/jabref/jabref-2.5.ebuild b/app-text/jabref/jabref-2.5.ebuild
index 5be0041c42ad..f4ad27716a78 100644
--- a/app-text/jabref/jabref-2.5.ebuild
+++ b/app-text/jabref/jabref-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.5.ebuild,v 1.3 2009/10/05 18:36:33 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.5.ebuild,v 1.4 2010/02/10 23:34:57 caster Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="mysql"
 
 CDEPEND="dev-java/spin:0
-	>=dev-java/glazedlists-1.7.0:0[java5]
+	|| ( >=dev-java/glazedlists-1.7.0-r1:0 >=dev-java/glazedlists-1.7.0:0[java5] )
 	>=dev-java/antlr-2.7.3:0[java]
 	>=dev-java/jgoodies-forms-1.1.0:0
 	dev-java/jgoodies-looks:2.0
diff --git a/app-text/jabref/jabref-2.6_beta.ebuild b/app-text/jabref/jabref-2.6_beta.ebuild
deleted file mode 100644
index e06b5d995ab5..000000000000
--- a/app-text/jabref/jabref-2.6_beta.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.6_beta.ebuild,v 1.2 2009/10/05 18:36:33 volkmar Exp $
-
-EAPI=2
-
-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="mysql"
-
-CDEPEND="dev-java/spin:0
-	>=dev-java/glazedlists-1.7.0:0[java5]
-	>=dev-java/antlr-2.7.3:0[java]
-	>=dev-java/jgoodies-forms-1.1.0:0
-	dev-java/jgoodies-looks:2.0
-	>=dev-java/microba-0.4.3:0
-	dev-java/jempbox:0
-	dev-java/pdfbox:0
-	dev-java/commons-logging:0
-	dev-java/jpf:1.5
-	dev-java/jpfcodegen:0
-	mysql? ( dev-java/jdbc-mysql:0 )"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-
-	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)
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-	java-pkg_dojar libs/antlr-3.0b5.jar
-
-	use doc && java-pkg_dojavadoc build/docs/api
-	dodoc src/txt/README
-
-	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 ${PN} JabRef JabRef-icon Office
-	echo "MimeType=text/x-bibtex" >> "${D}/usr/share/applications/${PN}-${PN}.desktop"
-}
diff --git a/app-text/jabref/jabref-2.6_beta2.ebuild b/app-text/jabref/jabref-2.6_beta2.ebuild
index afc84a23dd60..44975a7246b0 100644
--- a/app-text/jabref/jabref-2.6_beta2.ebuild
+++ b/app-text/jabref/jabref-2.6_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.6_beta2.ebuild,v 1.1 2009/11/02 21:39:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.6_beta2.ebuild,v 1.2 2010/02/10 23:34:57 caster Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mysql"
 
 CDEPEND="dev-java/spin:0
-	>=dev-java/glazedlists-1.7.0:0[java5]
+	|| ( >=dev-java/glazedlists-1.7.0-r1:0 >=dev-java/glazedlists-1.7.0:0[java5] )
 	>=dev-java/antlr-2.7.3:0[java]
 	>=dev-java/jgoodies-forms-1.1.0:0
 	dev-java/jgoodies-looks:2.0