commit: eb08821baab3c45463e81f624bf7d475e694a426
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 21:43:17 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 21:44:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb08821b
kde-frameworks/plasma: Fix the intended version 5.95.0, revert 5.94.0
Amends commit 5e8c3694a654026173f909d67605b7de9200e882
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/plasma/plasma-5.94.0.ebuild | 2 +-
kde-frameworks/plasma/plasma-5.95.0-r1.ebuild | 73 ----------------------
...lasma-5.94.0.ebuild => plasma-5.95.0-r2.ebuild} | 0
3 files changed, 1 insertion(+), 74 deletions(-)
diff --git a/kde-frameworks/plasma/plasma-5.94.0.ebuild
b/kde-frameworks/plasma/plasma-5.94.0.ebuild
index 648c6c572553..143e61839c1e 100644
--- a/kde-frameworks/plasma/plasma-5.94.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.94.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
=kde-frameworks/kactivities-${PVCUT}*:5
=kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5[qml]
+ =kde-frameworks/kconfig-${PVCUT}*:5
=kde-frameworks/kconfigwidgets-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/kdeclarative-${PVCUT}*:5
diff --git a/kde-frameworks/plasma/plasma-5.95.0-r1.ebuild
b/kde-frameworks/plasma/plasma-5.95.0-r1.ebuild
deleted file mode 100644
index 143e61839c1e..000000000000
--- a/kde-frameworks/plasma/plasma-5.95.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( media-libs/libglvnd[X?] )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/libglvnd
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.94.0.ebuild
b/kde-frameworks/plasma/plasma-5.95.0-r2.ebuild
similarity index 100%
copy from kde-frameworks/plasma/plasma-5.94.0.ebuild
copy to kde-frameworks/plasma/plasma-5.95.0-r2.ebuild
