From 81417caa3de190a1d3a560cae365a0ea05bb716e Mon Sep 17 00:00:00 2001
From: backbone <backbone@backbone.ws>
Date: Fri, 5 Aug 2022 09:05:30 +0300
Subject: [PATCH] up EAPI version, cmake -> cmake-utils

---
 app-admin/eselect-vala/eselect-vala-0.1.2.ebuild            | 2 +-
 app-admin/gentoo-upgrade/gentoo-upgrade-9999.ebuild         | 2 +-
 app-admin/htpasswd/htpasswd-9999.ebuild                     | 2 +-
 app-admin/localepurge/localepurge-0.5.4-r2.ebuild           | 2 +-
 app-admin/network-profile/network-profile-9999.ebuild       | 2 +-
 app-cdr/mdf2iso/mdf2iso-0.3.0-r1.ebuild                     | 2 +-
 .../stardict-enru-dictset-1.0.0.ebuild                      | 2 +-
 app-office/laview-core/laview-core-9999.ebuild              | 4 ++--
 .../laview-data-example/laview-data-example-9999.ebuild     | 4 ++--
 app-office/laview-desktop/laview-desktop-9999.ebuild        | 4 ++--
 .../laview-latex-struct/laview-latex-struct-9999.ebuild     | 4 ++--
 .../laview-object-example/laview-object-example-9999.ebuild | 4 ++--
 app-portage/ewo/ewo-0.4.1.ebuild                            | 2 +-
 app-portage/findcruftfiles/findcruftfiles-9999.ebuild       | 2 +-
 dev-libs/gobject-plugin/gobject-plugin-9999.ebuild          | 4 ++--
 dev-libs/gxml/gxml-0.16.3.ebuild                            | 2 +-
 dev-util/colormake/colormake-0.2-r2.ebuild                  | 2 +-
 dev-util/colormake/colormake-9999.ebuild                    | 2 +-
 dev-util/valadoc/valadoc-9999.ebuild                        | 2 +-
 games-puzzle/charley/charley-9999.ebuild                    | 2 +-
 media-fonts/corefonts-lucon/corefonts-lucon-1.0.0.ebuild    | 2 +-
 media-sound/apulse/apulse-9999.ebuild                       | 6 +++---
 net-im/viber/viber-9999-r9999.ebuild                        | 2 +-
 net-misc/gdrive/gdrive-2.1.0.ebuild                         | 2 +-
 sci-misc/labview/labview-8.6.0.ebuild                       | 2 +-
 virtual/linux-sources/linux-sources-3-r1.ebuild             | 2 +-
 x11-drivers/snail/snail-1.2.6.ebuild                        | 2 +-
 x11-drivers/snail/snail-9999.ebuild                         | 2 +-
 x11-libs/cairo-chart/cairo-chart-9999.ebuild                | 4 ++--
 29 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild b/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild
index 2c43cd2f..04aa7ecb 100644
--- a/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild
+++ b/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Eselect module to maintain vala compiler symlink"
 HOMEPAGE="http://code.google.com/p/eselect-vala/"
diff --git a/app-admin/gentoo-upgrade/gentoo-upgrade-9999.ebuild b/app-admin/gentoo-upgrade/gentoo-upgrade-9999.ebuild
index 191b8320..7c37e165 100644
--- a/app-admin/gentoo-upgrade/gentoo-upgrade-9999.ebuild
+++ b/app-admin/gentoo-upgrade/gentoo-upgrade-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/app-admin/htpasswd/htpasswd-9999.ebuild b/app-admin/htpasswd/htpasswd-9999.ebuild
index d45e59c0..dd685787 100644
--- a/app-admin/htpasswd/htpasswd-9999.ebuild
+++ b/app-admin/htpasswd/htpasswd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
index 41e1ef01..1f36789d 100644
--- a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
+++ b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit prefix
 
diff --git a/app-admin/network-profile/network-profile-9999.ebuild b/app-admin/network-profile/network-profile-9999.ebuild
index a21ce408..fe7b770b 100644
--- a/app-admin/network-profile/network-profile-9999.ebuild
+++ b/app-admin/network-profile/network-profile-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/app-cdr/mdf2iso/mdf2iso-0.3.0-r1.ebuild b/app-cdr/mdf2iso/mdf2iso-0.3.0-r1.ebuild
index 23a4acb8..ace83aea 100644
--- a/app-cdr/mdf2iso/mdf2iso-0.3.0-r1.ebuild
+++ b/app-cdr/mdf2iso/mdf2iso-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils toolchain-funcs
 
