gentoo resync : 12.05.2022

8 files changed, 75 insertions, 171 deletions

diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 1594edebbe95..04d93a2219a6 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,12 +1,6 @@
 AUX virt-viewer-10.0_p20210730-meson-0.61.patch 1022 BLAKE2B b4ff7ec6d33da1e73b7dac2fc2960890a447670b83f67f27fbc24b99a95d75e850de74cd75fd5d4f3ce2b32e458e2e0a6e26128f47a77e0da9aaf62a9622c02a SHA512 2ac3f31e9184dd7a0aa596458c991b573fac3073b0b4b04895082c720a3c7da189bde9099c8f530320d34c5fbc51f522096af2186b589879e372e17115ba78fb
-DIST virt-viewer-10.0.tar.xz 256372 BLAKE2B 3368164c2f770f8aa963e0fb93e713249b05d31600747b68197864a40bf6fdb221ad44abb8ea5465706543241bd5898353cadf2a3e0917455383283722fdfd4f SHA512 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3
 DIST virt-viewer-10.0_p20210730.tar.bz2 271223 BLAKE2B d66e915eccdea6eadc7d93309c66d648828da65e76e4884bd2a98a645db328296d0013955fe94df45bac5d21079230218de7e09909d29f63568d2fc32b4fe762 SHA512 58d49eb67e1bbeb73fd7672871348911ef8eaab95b0f90dd3ae2564cc2321d620eec703fe8520748a96c80429ecbdcd13ba4a7c31b249fd347a935c9b9c02531
-DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
-DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918
-DIST virt-viewer-9.0.tar.gz 1176991 BLAKE2B bc4df73575195888b769dddd8de5c0eda9daa257902f3f3ce8099f9096d0cd9be28547c8671decb70e83e5f0de71633793886bfe78bd9ab5f360dc9759afcc5b SHA512 a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2
-EBUILD virt-viewer-10.0.ebuild 1056 BLAKE2B be70282a9c98d2b5f9c82a7e16f5e08de95d0e02eb58f66ec9b9b50434499fb15377eb3913f6026eb060a2a738aff5dcb02470c253a29abfaeb894fd4516c303 SHA512 cd7f098f5aa49a10fc4e246f4fb64605113e4f83211c54671f6868983709a2407d96df917473fcf15b4c92c0978472bf5d36b709149d708626643a991c83f4e5
-EBUILD virt-viewer-10.0_p20210730.ebuild 1439 BLAKE2B 2db906db5df4da9052307be2cd6e3109d9fea19617ea84a4700f46cf6804ad83eb187929786660ce0881117d13ff3e21826e9d0a3238829b460964d5cc700c76 SHA512 5118feb813d2299549195050b021f3cc4d593ebc4c2a65aec3dc2d8a2197957093ea69f630de0a9c5f3d6b88ec043b37b037ac4026c0d4eb4c741471cde40f46
-EBUILD virt-viewer-7.0.ebuild 913 BLAKE2B 0b6dfcfe940c93c9d1cb2feaa5b2b67b710fe35b75dde82066b4f133ce060933742aea8dc437f394a1492d1ff579ad13f0f45acfebb5db80ed665aafdc050be1 SHA512 3d219e4c9aab912f6fdd0fe4b0fce8d7959d103305069629ce95a5baea8209b707e5bb51eeb87e2fc6f85178acdb8bc811baa9293bb6a256ac6ce8a4d9b4d47c
-EBUILD virt-viewer-8.0.ebuild 965 BLAKE2B fe006b764e6e1abfc9bcc915d92d9dc91d037e4b2a1dcf5dfc618a62fd65061445227da84aca0f8ab84ca28a1528fe063c37b39c5a4840b99532898f54f239a9 SHA512 4997e3c64b34953399b1369758741ff69cab3874b4a07f1378ec2ed7d2ee8439af45b614c073adf438b25e35ea9b1a388d222da54a803b6af49f533cc7de99b8
-EBUILD virt-viewer-9.0.ebuild 967 BLAKE2B c59e0871ce13171ab889f9950cdba14516163c22ae2fbf26f8e4fd16e07d320244c043070bb43f165b17e9f3f75f6e35adadf1c51339d1d560aa7bcd0fcf1de9 SHA512 1c87a447c14f88d73b50ef2614a4b95d417b7af4053de7b67511e6b439d15eda63955d61cf83618fc85efa5613740cae5c8eda2fe48efb5cb60dadc84ce30b49
-MISC metadata.xml 545 BLAKE2B 9473345ff5aa5aa0bb36403de7068c4434d306e7cbd8cefd08ebb3d007119714ac3350b90c047d0fd159b59ab356c1792f7c28d4bcd61334d104f46dcbb2685a SHA512 741a95f595007edd5f8f4ec4e918b8812a587fc4ccbc8cb6dbb35d9206d4fd9ae2b7ba2defa70429fc63f93e5034f756b72857dcc85ff4bddd6641bf3a3c15e1
+DIST virt-viewer-11.0.tar.xz 259772 BLAKE2B 41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a SHA512 738034e15e40a7aaadd2646bf289c12409cbf2d06925d43baa50fa7bc8438188480d6b97687e9816427ac0a9dae84d205351715cb2f38afdbefa2dd1d134904a
+EBUILD virt-viewer-10.0_p20210730.ebuild 1437 BLAKE2B 0e6f3b91d512a7603f009944524a9529b16cc37d7dad95bc1e45b200ff1de3c0acbdb39ada98b00a33724a4f409473a72d53280432c7c75a1c02e3161e0d7606 SHA512 554a8c23d2c4b2efe99fb7f0a3efb7cf13bd5ac0add3c845ca2b6543bf67abb03dd508912a044cf35dded8695b5cbb3117af1c3f20aa353be3e8a00a02b299b0
+EBUILD virt-viewer-11.0.ebuild 1614 BLAKE2B 0de968e9e8a753e6b636d6920caf4d815f224b2b2a73390322c3d3216ce431f8f3819fc1d7d23251221f0424c78aff5e15a456c30034c21b2fcb6fe311d3f3fe SHA512 02ffb1f971f177c195ba35bcaa632b0efbde048e0f7bd30106f2a639b5c5ae6aae62300b1d016b05f86ad8e8c95de7f4dc828df0bcf29a7d39db48ac8193846b
+MISC metadata.xml 646 BLAKE2B 67cf3ce66b0f002fb757d3359ef55580b132a09598d0973853fccba118c291d9c32a3e5a3b300b1762e7327f9bec0ca1f262ab9b73b800a2216b15fdf03e5a2a SHA512 cdc70fda98d7913708ae4d2b6d9806149aed4779d6088d257ecdb4caf70d0291e642bc50691099fa353d86868103889f58a7637186eb3ea57cb0aa727790d133
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index 9a4bdbb764b1..4acf8131c37a 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -10,6 +10,8 @@
 			managed by libvirt.</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual
 			machines.</flag>
