[gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-blast+/files/, sci-biology/ncbi-blast+/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     a6e8082dd9b651ba5114e1dbb08859e06d52f320
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Sun Nov 22 21:18:31 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Sun Nov 22 21:18:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a6e8082d

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

Package-Manager: portage-2.2.18

 sci-biology/ncbi-blast+/ChangeLog                                 | 8 ++++++++
 ...{fix_lib_deps.patch => ncbi-blast+-2.2.30__fix_lib_deps.patch} | 0
 sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild                 | 2 +-
 .../{ncbi-blast+-2.2.30.ebuild => ncbi-blast+-2.2.31.ebuild}      | 5 ++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sci-biology/ncbi-blast+/ChangeLog b/sci-biology/ncbi-blast+/ChangeLog
index 4570694..4e01710 100644
--- a/sci-biology/ncbi-blast+/ChangeLog
+++ b/sci-biology/ncbi-blast+/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*ncbi-blast+-2.2.31 (22 Nov 2015)
+
+  22 Nov 2015; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  +files/ncbi-blast+-2.2.30__fix_lib_deps.patch, +ncbi-blast+-2.2.31.ebuild,
+  -files/fix_lib_deps.patch, ncbi-blast+-2.2.30.ebuild:
+  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
+
   17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Add sqlite3 flag description.
 

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
similarity index 100%
rename from sci-biology/ncbi-blast+/files/fix_lib_deps.patch
rename to sci-biology/ncbi-blast+/files/ncbi-blast+-2.2.30__fix_lib_deps.patch

diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
index 31152c5..3008025 100644
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
+++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
@@ -125,7 +125,7 @@ src_prepare() {
 ##	epatch ${PATCHES[@]}
 
 	# 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
-	epatch "${FILESDIR}"/fix_lib_deps.patch
+	epatch "${FILESDIR}"/"${P}"__fix_lib_deps.patch
 	# make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
 	# https://bugs.gentoo.org/show_bug.cgi?id=514706
 

diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
similarity index 98%
copy from sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
copy to sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
index 31152c5..9b3c9b2 100644
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
+++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
@@ -125,7 +125,10 @@ src_prepare() {
 ##	epatch ${PATCHES[@]}
 
 	# 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
-	epatch "${FILESDIR}"/fix_lib_deps.patch
+	# the patches for 2.2.30+ do not apply to 2.2.31, mostly DLL_LIB is gone but somewhere
+	# it is still present, plus in a few places was something else patched
+	# staying without any patches for now and lets see is it works on Gentoo
+	# epatch "${FILESDIR}"/fix_lib_deps.patch
 	# make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
 	# https://bugs.gentoo.org/show_bug.cgi?id=514706