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 D3B4B139082 for ; Tue, 10 Jan 2017 00:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDEBBE0CDD; Tue, 10 Jan 2017 00:59:17 +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 B992BE0CDD for ; Tue, 10 Jan 2017 00:59:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0EC09341016 for ; Tue, 10 Jan 2017 00:59:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DCF12435 for ; Tue, 10 Jan 2017 00:59:14 +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: <1484008304.932231c6e6287f4f77189a6ae65b5885e1c7419a.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/ESTate/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/ESTate/ESTate-0.5.ebuild X-VCS-Directories: sci-biology/ESTate/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 932231c6e6287f4f77189a6ae65b5885e1c7419a X-VCS-Branch: master Date: Tue, 10 Jan 2017 00:59:14 +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: 0314ad0f-4f9a-4b0c-946c-e64d038435f3 X-Archives-Hash: 504317cd3905064f10221114f297613b commit: 932231c6e6287f4f77189a6ae65b5885e1c7419a Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Tue Jan 10 00:31:44 2017 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Tue Jan 10 00:31:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=932231c6 sci-biology/ESTate: avoid file collisions Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-biology/ESTate/ESTate-0.5.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sci-biology/ESTate/ESTate-0.5.ebuild b/sci-biology/ESTate/ESTate-0.5.ebuild index f48399d..aa66bcd 100644 --- a/sci-biology/ESTate/ESTate-0.5.ebuild +++ b/sci-biology/ESTate/ESTate-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,12 +28,12 @@ src_prepare(){ -i src/Makefile || die } -# Detected file collision(s) versus sci-biology/hmmer-2.3.2-r2: -# * sci-biology/ESTate-0.5:0::science -# * /usr/bin/revcomp -# * /usr/bin/translate - src_install(){ + # prevent file collision with sci-biology/hmmer-2.3.2 + newbin bin/{revcomp,revcomp_ESTate} + rm bin/revcomp || die + newbin bin/{translate,translate_ESTate} + rm bin/translate || die dobin bin/* doman doc/man/man1/*.1 doc/man/man7/*.7