diff --git a/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild b/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild
index a76b8d45..0af72a89 100644
--- a/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild
+++ b/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/app-office/laview-core/laview-core-9999.ebuild b/app-office/laview-core/laview-core-9999.ebuild
index 68f63b03..aef8aceb 100644
--- a/app-office/laview-core/laview-core-9999.ebuild
+++ b/app-office/laview-core/laview-core-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils cmake-utils
+inherit gnome2-utils cmake
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/LAview.Core.git"}
diff --git a/app-office/laview-data-example/laview-data-example-9999.ebuild b/app-office/laview-data-example/laview-data-example-9999.ebuild
index c8d44cf9..5956aae7 100644
--- a/app-office/laview-data-example/laview-data-example-9999.ebuild
+++ b/app-office/laview-data-example/laview-data-example-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils cmake-utils
+inherit gnome2-utils cmake
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/LAview.Data-Example.git"}
diff --git a/app-office/laview-desktop/laview-desktop-9999.ebuild b/app-office/laview-desktop/laview-desktop-9999.ebuild
index c0c4d722..847e059e 100644
--- a/app-office/laview-desktop/laview-desktop-9999.ebuild
+++ b/app-office/laview-desktop/laview-desktop-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils cmake-utils
+inherit gnome2-utils cmake
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/LAview.Desktop.git"}
diff --git a/app-office/laview-latex-struct/laview-latex-struct-9999.ebuild b/app-office/laview-latex-struct/laview-latex-struct-9999.ebuild
index 6394432b..c2370573 100644
--- a/app-office/laview-latex-struct/laview-latex-struct-9999.ebuild
+++ b/app-office/laview-latex-struct/laview-latex-struct-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/LAview.LaTeX-Struct.git"}
diff --git a/app-office/laview-object-example/laview-object-example-9999.ebuild b/app-office/laview-object-example/laview-object-example-9999.ebuild
index 8418548a..ab90c3d6 100644
--- a/app-office/laview-object-example/laview-object-example-9999.ebuild
+++ b/app-office/laview-object-example/laview-object-example-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils
+inherit cmake gnome2-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/LAview.Object-Example.git"}
diff --git a/app-portage/ewo/ewo-0.4.1.ebuild b/app-portage/ewo/ewo-0.4.1.ebuild
index 1e0fc642..e1b53c21 100644
--- a/app-portage/ewo/ewo-0.4.1.ebuild
+++ b/app-portage/ewo/ewo-0.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/app-portage/findcruftfiles/findcruftfiles-9999.ebuild b/app-portage/findcruftfiles/findcruftfiles-9999.ebuild
index c684b292..2c38e4ce 100644
--- a/app-portage/findcruftfiles/findcruftfiles-9999.ebuild
+++ b/app-portage/findcruftfiles/findcruftfiles-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/dev-libs/gobject-plugin/gobject-plugin-9999.ebuild b/dev-libs/gobject-plugin/gobject-plugin-9999.ebuild
index b902b165..fc565ae1 100644
--- a/dev-libs/gobject-plugin/gobject-plugin-9999.ebuild
+++ b/dev-libs/gobject-plugin/gobject-plugin-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/gobject-plugin.git"}
diff --git a/dev-libs/gxml/gxml-0.16.3.ebuild b/dev-libs/gxml/gxml-0.16.3.ebuild
index 055b10b1..9d38a42e 100644
--- a/dev-libs/gxml/gxml-0.16.3.ebuild
+++ b/dev-libs/gxml/gxml-0.16.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools gnome.org
 
