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/jellyfish/
Date: Tue, 21 Nov 2017 16:09:19
Message-Id: 1511280534.03271b4b44f838754e7af1b70c62366c42f4d4d2.mmokrejs@gentoo
1 commit: 03271b4b44f838754e7af1b70c62366c42f4d4d2
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Tue Nov 21 16:08:54 2017 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Tue Nov 21 16:08:54 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=03271b4b
7
8 sci-biology/jellyfish: rename jellyfish to jellyfish1
9
10 This will facilitate simultaneous installs of jeelyfish2
11 and jellyfish, so that sci-biology/SEECER and sci-biology/quorum
12 could be installed at the same time (both calling "jellyfish"
13 but quorum needs version 2 and SEECER version 1.
14 See list of files at https://packages.debian.org/unstable/jellyfish1
15
16 Package-Manager: Portage-2.3.14, Repoman-2.3.6
17
18 .../jellyfish/{jellyfish-1.1.11.ebuild => jellyfish-1.1.11-r1.ebuild} | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-)
20
21 diff --git a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild b/sci-biology/jellyfish/jellyfish-1.1.11-r1.ebuild
22 similarity index 85%
23 rename from sci-biology/jellyfish/jellyfish-1.1.11.ebuild
24 rename to sci-biology/jellyfish/jellyfish-1.1.11-r1.ebuild
25 index 9134a98d4..923784ada 100644
26 --- a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
27 +++ b/sci-biology/jellyfish/jellyfish-1.1.11-r1.ebuild
28 @@ -1,4 +1,4 @@
29 -# Copyright 1999-2016 Gentoo Foundation
30 +# Copyright 1999-2017 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI=6
34 @@ -34,6 +34,8 @@ src_prepare(){
35 }
36
37 src_install(){
38 + # install the binary under jellyfish1 name like Debian/Ubuntu to avoid name clash with jellyfish2 and allow simultaneous installs
39 + mv bin/jellyfish bin/jellyfish1 || die
40 default
41 sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-1.1.pc || die
42 mkdir -p "${ED}/usr/include/${PN}" || die