9 files changed, 153 insertions, 210 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3176d27a99ec..2cf090c7f7de 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 64e5a3f99a70..028dd73b2bd2 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -6,5 +6,5 @@ DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6a
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
 DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459
 EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 9f1a59804a601e3243d4b3242d67165060410af13778d3102c36e3e347bff0effb6a6a32856be7b46cf94d2cc38b2bab715c51545cdd8c433aa585d67957229c SHA512 d37d14cf41e7acdf789ff49e1d52b51c09e3a35bff8b01ca588a7656e4d2680d1c4163771ea2b71abbe8b13a2d7b0b9b559fe8c332a62cc9499c47f759031e2e
-EBUILD netkit-telnetd-0.17-r13.ebuild 1776 BLAKE2B c8db5790f398c6b8c7da49122918ebb0c464f7ac69d4299c351851972adb18cf9539d4ec4a60bc653c2aafaf4ee9944705434e5fc11ad74583698207f9747ca0 SHA512 8a5d77ba4d6ccb7a3faa3071428099d02c1a717d4154c5c57c930a89bdfcb7e024fed928a86c5defadffd800d3b59b5fcd8eb2080cc126c8d6dd65bc5f901328
+EBUILD netkit-telnetd-0.17-r13.ebuild 1771 BLAKE2B bca2a62c19be5fdd448ae7d0d43f3cc54f0474f3cea409968450c718a4184e1a774ba48342bed1ea56ddfbe652aa22c96bf29a61a6a5d602191bcd6f1bccb851 SHA512 77ddc3534bcf398be752f304bae1a52dab22f37154a0dba6ca363084ae6678f54bda627d0c9ca99a70c107edb28526c1f696aaa6befc7b6a8f15a8429c48383c
 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
index 5f3b97415d93..d7586da721f5 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index d1ea48e585a0..ca51450dec0a 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,3 @@
-DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
-DIST nextcloud-client-3.5.1.tar.gz 15392337 BLAKE2B 6f3826e33828aacfbefb1786c9a1231ccba0be4b649cc132546914d7c61b8755b32f873a9eb5c27d10d207121636738bc51354643d056ffe6733c5cd0f395cac SHA512 989cc4c99f81f7451af8b13453155f0c89448226ade565025030a8064c7e54e5668b37744564685cc700f2b5a54f899d563a4be2bfe023e43987928982a2feba
 DIST nextcloud-client-3.5.2.tar.gz 15433543 BLAKE2B 082031ac34a644f0db09679ef34237ee8fc9def88ff4659ad4a71e3ac611b3be3f9a0750deda25cd0ef34aca7e9d3c60fe7d3fc5a4d747eef46978e2fe84b742 SHA512 2892c277466869e3872a68049541c3d5afe94ca4dde1e97ea13ac615adedba198946763b5ff5dcb4694a9cec1946e35d1d6b6fd950d26b23cd6ddd94181f4b83
