[gentoo-commits] proj/sci:master commit in: app-text/jabref/

[Justin Lecher]

commit:     f20a5c6df87a80bba5a07d5fce10bd7d7d0c10c4
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 07:55:38 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 07:55:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f20a5c6d

app-text/jabref: Add missing dep

Package-Manager: portage-2.2.8-r1

---
 app-text/jabref/ChangeLog                   |  5 +++
 app-text/jabref/jabref-2.10_beta-r1.ebuild  | 65 -----------------------------
 app-text/jabref/jabref-2.10_beta.ebuild     | 35 ----------------
 app-text/jabref/jabref-2.10_beta2-r1.ebuild |  1 +
 app-text/jabref/jabref-2.10_beta2.ebuild    | 35 ----------------
 5 files changed, 6 insertions(+), 135 deletions(-)

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index fc8648b..f194baf 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@g.o> -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@g.o>
   jabref-2.10_beta2-r1.ebuild:
   app-text/jabref: Remove another bundled library.

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 e8cd8a1..0000000
--- 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 0c13e73..0000000
--- 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 5047c57..7ac1db1 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 e241397..0000000
--- 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
-}