6 files changed, 8 insertions, 274 deletions
diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index f34f039d1c08..340f22a4220c 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/jabref
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.88 2011/08/07 11:54:33 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.89 2012/12/13 15:13:21 jlec Exp $
+
+  13 Dec 2012; Justin Lecher <jlec@gentoo.org>
+  -files/jabref-2.2-build.xml.patch, -jabref-2.3.1.ebuild, -jabref-2.5.ebuild,
+  -jabref-2.6_beta3.ebuild, metadata.xml:
+  Drop old
 
   07 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> jabref-2.3.1.ebuild,
   jabref-2.5.ebuild, jabref-2.6_beta3.ebuild, jabref-2.6.ebuild:
diff --git a/app-text/jabref/files/jabref-2.2-build.xml.patch b/app-text/jabref/files/jabref-2.2-build.xml.patch
deleted file mode 100644
index 7a6cfb1a6e7f..000000000000
--- a/app-text/jabref/files/jabref-2.2-build.xml.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- build.xml	2007-02-13 01:40:37.000000000 +0100
-+++ build.xml	2007-02-13 01:41:35.000000000 +0100
-@@ -105,7 +105,6 @@
- 		</and>
- 	</condition>
- 
--	<taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
- 
- 
- 	<!-- Build classpath -->
-@@ -188,7 +187,7 @@
- 	</target>
- 
- 	<!-- Jars up project -->
--	<target name="jars" depends="build, unjarlib">
-+	<target name="jars" depends="build">
- 		<mkdir dir="${build.lib}" />
- 		<mkdir dir="${build.tmp}" />
- 		<jar destfile="${build.lib}/${build.jar}">
-@@ -373,6 +372,7 @@
- 
- 
- 	<target name="osxjar">
-+		<taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
- 		<jarbundler dir="${build.lib}" name="JabRef" mainclass="net.sf.jabref.JabRef" jars="${build.lib}/${build.jar}" icon="${images.dir}/JabRef-Logo.icns" version="${jabref.version}" jvmversion="1.4+" stubfile="${library.directory}/JavaApplicationStub" />
- 	</target>
- 
diff --git a/app-text/jabref/jabref-2.3.1.ebuild b/app-text/jabref/jabref-2.3.1.ebuild
deleted file mode 100644
index 1ab75b529f20..000000000000
--- a/app-text/jabref/jabref-2.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.3.1.ebuild,v 1.8 2011/08/07 11:54:33 xarthisius 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=""
-
-CDEPEND="dev-java/spin:0
-	>=dev-java/glazedlists-1.5.0:0
-	>=dev-java/antlr-2.7.7:0[java]
-	>=dev-java/jgoodies-forms-1.1.0:0
-	>=dev-java/jgoodies-looks-2.0:2.0
-	>=dev-java/microba-0.4.3:0
-	dev-java/jempbox:0
-	dev-java/pdfbox:0"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}"
-
-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
-	epatch "${FILESDIR}/${PN}-2.2-build.xml.patch"
-
-	mkdir libs
-	mv lib/antlr-3* libs/antlr3.jar
-	rm -v lib/*
-
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-
-	local gcp=$(java-pkg_getjars antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox)
-	gcp="${gcp}:libs/antlr3.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/antlr3.jar
-
-	use doc && java-pkg_dojavadoc build/docs/api
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} \
-		--main net.sf.jabref.JabRef
-
-	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.ebuild b/app-text/jabref/jabref-2.5.ebuild
deleted file mode 100644
index 42789ab6bf17..000000000000
--- a/app-text/jabref/jabref-2.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 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.5 2011/08/07 11:54:33 xarthisius 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-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
-	>=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
-}
diff --git a/app-text/jabref/jabref-2.6_beta3.ebuild b/app-text/jabref/jabref-2.6_beta3.ebuild
deleted file mode 100644
index fd43e6f3fc5e..000000000000
--- a/app-text/jabref/jabref-2.6_beta3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.6_beta3.ebuild,v 1.2 2011/08/07 11:54:33 xarthisius 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-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
-	>=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/metadata.xml b/app-text/jabref/metadata.xml
index 838c00a4a448..250f2d1940ea 100644
--- a/app-text/jabref/metadata.xml
+++ b/app-text/jabref/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+  <herd>java</herd>
 </pkgmetadata>