+		<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>)
+			in the GTK+ interface</flag>
 		<flag name="vnc">Support connecting to VNC-enabled virtual
 			machines.</flag>
 	</use>
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0.ebuild
deleted file mode 100644
index f6be72fe3118..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="https://virt-manager.org/"
-SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libvirt sasl +spice +vnc"
-
-RDEPEND=">=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	libvirt? (
-		>=app-emulation/libvirt-0.10.0[sasl?]
-		app-emulation/libvirt-glib
-	)
-	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature libvirt libvirt)
-		$(meson_feature vnc vnc)
-		$(meson_feature spice spice)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
index e87604e77799..30941a31c9d7 100644
--- a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${GIT_HASH}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+libvirt sasl +spice +vnc"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-emulation/virt-viewer/virt-viewer-11.0.ebuild b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
new file mode 100644
index 000000000000..f90932e555c0
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 xdg
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="https://virt-manager.org/"
+if [[ ${PV} == *_p* ]] ; then
+	GIT_HASH="f0cc7103becccbce95bdf0c80151178af2bace5a"
+	SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${GIT_HASH}/${PN}-${GIT_HASH}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${GIT_HASH}"
+else
+	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+libvirt sasl +spice +vnc vte"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.6
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	libvirt? (
+		>=app-emulation/libvirt-0.10.0:=[sasl?]
+		app-emulation/libvirt-glib
+	)
+	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
+	vte? ( x11-libs/vte:2.91 )
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
+DEPEND="${RDEPEND}
+	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0_p20210730-meson-0.61.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #811408
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature libvirt)
+		$(meson_feature vte)
+		$(meson_feature vnc)
+		$(meson_feature spice)
+
+		-Dgit_werror=disabled
+	)
+
+	meson_src_configure
+}
diff --git a/app-emulation/virt-viewer/virt-viewer-7.0.ebuild b/app-emulation/virt-viewer/virt-viewer-7.0.ebuild
deleted file mode 100644
index 62a5fc06143a..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl +spice +vnc"
-
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
-	app-emulation/libvirt-glib
-	>=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--without-ovirt \
-		$(use_with vnc gtk-vnc) \
-		$(use_with spice spice-gtk)
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-8.0.ebuild b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
deleted file mode 100644
index 5bb016169c9d..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="https://virt-manager.org/"
-SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+libvirt sasl +spice +vnc"
-
-RDEPEND=">=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	libvirt? (
-		>=app-emulation/libvirt-0.10.0[sasl?]
-		app-emulation/libvirt-glib
-	)
-	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--without-ovirt \
-		$(use_with libvirt) \
-		$(use_with vnc gtk-vnc) \
-		$(use_with spice spice-gtk)
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-9.0.ebuild b/app-emulation/virt-viewer/virt-viewer-9.0.ebuild
deleted file mode 100644
index 098fc095c389..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="https://virt-manager.org/"
-SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libvirt sasl +spice +vnc"
-
-RDEPEND=">=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	libvirt? (
-		>=app-emulation/libvirt-0.10.0[sasl?]
-		app-emulation/libvirt-glib
-	)
-	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--without-ovirt \
-		$(use_with libvirt) \
-		$(use_with vnc gtk-vnc) \
-		$(use_with spice spice-gtk)
-}