Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
Date: Tue, 31 Dec 2019 16:44:06
Message-Id: 1577810135.850d7df04f6b68e4b9d54260ad300ca2c3472f91.asturm@gentoo
1 commit: 850d7df04f6b68e4b9d54260ad300ca2c3472f91
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 31 16:30:13 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 16:35:35 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=850d7df0
7
8 x11-misc/sddm: Switch to cmake.eclass
9
10 Add missing RESTRICT="!test? ( test )"
11
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 x11-misc/sddm/sddm-9999.ebuild | 10 ++++++----
16 1 file changed, 6 insertions(+), 4 deletions(-)
17
18 diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
19 index 64e6785b..e2ddf0c9 100644
20 --- a/x11-misc/sddm/sddm-9999.ebuild
21 +++ b/x11-misc/sddm/sddm-9999.ebuild
22 @@ -12,7 +12,7 @@ else
23 fi
24
25 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
26 -inherit cmake-utils l10n systemd user
27 +inherit cmake l10n systemd user
28
29 DESCRIPTION="Simple Desktop Display Manager"
30 HOMEPAGE="https://github.com/sddm/sddm"
31 @@ -23,6 +23,8 @@ IUSE="consolekit elogind +pam systemd test"
32
33 REQUIRED_USE="?? ( elogind systemd )"
34
35 +RESTRICT="!test? ( test )"
36 +
37 BDEPEND="
38 dev-python/docutils
39 >=dev-qt/linguist-tools-5.9.4:5
40 @@ -58,7 +60,7 @@ PATCHES=(
41 )
42
43 src_prepare() {
44 - cmake-utils_src_prepare
45 + cmake_src_prepare
46
47 disable_locale() {
48 sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
49 @@ -80,11 +82,11 @@ src_configure() {
50 -DBUILD_MAN_PAGES=ON
51 -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
52 )
53 - cmake-utils_src_configure
54 + cmake_src_configure
55 }
56
57 src_install() {
58 - cmake-utils_src_install
59 + cmake_src_install
60
61 # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
62 local confd="/usr/lib/sddm/sddm.conf.d"