gentoo auto-resync : 12:05:2024 - 00:01:15

9 files changed, 119 insertions, 8 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 804078b982ad..be8288609ae0 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 090344bbf66e..662b414e0d97 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,5 +1,7 @@
 AUX ckb-0.6.0-fix-bashism.patch 692 BLAKE2B 25c5756e809f01045569e933447090ace40e66b002a0497d8211e091680eebb480b7d7075e73e238478d715cecb3ccf8c35db17375f11709222979fa7b3ca47a SHA512 8feab11579fa689e81d68d87ec3539f3db2b7299841ac14880be330a77cabc0a5e130022705c6edb21d694987b93605f2a27c1c0ce857e457e14e90566b06ea9
+AUX ckb-0.6.0-odr.patch 1126 BLAKE2B c2822fd5a52ad1fc55d76465e417a1365c40cf7e35860fe715d27ceced55dbce09a182d812612b72577802a65865b23b6e31d2c23d66d50ee827986c8fd5f775 SHA512 1ce9a73c2f2a618de236caf473cc4de3b7cb9721f47c12c3bd3a2337e602d6589dccec8e64ebba80add5bfe88316ada31cad63131b760ed616c063820b58ecbd
 DIST ckb-0.6.0.tar.gz 1835972 BLAKE2B a6d905cf4a62e9395e008628a2b585681f4fa4af52305a11e49d2f00db990a966be79f97e0ae684031a45bf77b372548b64e2b0f87e344eaa0eb67c07117f89c SHA512 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392
 EBUILD ckb-0.6.0-r1.ebuild 1421 BLAKE2B e41e3e0ffab06ad3ec571bd3e481be3be80ef76624abbe308476658890499022f17b1631508556168574a036d2a3e7e08c7ecabe4eb2a7ebb92c11e6b3d5300e SHA512 26b5a55efeb857a7a030ebdd7b41210afa8ee45ff26d9a4e03862bcd17d5fcf5776af7c93fbaa9cacbe872adef8b95c0eee7686e98fdeb782b6e7d44233dd228
+EBUILD ckb-0.6.0-r2.ebuild 1452 BLAKE2B f8d983797533ce1971da1696af3ddd2706886932afa4984e236195ddf80f8f389306eef47cbdb9410232488ab94f8f4740b731ef14ae523396330def8beda629 SHA512 3f0ff53abd67dc262cfe3601aa773a061e937e7c90368b88d04db067e5ff660e96e4b13989f9d7e2f02f18f00b8428030b2c167c6422c1b5b17510f581ef04a1
 EBUILD ckb-9999.ebuild 1371 BLAKE2B f440295e5d768353aa8224e3c1a49c59039f4c58efe1d74d3bf23377950b22ca464972744ef4f00e28f4da658180ecd2e93c91fbf7cf18e589ac275adb62172a SHA512 beb51fc89c6c58ef9896523eb3e915f5a41acb1b641c31bcf0a7a1cc92c1e2cd354dd6e1aef71dbc1e1394100c5667e008583d53f3380609376a979045efecfa
 MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.6.0-r2.ebuild b/app-misc/ckb/ckb-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..c70828a260ad
