[gentoo-commits] proj/sci:master commit in: sci-biology/subread/files/, sci-biology/subread/

[gentoo-commits] proj/sci:master commit in: sci-biology/subread/files/, sci-biology/subread/

[Jakov Smolić]

commit:     c2bedc8fe20d87568f4a7503474e355006693c1e
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Feb 20 21:08:45 2021 +0000
Commit:     Jakov Smolić <jakov.smolic <AT> sartura <DOT> hr>
CommitDate: Sat Feb 20 21:57:41 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c2bedc8f

sci-biology/subread: Fix build with gcc-10

Closes: https://bugs.gentoo.org/755539
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>

 sci-biology/subread/files/subread-2.0.1-fno-common.patch | 11 +++++++++++
 sci-biology/subread/subread-2.0.1.ebuild                 | 13 ++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sci-biology/subread/files/subread-2.0.1-fno-common.patch b/sci-biology/subread/files/subread-2.0.1-fno-common.patch
new file mode 100644
index 000000000..8f86840c5
--- /dev/null
+++ b/sci-biology/subread/files/subread-2.0.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/gene-algorithms.h
++++ b/src/gene-algorithms.h
+@@ -60,7 +60,7 @@ void add_allvote_q(gene_allvote_t* allvote,int qid , int pos, gene_vote_number_t
+ 
+ unsigned char get_next_char(FILE * fp);
+ 
+-unsigned char * replica_index;
++extern unsigned char * replica_index;
+ 
+ extern double begin_ftime;
+ 

diff --git a/sci-biology/subread/subread-2.0.1.ebuild b/sci-biology/subread/subread-2.0.1.ebuild
index 18f11e5a6..a16d0af5f 100644
--- a/sci-biology/subread/subread-2.0.1.ebuild
+++ b/sci-biology/subread/subread-2.0.1.ebuild
@@ -5,14 +5,7 @@ EAPI=7
 
 DESCRIPTION="NGS suite for analysis of mapped reads, summary of exon/intron/gene counts"
 HOMEPAGE="http://bioinf.wehi.edu.au/featureCounts/" # no https
-if [ "$PV" == "9999" ]; then
-	inherit subversion
-	ESVN_REPO_URI="https://subread.svn.sourceforge.net/svnroot/subread/trunk"
-	KEYWORDS=""
-else
-	SRC_URI="https://sourceforge.net/projects/subread/files/${P}/${P}-source.tar.gz"
-	KEYWORDS=""
-fi
+SRC_URI="https://sourceforge.net/projects/subread/files/${P}/${P}-source.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -20,7 +13,9 @@ SLOT="0"
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-S="${S}"-source
+S="${S}-source"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare(){
 	default