3 files changed, 105 insertions, 62 deletions
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 020b750663bc..39361ba033d1 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-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d
 DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
 DIST copyq-6.4.0.tar.gz 3316278 BLAKE2B 348fdc23a6d0d53ddcc8e2c32b194cfbf6c4d4d2374b972cb81d945e284c42d1e8f6b9ed30e657e43e69ed0f35661adc7875392b5daf653ce895d76afed7c09c SHA512 a97b4ac541ff73129a6283266fb8857d89d571d042829de5793b94e6423a2978f632b22728ca663bccd540bb90fed51c755b432d1d2545f75c227ea2cb0d9581
-EBUILD copyq-4.1.0.ebuild 1171 BLAKE2B 051e8c39d2c53ba008b957bf9b970a15f1168f9351df033247566a1057073d062abeabf919e9a4f905e48ff6e36660f2aadc01526805f23bf81272648cbf3a19 SHA512 23ce5cfef4d7d09ef58ab66cb4619cd3f47b3ff72c88aa47b0de9d35d399985176b5e670e368e2e02f7fc5bfe39c85365a1127c6e1ebfaf984657931fd5edcc0
+DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4
 EBUILD copyq-5.0.0.ebuild 1116 BLAKE2B 9b3ec608c4d55298f5c652fb178a6ea8e490e340be19bd54b5b2d159c2ef4885463b0f920b56b80c51d33d221d42d55c7996875c33083088c6bdf381fe82a6a4 SHA512 5d6c7ca5e4763ecb46c815d5306e7b9c2b8346c330c9f6d2441dd058c3661b77d697f4e09d5773669271a2926b4aad741793ef365a7b7654fb898af273d097b3
 EBUILD copyq-6.4.0.ebuild 2254 BLAKE2B 74ce469f1025c2b9f229d7655a3f40fc72522f538e6240e48a8a2ad4b034affad306e949b17b9f670df926fd068a54e599eb61e340b6c7597a8d1494ac2c943f SHA512 f89abe745111e9d8cef11a563ed73f8618017675ead625e3246d76294ee7d95238df7fb8b62125c24355dab783565006a399df9b9d9262413914c18387a8e502
+EBUILD copyq-7.0.0.ebuild 1941 BLAKE2B e33dfc9b7b634f6aafe066a8d6c9fb158701c338a0dfb5f2fdcf13c98d0181048ec707a61c219bef0ed97cd4dcd5a5ce4888a92cb3b9554d380034f1cd8727e7 SHA512 f68784d22a6ac79582494703a0ef89ccbeb5c4af697d90d012cf7f383d850a2e60cdbd66cf8e93f0152a6e4b08dbff555149916ebeb2a7d594cf53708cd38fd7
 MISC metadata.xml 243 BLAKE2B c814627bd719a7e626871bf03cb2a0d2a523bff91989d9e77ef27f5c234095eaf737edf0a9e795fbe5f2317884d6d8e735e19742776ef023b37c1364be1387c7 SHA512 802294fe73a224455ea8ea3ad5ed320c3f8cc803ba90cf6805a9a6bfafb627dee7334563f901d5c01ac37d2134d88aba1075defd1ca7420022a4cee996af778d
diff --git a/x11-misc/copyq/copyq-4.1.0.ebuild b/x11-misc/copyq/copyq-4.1.0.ebuild
deleted file mode 100644
index eddc9db5ab26..000000000000
--- a/x11-misc/copyq/copyq-4.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 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-libs/wayland
-	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
-	kde-frameworks/knotifications:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/CopyQ-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-bash-completion.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_TESTS=$(usex test)
-	)
-	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-7.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild
new file mode 100644
index 000000000000..be23a5c90760
--- /dev/null
+++ b/x11-misc/copyq/copyq-7.0.0.ebuild
@@ -0,0 +1,103 @@
+# 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"
+RESTRICT="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
+
+	ebegin "Starting IceWM"
+	icewm &
+	sleep 5
+	eend 0
+
+	cd "${BUILD_DIR}" || die
+	mkdir -p "${HOME}"/.gnupg || die
+
+	# 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
+}