From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B6171384B4 for ; Sun, 6 Dec 2015 13:13:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ABD521C073; Sun, 6 Dec 2015 13:13:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2FCE21C073 for ; Sun, 6 Dec 2015 13:13:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6ADED34082B for ; Sun, 6 Dec 2015 13:13:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 372EEABD for ; Sun, 6 Dec 2015 13:13:09 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1449407575.8237598b6e87fcb2765baa3f6cdd1116a203b67e.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/jabref/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/jabref/jabref-2.10-r4.ebuild X-VCS-Directories: app-text/jabref/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 8237598b6e87fcb2765baa3f6cdd1116a203b67e X-VCS-Branch: master Date: Sun, 6 Dec 2015 13:13:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dfa9cd5f-5319-4649-b2f8-98ec0ae7f5c2 X-Archives-Hash: 0ff1f6bdd0ab521cd87480209eec5032 commit: 8237598b6e87fcb2765baa3f6cdd1116a203b67e Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 6 13:11:04 2015 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 6 13:12:55 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8237598b app-text/jabref: Fix antlr dependency now that Java 8 is addressed This really depends on ANTLR 2 and 3. The fix applied in bug #547934 was somewhat bogus as 4 wasn't being used at all except for its bundled version of 3. It is a non-issue now that 3 has a workaround for Java 8. Even though 3.2 depends on 2, it is unusual for a third party to depend on both. Upstream actually uses 3.4 so 3.5 would be a closer match but using 3.2 means you won't pull in two different versions of stringtemplate. Package-Manager: portage-2.2.26 app-text/jabref/jabref-2.10-r4.ebuild | 78 +++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/app-text/jabref/jabref-2.10-r4.ebuild b/app-text/jabref/jabref-2.10-r4.ebuild new file mode 100644 index 0000000..ad8387b --- /dev/null +++ b/app-text/jabref/jabref-2.10-r4.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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: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: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-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 +}