gentoo auto-resync : 22:01:2024 - 10:49:19

6 files changed, 34 insertions, 4 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e07b26a3120b..8c8bdc2f73a5 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 2fc06e47716e..b770f9baf188 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,7 +1,8 @@
+AUX kvirc-5.2.0-qtver.patch 911 BLAKE2B 23f3af68c8b87643d28cc7e377f6964190c354980d4a3e592c7b0149cf99d99bf3a28b55748d64d0c11533a1b0ee717d2f868b8ade84b39e7b8d0bb9cb9d9dcd SHA512 d5926370fb329ba101f1bd2672076349156f16aa0fc502421777f35c68b293694816219023a12890f91e9ca4827e8aeca6c8cfe2b9ed055eaeab6c9647207a72
 AUX kvirc-5.2_pre20210630233331-fixqprocess.patch 869 BLAKE2B ccdec97ac8cd412c776146a56971f61bff66737a5a5590bb1508f05e64850211b9d0748999d347aaab8ade499d22ae6f9bfd8c4b9bced35de0dc0b2d7669734f SHA512 deb5252936bcb593fe1a11631fe4c03f26c28afaf1e88206a076d2f7754160620178362d0f00023a56f4eafa19d60c4d281cee88c20253ac6629033284719363
 DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079
 DIST kvirc-5.2_pre20220629000000.tar.gz 6173590 BLAKE2B b4bfdc307df81a485acb72b33908f82bad0793139543abed03a1b84cae36cba4e11a6b8098cffc9669cb0a7c9072fd6a608589ce03a228b25dfd00b8d7d94b82 SHA512 4369f3703555c8717febfd32c06f6fd8576424cb3a92f9d9e24a5af93acf69ca8707d89a27804457327fd6c30601566d7874c0fc08e12018a3f5440ea988a69e
-EBUILD kvirc-5.2.0.ebuild 3767 BLAKE2B 39f9728e01de43f7c67b3268cd33f17b36db8f66b2bfa02edb6dc820b4bbf601d682852ea6435b90977ce1cb1cb9199e2b452ee91dafc208a3607931927a825f SHA512 3869c2363ac8425f1b6c7462dbfb74f73f4d22be97cbb4efa48c1e2ac4e22dac8e0bd67107447fc2cf0e5c7a2b94345d393299ef4ee2837535f3cf9aeda55257
+EBUILD kvirc-5.2.0-r1.ebuild 3819 BLAKE2B dc16562e46df72225c3e9f4a621b9bdba4cbe622322386fb369a6d0c389b06b7f6fcf065a8490d7f47e5cd4f900f0b06326f171a85333625f8d161be02d57fbe SHA512 060e2f2852e4d3b2174739fa31175dadb73d9ac4e197e6f990a41869ce77ebed66f528da638210cf7fac5352f29ef19f9b1b1f845312d235dae2b1baa8c91390
 EBUILD kvirc-5.2_pre20220629000000.ebuild 4387 BLAKE2B fa9b947311a24f05ea67e5361b6ddb9cfc75563653630fb6b042e3179c4e1d00aea2ecd7cdf385ffaf4dc45136a48594f890f3bc110d3cd231d4e165b30a39d1 SHA512 6f843c06033883080a374120b2f93317b5d2096b58031aa095deb8772f741b533ccfa60a9d90ce6ba23b4828ac3e55349ce4fc2484b3925cba4078615f5e2db7
 EBUILD kvirc-9999.ebuild 3767 BLAKE2B 39f9728e01de43f7c67b3268cd33f17b36db8f66b2bfa02edb6dc820b4bbf601d682852ea6435b90977ce1cb1cb9199e2b452ee91dafc208a3607931927a825f SHA512 3869c2363ac8425f1b6c7462dbfb74f73f4d22be97cbb4efa48c1e2ac4e22dac8e0bd67107447fc2cf0e5c7a2b94345d393299ef4ee2837535f3cf9aeda55257
 MISC metadata.xml 632 BLAKE2B 00e76e3f4dae2d7422da074a35e0bf2ed0d919be1a7c86e42779c809f9a31e87e6627d6eac03f8913ab40e094a8e5d284daa42d1140717083c73783342b0bea5 SHA512 a38097a282426fad3339a155ea4e8be00bcae177fb8dc4820c3cd1b1c5ceab5820c47cc7a33573c8b0d391e7ad726f57ee8450dc1b0f33f9dcff8354a9d7e1fe
diff --git a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
new file mode 100644
index 000000000000..9f3700ec9d9b
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
@@ -0,0 +1,25 @@
+From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sun, 21 Jan 2024 21:07:37 +0000
+Subject: [PATCH] Fix ability to select Qt5 vs Qt6
+
+https://bugs.gentoo.org/922636
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aabc0988b..9368e81c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,7 +389,9 @@ endif()
+ ############################################################################
+ 
+ # first check if Qt6 or Qt5 has to be used
+-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++if(NOT DEFINED QT_VERSION_MAJOR)
++	find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++endif()
+ # second, detect available modules for the specific Qt version
+ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+ if(Qt${QT_VERSION_MAJOR}Widgets_FOUND)
diff --git a/net-irc/kvirc/kvirc-5.2.0.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
index aff1e010cbc6..9e0cd048be85 100644
--- a/net-irc/kvirc/kvirc-5.2.0.ebuild
+++ b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
@@ -66,6 +66,10 @@ RDEPEND="${DEPEND}
 
 DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/kvirc-5.2.0-qtver.patch"
