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, 30 Nov 2021 14:33:04
Message-Id: 1638282736.a14e0b004802a840ec13741767278ed32a180d37.asturm@gentoo
1 commit: a14e0b004802a840ec13741767278ed32a180d37
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 30 14:20:13 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 30 14:32:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14e0b00
7
8 kde-plasma/plasma-desktop: drop 5.23.3*
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-plasma/plasma-desktop/Manifest | 2 -
13 .../plasma-desktop/plasma-desktop-5.23.3-r1.ebuild | 188 ---------------------
14 2 files changed, 190 deletions(-)
15
16 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
17 index 49e1ec88bbc8..21de103ba33f 100644
18 --- a/kde-plasma/plasma-desktop/Manifest
19 +++ b/kde-plasma/plasma-desktop/Manifest
20 @@ -1,5 +1,3 @@
21 DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
22 -DIST plasma-desktop-5.23.3-restore-touchpad-applet.tar.xz 7160 BLAKE2B 75ad147a16f44619e1a0399124a0a00e8a7eabb3fa189dba9920feac435c932bc325361dbc082242785c65a411dfd693096ed52efc987e28778780224245186a SHA512 285f6b69a4fae7e73cde535b7b69dc10439d612c5ca7a025371261a3ab79caf205a192fc260dd3f503a868732a2f2ee8d9489b4a31e66710debc66e98266816a
23 -DIST plasma-desktop-5.23.3.tar.xz 15787952 BLAKE2B 39182407a32d185cd6694c24185318b9d90b3495e3402590e3039c3f1732abee4ff4bff5eaa5d627f555c19994db4c8e14cba67e2c8a11b9b8f849fdee48c0b0 SHA512 3ece7b471d0003c93b37ecbeb379a62bc96cb6076dec658e8c5db63e68a731c2b0d1bf48d71fcf2f2067345fc4c88ce8d446ca80ac1128a355721abe4cc9705e
24 DIST plasma-desktop-5.23.4.tar.xz 15796556 BLAKE2B 876d308272bfd395ba3006cf70aa3bd3fc4fead5000cddf49c6be0bdfc95bb171c4dcac23636341766318d0156c7d473b9a8f5f0e37a57ea4e73b4b224b85abc SHA512 afbf8d3f7ca755ec207cda5258329b4f77dc0b26cd735eeb67e266d0937e892dc63172822792ffc7053cd52b9a34253cd4dcd1d1f52b54dd8a80f4dfa31a9f08
25 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
26
27 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.3-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.3-r1.ebuild
28 deleted file mode 100644
29 index a7456185bba1..000000000000
30 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.3-r1.ebuild
31 +++ /dev/null
32 @@ -1,188 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=8
37 -
38 -ECM_HANDBOOK="forceoptional"
39 -ECM_TEST="true"
40 -KFMIN=5.86.0
41 -PVCUT=$(ver_cut 1-3)
42 -QTMIN=5.15.2
43 -VIRTUALX_REQUIRED="test"
44 -inherit ecm kde.org optfeature
45 -
46 -DESCRIPTION="KDE Plasma desktop"
47 -XORGHDRS="${PN}-override-include-dirs-1"
48 -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz
49 - https://dev.gentoo.org/~asturm/distfiles/${P}-restore-touchpad-applet.tar.xz"
50 -
51 -LICENSE="GPL-2" # TODO: CHECK
52 -SLOT="5"
53 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
54 -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
55 -
56 -COMMON_DEPEND="
57 - >=dev-qt/qtconcurrent-${QTMIN}:5
58 - >=dev-qt/qtdbus-${QTMIN}:5
59 - >=dev-qt/qtdeclarative-${QTMIN}:5
60 - >=dev-qt/qtgui-${QTMIN}:5
61 - >=dev-qt/qtnetwork-${QTMIN}:5
62 - >=dev-qt/qtprintsupport-${QTMIN}:5
63 - >=dev-qt/qtsql-${QTMIN}:5
64 - >=dev-qt/qtsvg-${QTMIN}:5
65 - >=dev-qt/qtwidgets-${QTMIN}:5
66 - >=dev-qt/qtx11extras-${QTMIN}:5
67 - >=dev-qt/qtxml-${QTMIN}:5
68 - >=kde-frameworks/attica-${KFMIN}:5
69 - >=kde-frameworks/kactivities-${KFMIN}:5
70 - >=kde-frameworks/kactivities-stats-${KFMIN}:5
71 - >=kde-frameworks/karchive-${KFMIN}:5
72 - >=kde-frameworks/kauth-${KFMIN}:5
73 - >=kde-frameworks/kbookmarks-${KFMIN}:5
74 - >=kde-frameworks/kcmutils-${KFMIN}:5
75 - >=kde-frameworks/kcodecs-${KFMIN}:5
76 - >=kde-frameworks/kcompletion-${KFMIN}:5
77 - >=kde-frameworks/kconfig-${KFMIN}:5
78 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
79 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
80 - >=kde-frameworks/kcrash-${KFMIN}:5
81 - >=kde-frameworks/kdbusaddons-${KFMIN}:5
82 - >=kde-frameworks/kdeclarative-${KFMIN}:5
83 - >=kde-frameworks/kded-${KFMIN}:5
84 - >=kde-frameworks/kdelibs4support-${KFMIN}:5
85 - >=kde-frameworks/kglobalaccel-${KFMIN}:5
86 - >=kde-frameworks/kguiaddons-${KFMIN}:5
87 - >=kde-frameworks/ki18n-${KFMIN}:5
88 - >=kde-frameworks/kiconthemes-${KFMIN}:5
89 - >=kde-frameworks/kio-${KFMIN}:5
90 - >=kde-frameworks/kitemmodels-${KFMIN}:5
91 - >=kde-frameworks/kitemviews-${KFMIN}:5
92 - >=kde-frameworks/kjobwidgets-${KFMIN}:5
93 - >=kde-frameworks/knewstuff-${KFMIN}:5
94 - >=kde-frameworks/knotifications-${KFMIN}:5
95 - >=kde-frameworks/knotifyconfig-${KFMIN}:5
96 - >=kde-frameworks/kparts-${KFMIN}:5
97 - >=kde-frameworks/krunner-${KFMIN}:5
98 - >=kde-frameworks/kservice-${KFMIN}:5
99 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
100 - >=kde-frameworks/kwindowsystem-${KFMIN}:5
101 - >=kde-frameworks/kxmlgui-${KFMIN}:5
102 - >=kde-frameworks/plasma-${KFMIN}:5
103 - >=kde-frameworks/solid-${KFMIN}:5
104 - >=kde-frameworks/sonnet-${KFMIN}:5
105 - >=kde-plasma/kwin-${PVCUT}:5
106 - >=kde-plasma/libksysguard-${PVCUT}:5
107 - >=kde-plasma/libkworkspace-${PVCUT}:5
108 - >=kde-plasma/plasma-workspace-${PVCUT}:5
109 - >=media-libs/phonon-4.11.0
110 - virtual/libcrypt:=
111 - x11-libs/libX11
112 - x11-libs/libXfixes
113 - x11-libs/libXi
114 - x11-libs/libxcb[xkb]
115 - x11-libs/libxkbfile
116 - emoji? (
117 - app-i18n/ibus[emoji]
118 - dev-libs/glib:2
119 - media-fonts/noto-emoji
120 - )
121 - ibus? (
122 - app-i18n/ibus
123 - dev-libs/glib:2
124 - >=dev-qt/qtx11extras-${QTMIN}:5
125 - x11-libs/libxcb
126 - x11-libs/xcb-util-keysyms
127 - )
128 - kaccounts? (
129 - kde-apps/kaccounts-integration:5
130 - net-libs/accounts-qt
131 - )
132 - policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
133 - scim? ( app-i18n/scim )
134 - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
135 - telemetry? ( dev-libs/kuserfeedback:5 )
136 -"
137 -DEPEND="${COMMON_DEPEND}
138 - dev-libs/boost
139 - x11-base/xorg-proto
140 -"
141 -RDEPEND="${COMMON_DEPEND}
142 - !kde-plasma/user-manager
143 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5
144 - >=dev-qt/qtquickcontrols2-${QTMIN}:5
145 - >=kde-frameworks/kirigami-${KFMIN}:5
146 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
147 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
148 - >=kde-plasma/oxygen-${PVCUT}:5
149 - sys-apps/util-linux
150 - x11-apps/setxkbmap
151 - x11-misc/xdg-user-dirs
152 - kaccounts? ( net-libs/signon-oauth2 )
153 - policykit? ( sys-apps/accountsservice )
154 -"
155 -BDEPEND="virtual/pkgconfig"
156 -
157 -PATCHES=(
158 - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
159 - "${WORKDIR}/${P}-restore-touchpad-applet" # KDE-bug 445095
160 -)
161 -
162 -src_prepare() {
163 - ecm_src_prepare
164 -
165 - if ! use policykit; then
166 - ecm_punt_bogus_dep KF5 Wallet
167 - cmake_run_in kcms cmake_comment_add_subdirectory users
168 - fi
169 -
170 - if ! use ibus; then
171 - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
172 - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
173 - fi
174 -
175 - use emoji || cmake_run_in applets/kimpanel/backend/ibus \
176 - cmake_comment_add_subdirectory emojier
177 -
178 - # TODO: try to get a build switch upstreamed
179 - if ! use scim; then
180 - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
181 - fi
182 -}
183 -
184 -src_configure() {
185 - local mycmakeargs=(
186 - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
187 - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
188 - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
189 - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
190 - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
191 - $(cmake_use_find_package kaccounts AccountsQt5)
192 - $(cmake_use_find_package kaccounts KAccounts)
193 - $(cmake_use_find_package semantic-desktop KF5Baloo)
194 - $(cmake_use_find_package telemetry KUserFeedback)
195 - )
196 - if ! use emoji && ! use ibus; then
197 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
198 - fi
199 -
200 - ecm_src_configure
201 -}
202 -
203 -src_test() {
204 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
205 - # test_kio_fonts needs D-Bus, bug #634166
206 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
207 - local myctestargs=(
208 - -j1
209 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
210 - )
211 -
212 - ecm_src_test
213 -}
214 -
215 -pkg_postinst() {
216 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
217 - optfeature "screen reader support" app-accessibility/orca
218 - fi
219 - ecm_pkg_postinst
220 -}