[gentoo-commits] repo/gentoo:master commit in: x11-misc/obconf-qt/, lxqt-base/lxqt-powermanagement/, dev-util/lxqt-build-tools/, ...

[Andreas Sturmlechner]

commit:     c7ec06f96b7b27518f55920bdc9b38e0d0fc883e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 23:25:19 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 18:03:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ec06f9

*/*: Switch lxqt proj packages to cmake.eclass

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild                           | 6 +++---
 dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild                           | 6 +++---
 dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild           | 2 +-
 lxqt-base/liblxqt/liblxqt-0.14.1.ebuild                           | 2 +-
 lxqt-base/libsysstat/libsysstat-0.4.2.ebuild                      | 2 +-
 lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild                     | 2 +-
 lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild                     | 2 +-
 lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild                | 6 +++---
 lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild           | 2 +-
 lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild           | 2 +-
 lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild     | 2 +-
 lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild | 4 ++--
 lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild                     | 6 +++---
 lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild             | 4 ++--
 lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild | 2 +-
 lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild               | 2 +-
 lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild                   | 4 ++--
 lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild                 | 6 +++---
 lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild                       | 2 +-
 media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild                  | 2 +-
 media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild           | 2 +-
 x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild                       | 2 +-
 x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild                        | 2 +-
 x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild                   | 2 +-
 x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild                  | 2 +-
 25 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index 8b3ad4f6fb4..d865124a86d 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils virtualx
+inherit cmake virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
 HOMEPAGE="https://lxqt.org/"
@@ -42,10 +42,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# Tests don't work with C
-	LC_ALL=en_US.utf8 virtx cmake-utils_src_test
+	LC_ALL=en_US.utf8 virtx cmake_src_test
 }

diff --git a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
index 98438d2a03e..aa1e840900b 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils virtualx
+inherit cmake virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
 HOMEPAGE="https://lxqt.org/"
@@ -43,10 +43,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# Tests don't work with C
-	LC_ALL=en_US.utf8 virtx cmake-utils_src_test
+	LC_ALL=en_US.utf8 virtx cmake_src_test
 }

diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
index 9efd9eafc84..5fa7d1b35f6 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt Build tools"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
index 7e6e0123112..eec7e2b2de7 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Common base library for the LXQt desktop environment"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
index 96c2fa678bc..dfe396b64ad 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A Qt-based interface to system statistics"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
index 6b986282a3c..c055c148604 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt about dialog"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
index d384598dab5..2c5edfb2f2d 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt system administration tool"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
index da4ec98c1f4..33b97791a6a 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="LXQt system configuration control center"
 HOMEPAGE="https://lxqt.org/"
@@ -59,11 +59,11 @@ src_configure() {
 		-DWITH_MONITOR="$(usex monitor)"
 		-DWITH_TOUCHPAD="$(usex touchpad)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
 }
 

diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
index aad48dd0656..db37fd6f180 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
index bb7cf41bf3c..997054a9b09 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
index 7db414c4059..2ec8adfd6b0 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt notification daemon and library"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
index aa20a07bf10..dcdcf9c6934 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt OpenSSH user password prompt tool"
 HOMEPAGE="https://lxqt.org/"
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}
 "
 
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/*.1
 
 	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/lxqt-openssh-askpass'" >> "${T}/99${PN}" \

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
index 7be8a5fd4e4..c221f24b334 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt desktop panel and plugins"
 HOMEPAGE="https://lxqt.org/"
@@ -107,10 +107,10 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	doman panel/man/*.1
 }

diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
index a363f9991e9..6bb6156325a 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt PolKit authentication agent"
 HOMEPAGE="https://lxqt.org/"
@@ -38,6 +38,6 @@ RDEPEND="${DEPEND}
 "
 
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/*.1
 }

diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
index bd2aa6e83b1..0d8a6576fd2 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt daemon for power management and auto-suspend"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
index 784e94a3399..e6ba1f2ab52 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt system integration plugin for Qt"
 HOMEPAGE="https://lxqt.org/"

diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
index 836a13a4c29..a707d4d44b9 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt quick launcher"
 HOMEPAGE="https://lxqt.org/"
@@ -43,6 +43,6 @@ RDEPEND="${DEPEND}
 "
 
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/*.1
 }

diff --git a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
index 74b9a973994..0c4a57a6f83 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQT session manager"
 HOMEPAGE="https://lxqt.org/"
@@ -49,11 +49,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DWITH_LIBUDEV=$(usex udev)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
 
 	echo XDG_CONFIG_DIRS=\"${EPREFIX}/usr/share\" >> 91lxqt-config-dir

diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
index 0bcef3d0513..b5b84507fa1 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt GUI frontend for sudo"
 HOMEPAGE="https://lxqt.org/"

diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 6a97c334b7a..4d0f37e5e5a 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXImage Image Viewer - GPicView replacement"
 HOMEPAGE="https://lxqt.org/"

diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
index 7d4e8ea7116..2a9dc38b6d6 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A Pulseaudio mixer in Qt (port of pavucontrol)"
 HOMEPAGE="https://lxqt.org/"

diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
index 100cff14a7f..0339cf6dda2 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
 HOMEPAGE="https://lxqt.org/"

diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index 11fa1f32bb9..7242f202bdd 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Openbox window manager configuration tool"
 HOMEPAGE="https://lxqt.org/"

diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index 5e94807c614..b0d72104855 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3

diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
index 88399b45527..5bee14e3a15 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Themes, graphics and icons for LXQt"
 HOMEPAGE="https://lxqt.org/"