Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-tools++/
Date: Wed, 25 Jun 2014 21:02:46
Message-Id: 1403730120.3f54d211a74334d29b3c624edc1c96743aa8785b.mmokrejs@gentoo
1 commit: 3f54d211a74334d29b3c624edc1c96743aa8785b
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Wed Jun 25 21:02:00 2014 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Wed Jun 25 21:02:00 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3f54d211
7
8 sci-biology/ncbi-tools++-12.0.0: install colliding files under a name suffixed by a plus sign
9
10 ---
11 sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild | 8 ++++++--
12 1 file changed, 6 insertions(+), 2 deletions(-)
13
14 diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
15 index 8ee3f16..6de9b4f 100644
16 --- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
17 +++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
18 @@ -339,8 +339,12 @@ src_install() {
19 # doheader "${S}"_build/inc/*
20
21 # File collisions with sci-biology/ncbi-tools
22 - rm -f "${ED}"/usr/bin/{asn2asn,rpsblast,test_regexp}
23 - mv "${ED}"/usr/bin/seedtop "${ED}"/usr/bin/seedtop2
24 + #rm -f "${ED}"/usr/bin/{asn2asn,rpsblast,test_regexp,vecscreen}
25 + mv "${ED}"/usr/bin/asn2asn "${ED}"/usr/bin/asn2asn+
26 + mv "${ED}"/usr/bin/rpsblast "${ED}"/usr/bin/rpsblast+
27 + mv "${ED}"/usr/bin/test_regexp "${ED}"/usr/bin/test_regexp+
28 + mv "${ED}"/usr/bin/vecscreen "${ED}"/usr/bin/vecscreen+
29 + mv "${ED}"/usr/bin/seedtop "${ED}"/usr/bin/seedtop+
30
31 echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}" > ${S}/99${PN}
32 doenvd "${S}/99${PN}"