+)
+
 pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index f73fafcbe381..f06cbe52bf20 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -28,7 +28,7 @@ EBUILD weechat-4.0.7.ebuild 4831 BLAKE2B 0861f3997f8fbf74bc5aa2d428c859d1b9aca3a
 EBUILD weechat-4.0.8.ebuild 4831 BLAKE2B 4aba39bb0df5cb333ab15c0b6e7e9443c5fbb7262b8f75c9e6a0aacafc38f61cd09ba9207275519e8b04684d11d46b04494bec8cb1ef31cb37cb06d82c221455 SHA512 42c830bae787f4934e2df5526f6c35c0713b9a69da29edad21f2f4d8f7118cba470681b2590e07b2d4b86a58081f81b636da9537fd26bb2ce4b4025a7576de4a
 EBUILD weechat-4.1.0.ebuild 4876 BLAKE2B 406c8532b59ddc6740ed309a5afc5fcefa8736b49fdf973359a9a0632fb83332cd9a11dd9f8a0cbc9cfe46009e360addf56cc7a4835d45db55b148a693d983be SHA512 ca87103d3b939de668bb1fe132dd3a88645ef55f79067c248b0ee15875601159d6390a1812d4ca9155d1d306d88a792269116de2095f26943c2e031f2f8422e3
 EBUILD weechat-4.1.1.ebuild 4876 BLAKE2B 406c8532b59ddc6740ed309a5afc5fcefa8736b49fdf973359a9a0632fb83332cd9a11dd9f8a0cbc9cfe46009e360addf56cc7a4835d45db55b148a693d983be SHA512 ca87103d3b939de668bb1fe132dd3a88645ef55f79067c248b0ee15875601159d6390a1812d4ca9155d1d306d88a792269116de2095f26943c2e031f2f8422e3
-EBUILD weechat-4.1.2.ebuild 4877 BLAKE2B 5cf14a76bc03d5c6038cdc26a067cba63596f0de09257bcae1310061522cd3128d3cd4ac27dd386c232f1d3a9ec0206ed3501c86503f1531659cb6804e59874c SHA512 2bb8b48f6a174ae0562b6b6f37cbc19d52d25fa54f75c27858fb16f712d14d78adcf2674e7e4615e6d9c20c518cb4a5eac712a1c1091b83a2c57dc0b4f3a9d58
+EBUILD weechat-4.1.2.ebuild 4875 BLAKE2B 1d9e6c670b84ed5fcff07ad53af8fe79c6e8b406477caec6c37f490568651d01ead94145be4ad80401e33a12db6d9844959c8138cfe54e630893ca8ce208e06f SHA512 4af41e955acf3c5fb252e10b25aa0be00a5cac9c9a3202be4e1dc96f909254daa49b5501e54a25796860f19f01b4b7ab862809ebada213f91563422fd6bfbbd5
 EBUILD weechat-4.1.3.ebuild 4877 BLAKE2B 0c38f159d7d80106eb21570609794415d1da032f771c6e9ac90ebc879286122df524b3564114f58b78df468aca0084e308a7e622230c3843c9110f9042cfc593 SHA512 a130e8d4439538bb0727d747444d7eed2e6706ae298e7468a7df36d25e71d0bdf396fb203db7107f597ae90aee668e4e14e14b92670d3666fc8743ef5fe465b4
 EBUILD weechat-9999.ebuild 4877 BLAKE2B 5cf14a76bc03d5c6038cdc26a067cba63596f0de09257bcae1310061522cd3128d3cd4ac27dd386c232f1d3a9ec0206ed3501c86503f1531659cb6804e59874c SHA512 2bb8b48f6a174ae0562b6b6f37cbc19d52d25fa54f75c27858fb16f712d14d78adcf2674e7e4615e6d9c20c518cb4a5eac712a1c1091b83a2c57dc0b4f3a9d58
 MISC metadata.xml 1555 BLAKE2B 02c9450e9d8cce403316631c91e211b9a70533fdb23275c5aed39683ac4e0d64e1276c3f4268dfe4b0adc49582a5d3457dd579e1419f6f98470fa784b48ff644 SHA512 ec3d7d9601d7d247af4a707e6b9cead1f7e78497daf1efad99025f7269adcf582deada141e0997398849116d44e89e62fab2d6cfee7e20ae1076799f0cae82e3
diff --git a/net-irc/weechat/weechat-4.1.2.ebuild b/net-irc/weechat/weechat-4.1.2.ebuild
index 4e2ec42c58f6..ea74ca445846 100644
--- a/net-irc/weechat/weechat-4.1.2.ebuild
+++ b/net-irc/weechat/weechat-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"