Revision bumping to make sure we get dependency rebuilds.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xAC91CA52

4 files changed, 91 insertions, 7 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index ca923df15000..1630c905e05f 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/jabref
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.102 2015/06/15 11:49:54 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.103 2015/06/19 16:24:13 nicolasbock Exp $
+
+*jabref-2.10-r3 (19 Jun 2015)
+
+  19 Jun 2015; Nicolas Bock <nicolasbock@gentoo.org> +jabref-2.10-r3.ebuild,
+  jabref-2.10-r2.ebuild:
+  Revision bumping to make sure we get dependency rebuilds.
 
   15 Jun 2015; Nicolas Bock <nicolasbock@gentoo.org>
   -files/jabref-2.4-build.xml.patch, jabref-2.10-r2.ebuild:
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 49fee83e7120..545cbd2eb772 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,4 +1,5 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 SHA256 09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942 WHIRLPOOL db0edafb63a6c37b001b071693278c2c0054ab20ae0744147fe8b1a828f1e575b7751d5aabca05a640fc7c099ce9402df835c6e81a0c3b21b7aa700110c426de
-EBUILD jabref-2.10-r2.ebuild 1959 SHA256 ab99af795a38715d9e86759eb903c9738421221ace6f380321260e30beb97178 SHA512 95cdd46457130f8f30ff0c251a90fddb0ac2c5e3f13fcac42be9e8af28a9aa28c11ab8c9b2bee3d2df923f1403ed590e54a60ce3e07b5b4f2bf2ba225d0f95ae WHIRLPOOL 12707852a937c10e3fdb63e935adf7c6f184056353bd8d93e967fb8431050b22305bff220bb6d011e16fe723c16c9409ad2f555518df1cd0a2a51be20b294184
-MISC ChangeLog 14702 SHA256 b2ea4bd673ba79151eb47dad57fdc134b3e716cc64a6c30f50f1f649d4f87d3e SHA512 fe6d0bdd5e34fbe3f440e8210e08709a8ee1ee3a12c457c9d9e0f710266a18be8c629241bdc97519dfe4a2fbef4d32c53c3149b65683d1b580fd47ad9fa4ab97 WHIRLPOOL e1a6604082f0b1e270141f195b2d57130c34dd3f2fb7c8ff2d443a38d5fa3c21b7408450dfa9f3d60aa24b84397720c503918ccdfc9b0e1531654661e0d8fe9e
+EBUILD jabref-2.10-r2.ebuild 1935 SHA256 c16b423022acc1b4b05179829521647400a8a3671fbe23e4c331a71a6e7a2f84 SHA512 ab608872372d72b541d09867e81010a6732581e34c627f71595ca45c4b0026324e32590609274d0da76cb9a1ab7dee6e092b0f4a24e26eaa303b4dfb1d77ea0e WHIRLPOOL d2ecc3c9a783acb0167cf6a495412b1900959d4e5211158d13bb62b243064ed61c0dcae65e6441a87a96f7421e8bd39c752f10aca8bf936462d9aef21f834902
+EBUILD jabref-2.10-r3.ebuild 1961 SHA256 ec4693cae07c675d69f946da49beeeb65ee930d8f2d06a530f3c7ce17d93406a SHA512 e40a28b0931df672b4a7bde3ca59676f75610681ae0f1a716c9c41d9ceece2f71508c1460cf4b50653b88b31723ffa01f768bd3181d9943733fedc38b8281701 WHIRLPOOL fb60c6143c77fe8f1a66d85543b1e1efc3f075afb60d4bc0dc645d22dd15eaf4608390b8e3fd44df2e59445a8d0ab96425c459395eded032bff6a0c9b725dce8
+MISC ChangeLog 14896 SHA256 5c59f68be2ace72e3f2f6a885528cdc49c5a71802c189590674d12b6ff3e93ef SHA512 555a18793b880411fc852045445b8707e0180f79efe15899237b7da553e273f5b8d81eeb997e6efa705cbe72984c4261d15348b53c5103ff14aaffb2f7279d82 WHIRLPOOL e650a3cf2725840dedb6a83c628f81d22930106ce997fc551e603ed2ccccc0a59526f5290de70aacb692d985c03fd23fe5d3c3d0c0c7ce978170f5f444652029
 MISC metadata.xml 321 SHA256 d81da1670385efdd40a0163bc6bbd14f504b2270af0ae403bec574ac5d69e5c8 SHA512 7f44e1b30a8afbb70e0ad134c5bc320b52fd5429397098f2a1786421fbae03d569ac55129f8f8d96b90c91c736679ed4f117d19bf85b192a27f0354c2b7e7464 WHIRLPOOL 64d8ca9c0846fc516c3f9b45402ca185057f41a2742b63eb3f0bc97285e883ec37d85a6101660a737bb493dd06144e084bf22fecbe97c7b783bf2495c1548809
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
index aa413b892f42..3dd5ee25dfee 100644
--- a/app-text/jabref/jabref-2.10-r2.ebuild
+++ b/app-text/jabref/jabref-2.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r2.ebuild,v 1.3 2015/06/15 11:49:54 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r2.ebuild,v 1.4 2015/06/19 16:24:13 nicolasbock Exp $
 
 EAPI=5
 
@@ -20,8 +20,7 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 COMMON_DEP="
-	dev-java/antlr:0
-	dev-java/antlr:4
+	dev-java/antlr:3
 	dev-java/fontbox:1.7
 	dev-java/jempbox:1.7
 	dev-java/log4j:0
@@ -58,7 +57,7 @@ java_prepare() {
 }
 
 src_compile() {
-	local EXTERNAL_JARS="antlr,antlr-4,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
+	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
 	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
 	eant \
 		-Dgentoo.classpath=${CLASSPATH} \
diff --git a/app-text/jabref/jabref-2.10-r3.ebuild b/app-text/jabref/jabref-2.10-r3.ebuild
new file mode 100644
index 000000000000..e4147880df59
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r3.ebuild,v 1.1 2015/06/19 16:24:13 nicolasbock Exp $
+
+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/antlr:0
+	dev-java/antlr:4
+	dev-java/fontbox:1.7
+	dev-java/jempbox:1.7
+	dev-java/log4j:0
+	dev-java/spin:0
+	dev-java/microba:0
+	>=dev-java/glazedlists-1.8.0: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/antlr*.jar || die
+	rm lib/fontbox*.jar || die
+	rm lib/jempbox*.jar || die
+	rm lib/spin.jar || die
+	rm lib/microba.jar || die
+	rm lib/glazedlists*.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
+
+	# Fix license file copy operation for microba bundled lib.
+	sed -i -e 's:^.*microba-license.*::' build.xml
+}
+
+src_compile() {
+	local EXTERNAL_JARS="antlr,antlr-4,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
+	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
+}