gentoo resync : 27.03.2021

4 files changed, 50 insertions, 96 deletions

diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index eea47e897771..27ad22e55f1c 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,7 +1,5 @@
-DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04649db02192ef9c80bf42214a112a050a9f054c81549a114e7a1236c86e0066e8002f0c7f09317abb672fe5f6a76789 SHA512 72f53a90d3e40aa93d4afe5b29f631afe859532fbdb4e27086da3bd4cdaf0fb25fc808a82a1994b7c2648a1e864876ce95de28acb3b4876dac47b0f4d1c97ba5
-DIST libvirt-glib-2.0.0.tar.gz 868946 BLAKE2B 1ff4695b25766d6caa603826dcc63e64aa3ce022e6623eb31017fb67a490baeb546a9bc67e16fc16c7b86040db971748b1ef4303a21b5dec098cf732f77c92ec SHA512 6ead4c37c314eb5670c5aa282ce039a0182a71a20b349a5d9c78367381eb674fad0f2ca0f2e20e1e89ff7df2ac9f1640f20fdfa63d599d8a2538fb4c0fba4c3f
 DIST libvirt-glib-3.0.0.tar.gz 899180 BLAKE2B ef10b3d9bad48e49dd1898733aacb2f51f1826330eda9c63a7f8df5f11c96812f8cc7fe6a867961efa85a433f45c934d75cf605eb523ec723459da4646335b1a SHA512 b9e7d782c25b5c3a9b2829f1be8162352438ab3505510a1ca7dd64d741eaab158dc9206fdd4b0e3e27b0c049e4bcfc47db0c9a7fa1a84888864e23d3c35c079e
-EBUILD libvirt-glib-1.0.0-r1.ebuild 1032 BLAKE2B 1f60d87c17a1e64ec297634266ed782cc1593a21b586e463c2afb5f4864d3fba4f3df0821faa5ddb863b479cb902b30cad897c2638c932e06fc1eff060add4cc SHA512 2d62a2730433fea1ca9de2dfe475c984202183412c04bf01450cde72b05b2fef1139441d37ea2ec28414949999166a2edea2b61f8da906e8335a2624ddfa365b
-EBUILD libvirt-glib-2.0.0.ebuild 1039 BLAKE2B 39ff2af30015a7cb37423f15a0a9ff82c5a2a3a44182b5c6a197580e1147395a80c80ba8f2e95b433031c73f20045319438de95d3a8cd9a95563a608995c7631 SHA512 25c52551f1707362d21a688b310865229a29720cd895b58e03589e4c04a8c1145693fdf7c37dc5c5605592b99ae1fad55ff487863161af8d5407c79698696092
+DIST libvirt-glib-4.0.0.tar.xz 161836 BLAKE2B e196d1f02f6f202b1883500241bbfda963b34ee12bd945b3fa897f84f55a049f98e0429132ccfad7168e5ba2b41245e9e7e3817a7f057e0dc40b674ca6c9b661 SHA512 e1b99e80aa671fa5a4d7f7f7a4ea70ce7c5fdaf97574407f79aa11a75dd177e1e3f92027728a83ded62e305852bbda76eb90326aaa1f5f19b77272b008351810
 EBUILD libvirt-glib-3.0.0.ebuild 975 BLAKE2B 1ea53e40c805b2d2de91f7c1a7a0690bc8bf768919b0c3706a05ae557dd4d4f6040e6df9e0e75fcb16bcf2caa411eb2570028e2937ceb377cd0c74002f7fbbcd SHA512 ef198cbd6313dd117b62f95cd5884b0254f90f638f42818f29217e926d0f0eefd293416afeda704bd38f77f13d400dcd16a4c1e2e318e6e34def2a80aa7c4911
+EBUILD libvirt-glib-4.0.0.ebuild 1051 BLAKE2B 2e604c2224e005a6b7356d061d64062404c94c638fd8e0d4137b7561282ddf2c02d3b70fe84ff493e3d489311806d21f86729791fee977885352d424f5239c38 SHA512 0c991f47f15bb6fe2246f82ccb6914a90932fc9e4b5e0cd7528b842f04c8d153cbdae9132b703e946ae7095d445c04dc03164c2b47a63a05dc4f290c906b872f
 MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild b/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
deleted file mode 100644
index c18bd71005a4..000000000000
--- a/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib and GObject mappings for libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
-SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection nls +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	>=app-emulation/libvirt-1.2.6:=
-	>=dev-libs/glib-2.38.0:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-test-coverage \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable nls) \
-		$(use_enable vala)
-}
diff --git a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
deleted file mode 100644
index 219f71992ece..000000000000
--- a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib and GObject mappings for libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
-SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="+introspection nls +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	>=app-emulation/libvirt-1.2.6:=
-	>=dev-libs/glib-2.38.0:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-test-coverage \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable nls) \
-		$(use_enable vala)
-}
diff --git a/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
new file mode 100644
index 000000000000..15bc2925d9cf
--- /dev/null
+++ b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson vala
+
+DESCRIPTION="GLib and GObject mappings for libvirt"
+HOMEPAGE="https://libvirt.org/ https://gitlab.com/libvirt/libvirt-glib/"
+SRC_URI="https://libvirt.org/sources/glib/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gtk-doc +introspection test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1
+	>=app-emulation/libvirt-1.2.8:=
+	>=dev-libs/glib-2.48.0:2
+	introspection? ( >=dev-libs/gobject-introspection-1.48.0:= )
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk-doc docs)
+		$(meson_feature introspection)
+		$(meson_feature test tests)
+		$(meson_feature vala vapi)
+	)
+
+	meson_src_configure
+}