4 files changed, 6 insertions, 53 deletions
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 336a0f6cbd43..033710ab8d33 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +1,5 @@
-DIST kirigami-1.1.0.tar.xz 262152 SHA256 6677af0c486a4c9cfefe74a0951e85dad53435010031bf2b7fcdf9c5df6b3edd SHA512 83d1c0600fed7838b25ddfa3d20e1abef594c8e5fa202314ef1c22b6548573db36058f02620236cd9bba9f65f45f8821fa37558689b49776f9fe3119c89b0b63 WHIRLPOOL b1d4cc22a0759f561c16bb61bf2a47494e92cc766401862b97866156dfe1cda452e1db01a62805fe902320fc106708794b7f545abfbd2ff5c0d8909acd024bc1
-DIST kirigami2-5.37.0.tar.xz 278452 SHA256 ad252c1ff20060f1de5afd41fade9b86e046bc9a7da38af6ca507f8ba2ce82fc SHA512 fcbeda787b571e9cad820b5dba9fc1fcf51e9411820765138bf350f57e8be01356d157d4207a78954901d96c3ca9db4c47604b054daeecc1cf10b0a769c5cf10 WHIRLPOOL ba3abe68200c96741ce2803a62fdc632127deec79adfce6218d4a583d4a36999667c2e35a8c8cf69f450133d8d259fd2701eaa1ca3af1102286059e6988a5d92
-DIST kirigami2-5.40.0.tar.xz 291456 SHA256 2b4b6c6aa5b6fdb57d19345526628f528b6e57fa4a471d4b83e0ceec3a674228 SHA512 689d91f23a1300afd9204173a40e2a100e83b0eb38d02962236ab1ff91fd4659dcc60d84c815766a38cacf38294488d82c5d0b9d540c1a0972489aa29e300974 WHIRLPOOL be16671d9fc0576edb2dd30162f011164e84405698991204b19ef924f7f1672d7ed9100a39cd3949e715e28dc9e7d07f5e22a1cd1b6f29e5089738570c04172b
-EBUILD kirigami-1.1.0.ebuild 803 BLAKE2B 423099a89cae85ce48b33104e9389a6fc09c7d3da47016a47a28f4b442b6fd031ab2efea2df6113a810666a8f7103aff1b69208f8e7914535561acb823bf63a8 SHA512 1b1a3204c7332978ed57199d0402eed4fd21b945a0333a310e4d6678abdddc76c619c467974a9f133e8655491554c72a91242ac638ea9f39716aeefd87fe5271
-EBUILD kirigami-5.37.0.ebuild 978 BLAKE2B 0ff536a02b0930bfc924166dd8743718700d75048a201d7be9b1f38ca282d6e4b81ae268da03ba4a7b535101b27d4a008c2badc0d3bf31fc6cbd067997e79a2b SHA512 fa644faa805bd22ac949a5b4dee6c8469f8a5a5e8ad99b685347d59b9ccabc0a612e54d648ab89f84266ba7fa776f80e858bd74c47a4a669e924e68617b549cb
-EBUILD kirigami-5.40.0.ebuild 917 BLAKE2B f069e3c78e7724a678163e9aaaeec274e3c2ab769430b74aa42c67e519f34b92e1abade2f85855de5ca748dd379650a509ec4a7230874944911d17b65bc067e2 SHA512 c4f11027c8b5b9fa7fea1897cfdec754fe2e86c68e8cde677f7690c2e9c4b4772f4e03b4719e0b8fc9ba956eaed26e6fe5cd56009c04a294b98c6f5aee1da408
+DIST kirigami2-5.40.0.tar.xz 291456 BLAKE2B d00d9df6880c45b1c74430fdeb9e09d2e7292e6b9512213969e5ff8c5668df1cc85b3c0116a86f546ec11f8e96a2a66fa599c29d46efafa3e2bd7db2a9329071 SHA512 689d91f23a1300afd9204173a40e2a100e83b0eb38d02962236ab1ff91fd4659dcc60d84c815766a38cacf38294488d82c5d0b9d540c1a0972489aa29e300974
+DIST kirigami2-5.41.0.tar.xz 292460 BLAKE2B 51195f79d37fc2832c6be5d31394823eb9d862217feec4259956cfa8d6579fe0683d7bfb4036eeabdbb1c4cfbc4fe134ff06bc523629cfcd02f4766299a76276 SHA512 987f666822aa2c137c57019aed6e811ddd6406318252cd48e71412ee3e6bcb22cd35042c5e3a0e0da5d12db48e4bf7168199d7c473f100a07913f32b1cd23bd1
+EBUILD kirigami-5.40.0.ebuild 916 BLAKE2B ec5163018354ad62c8486ffb12b002f38bb80dae17a8b5f0c23750a23316ea2ce05204bd1da03ea4827d718aa94dff52ad043e48d05007160a80aec9fc731a1f SHA512 e492963b7c5e94f0118a1a151edea0f58c49f4616dbf64a3fc995d4d82e5e45e57cc6f1ec77dc3aa40b821a9e8a239254d88f8e89785fb0a4442a25a9a76e10f
+EBUILD kirigami-5.41.0.ebuild 918 BLAKE2B 7f0806d8e098131fe62d99c7e86265ef46f59594fa6d7f536667f11a45f28f2df40d99a464ddaaba11e87dbbf56ead2e312f3920ae2d85ac6c1cb142f28f6e3c SHA512 01fbf0721e85efa1656180d467d79cbe0e72c1fe71a845fe13f8740d56d9e80b8db013c4de7d71f058bd464b4d9f76497eea5581bdb1a7d2eabe05d7be9b0fbf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-1.1.0.ebuild b/kde-frameworks/kirigami/kirigami-1.1.0.ebuild
deleted file mode 100644
index 1b1ff4256b2d..000000000000
--- a/kde-frameworks/kirigami/kirigami-1.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1"
-KEYWORDS="amd64 ~arm x86"
-IUSE="examples plasma"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	plasma? ( $(add_frameworks_dep plasma) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -i -e "/find_package(Qt5/s/Test//" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DPLASMA_ENABLED=$(usex plasma)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-5.40.0.ebuild b/kde-frameworks/kirigami/kirigami-5.40.0.ebuild
index 2f60ab8f9e54..eff2dca960b8 100644
--- a/kde-frameworks/kirigami/kirigami-5.40.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.40.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="plasma"
 
 RDEPEND="
diff --git a/kde-frameworks/kirigami/kirigami-5.37.0.ebuild b/kde-frameworks/kirigami/kirigami-5.41.0.ebuild
index 8da9cd4fdca0..d3fa319c2d78 100644
--- a/kde-frameworks/kirigami/kirigami-5.37.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.41.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="plasma"
 
 RDEPEND="
@@ -33,11 +33,6 @@ DEPEND="${RDEPEND}
 # requires package to already be installed
 RESTRICT+=" test"
 
-src_prepare() {
-	kde5_src_prepare
-	punt_bogus_dep Qt5 Test
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=$(usex examples)