Update glazedlists dep to reflect java5 flag removal.

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

4 files changed, 12 insertions, 95 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/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