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: Thu, 14 Oct 2021 10:32:55
Message-Id: 1634207397.34e49486d891a1716de98d3e1fb147674742ad84.asturm@gentoo
1 commit: 34e49486d891a1716de98d3e1fb147674742ad84
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 14 10:05:49 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 14 10:29:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e49486
7
8 kde-plasma/plasma-desktop: drop 5.22.90*
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.22.90.ebuild | 186 ---------------------
14 2 files changed, 187 deletions(-)
15
16 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
17 index d431a1b6afa..a1db1ced93d 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.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
22 -DIST plasma-desktop-5.22.90.tar.xz 15770628 BLAKE2B 473dbd7c77a79d8c626df737a3d80760cd086d301f0f4e8485634eb17a0b30334b5b6b0c0e0aed29e10fa7f2cf0d07e8e125c0eaa0e61be27343ea668fb92309 SHA512 7942075cfb1b6d9457bbe986b1300fd2aa004dffea703f648125fb63a171f085d1537d1e12a2d33203690b47b0a61e0dee5c78ccb03fe4c706edc74ef6b0ff8b
23 DIST plasma-desktop-5.23.0.tar.xz 15783688 BLAKE2B 340831bfe2cdf5a1ed6b4356e99586e72b9416a46cb065fd73d6a74bfd186bf6beef26cb06bf4fb0a7b899ced16c34b07846f84fa758d032b65d9dca8e9bcd2b SHA512 f7d74842874475741709d7fe76a8fe7fe7d98692e2864b8c008b2e3c59a29f9fe70f21cf16163e2ad14600060e835246e5cbf86676430b6c0bac1eebcf72686e
24 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
25
26 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild
27 deleted file mode 100644
28 index 1de5918b598..00000000000
29 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild
30 +++ /dev/null
31 @@ -1,186 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -ECM_HANDBOOK="forceoptional"
38 -ECM_TEST="true"
39 -KFMIN=5.86.0
40 -PVCUT=$(ver_cut 1-3)
41 -QTMIN=5.15.2
42 -VIRTUALX_REQUIRED="test"
43 -inherit ecm kde.org optfeature
44 -
45 -DESCRIPTION="KDE Plasma desktop"
46 -XORGHDRS="${PN}-override-include-dirs-1"
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 ~riscv ~x86"
52 -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
53 -
54 -COMMON_DEPEND="
55 - >=dev-qt/qtconcurrent-${QTMIN}:5
56 - >=dev-qt/qtdbus-${QTMIN}:5
57 - >=dev-qt/qtdeclarative-${QTMIN}:5
58 - >=dev-qt/qtgui-${QTMIN}:5
59 - >=dev-qt/qtnetwork-${QTMIN}:5
60 - >=dev-qt/qtprintsupport-${QTMIN}:5
61 - >=dev-qt/qtsql-${QTMIN}:5
62 - >=dev-qt/qtsvg-${QTMIN}:5
63 - >=dev-qt/qtwidgets-${QTMIN}:5
64 - >=dev-qt/qtx11extras-${QTMIN}:5
65 - >=dev-qt/qtxml-${QTMIN}:5
66 - >=kde-frameworks/attica-${KFMIN}:5
67 - >=kde-frameworks/kactivities-${KFMIN}:5
68 - >=kde-frameworks/kactivities-stats-${KFMIN}:5
69 - >=kde-frameworks/karchive-${KFMIN}:5
70 - >=kde-frameworks/kauth-${KFMIN}:5
71 - >=kde-frameworks/kbookmarks-${KFMIN}:5
72 - >=kde-frameworks/kcmutils-${KFMIN}:5
73 - >=kde-frameworks/kcodecs-${KFMIN}:5
74 - >=kde-frameworks/kcompletion-${KFMIN}:5
75 - >=kde-frameworks/kconfig-${KFMIN}:5
76 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
77 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
78 - >=kde-frameworks/kcrash-${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/libkworkspace-${PVCUT}:5
106 - >=kde-plasma/plasma-workspace-${PVCUT}:5
107 - >=media-libs/phonon-4.11.0
108 - virtual/libcrypt:=
109 - x11-libs/libX11
110 - x11-libs/libXfixes
111 - x11-libs/libXi
112 - x11-libs/libxcb[xkb]
113 - x11-libs/libxkbfile
114 - emoji? (
115 - app-i18n/ibus[emoji]
116 - dev-libs/glib:2
117 - media-fonts/noto-emoji
118 - )
119 - ibus? (
120 - app-i18n/ibus
121 - dev-libs/glib:2
122 - >=dev-qt/qtx11extras-${QTMIN}:5
123 - x11-libs/libxcb
124 - x11-libs/xcb-util-keysyms
125 - )
126 - kaccounts? (
127 - kde-apps/kaccounts-integration:5
128 - net-libs/accounts-qt
129 - )
130 - policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
131 - scim? ( app-i18n/scim )
132 - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
133 - telemetry? ( dev-libs/kuserfeedback:5 )
134 -"
135 -DEPEND="${COMMON_DEPEND}
136 - dev-libs/boost
137 - x11-base/xorg-proto
138 -"
139 -RDEPEND="${COMMON_DEPEND}
140 - !kde-plasma/user-manager
141 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5
142 - >=dev-qt/qtquickcontrols2-${QTMIN}:5
143 - >=kde-frameworks/kirigami-${KFMIN}:5
144 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
145 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
146 - >=kde-plasma/oxygen-${PVCUT}:5
147 - sys-apps/util-linux
148 - x11-apps/setxkbmap
149 - x11-misc/xdg-user-dirs
150 - kaccounts? ( net-libs/signon-oauth2 )
151 - policykit? ( sys-apps/accountsservice )
152 -"
153 -BDEPEND="virtual/pkgconfig"
154 -
155 -PATCHES=(
156 - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
157 -)
158 -
159 -src_prepare() {
160 - ecm_src_prepare
161 -
162 - if ! use policykit; then
163 - ecm_punt_bogus_dep KF5 Wallet
164 - cmake_run_in kcms cmake_comment_add_subdirectory users
165 - fi
166 -
167 - if ! use ibus; then
168 - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
169 - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
170 - fi
171 -
172 - use emoji || cmake_run_in applets/kimpanel/backend/ibus \
173 - cmake_comment_add_subdirectory emojier
174 -
175 - # TODO: try to get a build switch upstreamed
176 - if ! use scim; then
177 - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
178 - fi
179 -}
180 -
181 -src_configure() {
182 - local mycmakeargs=(
183 - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
184 - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
185 - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
186 - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
187 - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
188 - $(cmake_use_find_package kaccounts AccountsQt5)
189 - $(cmake_use_find_package kaccounts KAccounts)
190 - $(cmake_use_find_package semantic-desktop KF5Baloo)
191 - $(cmake_use_find_package telemetry KUserFeedback)
192 - )
193 - if ! use emoji && ! use ibus; then
194 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
195 - fi
196 -
197 - ecm_src_configure
198 -}
199 -
200 -src_test() {
201 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
202 - # test_kio_fonts needs D-Bus, bug #634166
203 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
204 - local myctestargs=(
205 - -j1
206 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
207 - )
208 -
209 - ecm_src_test
210 -}
211 -
212 -pkg_postinst() {
213 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
214 - optfeature "screen reader support" app-accessibility/orca
215 - fi
216 - ecm_pkg_postinst
217 -}