Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/
Date: Tue, 27 Oct 2020 21:26:45
Message-Id: 1603833953.c64b53ef0ea4d852c861ee77c89cd262fd5bca27.asturm@gentoo
1 commit: c64b53ef0ea4d852c861ee77c89cd262fd5bca27
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 20:21:26 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 21:25:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64b53ef
7
8 kde-plasma/plasma-desktop: drop 5.20.1*
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-plasma/plasma-desktop/Manifest | 1 -
13 .../plasma-desktop/plasma-desktop-5.20.1-r1.ebuild | 161 ---------------------
14 2 files changed, 162 deletions(-)
15
16 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
17 index b2d07ca54f9..64ab61ae699 100644
18 --- a/kde-plasma/plasma-desktop/Manifest
19 +++ b/kde-plasma/plasma-desktop/Manifest
20 @@ -1,4 +1,3 @@
21 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
22 -DIST plasma-desktop-5.20.1.tar.xz 15862268 BLAKE2B 2b674a974fb520d6eb9ad559f90f1b0d3d9281245425a1148e4837bae1653dad63a2e2eae00a9b06970e666df76455e7e3e4d4fd2b401c90ec42956b7206e7c9 SHA512 1b18b046dca64bcd1e99464b2c378b9df85281c09a7f9fdb67d522475a6f49269a5c22ca424cba260c092f065e8026e6abe76cfa9ea514e0a19470f467185e0e
23 DIST plasma-desktop-5.20.2.tar.xz 15864844 BLAKE2B 84c6b33d018abd05bfb72ab48d7172996c3a5664a4f89bb0aefeba30291cb96af058bc62bfe417989d907c7c034f1191f6c708e4f1de34f9ada53b0e5b03585b SHA512 57532e2ff74c810d1b71fc1b880bd69b0beb29dbe558a12298bda21372a33e9758c3c383b6dfd98d1caa85f175ae5872e0ceca134b14340940d699756db77fec
24 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
25
26 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.1-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.1-r1.ebuild
27 deleted file mode 100644
28 index eeaffa6170c..00000000000
29 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.1-r1.ebuild
30 +++ /dev/null
31 @@ -1,161 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -ECM_HANDBOOK="forceoptional"
38 -ECM_TEST="true"
39 -KFMIN=5.74.0
40 -PVCUT=$(ver_cut 1-3)
41 -QTMIN=5.15.1
42 -VIRTUALX_REQUIRED="test"
43 -inherit ecm kde.org
44 -
45 -DESCRIPTION="KDE Plasma desktop"
46 -XORGHDRS="${PN}-override-include-dirs-0"
47 -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
48 -
49 -LICENSE="GPL-2" # TODO: CHECK
50 -SLOT="5"
51 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
52 -IUSE="emoji ibus +kaccounts scim +semantic-desktop"
53 -
54 -BDEPEND="virtual/pkgconfig"
55 -COMMON_DEPEND="
56 - >=dev-qt/qtconcurrent-${QTMIN}:5
57 - >=dev-qt/qtdbus-${QTMIN}:5
58 - >=dev-qt/qtdeclarative-${QTMIN}:5
59 - >=dev-qt/qtgui-${QTMIN}:5
60 - >=dev-qt/qtnetwork-${QTMIN}:5
61 - >=dev-qt/qtprintsupport-${QTMIN}:5
62 - >=dev-qt/qtsql-${QTMIN}:5
63 - >=dev-qt/qtsvg-${QTMIN}:5
64 - >=dev-qt/qtwidgets-${QTMIN}:5
65 - >=dev-qt/qtx11extras-${QTMIN}:5
66 - >=dev-qt/qtxml-${QTMIN}:5
67 - >=kde-frameworks/attica-${KFMIN}:5
68 - >=kde-frameworks/kactivities-${KFMIN}:5
69 - >=kde-frameworks/kactivities-stats-${KFMIN}:5
70 - >=kde-frameworks/karchive-${KFMIN}:5
71 - >=kde-frameworks/kauth-${KFMIN}:5
72 - >=kde-frameworks/kbookmarks-${KFMIN}:5
73 - >=kde-frameworks/kcmutils-${KFMIN}:5
74 - >=kde-frameworks/kcodecs-${KFMIN}:5
75 - >=kde-frameworks/kcompletion-${KFMIN}:5
76 - >=kde-frameworks/kconfig-${KFMIN}:5
77 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
78 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
79 - >=kde-frameworks/kdbusaddons-${KFMIN}:5
80 - >=kde-frameworks/kdeclarative-${KFMIN}:5
81 - >=kde-frameworks/kded-${KFMIN}:5
82 - >=kde-frameworks/kdelibs4support-${KFMIN}:5
83 - >=kde-frameworks/kglobalaccel-${KFMIN}:5
84 - >=kde-frameworks/kguiaddons-${KFMIN}:5
85 - >=kde-frameworks/ki18n-${KFMIN}:5
86 - >=kde-frameworks/kiconthemes-${KFMIN}:5
87 - >=kde-frameworks/kio-${KFMIN}:5
88 - >=kde-frameworks/kitemmodels-${KFMIN}:5
89 - >=kde-frameworks/kitemviews-${KFMIN}:5
90 - >=kde-frameworks/kjobwidgets-${KFMIN}:5
91 - >=kde-frameworks/knewstuff-${KFMIN}:5
92 - >=kde-frameworks/knotifications-${KFMIN}:5
93 - >=kde-frameworks/knotifyconfig-${KFMIN}:5
94 - >=kde-frameworks/kparts-${KFMIN}:5
95 - >=kde-frameworks/krunner-${KFMIN}:5
96 - >=kde-frameworks/kservice-${KFMIN}:5
97 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
98 - >=kde-frameworks/kwindowsystem-${KFMIN}:5
99 - >=kde-frameworks/kxmlgui-${KFMIN}:5
100 - >=kde-frameworks/plasma-${KFMIN}:5
101 - >=kde-frameworks/solid-${KFMIN}:5
102 - >=kde-frameworks/sonnet-${KFMIN}:5
103 - >=kde-plasma/kwin-${PVCUT}:5
104 - >=kde-plasma/libksysguard-${PVCUT}:5
105 - >=kde-plasma/plasma-workspace-${PVCUT}:5
106 - >=media-libs/phonon-4.11.0
107 - x11-libs/libX11
108 - x11-libs/libXfixes
109 - x11-libs/libXi
110 - x11-libs/libxcb[xkb]
111 - x11-libs/libxkbfile
112 - emoji? (
113 - app-i18n/ibus[emoji]
114 - dev-libs/glib:2
115 - media-fonts/noto-emoji
116 - )
117 - ibus? (
118 - app-i18n/ibus
119 - dev-libs/glib:2
120 - >=dev-qt/qtx11extras-${QTMIN}:5
121 - x11-libs/libxcb
122 - x11-libs/xcb-util-keysyms
123 - )
124 - kaccounts? (
125 - kde-apps/kaccounts-integration:5
126 - net-libs/accounts-qt
127 - )
128 - scim? ( app-i18n/scim )
129 - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
130 -"
131 -DEPEND="${COMMON_DEPEND}
132 - dev-libs/boost
133 - x11-base/xorg-proto
134 -"
135 -RDEPEND="${COMMON_DEPEND}
136 - !<kde-plasma/kdeplasma-addons-5.15.80
137 - !kde-plasma/user-manager
138 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5
139 - >=dev-qt/qtquickcontrols2-${QTMIN}:5
140 - >=kde-frameworks/kirigami-${KFMIN}:5
141 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
142 - >=kde-plasma/breeze-${PVCUT}:5
143 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
144 - >=kde-plasma/oxygen-${PVCUT}:5
145 - sys-apps/accountsservice
146 - sys-apps/util-linux
147 - x11-apps/setxkbmap
148 - kaccounts? ( net-libs/signon-oauth2 )
149 -"
150 -
151 -PATCHES=(
152 - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
153 -)
154 -
155 -src_prepare() {
156 - ecm_src_prepare
157 -
158 - if ! use ibus; then
159 - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
160 - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
161 - fi
162 -}
163 -
164 -src_configure() {
165 - local mycmakeargs=(
166 - -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
167 - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
168 - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
169 - -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
170 - $(cmake_use_find_package kaccounts AccountsQt5)
171 - $(cmake_use_find_package kaccounts KAccounts)
172 - $(cmake_use_find_package scim SCIM)
173 - $(cmake_use_find_package semantic-desktop KF5Baloo)
174 - )
175 - if ! use emoji && ! use ibus; then
176 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
177 - fi
178 -
179 - ecm_src_configure
180 -}
181 -
182 -src_test() {
183 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
184 - # test_kio_fonts needs D-Bus, bug #634166
185 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
186 - local myctestargs=(
187 - -j1
188 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
189 - )
190 -
191 - ecm_src_test
192 -}