Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/
Date: Thu, 27 Aug 2020 06:17:08
Message-Id: 1598473905.15db5dfc63127579ebbfe6de30b138186a957327.asturm@gentoo
1 commit: 15db5dfc63127579ebbfe6de30b138186a957327
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 26 20:31:45 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 26 20:31:45 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=15db5dfc
7
8 kde-plasma/plasma-desktop: Several KCMs moved to plasma-workspace
9
10 colors
11 cursortheme
12 fonts
13 kfontinst
14 krdb
15 lookandfeel
16 style
17
18 Upstream commit 896f55c94b75757b515ba2ed5730dd2991c03471
19
20 Package-Manager: Portage-3.0.4, Repoman-3.0.1
21 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
22
23 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 11 +----------
24 1 file changed, 1 insertion(+), 10 deletions(-)
25
26 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
27 index f63f968705..e02b83a077 100644
28 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
29 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
30 @@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
31 LICENSE="GPL-2" # TODO: CHECK
32 SLOT="5"
33 KEYWORDS=""
34 -IUSE="emoji +fontconfig ibus +kaccounts scim +semantic-desktop"
35 +IUSE="emoji ibus +kaccounts scim +semantic-desktop"
36
37 BDEPEND="virtual/pkgconfig"
38 COMMON_DEPEND="
39 @@ -77,7 +77,6 @@ COMMON_DEPEND="
40 >=kde-plasma/plasma-workspace-${PVCUT}:5
41 media-libs/phonon[qt5(+)]
42 x11-libs/libX11
43 - x11-libs/libXcursor
44 x11-libs/libXfixes
45 x11-libs/libXi
46 x11-libs/libxcb[xkb]
47 @@ -87,12 +86,6 @@ COMMON_DEPEND="
48 dev-libs/glib:2
49 media-fonts/noto-emoji
50 )
51 - fontconfig? (
52 - media-libs/fontconfig
53 - media-libs/freetype
54 - x11-libs/libXft
55 - x11-libs/xcb-util-image
56 - )
57 ibus? (
58 app-i18n/ibus
59 dev-libs/glib:2
60 @@ -110,7 +103,6 @@ COMMON_DEPEND="
61 DEPEND="${COMMON_DEPEND}
62 dev-libs/boost
63 x11-base/xorg-proto
64 - fontconfig? ( x11-libs/libXrender )
65 "
66 RDEPEND="${COMMON_DEPEND}
67 !<kde-plasma/kdeplasma-addons-5.15.80
68 @@ -141,7 +133,6 @@ src_prepare() {
69
70 src_configure() {
71 local mycmakeargs=(
72 - $(cmake_use_find_package fontconfig Fontconfig)
73 -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
74 -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
75 -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include