--- /usr/portage/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild	2019-10-01 14:39:51.000000000 -0500
+++ /usr/local/portage/paintchip/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.04.ebuild	2020-05-11 22:29:02.904111940 -0500
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator toolchain-funcs
+inherit toolchain-funcs
 
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
+MY_PV=$(ver_rs 1 _ "$(ver_cut 2-)")
 MY_PN=df
 MY_P=${MY_PN}_${MY_PV}