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, 02 Aug 2022 18:38:54
Message-Id: 1659465515.7e301b1231265981eb83f2b92e843fbcd3d6fb77.asturm@gentoo
1 commit: 7e301b1231265981eb83f2b92e843fbcd3d6fb77
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 2 12:41:03 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 18:38:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e301b12
7
8 kde-plasma/plasma-desktop: drop 5.25.3-r1
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.25.3-r1.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 5cc69517a136..8ef6670a7b75 100644
18 --- a/kde-plasma/plasma-desktop/Manifest
19 +++ b/kde-plasma/plasma-desktop/Manifest
20 @@ -1,6 +1,5 @@
21 DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
22 DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
23 -DIST plasma-desktop-5.25.3.tar.xz 6300620 BLAKE2B 52df17bae22fcd12f7aa0c93663a309483dccfe17fc8925094988fdc6e280dad478d5c69d9737638d2e579291e49980ddd3710b0e89cb6700507540d6c478018 SHA512 d0540fab9d04849d8191bb5d6855be12f01610cbf678aa996807e98cbf579c96094cdd6c59a91c0e3d04cea51755aacbdb81d93452c0d3813a96531e960698d4
24 DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547
25 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
26 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
27
28 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.3-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.3-r1.ebuild
29 deleted file mode 100644
30 index 7cc313064b6b..000000000000
31 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.3-r1.ebuild
32 +++ /dev/null
33 @@ -1,178 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -ECM_HANDBOOK="forceoptional"
40 -ECM_TEST="true"
41 -KFMIN=5.95.0
42 -PVCUT=$(ver_cut 1-3)
43 -QTMIN=5.15.5
44 -VIRTUALX_REQUIRED="test"
45 -inherit ecm plasma.kde.org optfeature
46 -
47 -DESCRIPTION="KDE Plasma desktop"
48 -XORGHDRS="${PN}-override-include-dirs-2"
49 -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
50 -
51 -LICENSE="GPL-2" # TODO: CHECK
52 -SLOT="5"
53 -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
54 -IUSE="emoji ibus +kaccounts 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 - 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 - 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 -"
152 -BDEPEND="virtual/pkgconfig"
153 -
154 -PATCHES=(
155 - "${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
156 -)
157 -
158 -src_prepare() {
159 - ecm_src_prepare
160 -
161 - if ! use ibus; then
162 - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
163 - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
164 - fi
165 -
166 - use emoji || cmake_run_in applets/kimpanel/backend/ibus \
167 - cmake_comment_add_subdirectory emojier
168 -
169 - # TODO: try to get a build switch upstreamed
170 - if ! use scim; then
171 - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
172 - fi
173 -}
174 -
175 -src_configure() {
176 - local mycmakeargs=(
177 - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
178 - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
179 - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
180 - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
181 - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
182 - $(cmake_use_find_package kaccounts AccountsQt5)
183 - $(cmake_use_find_package kaccounts KAccounts)
184 - $(cmake_use_find_package semantic-desktop KF5Baloo)
185 - $(cmake_use_find_package telemetry KUserFeedback)
186 - )
187 - if ! use emoji && ! use ibus; then
188 - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
189 - fi
190 -
191 - ecm_src_configure
192 -}
193 -
194 -src_test() {
195 - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
196 - # test_kio_fonts needs D-Bus, bug #634166
197 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918
198 - local myctestargs=(
199 - -j1
200 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
201 - )
202 -
203 - ecm_src_test
204 -}
205 -
206 -pkg_postinst() {
207 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
208 - optfeature "screen reader support" app-accessibility/orca
209 - fi
210 - ecm_pkg_postinst
211 -}