gentoo resync : 12.05.2022

8 files changed, 73 insertions, 21 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index dc4699de939a..199c94acfa2e 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 9a2d1e0a2b86..ab2fa4b2d785 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha09-r3.ebuild 8176 BLAKE2B 47e5d32a77a929a0982e8823b72f424a88668e3e42bde40bf0a633e587fdaf27ed1a9573d9029f6f46cf0928813e498f070d2338258edcdd97e71bd01ee35932 SHA512 6a53a2eb61a2c6d370eb701a7007f6d5f411a5f22bd0de72d7a9d639111857f24f822eb4ce94115e012ce6db4dc26ecaf74802114aebdf752c6931f39c0ad567
-EBUILD cdrtools-3.02_alpha09-r4.ebuild 8621 BLAKE2B 3c852c9912b64d1f018024f9d19d425dd3b79f8626e4bbc9d3cdfd20e9eee8c4f15c534fbb5c29b68848612a86f1db00a26f45a5133a0a7fe2bfa2a1fa9ad415 SHA512 cacff66bf2cab9f922308e07b62745db8af3c8725f2393a34eb62df106b61d3321a38989681359889f8782b29301d7a21f136bc1a09bc6af1a72d919d9569983
+EBUILD cdrtools-3.02_alpha09-r4.ebuild 9006 BLAKE2B c185543b1b29af2555cebf3d97f821fac8db389b422d82b85d6d8f273abe4e47d0f2696d524842ba3fb73baf8dad3fc88c288725259bd2183392887f635ec647 SHA512 4e2aa1ccc621172333301bb8e05bbfe136557c574312aa745862eec8b1969e85ed51ecf49417772acb2bb8df2cb11fc7653d63f54f6f5c41fc2c5ad45abba503
 EBUILD cdrtools-3.02_alpha09.ebuild 7881 BLAKE2B 3ca107b16e92797b85e0fd09a5e205db41d73977220998d7b0baef7d29120bb0cbbeb788c739f98d9e3b8f4bdcda5f6b2a5a57b2cf55562edc2d82136a6d8aef SHA512 0835b77c2af21e5cff24ab0da2d089273b2984eca57087e3e0e92f0cc01325718d7b583f87179d8dba9bb3ad2d46f95752afce55b5d51bc678cc0a3c33bb3c67
 MISC metadata.xml 445 BLAKE2B 43f12bca87633d1b039beed2fb401b652eafb937afc8a27d9d84885d306636bc29978beb17426dc782cb7c2e7ba9333b9346b6455fa72db2b778800f39995476 SHA512 c552eae00d8560d482fcb02799f064f5481e67ec12107760c841620db2d3023826377e186f5dc1b3555eea9b40964b4c7020b1deb82574ff1ff3ad7fd957bde9
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
index d57c022de7c1..0bd54271fe20 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
@@ -44,6 +44,19 @@ cdrtools_os() {
 	echo "${os}"
 }
 
