gentoo auto-resync : 12:02:2023 - 09:56:54

9 files changed, 141 insertions, 65 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e32c4d9432ba..6c51bc3d053a 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 18bb102613b5..020b750663bc 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,8 +1,8 @@
 AUX copyq-4.1.0-bash-completion.patch 562 BLAKE2B de24e0e04fe07335254d919a0bf8174b0eb69b4e984aa56823589773cabecc837c273789b22bba45725a4be735e79edc7648e6935660043025ae38751449debc SHA512 89bb0127031151ab6c841902deffe53ba838989163b70891806ab406ef8d5659ad82a9e3ba204d7b70a03330d29b7f7a1ca4661b26a0cb99995fbd8715c9b02d
-DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
 DIST copyq-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d
 DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
-EBUILD copyq-3.13.0.ebuild 1052 BLAKE2B dd57b2a42902f3f8320a14df65c153db481807cf938e17f922876464b39dc67b0ccfce67a15a3b62f201b80b4f89923de9ed57a06dd4085b991ecfba4ed0a1b0 SHA512 cedc36d6c41c9f6cacc970cdb84023deb125d8e27be00ca70f76d43ea32b4b71f7be2e46461886f89ee2de2437a8ccbe367cf618fa5bf06d548087b6a43b2310
+DIST copyq-6.4.0.tar.gz 3316278 BLAKE2B 348fdc23a6d0d53ddcc8e2c32b194cfbf6c4d4d2374b972cb81d945e284c42d1e8f6b9ed30e657e43e69ed0f35661adc7875392b5daf653ce895d76afed7c09c SHA512 a97b4ac541ff73129a6283266fb8857d89d571d042829de5793b94e6423a2978f632b22728ca663bccd540bb90fed51c755b432d1d2545f75c227ea2cb0d9581
 EBUILD copyq-4.1.0.ebuild 1171 BLAKE2B 051e8c39d2c53ba008b957bf9b970a15f1168f9351df033247566a1057073d062abeabf919e9a4f905e48ff6e36660f2aadc01526805f23bf81272648cbf3a19 SHA512 23ce5cfef4d7d09ef58ab66cb4619cd3f47b3ff72c88aa47b0de9d35d399985176b5e670e368e2e02f7fc5bfe39c85365a1127c6e1ebfaf984657931fd5edcc0
 EBUILD copyq-5.0.0.ebuild 1116 BLAKE2B 9b3ec608c4d55298f5c652fb178a6ea8e490e340be19bd54b5b2d159c2ef4885463b0f920b56b80c51d33d221d42d55c7996875c33083088c6bdf381fe82a6a4 SHA512 5d6c7ca5e4763ecb46c815d5306e7b9c2b8346c330c9f6d2441dd058c3661b77d697f4e09d5773669271a2926b4aad741793ef365a7b7654fb898af273d097b3
+EBUILD copyq-6.4.0.ebuild 2254 BLAKE2B 74ce469f1025c2b9f229d7655a3f40fc72522f538e6240e48a8a2ad4b034affad306e949b17b9f670df926fd068a54e599eb61e340b6c7597a8d1494ac2c943f SHA512 f89abe745111e9d8cef11a563ed73f8618017675ead625e3246d76294ee7d95238df7fb8b62125c24355dab783565006a399df9b9d9262413914c18387a8e502
 MISC metadata.xml 243 BLAKE2B c814627bd719a7e626871bf03cb2a0d2a523bff91989d9e77ef27f5c234095eaf737edf0a9e795fbe5f2317884d6d8e735e19742776ef023b37c1364be1387c7 SHA512 802294fe73a224455ea8ea3ad5ed320c3f8cc803ba90cf6805a9a6bfafb627dee7334563f901d5c01ac37d2134d88aba1075defd1ca7420022a4cee996af778d
