app-text/jabref: Add missing dep

Package-Manager: portage-2.2.8-r1

6 files changed, 6 insertions, 136 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index fc8648be3..f194bafb3 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jan 2014; Justin Lecher <jlec@gentoo.org> -jabref-2.10_beta.ebuild,
+  -jabref-2.10_beta-r1.ebuild, -jabref-2.10_beta2.ebuild,
+  jabref-2.10_beta2-r1.ebuild:
+  Add missing dep
+
   03 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org>
   jabref-2.10_beta2-r1.ebuild:
   app-text/jabref: Remove another bundled library.
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 0a4712b04..77ccac153 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,3 +1,2 @@
-DIST JabRef-2.10b-src.tar.bz2 16785780 SHA256 d44848d75072f54bb1db2352f43714fe951c8f967bd44a4ff1f6ce981dc94b10 SHA512 35cfb46c3e31f1e7a058e0d63bc041e7b3a416a1b56cac98bd96dec8073e56416e561865dc92cf5918b6a6f2b5ff022c01463ed56ce6d84b63901e2a48c8956f WHIRLPOOL bdeb845e6ed026ce7a6f11495f1791380aeb7a2bb26557242e349c6669aa8833fc358ca500c9f8c2989ff360fd096db07287806eba9679d4e6dfe6326ee25d4f
 DIST JabRef-2.10b2-src.tar.bz2 16796962 SHA256 296a55bd480c252facfae25b6ee36b4d490ec6e1852d79609b01d6ad6d12d941 SHA512 611456d0fcc310987876b0210537ed5cc648bed43de543b465b93613bf6f2449ba4514e3086dc633005e630216ac776f716671b9085623940e380b5133cb4323 WHIRLPOOL 220548bf28ffef14e488838fbe7b2e130043518369de9bc95fc7ee7207f49a6995dd59f3e2857e2afabe3762739e6b0ecfc36ead5a46114bcf1932dfe08e25eb
 DIST JabRef-2.9.2-src.tar.bz2 16664284 SHA256 12bc7e489709bc6f57327bf8e15c6bc9ceaa600369dca6452b7c13d792215e83 SHA512 40eb5d3f3528e92c4d5c62abce12d87ea63b84a58778a32151cd1af2a0198c49aa354ee295f8b3c9449d5b078f7119163babd3c29f358b0d56b3776980292463 WHIRLPOOL d2115e497066f31a3772085510f6820e46a55fbe36778471e6c81a4973f45607761cca80655cfefffb1308f65315ef72fb17791fe964d004826f345322ca0dcf
diff --git a/app-text/jabref/jabref-2.10_beta-r1.ebuild b/app-text/jabref/jabref-2.10_beta-r1.ebuild
deleted file mode 100644
index e8cd8a123..000000000
--- a/app-text/jabref/jabref-2.10_beta-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/fontbox:1.7
-	dev-java/spin:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/fontbox*.jar || die
-	rm lib/spin.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="fontbox-1.7,spin"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.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
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10_beta.ebuild b/app-text/jabref/jabref-2.10_beta.ebuild
deleted file mode 100644
index 0c13e73d7..000000000
--- a/app-text/jabref/jabref-2.10_beta.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EANT_DOC_TARGET=javadocs
-inherit java-pkg-2 java-ant-2
-
-SFVERSION="2.10b"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${SFVERSION}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-EANT_BUILD_TARGET="jars"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${PN}-${SFVERSION}"
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${SFVERSION}.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
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10_beta2-r1.ebuild b/app-text/jabref/jabref-2.10_beta2-r1.ebuild
index 5047c5704..7ac1db143 100644
--- a/app-text/jabref/jabref-2.10_beta2-r1.ebuild
+++ b/app-text/jabref/jabref-2.10_beta2-r1.ebuild
@@ -23,6 +23,7 @@ COMMON_DEP="
 	dev-java/antlr:3
 	dev-java/fontbox:1.7
 	dev-java/jempbox:1.7
+	dev-java/log4j:0
 	dev-java/spin:0
 	"
 
diff --git a/app-text/jabref/jabref-2.10_beta2.ebuild b/app-text/jabref/jabref-2.10_beta2.ebuild
deleted file mode 100644
index e24139772..000000000
--- a/app-text/jabref/jabref-2.10_beta2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EANT_DOC_TARGET="docs"
-EANT_BUILD_TARGET="jars"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-SFVERSION="2.10b2"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${SFVERSION}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${PN}-${SFVERSION}"
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${SFVERSION}.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
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}