3 files changed, 30 insertions, 10 deletions
diff --git a/sci-biology/gmap/Manifest b/sci-biology/gmap/Manifest
index 2221d6ef0191..389c55c2b131 100644
--- a/sci-biology/gmap/Manifest
+++ b/sci-biology/gmap/Manifest
@@ -1,3 +1,4 @@
-DIST gmap-gsnap-2015-12-31.v5.tar.gz 4169874 BLAKE2B bbbf53b72b5b7f97ba0eb05db7daa3d1f8a9330f32b96c2460a904a9f9f22078093f6fa585a12d4275e0943145ee78ef99348de4f19349dfa4e81d5f65572e1c SHA512 d42623c60c298d9d3009893432f3eef8cb764bf7cf26b42e6a95b27a468fffab20c8307597c4c8e1afdd61f35652246568c3162137ce59fc4850aaab1062bb48
-EBUILD gmap-2015.12.31.5.ebuild 573 BLAKE2B 0f419e1978d475ea2cc509667d0bf5c389761a42439c8778309217a8b3bcb47215344531784b576d5dba5f0c972cf51a6cafc624f0a0ea3a899387b7a507200b SHA512 8a07e7de0c5d57a2fdc4b7e9da261f469722482be4acdaebcdd76b67d26440ad04cf93ce51a98e908a19ccb6d98bc2725103f9cac7cfcf254812d6499ce8aa70
+AUX gmap-2020.10.27-fno-common.patch 483 BLAKE2B 61055eccbfddd694128288594056d880beaab5f8cf61774c7f745a948fff15ff7e5261c333a0f26152e6f23d8546958e497b7975c9d8150b5279076be05dd4b0 SHA512 ea3de0c56db2c4683cad8471e5f772670288d003e7be8404b8c7528af5d4624c40f390c77b35c3f435ce8459e629783b1d26e8a76f2a479aed3c22feaa78a1a0
+DIST gmap-gsnap-2020-10-27.tar.gz 4480720 BLAKE2B 9f8e8bfab19c079111d42ec466dd145385d35e3fde0a809e46776ed1b62b599664f12618803ea4475b6961a053423a8794d0b77eb0b308bdfa927b5bcaa7d49c SHA512 22e59adf404f5ef524b3cd472fb3124d03c8c55aa7946b9dc3901f5070339dc765f8f1ecc7e394b69a14bf80923f7a9db8d545e45328a346996b3288115a535b
+EBUILD gmap-2020.10.27.ebuild 479 BLAKE2B f3363283af3980dd1d95f33d66ea0bbe54780e9d4ff0a1b0c601d545592086a27d4af2c446b500a43a20887bb0df9632e6716fccb3e925e786b007b2ddbe5302 SHA512 7db5938e76273af4063b2c84c292ad657f50d40ccff35fe391217fefcc358882d86dbc5db1fee448b7e36b0ca5a3c6aae438691838df61274df6682d1c473671
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/gmap/files/gmap-2020.10.27-fno-common.patch b/sci-biology/gmap/files/gmap-2020.10.27-fno-common.patch
new file mode 100644
index 000000000000..cc225a78c26e
--- /dev/null
+++ b/sci-biology/gmap/files/gmap-2020.10.27-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/dynprog_end.c
++++ b/src/dynprog_end.c
+@@ -109,7 +109,7 @@
+ static Trieoffset_T *trieoffsets_max;
+ static Triecontent_T *triecontents_max;
+ 
+-bool homopolymerp;
++static bool homopolymerp;
+ 
+ void
+ Dynprog_end_setup (Univcoord_T *splicesites_in, Splicetype_T *splicetypes_in,
+--- a/src/dynprog_single.c
++++ b/src/dynprog_single.c
+@@ -91,7 +91,7 @@
+ 
+ #define T Dynprog_T
+ 
+-bool homopolymerp;
++static bool homopolymerp;
+ 
+ void
+ Dynprog_single_setup (bool homopolymerp_in) {
diff --git a/sci-biology/gmap/gmap-2015.12.31.5.ebuild b/sci-biology/gmap/gmap-2020.10.27.ebuild
index 82ae6f3f2748..a90f0f631068 100644
--- a/sci-biology/gmap/gmap-2015.12.31.5.ebuild
+++ b/sci-biology/gmap/gmap-2020.10.27.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
-
-MY_BASE_PV="$(replace_all_version_separators '-' $(get_version_component_range 1-3))"
-MY_PV="${MY_BASE_PV}.v$(get_version_component_range 4)"
+MY_PV="$(ver_rs 1- '-')"
 
 DESCRIPTION="A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
 HOMEPAGE="http://research-pub.gene.com/gmap/"
@@ -14,7 +11,7 @@ SRC_URI="http://research-pub.gene.com/gmap/src/gmap-gsnap-${MY_PV}.tar.gz"
 
 LICENSE="gmap"
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/gmap-${MY_BASE_PV}"
+S="${WORKDIR}/gmap-${MY_PV}"
+PATCHES=( "${FILESDIR}"/${PN}-2020.10.27-fno-common.patch )