+symlink_build_rules() {
+	local cputype="$1"
+	pushd "${S}"/RULES > /dev/null || die
+	ln -sf i586-linux-cc.rul       "${cputype}"-linux-cc.rul      || die
+	ln -sf i586-linux-clang.rul    "${cputype}"-linux-clang.rul   || die
+	ln -sf i586-linux-clang32.rul  "${cputype}"-linux-clang32.rul || die
+	ln -sf i586-linux-clang64.rul  "${cputype}"-linux-clang64.rul || die
+	ln -sf i586-linux-gcc.rul      "${cputype}"-linux-gcc.rul     || die
+	ln -sf i586-linux-gcc32.rul    "${cputype}"-linux-gcc32.rul   || die
+	ln -sf i586-linux-gcc64.rul    "${cputype}"-linux-gcc64.rul   || die
+	popd > /dev/null || die
+}
+
 src_prepare() {
 	default
 
@@ -71,6 +84,11 @@ src_prepare() {
 		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
 		|| die "sed rules"
 
+	# Don't quote $(MAKE)
+	sed -i -e 's|"$(MAKE)"|$(MAKE)|' \
+		$(find ./RULES -type f -exec grep -l '"$(MAKE)"' '{}' '+') \
+		|| die "sed RULES/"
+
 	# Enable verbose build.
 	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
 		RULES/*.rul RULES/rules.prg RULES/rules.inc \
@@ -80,9 +98,6 @@ src_prepare() {
 	cd "${S}"/RULES || die
 	local tcCC="$(tc-getCC)"
 	local tcCXX="$(tc-getCXX)"
-	# fix RISC-V build err, bug 811375
-	ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
-	ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
 
 	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
 		rules1.top || die "sed rules1.top"
@@ -95,13 +110,14 @@ src_prepare() {
 		rules.cnf || die "sed rules.cnf"
 
 	# Add support for arm64
-	ln -sf i586-linux-cc.rul       aarch64_be-linux-cc.rul
-	ln -sf i586-linux-clang.rul    aarch64_be-linux-clang.rul
-	ln -sf i586-linux-clang32.rul  aarch64_be-linux-clang32.rul
-	ln -sf i586-linux-clang64.rul  aarch64_be-linux-clang64.rul
-	ln -sf i586-linux-gcc.rul      aarch64_be-linux-gcc.rul
-	ln -sf i586-linux-gcc32.rul    aarch64_be-linux-gcc32.rul
-	ln -sf i586-linux-gcc64.rul    aarch64_be-linux-gcc64.rul
+	symlink_build_rules aarch64_be
+
+	# fix RISC-V build err, bug 811375
+	symlink_build_rules riscv
+	symlink_build_rules riscv64
+
+	# Add support for loong
+	symlink_build_rules loongarch64
 
 	# Schily make setup.
 	cd "${S}"/DEFAULTS || die
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 32b2bcbc7cff..3835fdc96435 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
 DIST dolphin-plugins-21.12.3.tar.xz 254696 BLAKE2B e669a8acbf8b5559a602dd3ae646e2384b89a672bb0ed42d2f094b75a1eaefd6994644daaa70d17f9baba8ea491cef632090050b93e0f5e0b50f203a6166338e SHA512 3dad72b6e0283a8c825aded82e9d15bc5e03303bbfc6dd8f1e6af2cb3892ec9b04a3c97f01246e20abe6d86e5a91fa1c4f8fff48ed24186a3780009a78298d23
-EBUILD dolphin-plugins-mountiso-21.08.3.ebuild 1520 BLAKE2B 1b84b974e4b0c854e17cefed151b0d5547013cd2bcfb6d3ec7a85daf254fe2f71246bd56a64e5af3a9a2ca923c9601ac04c2fdf4833287e76c704602d315eb3f SHA512 bc96692b892f4b1348ddc53dad7faae7d7f3deb7a9de7a491ed36ec95ee2528480048bb467bacd2aca1d9a8bba98f2b002c10aaf1f42e1271e790642fcedd5a4
-EBUILD dolphin-plugins-mountiso-21.12.3.ebuild 1513 BLAKE2B 3429e516371c9942929a53d8f1a4a1b39e9443f451e95a828a44092f2d5c0e70726a37011ba05c655c4cab3ac0e121adacbbc0dab0cc8fe26ff3fda2fe0dab78 SHA512 cdbe8662edb20adedbdf87aaf2babf42cdddeb3c9ebf326bc5fecc871fb8517bc35163f86ebba65b62854839b212ebcaf68ac7a6a11f4c09b25b0638b7bf6e30
+DIST dolphin-plugins-22.04.0.tar.xz 256164 BLAKE2B 8980f3d7687b456edc81d69027c66f1e7801fa5876ef605a021caecae02b7b30596b1b9bdd8c0de2b5c6c98393eafb75bedc6f0d411d144fa430619778ff7f97 SHA512 3c7dcc1404cbfbb0a4805eb1116dae53b03fa1b49ee483b09009f32035d0939fc8bedd65866765e94d5294185f42bda4b6aaba6486c52ea2a524e5678e6b4c28
+EBUILD dolphin-plugins-mountiso-21.12.3.ebuild 1512 BLAKE2B 39104e1cc19cb8b853fc10a32f1f515163516cea40cfe307067b6bf91c4367e2bb809789bb3dc123968c9aea92c6cd5bb52b530f14b985fccaca691a560cb8cc SHA512 0deeeb509daf1806d95a21062e05121fbba73472ead78ef439300286cb414438b1bdde7e68574544d6240ed25ba558c8fbfaa3fd2d7b51731f1857717ed99c3c
+EBUILD dolphin-plugins-mountiso-22.04.0.ebuild 1515 BLAKE2B f77cc947a5a9e77b4731537cf8840d14529208eecdb9a9d3c0247722cc3817a4b29b39fbdab64cf02bfb8d92d62453b6cda895bb5bdab522e35cc0c1d85d6edc SHA512 c9d105c238f42d98f466358b5f5a2f677bd919f1e48f6349dbb3969962c5003758656f623cab9c056ced20c955ca1683db1a1db19d936af2a112efdf096a9401
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.3.ebuild
index f65fd9ddfb98..4577abd437c8 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.08.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.0.ebuild
index 972b1746dacc..dc115514595c 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.08.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ KDE_GEAR="true"
 KDE_ORG_CATEGORY="sdk"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="mountiso"
-KFMIN=5.84.0
+KFMIN=5.92.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -39,8 +39,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
 	# delete non-${PN} translations
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
 		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index e0d61cccc28c..d7e1b30262ad 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,3 +1,5 @@
 DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
+DIST isoimagewriter-0.9.tar.xz 446764 BLAKE2B db3628c702b845591c5895662aad17a4c691352b97ad29f0569db6472cd39c6446ff220c932e970aaf8e56be30c8549358fb6d2e318f01c12830e55fbeadd499 SHA512 94a05da44b22ae932a79f6bb91c6806047f94e9b0fb4fe5530eb6094664877c47a0581f0858ff4458daca8924a7803a979e74d6538ec8da642403c4ede58688d
 EBUILD isoimagewriter-0.8-r1.ebuild 673 BLAKE2B 75f9407b7663d19f1141fc1cfe9bdb09dee09ba929557feda4e8c4004d78ba5725dd3ad9eeff430553e1d0758430bb4756eb3065bbbc09b7285e6662252e57d1 SHA512 91f707eabc5ea818de44d658fe2b469503c177703ee7c565f1f2a37ea78a999d19f8fa91d4ea9fcd1dbc322915273187dd6cc6534782f58eaf30f3a9c4a30004
+EBUILD isoimagewriter-0.9.ebuild 795 BLAKE2B e452fe0e22f2a505c41a56efd3f52e3c5f43172fb565f7977e611ec675960834d5e7edba9fa2feb0c5652c82fa9a37cceba1d949bc2be64badf9ff9c1cf7d7c5 SHA512 774be81360983d644e979759f9f9004d89e1398eac432d1c5d2d5ae762c93a2976a6645722c00b97b4f18490677fed779821969d6ffdb551d77e5f02113004fe
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.9.ebuild b/app-cdr/isoimagewriter/isoimagewriter-0.9.ebuild
new file mode 100644
index 000000000000..5eaf2976fc89
--- /dev/null
+++ b/app-cdr/isoimagewriter/isoimagewriter-0.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Write hybrid ISO files onto a USB disk"
+HOMEPAGE="https://community.kde.org/ISOImageWriter"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+	app-crypt/gpgme:=[cxx(+),qt5]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"