diff --git a/dev-util/colormake/colormake-0.2-r2.ebuild b/dev-util/colormake/colormake-0.2-r2.ebuild
index f71d745f..2f568cea 100644
--- a/dev-util/colormake/colormake-0.2-r2.ebuild
+++ b/dev-util/colormake/colormake-0.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/dev-util/colormake/colormake-9999.ebuild b/dev-util/colormake/colormake-9999.ebuild
index da04616b..128dc9d1 100644
--- a/dev-util/colormake/colormake-9999.ebuild
+++ b/dev-util/colormake/colormake-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/dev-util/valadoc/valadoc-9999.ebuild b/dev-util/valadoc/valadoc-9999.ebuild
index d3eeb6d6..5667203a 100644
--- a/dev-util/valadoc/valadoc-9999.ebuild
+++ b/dev-util/valadoc/valadoc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 VALA_MIN_API_VERSION="0.20"
 
 inherit autotools eutils git-r3 vala
diff --git a/games-puzzle/charley/charley-9999.ebuild b/games-puzzle/charley/charley-9999.ebuild
index 6cf47683..78e71876 100644
--- a/games-puzzle/charley/charley-9999.ebuild
+++ b/games-puzzle/charley/charley-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/masterfri/Charley.git"}
diff --git a/media-fonts/corefonts-lucon/corefonts-lucon-1.0.0.ebuild b/media-fonts/corefonts-lucon/corefonts-lucon-1.0.0.ebuild
index eaf35eb0..1179ae50 100644
--- a/media-fonts/corefonts-lucon/corefonts-lucon-1.0.0.ebuild
+++ b/media-fonts/corefonts-lucon/corefonts-lucon-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/media-sound/apulse/apulse-9999.ebuild b/media-sound/apulse/apulse-9999.ebuild
index f2d7ba40..5d5fba30 100644
--- a/media-sound/apulse/apulse-9999.ebuild
+++ b/media-sound/apulse/apulse-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}
 MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Ensure all relevant libdirs are added, to support all ABIs
 	DIRS=
@@ -33,11 +33,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse")
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install_all() {
-	cmake-utils_src_install
+	cmake_src_install
 	einstalldocs
 	dobin "${T}"/apulse
 }
diff --git a/net-im/viber/viber-9999-r9999.ebuild b/net-im/viber/viber-9999-r9999.ebuild
index 3467b7f7..a763460a 100644
--- a/net-im/viber/viber-9999-r9999.ebuild
+++ b/net-im/viber/viber-9999-r9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 DESCRIPTION="Free calls, text and picture sharing with anyone, anywhere!"
diff --git a/net-misc/gdrive/gdrive-2.1.0.ebuild b/net-misc/gdrive/gdrive-2.1.0.ebuild
index 2a3cde94..fdf831d0 100644
--- a/net-misc/gdrive/gdrive-2.1.0.ebuild
+++ b/net-misc/gdrive/gdrive-2.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit golang-build
 
diff --git a/sci-misc/labview/labview-8.6.0.ebuild b/sci-misc/labview/labview-8.6.0.ebuild
index 82328546..314419d4 100644
--- a/sci-misc/labview/labview-8.6.0.ebuild
+++ b/sci-misc/labview/labview-8.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils
 
diff --git a/virtual/linux-sources/linux-sources-3-r1.ebuild b/virtual/linux-sources/linux-sources-3-r1.ebuild
index d5565bf5..5b24b291 100644
--- a/virtual/linux-sources/linux-sources-3-r1.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Virtual for Linux kernel sources"
 SLOT="0"
diff --git a/x11-drivers/snail/snail-1.2.6.ebuild b/x11-drivers/snail/snail-1.2.6.ebuild
index a4dc85f9..3305b6d0 100644
--- a/x11-drivers/snail/snail-1.2.6.ebuild
+++ b/x11-drivers/snail/snail-1.2.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 EGIT_REPO_URI="https://git.backbone.ws/kolan/snail.git"
 
diff --git a/x11-drivers/snail/snail-9999.ebuild b/x11-drivers/snail/snail-9999.ebuild
index 18e7069c..6b508f57 100644
--- a/x11-drivers/snail/snail-9999.ebuild
+++ b/x11-drivers/snail/snail-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
 EGIT_REPO_URI="https://git.backbone.ws/kolan/snail.git"
 
diff --git a/x11-libs/cairo-chart/cairo-chart-9999.ebuild b/x11-libs/cairo-chart/cairo-chart-9999.ebuild
index 372d339d..57140d57 100644
--- a/x11-libs/cairo-chart/cairo-chart-9999.ebuild
+++ b/x11-libs/cairo-chart/cairo-chart-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://git.backbone.ws/kolan/cairo-chart.git"}