From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC7101382C5 for ; Thu, 12 Apr 2018 11:22:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22EA8E084A; Thu, 12 Apr 2018 11:22:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3D54E084A for ; Thu, 12 Apr 2018 11:22:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DE1A335C07 for ; Thu, 12 Apr 2018 11:22:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37C68274 for ; Thu, 12 Apr 2018 11:22:20 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1523532121.32cd1f6f1c693d74575f0c0b5be30bf4d61c1999.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/picard/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/picard/picard-2.10.2.ebuild sci-biology/picard/picard-2.17.11.ebuild X-VCS-Directories: sci-biology/picard/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 32cd1f6f1c693d74575f0c0b5be30bf4d61c1999 X-VCS-Branch: master Date: Thu, 12 Apr 2018 11:22:20 +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: 99d38fd6-4832-45ff-8cac-f519cbdc167e X-Archives-Hash: 8ce8f0d38922b5c71759dfc671a4cbb6 commit: 32cd1f6f1c693d74575f0c0b5be30bf4d61c1999 Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Thu Apr 12 11:22:01 2018 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Thu Apr 12 11:22:01 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=32cd1f6f sci-biology/picard: version bump (not working yet) Bug: https://github.com/broadinstitute/picard/issues/605 Bug: https://bugs.gentoo.org/653012 Package-Manager: Portage-2.3.27, Repoman-2.3.9 sci-biology/picard/picard-2.10.2.ebuild | 58 ------------------------------ sci-biology/picard/picard-2.17.11.ebuild | 61 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 58 deletions(-) diff --git a/sci-biology/picard/picard-2.10.2.ebuild b/sci-biology/picard/picard-2.10.2.ebuild deleted file mode 100644 index bddadedbb..000000000 --- a/sci-biology/picard/picard-2.10.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java-based command-line utilities that manipulate SAM/BAM/CRAM/VCF files" -HOMEPAGE="http://picard.sourceforge.net - http://broadinstitute.github.io/picard" -SRC_URI="https://github.com/broadinstitute/picard/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -IUSE="" -KEYWORDS="" - -CDEPEND="dev-java/snappy:1.1 - dev-java/cofoja:0 - dev-java/commons-jexl:2 - dev-java/ant-core:0 - dev-java/htsjdk:0" - -DEPEND=">=virtual/jdk-1.8 - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.8 - ${CDEPEND}" - -EANT_BUILD_TARGET="all" -EANT_NEEDS_TOOLS="true" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="snappy-1.1,cofoja,commons-jexl-2,ant-core,htsjdk" - -java_prepare() { - default - rm -r src/java/picard/util/TestNGUtil.java src/tests/java/* || die - epatch "${FILESDIR}"/${PV}-build.xml.patch -} - -src_compile(){ - # work around gradle writing $HOME/.gradle and requiring $HOME/.git - # https://github.com/samtools/htsjdk/issues/660#issuecomment-232155965 - GRADLE_USER_HOME="${WORKDIR}" ./gradlew --stacktrace --debug || die -} - -#src_install() { -# cd dist || die -# java-pkg_dojar ${PN}.jar -# java-pkg_dojar ${PN}-lib.jar -# -# java-pkg_dolauncher ${PN} --main picard.cmdline.PicardCommandLine -# -# use source && java-pkg_dosrc "${S}"/src/java/* -# use doc && java-pkg_dojavadoc "${S}"/javadoc -#} diff --git a/sci-biology/picard/picard-2.17.11.ebuild b/sci-biology/picard/picard-2.17.11.ebuild new file mode 100644 index 000000000..636bf879c --- /dev/null +++ b/sci-biology/picard/picard-2.17.11.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +#JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="" + +inherit git-r3 java-pkg-2 + +DESCRIPTION="Java-based command-line utilities that manipulate SAM/BAM/CRAM/VCF files" +HOMEPAGE="http://picard.sourceforge.net + http://broadinstitute.github.io/picard" +EGIT_REPO_URI="https://github.com/broadinstitute/picard.git" +EGIT_BRANCH="${PV}" +# building outside of git is not possible, +# see https://github.com/broadinstitute/picard/issues/605 +#SRC_URI="https://github.com/broadinstitute/picard/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +IUSE="" +KEYWORDS="" + +CDEPEND="dev-java/snappy:1.1 + dev-java/cofoja:0 + dev-java/commons-jexl:2 + dev-java/htsjdk:0" + +DEPEND=">=virtual/jdk-1.8 + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.8 + ${CDEPEND}" + +EANT_BUILD_TARGET="all" +EANT_NEEDS_TOOLS="true" +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="snappy-1.1,cofoja,commons-jexl-2,htsjdk" + +src_prepare() { + default +} + +src_compile(){ + # work around gradle writing $HOME/.gradle, requiring $HOME/.git and $HOME/.m2/ + # https://github.com/samtools/htsjdk/issues/660#issuecomment-232155965 + # make jure SDK-1.8 is available, JRE-1.8 is not enough + GRADLE_USER_HOME="${WORKDIR}" ./gradlew --stacktrace --debug || die +} + +src_install() { + cd build/libs || die + java-pkg_dojar "${PN}".jar + java-pkg_dojar "${PN}"-*-SNAPSHOT.jar + + java-pkg_dolauncher ${PN} --main picard.cmdline.PicardCommandLine + + #use source && java-pkg_dosrc "${S}"/src/java/* + #use doc && java-pkg_dojavadoc "${S}"/javadoc +}