--- /dev/null
+++ b/app-misc/ckb/ckb-0.6.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev xdg
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"
+else
+	SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-next-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="systemd"
+
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	|| (
+		media-libs/libpulse
+		media-sound/apulse[sdk]
+	)
+	virtual/libudev:=
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-bashism.patch"
+	"${FILESDIR}/${P}-odr.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+			if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-config start ckb-next-daemon"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/ckb/files/ckb-0.6.0-odr.patch b/app-misc/ckb/files/ckb-0.6.0-odr.patch
new file mode 100644
index 000000000000..9547fe4edaf9
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.6.0-odr.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/924410
+
+From c5b68a00867b2add28bfd62430c45781ac2e9cb8 Mon Sep 17 00:00:00 2001
+From: John Helmert III <ajak@gentoo.org>
+Date: Fri, 16 Feb 2024 22:14:24 -0800
+Subject: [PATCH] ckbsettingswriter: mirror QT version guards from ckbsettings
+
+The differing definitions between ckbsettingswriter.cpp and
+ckbsettings.cpp trigger compilation errors with -Werror=odr.
+
+Signed-off-by: John Helmert III <ajak@gentoo.org>
+--- a/src/gui/ckbsettingswriter.cpp
++++ b/src/gui/ckbsettingswriter.cpp
+@@ -1,9 +1,18 @@
+ #include "ckbsettingswriter.h"
++
++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
++#include <QRecursiveMutex>
++#else
+ #include <QMutex>
++#endif
+ 
+ // Mirror ckbsettings.cpp
+ extern QAtomicInt cacheWritesInProgress;
++#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
++extern QRecursiveMutex settingsMutex, settingsCacheMutex;
++#else
+ extern QMutex settingsMutex, settingsCacheMutex;
++#endif
+ #define lockMutex           QMutexLocker locker(backing == _globalSettings ? &mutex : 0)
+ #define lockMutexStatic     QMutexLocker locker(&settingsMutex)
+ #define lockMutexStatic2    QMutexLocker locker2(&settingsMutex)
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 359163aa375d..1e30a93d93a0 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -12,6 +12,6 @@ AUX g15daemon.service 209 BLAKE2B 0b909fd73dc8d0961f35257d430e4c8b321bf12671a778
 DIST g15daemon-1.9.5.3.tar.gz 414603 BLAKE2B 4f683bab47f6cbde3a028b306c1999ea4fcb84c0c05160a17374be93f953d21588f332e8fbf040c607545c31ee09e30b56b1068db95a801472c9d72ee9fe8e43 SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a
 DIST g15daemon-3.0.4.tar.bz2 372553 BLAKE2B 008cf2eda9e8cbc45a2fd2eef938438be73236f2bffbbc47bdce66f04d6860705572270994df09bc1d7c2c02dc75ca347199e02dc7aa9f71134985cff284c7c8 SHA512 4adbb11ca8128bbaff5ad1dee17ddcfcdfca589f7e8a1a264127dd9d5aec39e07e4986a4b78f4199fb7f3e12979fd8d50a851b047b6cb8cfa13410aa59df062a
 EBUILD g15daemon-1.9.5.3-r15.ebuild 3708 BLAKE2B 691960adf84a399b5c001e539c6047e4bc569e916c202f35f838373040d70cd20df45febc00f1d755e6e2a37565f0ef1beeff49e890ff394992f806d2c867a72 SHA512 858dad4d3e59f1fd7977bb5c67f1cee11d54ebe74be5a7f91f0fe632eea9420089434da3c0b5b7dc473c07e69e1c7927fec5aada3e2ab467b3defcd031ff74d0
-EBUILD g15daemon-3.0.4-r1.ebuild 3782 BLAKE2B 961a71f8a767fc7f07c987cfc9af3033313601cabae0d428ab012e93fd479d7ea361600ae79090299007e3a0cbfea9d0939cabbeb64f6c3fc379a5cd655208f6 SHA512 4979e41604eecd8f4da27caf637c099057a506db9124146185ad72bfd2563e2b4b0a5beb52fc87e65306bb6f592b8c8e1d3dc7b38e3df258fa09fcb2ac09a936
-EBUILD g15daemon-9999.ebuild 3780 BLAKE2B a28f3f3f5eb2585093972627062e885977e48907562b76ac23d899de43c179446e1c38dadc40b7a48fb10f94af900fa1d64528c1b7415c906bbe919bfbd8dbaf SHA512 6afb6f09754855f0d6b6fdef8856fbf3e91d993cd894250b9cb526489d62015393557164be0ba021ea77cacb9306e5adeb60d7ef25c63352adc95921d87b2647
+EBUILD g15daemon-3.0.4-r1.ebuild 3788 BLAKE2B 7385b51a879ec0d87b08174433a554960b43af50835ad0237c001a9236ab5300f2141224aface6c8ca1725565b0f1b8eb1803d2e36ab294d00f692d04f29f4ba SHA512 2475f54c67940b391a708779e60c0e05006b4577b07842c7b1dc47a45a6d0ec9c2f5c19a44e76d0e19391b3409799beed98da01f3ca7bc142bec1a9bf70342bf
+EBUILD g15daemon-9999.ebuild 3786 BLAKE2B 1181d896fd4ad8e20cd7847d903a84fac32a74fe3255220a2259312a1599aec8144ed756d0452c29eccf4376cc1f4b144ccda68710df60db33d207f18088ff41 SHA512 162b5427d432b15df835a9792e976fdaee7f7e92ee68d0040d1b5ca19dec0c971da4a6f3e521a6669808e1deed4d7ea08576391f4e8d0f34ee145f370d5e07d1
 MISC metadata.xml 298 BLAKE2B f14293e0ff4138c4d98d6836f5502e1beaa69f8c7527d129888beef69bf823186e82e8742b85cf9fa78fcf8c38d1dd4e6738bf2d489b2ad8370de4a15efee505 SHA512 b8e2f29fd0ec3dbf81002e99c2beddd0078679916916d33ee88cf06356b00cb3f9da44075bfd87cd1887164177a64e25565ea73b891dab786d3add82340006aa
