app-text/jabref-2.10-r2: Removing glazedlist bundled library.

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

3 files changed, 88 insertions, 5 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index e62d14af3bc7..5600cc038ba3 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/jabref
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.97 2014/03/15 13:24:48 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.98 2014/03/21 14:22:19 nicolasbock Exp $
+
+*jabref-2.10-r2 (21 Mar 2014)
+
+  21 Mar 2014; Nicolas Bock <nicolasbock@gentoo.org> +jabref-2.10-r2.ebuild:
+  app-text/jabref-2.10-r2: Removing glazedlist bundled library.
 
 *jabref-2.10-r1 (15 Mar 2014)
 
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 914dffd8e78e..2d4b7f68e284 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -8,17 +8,18 @@ DIST JabRef-2.10b3-src.tar.bz2 16799104 SHA256 0ff6084d55273644210a6caaa1a2c465c
 DIST JabRef-2.6-src.tar.bz2 7028591 SHA256 fd7551b796cdeca8db0b3cb8f089fcb673b03d797b6ff0e68216b1201792d02c SHA512 63302871ed8724451d76fed451b585f13b776f2ab5b765ba4d95b55652ea5c8ffccbdecbe3cd4d4e9f43bd03268da4e24896a0ac6f61e54c985c7f11cab411ec WHIRLPOOL 01a3681644b2782ebd5ed3f0413a79f50ed9a514ef53421e90907263add8a80da675d6f27004ac5231b73eef24a3ecf022bfb7da48c89c4a764c58da3aa858ad
 DIST JabRef-2.9.2-src.tar.bz2 16664284 SHA256 12bc7e489709bc6f57327bf8e15c6bc9ceaa600369dca6452b7c13d792215e83 SHA512 40eb5d3f3528e92c4d5c62abce12d87ea63b84a58778a32151cd1af2a0198c49aa354ee295f8b3c9449d5b078f7119163babd3c29f358b0d56b3776980292463 WHIRLPOOL d2115e497066f31a3772085510f6820e46a55fbe36778471e6c81a4973f45607761cca80655cfefffb1308f65315ef72fb17791fe964d004826f345322ca0dcf
 EBUILD jabref-2.10-r1.ebuild 1861 SHA256 bc619d2a580d885a12fc100dafefd0a8c2e4de82de16c53e11455f327c1d735b SHA512 99a0e1c783520a999f2a9d9f7d58f1f5132c2d7da3abc46929d9347d88b9414ee6d6dbe12753ceb92104e2bc2f0ae42d2cca5f4eebc02347f6e1b2f8647c5c15 WHIRLPOOL 299a0791d00e64c94ce0a33885c0de63e4666baf3308f5a12fafd215ffb22cb9489fa45bf0845e68ec5719ac32576c30a33e078f7114192ff19902d7295e41f3
