--- chicken-4.13.0-r1.ebuild	2020-09-14 10:33:39.467351064 +1000
+++ chicken-5.2.0.ebuild	2020-09-14 13:58:45.467504891 +1000
@@ -1,18 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-3)
 DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
 HOMEPAGE="http://www.call-cc.org/"
-SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
+SRC_URI="http://code.call-cc.org/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=""
@@ -21,8 +18,8 @@
 src_prepare() {
 	default
 
-	#Because chicken's Upstream is in the habit of using variables that
-	#portage also uses :( eg. $ARCH and $A
+	# Because chicken's Upstream is in the habit of using variables that
+	# portage also uses :( eg. $ARCH and $A
 	sed "s,A\(\s?=\|)\),chicken&," \
 		-i Makefile.cross-linux-mingw defaults.make rules.make || die
 	sed "s,ARCH,zARCH," \
@@ -32,7 +29,7 @@
 		-i defaults.make || die
 
 	if ! use doc; then
-		rm -rf manual || die
+		rm -rf manual-html || die
 		# Without this Makefile tries to re-bootstrap the compiler
 		touch build-version.c
 	fi
@@ -60,7 +57,7 @@
 	dodoc NEWS
 
 	# Let portage track this file (created later)
-	touch "${D}"/usr/$(get_libdir)/chicken/8/modules.db || die
+	touch "${D}"/usr/$(get_libdir)/chicken/11/modules.db || die
 }
 
 pkg_postinst() {