diff --git a/app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild b/app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild
index 660ce78c17cd..97808207a322 100644
--- a/app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild
+++ b/app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,7 +66,7 @@ src_unpack() {
 	fi
 
 	if use perl ; then
-		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+		unpack "${S}"/contrib/lang-bindings/perl-G15Daemon-0.2.tar.gz
 	fi
 }
 
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
index 0e442d9fbcdc..e063bae8d4ca 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,7 +66,7 @@ src_unpack() {
 	fi
 
 	if use perl ; then
-		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+		unpack "${S}"/contrib/lang-bindings/perl-G15Daemon-0.2.tar.gz
 	fi
 }
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index aed7c07fcae8..b1ddc3107e2d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -6,6 +6,6 @@ AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.31.tar.xz 2385632 BLAKE2B aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe SHA512 dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d
 EBUILD mc-4.8.30-r1.ebuild 3229 BLAKE2B ba2bc855289dffb0750eec94f045fa337b337e4863e96a4a3110c71260227fcd1e56530ab87deb87d69a19c579b1d446002015a19930d233edee84c48e326be8 SHA512 ba5d06fdb16fc8b7f925b021a3a99cc622446f241973cd7bc61c47bfafb80c511cccc58d494a23533e4f2dc3f322fe974f655b6d0cb39bd35a04549a3b1d1363
-EBUILD mc-4.8.30-r2.ebuild 3338 BLAKE2B 4ac48187a8941f7d2e0253f75e53679363f5a2690cfa344514c7bfa31355b258d1f999a5d97a55dfb25e7e5f9c67ca7bcf58e5718ccb366aaf4a3cd7a9d7b732 SHA512 ab0b8d3ae48882879893437319d859c74a59594820f5cfb7d102f81c95b45ca3e6473f9adede254921e70117c4c17c8374707b57e5f2306f43decceb81963eeb
+EBUILD mc-4.8.30-r2.ebuild 3337 BLAKE2B ed90e75a4f486c9807fde430308f58d35a8aa90934f2e0aac4804c373c05dbf15bc10dd7912015d77d902dffbe544d9e61ce74ad8a263bdce53f546077a62aaf SHA512 939a3ec1016fd4fbb7dcf734751113a79a2ac91e444b0ccc00426c8c9fdbf5c0c904a7af6a49740cdab5211b4675942b3e35226a207ea09aaf16796009737ec6
 EBUILD mc-4.8.31.ebuild 3445 BLAKE2B 5841622fb19f116b0ab6f3dd76a9493c0004b14f4c62fb9e60f14fdaefd9a900ef334891a249ab162f95675fb3c3e5c497132223d847e851b2513d703f2a045a SHA512 3b99c966846afa62bc2be93bdb0b344b22a25db6ad31bcd11cb0ba74b1a88e95cc3c85ce9ab36b0bca5556e4b4f01bff15f496c3da10411e9b8b3ff8595282ec
 MISC metadata.xml 623 BLAKE2B 780b4f47a79d96cfe18308032aedcf02040eb3b2b90a3241dc1a26d03c1fa6e801144b9a343731b96c9cde2554a34ed52235859851025fd074675fdb1f7c91d9 SHA512 85ab83892b0ad219dfc1112e1d3f2141c186c8cc1b274fd397a34bf68345a0821d3cf5a5421f9d6053e7e99178aa45724e1057a9386e4bdf9c5136d69232e776
diff --git a/app-misc/mc/mc-4.8.30-r2.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
index 7970a6b0d148..3c52e9a0e0ba 100644
--- a/app-misc/mc/mc-4.8.30-r2.ebuild
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"