+EBUILD jabref-2.10-r2.ebuild 1935 SHA256 1e8b86d3dab9066b6384e5a59364238de6b7c1b60c159fc994a0637b3fac44dc SHA512 d9786a76aeee89d97eeceaee2bcb571771568e4e809f0898d42a981552ab2e52c312442d172be715394b78d6c5e2b888f60e1dbdfeb342be88a4c1af9e75a0b0 WHIRLPOOL 84adffda7d7005a9e1755daf04fa9367f0a32db30c4d2348d065d4bd273f13e60bacdf9ab610f2a8a82666e74520a3b2b22a51b80c967f6b00c8db67419d9d97
 EBUILD jabref-2.10.ebuild 1688 SHA256 8cf7ca89ce649714416f4ec3ce87a5706ef1bbe42788ec654a8e3580ee12ab8c SHA512 4349b3e712ebee3597d9d51e93fef4c8c7ddad04e55f22b6ae464a9c5ad86a104a3bdd1bb855b9cfb897fcd57cb1058b0db68da5435dbaaf8527525b01f71e1f WHIRLPOOL 42ea08d7d642134dfa04b10263b71dd3338243651e80e52995015a4af14d3c9da628d50f7dc3eda0c814548440aaec10a255a6ed86800819fc3752613083316c
 EBUILD jabref-2.10_beta2.ebuild 1694 SHA256 2ae1a3e29566bdda79d8ca09a889cd175e1ae4e21f8fe0fbf8cb17726b8bfbb2 SHA512 719f776b12e50bc4c7d682c6c760cd6de65e58c34c14bfff6d8b920f07d39804073bc0bdfb8a50ec142835b5ef48738942a3b8c85d7a6a5a5db597c33dd31f98 WHIRLPOOL 00689cdf2875ed7b733324a4b0805d87ab5192390df507166d698e2f9bfd315e79e2e36fffa888b4e4f5f251a643639612c500206cb599006f0701b6d5298ff8
 EBUILD jabref-2.10_beta3.ebuild 1773 SHA256 db177cb3f02aa9e35b70f26a712a3cd79b642007278588c9f3fc2d9d1d8fc925 SHA512 a47871a806d544de1f83147c919061a841d3fd0a1aeb2230b5604bab71a06d8d275deb964e6106e7cde21fe4176de47136b571e17775d89711fdb6570fb6c7bc WHIRLPOOL 12b289ca59f42548bbc504225cf9d3d28ccd3eb21031989e3e9fa4655ed89d5b8bdb06d4aba9d0bb9ee9e2c8db692a1acc02b2b218f21521ac008d37e9592125
 EBUILD jabref-2.6.ebuild 2535 SHA256 1d4c8f77a7c1d32310dcd4e806b89fa1f255c7caaa271d309c86447a481a02c4 SHA512 e58e47e09922b03954a3cdba136cfc2078673420f1951835b8164925c270a16886516ebbb2f8bcd61cb6c42ceb64488a4d41645da6ce67d54cc2983c99bf18f9 WHIRLPOOL 99c6ba5bdb67c6094da1c1f0ec0262c6a2f0cd1c1858efae41c6a2dd6ac657a5de9b9e1443d46a5e0943ed8fc5c7d4af41767be7de9f57dbe07ffb275b144e42
 EBUILD jabref-2.9.2.ebuild 1120 SHA256 4f4ed6020f45b0c43fc2e42305bb871e6c6b60e9f71a01359eb66559b1a382d1 SHA512 d77d747d4115ac4c14fb6a5e2fa53696710b41554f0dca945fc9d66fedd6dc1d7776366c0a69082d12f45b29193e487493ef13158d95065dedfd8043efec3664 WHIRLPOOL 18755a62c04cb82e420f6e965f47467d4f7185194ba9f1a62ab0793dd0aa6ad0c0f1b0fa8b65781e0097e659b94a3ee2d23b715a8e2a494ef0658f81d6d98c8c
-MISC ChangeLog 13901 SHA256 a94697e9004fd98cda6dd8ed1a42905326d7d7286c1d6c0497ed38fb0cb95387 SHA512 186603d0de706dc0681eb9c1aed8018412ee3461a3a36f26affa9654e26e49d37ec70f7bb5c0548096343b927a06fba6d05ff1a8edbd33a2c4a24f6655946605 WHIRLPOOL 474fa0335314f087c585ddc16099b2d1da07330e0b59eb539b15a454c0f92a641a55453d8da77f9668588a49812be05100ffc81d67daa0e1e859095e53d82f32
+MISC ChangeLog 14074 SHA256 c5f00e63ca7b434ac787aa37f1542855e8a0ecd4dfdad5e09263851f85b4d718 SHA512 a10096da0ec8b5d1c6931b3697d0f80c61c0e4efd2039a5a40ca5e563273961afd176da7b229c9e99cdd1b008374b0c3f65bc7795e464ddf4955eb9b59e3f78f WHIRLPOOL bc2553f012294f22ac1bfbd2a8b8840bd3b044a87601791bd754433649f7ea3b3f966ddb32814f8dc8bb5fbed9ac9198b9e355ccab504cfd117605e3c89bfb27
 MISC metadata.xml 245 SHA256 ca0e2cc158acb7aa2e3f35f242757f3ea48c63b4774ce0d917a36883a779e603 SHA512 a1ba5aa8ecce0fb8e837691c50e710c0198748c986df4730aaf5fc73bd939a9b083c0a02ca15a8e54ab4bf43b9ccce30ace854fad0af35a0ac6aebb8f07cb969 WHIRLPOOL af577810462412dfabbd44aae2cc599eb73c4a13a3519807612e15af88be5214f8c288fa41153dd245b96a2995589dd56e75137163a019d32a95f25bdecdb813
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMkVKYACgkQf15tZKyRylK0ZgCeIMNK7wB98dDUc053z2fRUHRX
-1EMAnRkfbK8EeluWTcYs/ztp1PR3bGE5
-=Kt8N
+iEYEAREIAAYFAlMsSxwACgkQf15tZKyRylKIEgCg2vCgt1O959TbgQicx18bTsMn
+MDgAoNBDQzwQhQPSZf4SFcXbQ5ivtzrP
+=rkEA
 -----END PGP SIGNATURE-----
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
new file mode 100644
index 000000000000..46e60a10f695
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 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.1 2014/03/21 14:22:19 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:3
+	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
+	"
+
+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-3,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
+}