From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- kde-plasma/plasma-desktop/Manifest | 4 +- .../plasma-desktop/plasma-desktop-5.23.2.1.ebuild | 186 --------------------- .../plasma-desktop/plasma-desktop-5.23.3.ebuild | 186 +++++++++++++++++++++ 3 files changed, 188 insertions(+), 188 deletions(-) delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.23.3.ebuild (limited to 'kde-plasma/plasma-desktop') diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 876a7785e348..2a45f3d518b0 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,6 +1,6 @@ DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac -DIST plasma-desktop-5.23.2.1.tar.xz 15787420 BLAKE2B ca4e55cde0f27f44fb55ecb473c30d4667a9512163d2be61d82bc15fb97aa6aef5459590c2e80e6b6218d1b85e5326a0cb2e5aa5507ea1cfe4eee30561477cf9 SHA512 610b5693e1a56f05c4421c496909960e679035521822c94a180d8ed8656f7995fd9dba5adb92cb18c7c1b4d0c9760b7df5d64fe67e6603538b7ea8a7276ea07d +DIST plasma-desktop-5.23.3.tar.xz 15787952 BLAKE2B 39182407a32d185cd6694c24185318b9d90b3495e3402590e3039c3f1732abee4ff4bff5eaa5d627f555c19994db4c8e14cba67e2c8a11b9b8f849fdee48c0b0 SHA512 3ece7b471d0003c93b37ecbeb379a62bc96cb6076dec658e8c5db63e68a731c2b0d1bf48d71fcf2f2067345fc4c88ce8d446ca80ac1128a355721abe4cc9705e DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20 EBUILD plasma-desktop-5.22.5.ebuild 5429 BLAKE2B 979ca198a875cc14e82a5f1acc21f5c61b595febefae0ae63f107498f7267919dfb4c7d8821aeccf615c2d39ddacd2f17b0bce1bb5c1cc0fb3fdb0edbcc792b0 SHA512 cb2212107565b78a19b580178e4b9c7dfff84cc095d0ac6d291c9003de86d0adc7def98378e3a07a7d4106e5c83f62690baa5075592bbecae2b1d523f17dd98b -EBUILD plasma-desktop-5.23.2.1.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35 +EBUILD plasma-desktop-5.23.3.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild deleted file mode 100644 index 1de5918b5983..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-1" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry" - -COMMON_DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - virtual/libcrypt:= - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb[xkb] - x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - kaccounts? ( - kde-apps/kaccounts-integration:5 - net-libs/accounts-qt - ) - policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) - scim? ( app-i18n/scim ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/user-manager - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/oxygen-${PVCUT}:5 - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) - policykit? ( sys-apps/accountsservice ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch -) - -src_prepare() { - ecm_src_prepare - - if ! use policykit; then - ecm_punt_bogus_dep KF5 Wallet - cmake_run_in kcms cmake_comment_add_subdirectory users - fi - - if ! use ibus; then - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die - fi - - use emoji || cmake_run_in applets/kimpanel/backend/ibus \ - cmake_comment_add_subdirectory emojier - - # 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_PackageKitQt5=ON # not packaged - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - $(cmake_use_find_package kaccounts AccountsQt5) - $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) - 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 -} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.3.ebuild new file mode 100644 index 000000000000..1de5918b5983 --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.3.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.86.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org optfeature + +DESCRIPTION="KDE Plasma desktop" +XORGHDRS="${PN}-override-include-dirs-1" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry" + +COMMON_DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/attica-${KFMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kdelibs4support-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-workspace-${PVCUT}:5 + >=media-libs/phonon-4.11.0 + virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxcb[xkb] + x11-libs/libxkbfile + emoji? ( + app-i18n/ibus[emoji] + dev-libs/glib:2 + media-fonts/noto-emoji + ) + ibus? ( + app-i18n/ibus + dev-libs/glib:2 + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) + kaccounts? ( + kde-apps/kaccounts-integration:5 + net-libs/accounts-qt + ) + policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) + scim? ( app-i18n/scim ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/user-manager + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/oxygen-${PVCUT}:5 + sys-apps/util-linux + x11-apps/setxkbmap + x11-misc/xdg-user-dirs + kaccounts? ( net-libs/signon-oauth2 ) + policykit? ( sys-apps/accountsservice ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch +) + +src_prepare() { + ecm_src_prepare + + if ! use policykit; then + ecm_punt_bogus_dep KF5 Wallet + cmake_run_in kcms cmake_comment_add_subdirectory users + fi + + if ! use ibus; then + sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ + -i applets/kimpanel/backend/ibus/CMakeLists.txt || die + fi + + use emoji || cmake_run_in applets/kimpanel/backend/ibus \ + cmake_comment_add_subdirectory emojier + + # 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_PackageKitQt5=ON # not packaged + -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + $(cmake_use_find_package kaccounts AccountsQt5) + $(cmake_use_find_package kaccounts KAccounts) + $(cmake_use_find_package semantic-desktop KF5Baloo) + $(cmake_use_find_package telemetry KUserFeedback) + ) + if ! use emoji && ! use ibus; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) + 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 +} -- cgit v1.2.3