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-blast+/files/, sci-biology/ncbi-blast+/
Date: Sun, 22 Nov 2015 21:20:04
Message-Id: 1448227111.a6e8082dd9b651ba5114e1dbb08859e06d52f320.mmokrejs@gentoo
1 commit: a6e8082dd9b651ba5114e1dbb08859e06d52f320
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Sun Nov 22 21:18:31 2015 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Sun Nov 22 21:18:31 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a6e8082d
7
8 sci-biology/ncbi-blast+-2.2.31: version bump, seems that some parts of the ncbi-blast+-2.2.30__fix_lib_deps.patch could/should be re-used
9
10 Package-Manager: portage-2.2.18
11
12 sci-biology/ncbi-blast+/ChangeLog | 8 ++++++++
13 ...{fix_lib_deps.patch => ncbi-blast+-2.2.30__fix_lib_deps.patch} | 0
14 sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild | 2 +-
15 .../{ncbi-blast+-2.2.30.ebuild => ncbi-blast+-2.2.31.ebuild} | 5 ++++-
16 4 files changed, 13 insertions(+), 2 deletions(-)
17
18 diff --git a/sci-biology/ncbi-blast+/ChangeLog b/sci-biology/ncbi-blast+/ChangeLog
19 index 4570694..4e01710 100644
20 --- a/sci-biology/ncbi-blast+/ChangeLog
21 +++ b/sci-biology/ncbi-blast+/ChangeLog
22 @@ -2,6 +2,14 @@
23 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
24 # $Id$
25
26 +*ncbi-blast+-2.2.31 (22 Nov 2015)
27 +
28 + 22 Nov 2015; Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
29 + +files/ncbi-blast+-2.2.30__fix_lib_deps.patch, +ncbi-blast+-2.2.31.ebuild,
30 + -files/fix_lib_deps.patch, ncbi-blast+-2.2.30.ebuild:
31 + sci-biology/ncbi-blast+-2.2.31: version bump, seems that some parts of the
32 + ncbi-blast+-2.2.30__fix_lib_deps.patch could/should be re-used
33 +
34 17 Jul 2015; Andrew Savchenko <bircoph@g.o> metadata.xml:
35 Add sqlite3 flag description.
36
37
38 diff --git a/sci-biology/ncbi-blast+/files/fix_lib_deps.patch b/sci-biology/ncbi-blast+/files/ncbi-blast+-2.2.30__fix_lib_deps.patch
39 similarity index 100%
40 rename from sci-biology/ncbi-blast+/files/fix_lib_deps.patch
41 rename to sci-biology/ncbi-blast+/files/ncbi-blast+-2.2.30__fix_lib_deps.patch
42
43 diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
44 index 31152c5..3008025 100644
45 --- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
46 +++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
47 @@ -125,7 +125,7 @@ src_prepare() {
48 ## epatch ${PATCHES[@]}
49
50 # use a Debian patch from http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ncbi-blast%2B/trunk/debian/patches/fix_lib_deps?revision=18535&view=markup
51 - epatch "${FILESDIR}"/fix_lib_deps.patch
52 + epatch "${FILESDIR}"/"${P}"__fix_lib_deps.patch
53 # make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
54 # https://bugs.gentoo.org/show_bug.cgi?id=514706
55
56
57 diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
58 similarity index 98%
59 copy from sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
60 copy to sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
61 index 31152c5..9b3c9b2 100644
62 --- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
63 +++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
64 @@ -125,7 +125,10 @@ src_prepare() {
65 ## epatch ${PATCHES[@]}
66
67 # use a Debian patch from http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ncbi-blast%2B/trunk/debian/patches/fix_lib_deps?revision=18535&view=markup
68 - epatch "${FILESDIR}"/fix_lib_deps.patch
69 + # the patches for 2.2.30+ do not apply to 2.2.31, mostly DLL_LIB is gone but somewhere
70 + # it is still present, plus in a few places was something else patched
71 + # staying without any patches for now and lets see is it works on Gentoo
72 + # epatch "${FILESDIR}"/fix_lib_deps.patch
73 # make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
74 # https://bugs.gentoo.org/show_bug.cgi?id=514706