gentoo resync : 20.03.2022

3 files changed, 3 insertions, 66 deletions

diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index ef572221cdbc..f78bc62c81a3 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,3 @@
-DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
 DIST libdazzle-3.42.0.tar.xz 450636 BLAKE2B 0a77a9ceeca2af8a001b75dbffa04cd385be89d9fac898e6b90111d240b409a54357d9668ca33e494dbb0ed932f16605f363aa69b92c548981be0db971b67dfe SHA512 db6ac54deba034627726747b8c15472aa2f640617473825698e23ca6527d5b69e9103dd82141e82b7dd7fa8bd57eadf054cdd300d46e1b65ced0fffcbc55a301
-EBUILD libdazzle-3.40.0.ebuild 1702 BLAKE2B c3e106800152ec6f2d7ef0156f85016fbbfb27dd815cd6ad6fdf7b21a62e31dae5bf58d233e5f2a7e032c9075e00931327a1460e5e72457ab027c6db18a71dd4 SHA512 1ab1bda49dc015ca1a9ff84e467c43373ec74127ff82f78bf34164680038373ad9ddafc99391a19d4b972bdb03726e1459e5780cb1a4f56e27e8e489f8f7144e
-EBUILD libdazzle-3.42.0.ebuild 1704 BLAKE2B 96d1bf947fe0f31e074ddcc0d66620045b4e08c9c3ed59176d2c5e1af47771ff7e3d5138849bb91b1698cc35f486b3483fe8bafd522a86868fe183dbf4cf9053 SHA512 e9d851e73fe77bea2c72617ef39e7d066f746ff7af5f131c2c879751f356ec4b1b738a5af6f3786021eaeef119f775a0e7c20e88a2ffe85f6d2e8d00b0bfb1d2
+EBUILD libdazzle-3.42.0.ebuild 1701 BLAKE2B 52083fcba3194aad21f21aa6eee9819c4c721be3417be40538db6febcda99ae4451d43bef4da00d3945b06c271dd4a7c9ea13f4b0d55abf0ffd1cd0dedbe5742 SHA512 dcbe89393adb92734e7b22612ad9bb88bf5de8fd4ffcd49c943009e10c6c6dfea6a0e358d904f96303f01522e98308c8a9248867bf293024320c324a4465da73
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
deleted file mode 100644
index 86eded995e3f..000000000000
--- a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Experimental new features for GTK+ and GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		# On linux it'll always use a vdso based implementation that is even faster
-		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
-		# as the rdtscp using function will never get called anyways.
-		-Denable_rdtscp=false
-		-Denable_tools=true # /usr/bin/dazzle-list-counters
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
index 0bed8faf85a5..c14f4e044587 100644
--- a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"