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 AE407138331 for ; Mon, 3 Oct 2016 20:21:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AABC5E0BDF; Mon, 3 Oct 2016 20:21:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5ACC3E0BD8 for ; Mon, 3 Oct 2016 20:21:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE739340F14 for ; Mon, 3 Oct 2016 20:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59DAB24A8 for ; Mon, 3 Oct 2016 20:21:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1475526081.6cd0461e803e777a0b1d91569a25a91b05edc4b1.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/samtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/samtools/samtools-0.1.20-r2.ebuild sci-biology/samtools/samtools-0.1.20-r3.ebuild X-VCS-Directories: sci-biology/samtools/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6cd0461e803e777a0b1d91569a25a91b05edc4b1 X-VCS-Branch: master Date: Mon, 3 Oct 2016 20:21:35 +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: f968e384-eb9b-48eb-8205-7b8b279787e1 X-Archives-Hash: 3b08911945a5f7eb940f9616bd7b1189 commit: 6cd0461e803e777a0b1d91569a25a91b05edc4b1 Author: David Seifert gentoo org> AuthorDate: Mon Oct 3 19:50:27 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Oct 3 20:21:21 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd0461e sci-biology/samtools: Use 'python-single-r1' instead of 'python-r1' Package-Manager: portage-2.3.1 ...-0.1.20-r2.ebuild => samtools-0.1.20-r3.ebuild} | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/sci-biology/samtools/samtools-0.1.20-r2.ebuild b/sci-biology/samtools/samtools-0.1.20-r3.ebuild similarity index 60% rename from sci-biology/samtools/samtools-0.1.20-r2.ebuild rename to sci-biology/samtools/samtools-0.1.20-r3.ebuild index e30ed26..787add8 100644 --- a/sci-biology/samtools/samtools-0.1.20-r2.ebuild +++ b/sci-biology/samtools/samtools-0.1.20-r3.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils python-r1 toolchain-funcs +inherit python-single-r1 toolchain-funcs DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats" HOMEPAGE="http://samtools.sourceforge.net/" @@ -16,10 +16,10 @@ LICENSE="MIT" SLOT="0.1-legacy" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="examples" - REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="sys-libs/ncurses:0= +RDEPEND="${PYTHON_DEPS} + sys-libs/ncurses:0= dev-lang/perl" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -30,7 +30,8 @@ PATCHES=( src_prepare() { default - sed -i 's~/software/bin/python~/usr/bin/env python~' "${S}"/misc/varfilter.py || die + # required, otherwise python_fix_shebang errors out + sed -i 's~/software/bin/python~/usr/bin/env python~' misc/varfilter.py || die tc-export CC AR } @@ -41,24 +42,24 @@ src_compile() { } src_install() { - dobin samtools $(find bcftools misc -type f -executable) - mv "${ED}"/usr/{bin,${PN}-${SLOT}} || die - mkdir "${ED}"/usr/bin || die - mv "${ED}"/usr/{${PN}-${SLOT},bin/} || die + # install executables and hide them away from sight + dobin samtools bcftools/{bcftools,vcfutils.pl} misc/{*.py,*.pl,wgsim,ace2sam} \ + misc/{md5sum-lite,maq2sam-short,bamcheck,maq2sam-long,md5fa,plot-bamcheck} + mv "${ED%/}"/usr/{bin,${PN}-${SLOT}} || die + mkdir "${ED%/}"/usr/bin || die + mv "${ED%/}"/usr/{${PN}-${SLOT},bin/} || die - mv "${ED}"/usr/bin/${PN}-${SLOT}/varfilter{,-${SLOT}}.py || die - python_replicate_script "${ED}"/usr/bin/${PN}-${SLOT}/varfilter-${SLOT}.py + # ... do the same with the python script, but also fix the shebang + mv "${ED%/}"/usr/bin/${PN}-${SLOT}/varfilter{,-${SLOT}}.py || die + python_fix_shebang "${ED%/}"/usr/bin/${PN}-${SLOT}/varfilter-${SLOT}.py # fix perl shebangs - pushd "${ED}"usr/bin/"${PN}-${SLOT}"/ >> /dev/null + pushd "${ED%/}"/usr/bin/${PN}-${SLOT} >/dev/null || die local i for i in plot-bamcheck *.pl; do sed -e '1s:.*:#!/usr/bin/env perl:' -i "${i}" || die done - - # remove lua scripts - rm -f r2plot.lua vcfutils.lua || die - popd >> /dev/null + popd >/dev/null || die dolib.so libbam-${SLOT}$(get_libname 1) dosym libbam-${SLOT}$(get_libname 1) /usr/$(get_libdir)/libbam-${SLOT}$(get_libname) @@ -68,9 +69,12 @@ src_install() { mv ${PN}{,-${SLOT}}.1 || die doman ${PN}-${SLOT}.1 - dodoc AUTHORS NEWS + einstalldocs - use examples && dodoc -r examples + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi } pkg_postinst() {