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/repeatmasker/
Date: Tue, 31 Jan 2017 18:04:46
Message-Id: 1485885866.ca02fa6f25e71ab9956a8fd21a9fa1ae80e1ff49.mmokrejs@gentoo
1 commit: ca02fa6f25e71ab9956a8fd21a9fa1ae80e1ff49
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Tue Jan 31 18:04:26 2017 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Tue Jan 31 18:04:26 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ca02fa6f
7
8 sci-biology/repeatmasker: remove escaping backslashes so that the ebuild works again
9
10 Also drop the full paths from configure which otherwise needed EPREFIX mangling
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 sci-biology/repeatmasker/repeatmasker-4.0.6-r3.ebuild | 16 ++++++++--------
15 1 file changed, 8 insertions(+), 8 deletions(-)
16
17 diff --git a/sci-biology/repeatmasker/repeatmasker-4.0.6-r3.ebuild b/sci-biology/repeatmasker/repeatmasker-4.0.6-r3.ebuild
18 index 8155caa..a3ebd5a 100644
19 --- a/sci-biology/repeatmasker/repeatmasker-4.0.6-r3.ebuild
20 +++ b/sci-biology/repeatmasker/repeatmasker-4.0.6-r3.ebuild
21 @@ -35,8 +35,8 @@ src_prepare(){
22 }
23
24 src_configure() {
25 - sed -e "s#/usr/bin/which#${EPREFIX}/usr/bin/which#g" -i "${S}"/configure || die
26 - sed -e "s#/usr/bin/perl#${EPREFIX}/usr/bin/perl#g" -i "${S}"/configure || die
27 + sed -e "s#/usr/bin/which#which#g" -i "${S}"/configure || die
28 + sed -e "s#/usr/bin/perl#perl#g" -i "${S}"/configure || die
29 perl_set_version
30 insinto ${VENDOR_LIB}
31 sed -e "s#/usr/perl5/lib/#${VENDOR_LIB}#g" -i "${S}"/configure || die
32 @@ -53,18 +53,18 @@ src_configure() {
33 # below try to define paths to trf, cross_match, rmblast and nhmmer as search tools
34 echo "
35 env
36 -\"${S}\"
37 -"${EPREFIX}"/opt/bin
38 +${S}
39 +${EPREFIX}/opt/trf/bin
40 1
41 -"${EPREFIX}"/usr/bin
42 +${EPREFIX}/usr/bin
43 Y
44 2
45 -"${EPREFIX}"/usr/bin
46 +${EPREFIX}/usr/bin
47 Y
48 4
49 -"${EPREFIX}"/usr/bin
50 +${EPREFIX}/usr/bin
51 Y
52 -5" | "${S}/configure" || die "configure failed"
53 +5" | "${S}"/configure || die "configure failed"
54 sed -i -e "s|use lib $FindBin::RealBin;|use lib ${EPREFIX}/usr/share/${PN}/lib;|" \
55 -e "s|.*\(taxonomy.dat\)|${EPREFIX}/usr/share/${PN}/Libraries/\1|" \
56 -e "/$REPEATMASKER_DIR/ s|$FindBin::RealBin|${EPREFIX}/usr/share/${PN}|" \