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, 29 Jul 2021 18:03:31
Message-Id: 1627581703.8b591a4e6ae35a1820fdfbe20b3898db7d094b6b.asturm@gentoo
1 commit: 8b591a4e6ae35a1820fdfbe20b3898db7d094b6b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 29 17:59:00 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 29 18:01:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b591a4e
7
8 kde-plasma/plasma-desktop: drop 5.22.3*
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.3.ebuild | 184 ---------------------
14 2 files changed, 185 deletions(-)
15
16 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
17 index c0d633d2cae..a3349f29f79 100644
18 --- a/kde-plasma/plasma-desktop/Manifest
19 +++ b/kde-plasma/plasma-desktop/Manifest
20 @@ -1,5 +1,4 @@
21 DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
22 -DIST plasma-desktop-5.22.3.tar.xz 15738116 BLAKE2B d49ed441098b008e4559a0dbcb6a6aa690b30422bdbb0b959966fa9db69add6240cca267815052cf838daa3b558f2abe1569245b9f4a21142829aeaa456c7bac SHA512 ad7bcc269ea2da59be90dee310bd406efb6558944ac21feaaf5df1eb113a2b0626890354b8066050b9c38dfb4ecb4af18b62ed0274a4af4d76b7a6cb7445c4a3
23 DIST plasma-desktop-5.22.4.tar.xz 15742204 BLAKE2B badd9128cc9c53a4e5ce79b067bd95539f1e174e2c774c87db732a20769a6cf03518c9c2382441f0abdd38f526b097729a3fd9d8a83fa783cba61bd6df68afd3 SHA512 ac355b611fb473139f23b352ab8e496ad01a4c2377c24ce7e7951847e467b176a585c92d43e4ea54cde0a5b985e2e4536c57b887fd62b747fe9ba82f34b4e739
24 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
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.22.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.3.ebuild
28 deleted file mode 100644
29 index e3ac5f790ba..00000000000
30 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.3.ebuild
31 +++ /dev/null
32 @@ -1,184 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -ECM_HANDBOOK="forceoptional"
39 -ECM_TEST="true"
40 -KFMIN=5.82.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 -
50 -LICENSE="GPL-2" # TODO: CHECK
51 -SLOT="5"
52 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
53 -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
54 -
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/kcrash-${KFMIN}:5
80 - >=kde-frameworks/kdbusaddons-${KFMIN}:5
81 - >=kde-frameworks/kdeclarative-${KFMIN}:5
82 - >=kde-frameworks/kded-${KFMIN}:5
83 - >=kde-frameworks/kdelibs4support-${KFMIN}:5
84 - >=kde-frameworks/kglobalaccel-${KFMIN}:5
85 - >=kde-frameworks/kguiaddons-${KFMIN}:5
86 - >=kde-frameworks/ki18n-${KFMIN}:5
87 - >=kde-frameworks/kiconthemes-${KFMIN}:5
88 - >=kde-frameworks/kio-${KFMIN}:5
89 - >=kde-frameworks/kitemmodels-${KFMIN}:5
90 - >=kde-frameworks/kitemviews-${KFMIN}:5
91 - >=kde-frameworks/kjobwidgets-${KFMIN}:5
92 - >=kde-frameworks/knewstuff-${KFMIN}:5
93 - >=kde-frameworks/knotifications-${KFMIN}:5
94 - >=kde-frameworks/knotifyconfig-${KFMIN}:5
95 - >=kde-frameworks/kparts-${KFMIN}:5
96 - >=kde-frameworks/krunner-${KFMIN}:5
97 - >=kde-frameworks/kservice-${KFMIN}:5
98 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
99 - >=kde-frameworks/kwindowsystem-${KFMIN}:5
100 - >=kde-frameworks/kxmlgui-${KFMIN}:5
101 - >=kde-frameworks/plasma-${KFMIN}:5
102 - >=kde-frameworks/solid-${KFMIN}:5
103 - >=kde-frameworks/sonnet-${KFMIN}:5
104 - >=kde-plasma/kwin-${PVCUT}:5
105 - >=kde-plasma/libksysguard-${PVCUT}:5
106 - >=kde-plasma/libkworkspace-${PVCUT}:5
107 - >=kde-plasma/plasma-workspace-${PVCUT}:5
108 - >=media-libs/phonon-4.11.0
109 - virtual/libcrypt:=
110 - x11-libs/libX11
111 - x11-libs/libXfixes
112 - x11-libs/libXi
113 - x11-libs/libxcb[xkb]
114 - x11-libs/libxkbfile
115 - emoji? (
116 - app-i18n/ibus[emoji]
117 - dev-libs/glib:2
118 - media-fonts/noto-emoji
119 - )
120 - ibus? (
121 - app-i18n/ibus
122 - dev-libs/glib:2
123 - >=dev-qt/qtx11extras-${QTMIN}:5
124 - x11-libs/libxcb
125 - x11-libs/xcb-util-keysyms
126 - )
127 - kaccounts? (
128 - kde-apps/kaccounts-integration:5
129 - net-libs/accounts-qt
130 - )
131 - policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
132 - scim? ( app-i18n/scim )
133 - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}: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 - )
192 - if ! use emoji && ! use ibus; then
193 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
194 - fi
195 -
196 - ecm_src_configure
197 -}
198 -
199 -src_test() {
200 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
201 - # test_kio_fonts needs D-Bus, bug #634166
202 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
203 - local myctestargs=(
204 - -j1
205 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
206 - )
207 -
208 - ecm_src_test
209 -}
210 -
211 -pkg_postinst() {
212 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
213 - optfeature "screen reader support" app-accessibility/orca
214 - fi
215 - ecm_pkg_postinst
216 -}