diff --git a/x11-misc/copyq/copyq-3.13.0.ebuild b/x11-misc/copyq/copyq-3.13.0.ebuild
deleted file mode 100644
index 2f1b7720f7a3..000000000000
--- a/x11-misc/copyq/copyq-3.13.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/CopyQ-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_TESTS=$(usex test)
-		-DWITH_WEBKIT=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/copyq/copyq-6.4.0.ebuild b/x11-misc/copyq/copyq-6.4.0.ebuild
new file mode 100644
index 000000000000..2103adde0559
--- /dev/null
+++ b/x11-misc/copyq/copyq-6.4.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edo optfeature virtualx xdg
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CopyQ-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kde qt6 test"
+
+# Qt6 tests fail with "Failed to stop server" error
+RESTRICT="
+	qt6? ( test )
+	!test? ( test )
+"
+
+RDEPEND="
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwayland:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		kde? ( kde-frameworks/knotifications:5 )
+		test? ( dev-qt/qttest:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6=[X,gui,network,test?,widgets,xml(+)]
+		dev-qt/qtdeclarative:6
+		dev-qt/qtsvg:6
+		dev-qt/qtwayland:6
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:5
+	!qt6? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtwaylandscanner:5
+	)
+	qt6? (
+		dev-qt/qttools:6[linguist]
+		dev-qt/qtwayland:6
+		dev-util/wayland-scanner
+	)
+	test? (
+		app-crypt/gnupg
+		x11-wm/icewm
+	)
+"
+
+src_configure() {
+	if use debug; then
+		# Add debug definitions
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins"
+		-DWITH_NATIVE_NOTIFICATIONS=$(usex kde)
+		-DWITH_QT6=$(usex qt6)
+		-DWITH_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+my_src_test() {
+	local -x COPYQ_TESTS_RERUN_FAILED=0
+	local -x COPYQ_TESTS_NO_NETWORK=1
+
+	local plug
+	local plugins=(
+		itemencrypted
+		itemfakevim
+		itempinned
+		#itemsync -- failure in avoidDuplicateItemsAddedFromClipboard()
+		itemtags
+	)
+
+	ebegin "Starting IceWM"
+	icewm &
+	sleep 5
+	eend 0
+
+	cd "${BUILD_DIR}" || die
+	mkdir -p "${HOME}"/.gnupg || die
+	for plug in "${plugins[@]}"; do
+		edo ./copyq tests PLUGINS:"${plug}"
+	done
+
+	# ScriptError: Failed to send key presses
+	#edo ./copyq tests
+}
+
+src_test() {
+	virtx my_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "encryption support" app-crypt/gnupg
+}
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 429237380475..53708a28f477 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-contrib-2.0.0-respect-CFLAGS.patch 1391 BLAKE2B 4d2f1d6a567074dce73aa4d5ecec38cc6cba130e94efbb3074c53ea5253f167bcb01e8b37f8d35f6802961a7e610ffa606e31d91fc9f4936ee55425b0b128719 SHA512 ab137c15781f6874cbbb731810ed8fdeb022374048670571e46048e823814e5961e9c8f8b749197478494073bf97d660d03b93edcde500da662ef90513382c23
 DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835
-EBUILD i3blocks-contrib-2.0.0.ebuild 1926 BLAKE2B a0435403b8c9e3d20eff22041bf21f89d65d7567610951836b4e6bffec89dadbc7c61de94adc014a67d6855e277fcac648bb3f21b0ae6e48aa0d1e56c3a9e2fa SHA512 e498d3e46008e0bba682b4c481f43e0394824552cdd62c063d8a8335f661f2025a8176edeb0b7783a24b4882d840629d6c2c48ef003042a421f58cc1e439dbed
+EBUILD i3blocks-contrib-2.0.0.ebuild 1901 BLAKE2B faba84766338d2ae42f4c8754b4780c8b0ef0dba5b5c1ccaf23f50ff92097e14d75964512ab9bddfc94af689d49f7d358d1bafbbc462e8eb8d501a1d3507298a SHA512 eb982e9cb41b1c0f6274707f61ead5023f4faad1e46dbd58843c66b506caa3656731be1aad110103fc2ef99ba1db4f3fc61fd0eea5b0af0bc7e8473c4516881f
 MISC metadata.xml 333 BLAKE2B e61c03570a64645a4a0e96357b75c4bc0c19abc377726c4b413ea8a75fff7f6707b3bd6f126cf2c2d9ec4c90dd45e386116f0243ff6e574a059102c6ad5b5e2c SHA512 273f7dbcf62381ff71890a76478e0ca056a5114b2fd31cbd7203ab8bc30655495f6b5b85c2621b04d2a5681b612dbbffb98388e5f7523d88cc388475e56aa59a
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
index 104cad3b9417..2ee22731467a 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=""
-RDEPEND="!<x11-misc/i3blocks-1.5
-	>=x11-misc/i3blocks-1.5"
+RDEPEND=">=x11-misc/i3blocks-1.5"
 BDEPEND=""
 
 PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 8278cce254ea..c44db7f2c216 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -8,5 +8,5 @@ AUX 0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch 3810 BLAKE2B
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
 DIST i3status-2.14.tar.xz 68900 BLAKE2B e85019c2a95d50b6bd4adc6bc9dafb85c3a3d8cdaa93602a9c2af54e6818a4e58ad26f47e2c85b38744c12c08f52c4b5c1216e6f3215f8ee2f4152b42a547905 SHA512 10a1235cc314f5fc4dde4e1369a30f49118c95271f636c5803caa52d94d99ad8565b89fcd602d0c8aa7c830a79d3a3bb08e5ac8123cf07cfddc8ef0126b10f80
 EBUILD i3status-2.13-r1.ebuild 1596 BLAKE2B bade9901de5d86d0b7de2b7d21a0efa2d945ab9078241b4ca77c982e0e8fb20ffb7ce4799d6b19ff19976d0f62be2a66cd98f433c47411a1b03a6a23c7022fd5 SHA512 58b619644902a062e932ae581fe7e77c72c29cab510c3c48453032d215df611d7bd1f65d90439b2f960df2d913bba751bc52461ed82855ed0ec7a01e7d23f78f
-EBUILD i3status-2.14.ebuild 975 BLAKE2B b51857a8b3dd910e8aad7da3e901d14d87f432f1f9ffe719ec16957e2b0f9cec4ab3001de498491a0a7f2889229aaa72afb03a751ad0484f787794b10821de54 SHA512 1f268f93734728109e7e0e120f61faece1d8a1eb9ae920bb0e1c3f5dd572d55341c02f00d5b186a3447af48c3bd767de0487b5c6bd18ac46698c7d72ffd396a4
-MISC metadata.xml 895 BLAKE2B 91e71a660f32f4f2311691cc3064471ae284b297e5cf5e031ffa0702027e380f5da3fe1e7e887550b8e68d299c7e65918be00683d2e2cf858d8a4e450ff10f12 SHA512 6e47f5d36d68b281e5b6f149e90ffec7b689984c5ec038cd3bcafbaf44e75d8cf2adcea02c74dc25dab9f92fdeedbe0609ce3dab57356202e9cc0b0762335909
+EBUILD i3status-2.14.ebuild 1234 BLAKE2B fa716c13c8a81b16a13d9b546a81cdbde2bdfde222a93ffa6a955463304c70908092dfb364db6124c2eaf388e8ecbdc6802afddcbe8fbd030d438237a1ff1dcb SHA512 3b04e945bc2a339e503d3cc54758e6d7718e52cc88c3e8087325182640644e1b36cb6ba0e47bee4733ba9817d5ba4027dfb359fea279561a503ae6eedca62339
+MISC metadata.xml 972 BLAKE2B aa7db0a2c8f4a38764e3722df33016534c86f80e98812ebe16ef5521e15defb0bee7c4d7df0b776a7255cb2e38db0f0e90f6f52e63a1c6e42fe3653c29731081 SHA512 18d49f9df35606d4f542356e887c2391542592acdbab20424bbc4723cf5d3309a69b21dcf4d2ed0f6387d5518605e37f477c5a1045c76f24928b014135768895
diff --git a/x11-misc/i3status/i3status-2.14.ebuild b/x11-misc/i3status/i3status-2.14.ebuild
index 9a1390b6ee6a..4a7d1e2f875a 100644
--- a/x11-misc/i3status/i3status-2.14.ebuild
+++ b/x11-misc/i3status/i3status-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,8 +29,18 @@ DEPEND="
 "
 
 PATCHES=(
+
 )
 
+src_prepare() {
+	default
+
+	# Needs an ALSA master device, bug #840622
+	# Also skipped in CI:
+	# https://github.com/i3/i3status/blob/07ad5aef2deea1f10eb6c544593e7a87205f24f8/.github/workflows/main.yml#L34
+	rm -rf testcases/020-percentliteral-volume || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use pulseaudio pulseaudio)
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index dc27abb8c502..e16cefd50de7 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -14,6 +14,9 @@
 		your CPU as much as spawning the corresponding amount of shell commands would.
 	</longdescription>
 	<use>
-		<flag name="filecaps">Linux capabilities library is required for i3status to be able to read net bandwith</flag>
+		<flag name="filecaps">Linux capabilities library is required for i3status to be able to read net bandwidth</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">i3/i3status</remote-id>
+	</upstream>
 </pkgmetadata>