Restore 2.4.2, thanks to fauli for telling me. Remove the betas as intended.

(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 15 insertions, 97 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 83ffe8859dc1..98df231eb8cd 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2009/06/22 22:33:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.78 2009/07/04 16:03:20 caster Exp $
+
+  04 Jul 2009; Vlastimil Babka <caster@gentoo.org> +jabref-2.4.2.ebuild,
+  -jabref-2.5_beta.ebuild, -jabref-2.5_beta2.ebuild:
+  Restore 2.4.2, thanks to fauli for telling me. Remove the betas as
+  intended.
 
 *jabref-2.5 (22 Jun 2009)
 
diff --git a/app-text/jabref/jabref-2.5_beta.ebuild b/app-text/jabref/jabref-2.4.2.ebuild
index 266719731a0a..31e9e981b5f6 100644
--- a/app-text/jabref/jabref-2.5_beta.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.5_beta.ebuild,v 1.4 2009/05/02 13:34:16 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.4.2.ebuild,v 1.6 2009/07/04 16:03:20 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,28 +31,27 @@ CDEPEND="dev-java/spin:0
 	dev-java/jpfcodegen:0
 	mysql? ( dev-java/jdbc-mysql:0 )"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.5
 	${CDEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-java_prepare() {
+src_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"
@@ -76,11 +75,11 @@ 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
 }
diff --git a/app-text/jabref/jabref-2.5_beta2.ebuild b/app-text/jabref/jabref-2.5_beta2.ebuild
deleted file mode 100644
index 94c038aaf339..000000000000
--- a/app-text/jabref/jabref-2.5_beta2.ebuild
+++ /dev/null
@@ -1,86 +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.5_beta2.ebuild,v 1.1 2009/05/20 22:13:55 caster 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 ~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 jabref JabRef JabRef-icon Office
-}