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, 29 Mar 2022 15:57:12
Message-Id: 1648569401.673084700549bd9390c08a7af74e67dc4aeb5490.asturm@gentoo
1 commit: 673084700549bd9390c08a7af74e67dc4aeb5490
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 29 15:48:52 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 29 15:56:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67308470
7
8 kde-plasma/plasma-desktop: drop 5.24.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.24.3.ebuild | 178 ---------------------
14 2 files changed, 179 deletions(-)
15
16 diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
17 index a7d23298fad7..c8559e189b34 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.23.5.tar.xz 15794548 BLAKE2B 6e215cc5ef10598308a9fbe6c58ea67ea16ee3c3394c69bebcd1167b939e8ff1442bc839c87428cc5a57b274cc95d02983a67ab0e8fac6c27435e446f84c8630 SHA512 14cd20b24e265ef9cc4e4ebbfc743151cf5f9ba0a94fbc19e44571c7e68db61d68bab17dd1feea6f4e0844ab448110010fbfe85212b426c1e12232b73bd1c531
22 -DIST plasma-desktop-5.24.3.tar.xz 6234824 BLAKE2B dca59879db162fc8c42841ad7de89dbd8b0927f0c5793b0a632662837ec2d0eef4630aab3086a8d9ede34807affbeac1e16adeabf08bf0f7105f5b0dbe42c099 SHA512 0a479819fe8cd3665adce95367a2537921b742d31e9da30887b878a4c6dc37c97b325245c80d7c49ef8a44d278e79178319deacb924967ec5c9fec897a4c06f0
23 DIST plasma-desktop-5.24.4.tar.xz 6239980 BLAKE2B 0b8af5d596e277d202a9c088aa561ce3f0c3602ca781c807b4082f37da4269176429946edf0665ebd9bc6046cd6b0a97baf5a67ec3c0194c23d6fe237a56c18d SHA512 9d6a8c50a85d7f59b89a13753d9a7072df5e8bd1e726bf1037c4cf8d4d43046c2076c8993dffc1f5cec7f7a113832dd14f836e9b47b879f6352f3c30f4b5c408
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.24.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.3.ebuild
27 deleted file mode 100644
28 index 302d9b8d656b..000000000000
29 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.3.ebuild
30 +++ /dev/null
31 @@ -1,178 +0,0 @@
32 -# Copyright 1999-2022 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.90.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 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 - x11-libs/libX11
109 - x11-libs/libXfixes
110 - x11-libs/libXi
111 - x11-libs/libxcb[xkb]
112 - x11-libs/libxkbfile
113 - emoji? (
114 - app-i18n/ibus[emoji]
115 - dev-libs/glib:2
116 - media-fonts/noto-emoji
117 - )
118 - ibus? (
119 - app-i18n/ibus
120 - dev-libs/glib:2
121 - >=dev-qt/qtx11extras-${QTMIN}:5
122 - x11-libs/libxcb
123 - x11-libs/xcb-util-keysyms
124 - )
125 - kaccounts? (
126 - kde-apps/kaccounts-integration:5
127 - net-libs/accounts-qt
128 - )
129 - scim? ( app-i18n/scim )
130 - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
131 - telemetry? ( dev-libs/kuserfeedback:5 )
132 -"
133 -DEPEND="${COMMON_DEPEND}
134 - dev-libs/boost
135 - x11-base/xorg-proto
136 -"
137 -RDEPEND="${COMMON_DEPEND}
138 - !kde-plasma/user-manager
139 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5
140 - >=dev-qt/qtquickcontrols2-${QTMIN}:5
141 - >=kde-frameworks/kirigami-${KFMIN}:5
142 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
143 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
144 - >=kde-plasma/oxygen-${PVCUT}:5
145 - sys-apps/util-linux
146 - x11-apps/setxkbmap
147 - x11-misc/xdg-user-dirs
148 - kaccounts? ( net-libs/signon-oauth2 )
149 -"
150 -BDEPEND="virtual/pkgconfig"
151 -
152 -PATCHES=(
153 - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
154 -)
155 -
156 -src_prepare() {
157 - ecm_src_prepare
158 -
159 - if ! use ibus; then
160 - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
161 - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
162 - fi
163 -
164 - use emoji || cmake_run_in applets/kimpanel/backend/ibus \
165 - cmake_comment_add_subdirectory emojier
166 -
167 - # TODO: try to get a build switch upstreamed
168 - if ! use scim; then
169 - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
170 - fi
171 -}
172 -
173 -src_configure() {
174 - local mycmakeargs=(
175 - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
176 - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
177 - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
178 - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
179 - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
180 - $(cmake_use_find_package kaccounts AccountsQt5)
181 - $(cmake_use_find_package kaccounts KAccounts)
182 - $(cmake_use_find_package semantic-desktop KF5Baloo)
183 - $(cmake_use_find_package telemetry KUserFeedback)
184 - )
185 - if ! use emoji && ! use ibus; then
186 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
187 - fi
188 -
189 - ecm_src_configure
190 -}
191 -
192 -src_test() {
193 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
194 - # test_kio_fonts needs D-Bus, bug #634166
195 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
196 - local myctestargs=(
197 - -j1
198 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
199 - )
200 -
201 - ecm_src_test
202 -}
203 -
204 -pkg_postinst() {
205 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
206 - optfeature "screen reader support" app-accessibility/orca
207 - fi
208 - ecm_pkg_postinst
209 -}