diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.3.1-r25.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.3.1-r25.ebuild
deleted file mode 100644
index 1776276a2..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.3.1-r25.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.1"
-	["install"]="3.7.3.1"
-	["core"]="3.7.3"
-	["i18n"]="3.7.3.1"
-	["client"]="3.7.3.2"
-	["console"]="3.7.3"
-	["console-gui"]="3.7.3"
-	["update"]="3.7.3.5"
-	["builder"]="3.7.3.5"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.3.2-r16.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.3.2-r16.ebuild
deleted file mode 100644
index 795c4fdba..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.3.2-r16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.10"
-	["install"]="3.7.3.7"
-	["core"]="3.7.3.1"
-	["i18n"]="3.7.3.3"
-	["client"]="3.7.3.3"
-	["console"]="3.7.3"
-	["console-gui"]="3.7.3"
-	["update"]="3.7.3.8"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.3.3.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.3.3.ebuild
deleted file mode 100644
index d7e828383..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python3_9)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.20"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.3"
-	["i18n"]="3.7.3.6"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3.1"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.9"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r4.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r4.ebuild
deleted file mode 100644
index 82c67a0b9..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.17"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.1"
-	["i18n"]="3.7.3.5"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3"
-	["console-gui"]="3.7.3"
-	["update"]="3.7.3.8"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r5.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r5.ebuild
deleted file mode 100644
index 03e444edc..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.18"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.1"
-	["i18n"]="3.7.3.5"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3"
-	["console-gui"]="3.7.3"
-	["update"]="3.7.3.8"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r6.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r6.ebuild
deleted file mode 100644
index 386ed9f81..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.0-r6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.18"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.1"
-	["i18n"]="3.7.3.5"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.8"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r5.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r5.ebuild
deleted file mode 100644
index 343e023da..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.20"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.1"
-	["i18n"]="3.7.3.6"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3.1"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.9"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r17
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r6.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r6.ebuild
deleted file mode 100644
index 2cd3eb27a..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.20"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.2"
-	["i18n"]="3.7.3.6"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3.1"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.9"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r17
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r7.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r7.ebuild
deleted file mode 100644
index 213014697..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.20"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.3"
-	["i18n"]="3.7.3.6"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3.1"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.9"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r17
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r8.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r8.ebuild
deleted file mode 100644
index 22cd1c0c7..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.21"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.3"
-	["i18n"]="3.7.3.6"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3.1"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.9"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r17
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r9.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r9.ebuild
index 4d071358f..506c5e147 100644
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r9.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="7"
+EAPI="8"
 
 UTILS_PV="3.7.3"
 
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1.ebuild
deleted file mode 100644
index 927ff6f25..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.7.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-
-UTILS_PV="3.7.3"
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.7.3.19"
-	["install"]="3.7.3.8"
-	["core"]="3.7.3.1"
-	["i18n"]="3.7.3.5"
-	["client"]="3.7.3.4"
-	["console"]="3.7.3"
-	["console-gui"]="3.7.3.1"
-	["update"]="3.7.3.8"
-	["builder"]="3.7.3.7"
-)
-
-inherit calculate-utils-r16
-
-DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild
index 77b9a8e4e..a32661925 100644
--- a/sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="7"
+EAPI="8"
 
 inherit calculate-utils-r16 git-r3