[gentoo-commits] proj/kde-sunset:master commit in: dev-util/automoc/, dev-util/automoc/files/

[gentoo-commits] proj/kde-sunset:master commit in: dev-util/automoc/, dev-util/automoc/files/

[Andreas Sturmlechner]

commit:     3eea6933056d38d15b0e0a9933b845b9c5168956
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 15:15:05 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 15:15:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=3eea6933

dev-util/automoc: EAPI-7 bump, switch to cmake.eclass

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/automoc/automoc-0.9.88-r1.ebuild          | 10 ++++------
 dev-util/automoc/files/automoc-0.9.88-objc++.patch |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
index 4c423747..d28605da 100644
--- a/dev-util/automoc/automoc-0.9.88-r1.ebuild
+++ b/dev-util/automoc/automoc-0.9.88-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="automoc4"
 MY_P="${MY_PN}-${PV}"
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="KDE Meta Object Compiler"
 HOMEPAGE="https://www.kde.org"
@@ -16,9 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="
-	dev-qt/qtcore:4
-"
+DEPEND="dev-qt/qtcore:4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -26,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=( "${FILESDIR}/${PN}-0.9.88-objc++.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if [[ ${ELIBC} = uclibc ]]; then
 		append-flags -pthread

diff --git a/dev-util/automoc/files/automoc-0.9.88-objc++.patch b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
index 1f4dacdc..97f25ad2 100644
--- a/dev-util/automoc/files/automoc-0.9.88-objc++.patch
+++ b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
@@ -3,8 +3,8 @@ Please refer to
 
 Adds support for objc++ in automoc, so that running moc on .mm-files will work.
 
---- trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:40:57	934695
-+++ trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:42:18	934696
+--- a/Automoc4Config.cmake	2009/03/03 15:40:57	934695
++++ b/Automoc4Config.cmake	2009/03/03 15:42:18	934696
 @@ -105,9 +105,9 @@
        if(NOT  _generated  AND NOT  _skip)
           get_filename_component(_suffix "${_current_FILE}" EXT)
@@ -35,8 +35,8 @@ Adds support for objc++ in automoc, so that running moc on .mm-files will work.
        endif(NOT  _generated  AND NOT  _skip)
     endforeach (_current_FILE)
  
---- trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:40:57	934695
-+++ trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:42:18	934696
+--- a/kde4automoc.cpp	2009/03/03 15:40:57	934695
++++ b/kde4automoc.cpp	2009/03/03 15:42:18	934696
 @@ -326,7 +326,7 @@
      foreach (const QString &absFilename, sourceFiles) {
          //qDebug() << absFilename;