-EBUILD nextcloud-client-3.4.4.ebuild 2181 BLAKE2B d246952097b7b568f21956df4b78f9189e70367edbf7798b5b915afab8468b8eb1de1a33daa7591457ad94a68c7adc7668317402e8fe3f038df498329999b0c3 SHA512 b783495c8c6ed6abe9337b9573eb7d3e8c63b4e4082643598d4273aec15b5724faee52170517e25f330541d099d4f4f993f52bdd062f4166ae19211d22bf9367
-EBUILD nextcloud-client-3.5.1.ebuild 2329 BLAKE2B 37ecc1794f656040a924d2ac0126d69239775223e527d78dd307de45d557aae11910aa2de380e31aa4299c47bb69374a3f19aad671f867275ce8a01439568fb3 SHA512 71416fe2cdad8e80465a53cbc1c27a69a4761cccf5de70b8374c3fccf87d236cc5f6ce653638a51e2678a71d7410bbec614ae522b0ccf1bf38f89dc279c07ecf
-EBUILD nextcloud-client-3.5.2.ebuild 2329 BLAKE2B 37ecc1794f656040a924d2ac0126d69239775223e527d78dd307de45d557aae11910aa2de380e31aa4299c47bb69374a3f19aad671f867275ce8a01439568fb3 SHA512 71416fe2cdad8e80465a53cbc1c27a69a4761cccf5de70b8374c3fccf87d236cc5f6ce653638a51e2678a71d7410bbec614ae522b0ccf1bf38f89dc279c07ecf
+EBUILD nextcloud-client-3.5.2.ebuild 2355 BLAKE2B b5c9f8a5929edba0b29082d4407797b1186e829896a2e59aef958be261e4c7332dd3fe1e836b32884bdd6070a90a62a5252a953191b8d635090973462ac9cf69 SHA512 f020af2c04bd42c2a6979e390a904aad28f4164bde2f4693df68512802af8e5dea55ed2e6ba0b41748d9934b95b2a5e1f536242589a5b6d57f2c920bea8473ec
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
deleted file mode 100644
index f73bb52faae8..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	gnome-base/librsvg
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# We do not package libcloudproviders
-	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
deleted file mode 100644
index 6aac8d9ce510..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	gnome-base/librsvg
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# We do not package libcloudproviders
-	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
index 6aac8d9ce510..fcca8e8efa4d 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
-	gnome-base/librsvg
+	|| ( gnome-base/librsvg media-gfx/inkscape )
 	doc? (
 		dev-python/sphinx
 		dev-tex/latexmk
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index e227d6b331e1..242809486c0f 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,8 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45
 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
+DIST spice-gtk-0.40-meson-0.63.patch.xz 5932 BLAKE2B 5188e46236024575543125226404a24490faf37e9b764e8b8e2935620c6a908f6ca93f35c2a414306bb3c6646c0e47b2fd12ced83a7829ad8c118a1188b44ed8 SHA512 7b4ea4cf48b1e95bbc81c7eaa54b135333a8dba8167959e8baa7b50398d6542f2ac3d98fdb493995abb47b2a6bfb2ac75c393dda795cf69b7335ca6e3b1ddb70
 DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
 EBUILD spice-gtk-0.39-r2.ebuild 3205 BLAKE2B 70c637fc3edd032462b4a5eef134d03e7f8b5805a96d0b3fa72fb1bae49aa2e49cd7db7b3c1f7399051a3a754aa96402cea83a5618313ca3e3fbefd8ee8a0e65 SHA512 6bc020c385e9ac49cb8f23d259c69d4c578377d9baa068885ac268ae4acb5c60dc4624bb1606aca0d14c8e31e49e3ff3a940716c2912eb867a0062630b1e0e4e
+EBUILD spice-gtk-0.40-r1.ebuild 3810 BLAKE2B 359d421f50334e1cfdf86a9a0788b92fe07d00a8ff98a3ca1b098949888de5b84864c11381c818425d8f9ce3b4838e9182571cdc7cc7d1cbfeffafe9fbb80bb4 SHA512 97f3db8cf477886c36e5b940dc45a129b5376efb58f0ca663e22c7c9c517e220dc15983c1ce0c73bcef5deac47babc79207e4a035962f3569e6fecffffca3ca9
 EBUILD spice-gtk-0.40.ebuild 3668 BLAKE2B 7363180cd7de7fe721a557043a7858268abdbfea8e89e9c4528bcbac5820ee492cb43b198f771aaa9d410051bc3ae3a4f30e9b114f6a1bfd1d25f53b7c0db8eb SHA512 37501a0ac3359e2df1c815b2d58b88b9472e8ed5f0b9126bf5bd6f3e2f7f42f5cbe4bac5539cbe0c87aad43a12aebca54eac27f14775971e52ace1e0e69b4de1
 EBUILD spice-gtk-9999.ebuild 3668 BLAKE2B 7363180cd7de7fe721a557043a7858268abdbfea8e89e9c4528bcbac5820ee492cb43b198f771aaa9d410051bc3ae3a4f30e9b114f6a1bfd1d25f53b7c0db8eb SHA512 37501a0ac3359e2df1c815b2d58b88b9472e8ed5f0b9126bf5bd6f3e2f7f42f5cbe4bac5539cbe0c87aad43a12aebca54eac27f14775971e52ace1e0e69b4de1
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
new file mode 100644
index 000000000000..889d11f7e6fd
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
+	inherit git-r3
+
+	SPICE_PROTOCOL_VER=9999
+else
+	SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.63.patch.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+	SPICE_PROTOCOL_VER=0.14.3
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0[introspection?]
+	media-libs/opus
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	x11-libs/libX11
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	introspection? ( dev-libs/gobject-introspection )
+	dev-libs/openssl:=
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwdata
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+		)
+	)
+	webdav? (
+		net-libs/phodav:2.0
+		>=net-libs/libsoup-2.49.91:2.4
+	)
+"
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}"
+BDEPEND="
+	dev-perl/Text-CSV
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-meson-0.63.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature lz4)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+		$(meson_feature wayland wayland-protocols)
+	)
+
+	if use usbredir; then
+		emesonargs+=(
+			-Dusb-acl-helper-dir=/usr/libexec
+			-Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use usbredir && use policykit; then
+		# bug #775554 (and bug #851657)
+		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
+		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	fi
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
+}