From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A055158041 for ; Wed, 6 Mar 2024 15:47:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1FFAE2A06; Wed, 6 Mar 2024 15:47:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99542E2A06 for ; Wed, 6 Mar 2024 15:47:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 934C733F9FD for ; Wed, 6 Mar 2024 15:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2009C14E8 for ; Wed, 6 Mar 2024 15:47:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1709739996.d4e9c4d733426ed08f3688d49e34b91f5dc6e47b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-desktop/Manifest kde-plasma/plasma-desktop/plasma-desktop-6.0.0-r1.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d4e9c4d733426ed08f3688d49e34b91f5dc6e47b X-VCS-Branch: master Date: Wed, 6 Mar 2024 15:47:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bdf2550b-87d7-460f-bd5a-59f636f19c6a X-Archives-Hash: 84bd574f0189f40e8465349b80d0271f commit: d4e9c4d733426ed08f3688d49e34b91f5dc6e47b Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 6 15:21:35 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 6 15:46:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e9c4d7 kde-plasma/plasma-desktop: drop 6.0.0-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-desktop/Manifest | 1 - .../plasma-desktop/plasma-desktop-6.0.0-r1.ebuild | 185 --------------------- 2 files changed, 186 deletions(-) diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 98c68d76b4ff..671771b3f27e 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,4 +1,3 @@ DIST plasma-desktop-5.27.10.tar.xz 14724388 BLAKE2B 59a6bbe524a45b5331d46497fff9d83136906dc094dca571f43641cded5b8a9b9d117a1fcbccfe04c1877d52ee686a2c3949e5194fee611d798548c2d8bb501e SHA512 88d0aa3d4d57aa9286d1d45c1908c5a2fcc7005cc39105085c19cd22657b72b1ea4bfef5be59d3e68fe3851acb68d1b8ac8d4d33305e22c70877d66c266b03e9 -DIST plasma-desktop-6.0.0.tar.xz 15624148 BLAKE2B 0b8220f99d9adb2d278d54fdbbc07163eb38b0eed3c549adbae32c21309ed1b48ce9ac8807b0cce4b9bcbbcc2ee06eb04d9e1bf0417099ee6d58efc2141cf67c SHA512 73dedf32056711544f58c93a166db5ae9df97c6487ab63d1773b9b0609111ddb1f4f521a94ff46efdd3dde52a702705ae65e9ebf717461aee39a0d41f3eae027 DIST plasma-desktop-6.0.1.tar.xz 15625032 BLAKE2B a67af368d3cf7ece3cea0a8fbd8b27c8993fe2e150cede749b60b9d09773745c382f4f3d4ef3236615595b6ee697cfa3ebdd5387b2bb3a544e7883b92b6a5e0f SHA512 7cc1d9430a3f66d7553e6dc3116e006c7fe81bb90c0a0224ac22cfa27cc1d124016d23eb2a4ad0e7a5e41db225e60ac1c9b2273ae620cb4422fdcf48c1d078b5 DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.0-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.0-r1.ebuild deleted file mode 100644 index d903e49a5d72..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.0-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=6.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.6.2 -inherit ecm plasma.kde.org optfeature - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-3" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64" -IUSE="ibus kaccounts scim screencast sdl +semantic-desktop X" - -RESTRICT="test" # missing selenium-webdriver-at-spi - -# kde-frameworks/kwindowsystem[X]: Uses KX11Extras -COMMON_DEPEND=" - dev-libs/icu:= - dev-libs/wayland - >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=dev-qt/qtwayland-${QTMIN}:6 - >=kde-frameworks/attica-${KFMIN}:6 - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kauth-${KFMIN}:6 - >=kde-frameworks/kbookmarks-${KFMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcodecs-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kded-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kitemmodels-${KFMIN}:6 - >=kde-frameworks/kitemviews-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kpackage-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=kde-frameworks/sonnet-${KFMIN}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?] - >=kde-plasma/plasma5support-${PVCUT}:6 - media-libs/libcanberra - x11-libs/libX11 - x11-libs/libXi - X? ( - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libxkbcommon - x11-libs/libxkbfile - ) - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - x11-libs/xcb-util-keysyms - ) - kaccounts? ( - kde-apps/kaccounts-integration:6 - >=net-libs/accounts-qt-1.16_p20220803[qt6] - ) - scim? ( app-i18n/scim ) - sdl? ( media-libs/libsdl2[joystick] ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/wayland-protocols-1.25 - dev-libs/boost - x11-base/xorg-proto - test? ( - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 - ) -" -RDEPEND="${COMMON_DEPEND} - !=dev-qt/qtwayland-${QTMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/kde-cli-tools-${PVCUT}:* - >=kde-plasma/oxygen-${PVCUT}:6 - media-fonts/noto-emoji - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] ) - screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) -" -BDEPEND=" - dev-util/intltool - dev-util/wayland-scanner - >=kde-frameworks/kcmutils-${KFMIN}:6 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch -) - -src_prepare() { - ecm_src_prepare - - if ! use ibus; then - sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die - fi - - # TODO: try to get a build switch upstreamed - if ! use scim; then - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged - $(cmake_use_find_package ibus GLIB2) - $(cmake_use_find_package kaccounts AccountsQt6) - $(cmake_use_find_package kaccounts KAccounts6) - $(cmake_use_find_package sdl SDL2) - $(cmake_use_find_package semantic-desktop KF6Baloo) - -DBUILD_KCM_MOUSE_X11=$(usex X) - -DBUILD_KCM_TOUCHPAD_X11=$(usex X) - ) - - if use X; then - mycmakeargs+=( - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - ) - fi - - ecm_src_configure -} - -src_test() { - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 - # test_kio_fonts needs D-Bus, bug #634166 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918 - local myctestargs=( - -j1 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" - ) - - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "screen reader support" "app-accessibility/orca" - fi - ecm_pkg_postinst -}