gentoo resync : 05.12.2021

5 files changed, 4 insertions, 106 deletions

diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 15b0cd3c736e..c280effb99ef 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,9 +1,6 @@
-AUX umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch 1743 BLAKE2B de1529d047dfce8038d0d466181c8ae54ffb48087620f9a391da0914665bd53d7915acf6e2611816bdb9665821b6b5379736a293f6d4ed09d065840c4decf31b SHA512 3e975a3fc03f78272c40e04a1d7c504be0fb8b4442db4598b9762afb2126608569c13e671863b7b79f9bc46d7b52be015c73b8bdd164afd591cce691e22269e9
 AUX umockdev-0.16.1-Werror.patch 596 BLAKE2B 029f0db068fa900a1b0acff33e38634194b70447c0d853f9a869fb629eb5c1f555e796700fab29bca3e9a684a85194ff34416889e898ff6038b2f5c45fd00ee5 SHA512 0c500019d66e6a1f8658a97b2ff022d87cf32e424c3d1e7e8ad66ebbb197e3ba931c03a05fc69daee899fd66ef77f7b86fa0ae085fa6751dd36ebeb7b56ee897
-DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
-EBUILD umockdev-0.12.1.ebuild 1304 BLAKE2B 35be39188381c08265e988b7dfc58b6b1f48b57ddb9b8d253513b37e592239d53e0e3b3a7561767336a4910505c47d4db2bba5bcb9d8472b63395d748275e8f6 SHA512 68943daec6ca268b1cc2069286fd4432cdb036c161e4b6a19c1de935a8f28414db30edc854fa87cfc04523c494886d4dc2c86f296f6e8209eee9deb13faf0dbe
-EBUILD umockdev-0.16.1-r1.ebuild 1190 BLAKE2B 900ca5190eb654654643c76ea29e066ebfe8859a183f80108e12da90588ca333929f2b22c64048bff9bc167988c45f6fcce615314203331588b08c4f5c9df42b SHA512 4ed435f6ecd9561a097d1778e7777446766955bb3a47d1587596866888bb8c0d2a7f2414582e3435f7318f6c7ed282e63b75332603fefabc282670528a23da17
-EBUILD umockdev-0.16.2.ebuild 1202 BLAKE2B 03560e8632ed2b0d403ad5ceb1455f723dcf96c5b08ca0bf4cb3fbb0ec6cf30ee8655a434f1f206a26a0a6c6c8b34a870c109f8cfb0ca1bcc47a5bbeacfbe770 SHA512 26f1c5b1db1df7b71886d2eb7ef8fdb79bbddc1d40c30e6f124422948be028e045bf9b98dfa9f0cb061e659fa833c52b13e0b8aab141457c931111aa96a0f678
+EBUILD umockdev-0.16.1-r1.ebuild 1189 BLAKE2B c12e23c8fd73e5b7bf152820300bb74c0b0bf28623800aac162a7e95828f54f6a21a934285d694c8840968a3338c5fa4d078e419d7eecf9db5597b6c0c8d7284 SHA512 2c29ab977fe681fc5f9c1054858a7af993689f3db59d00c088cbf0857ed5039852d3060659c292167890f4bbf422c23bbd34bb800c627c93e3d9688a0ef5659a
+EBUILD umockdev-0.16.2.ebuild 1208 BLAKE2B 126666b85478185a70e38b23f0b9940f4d00d18e53058cb1f0e49002c6e5f42a1c929663dcd05019e88b7c02260bfd1b8577fd71dc4f37111981244615bac780 SHA512 023b535bdf6ef5ab951b4ec1812cd31bc1c8b2233ee98d67abf3accf7d7d43e78dea4eed6c9f27e810dbc225d6818fe55a304ad213ed4a469ed352e946daf955
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch b/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
deleted file mode 100644
index 15f5ddbe99c0..000000000000
--- a/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin@piware.de>
-Date: Fri, 23 Oct 2020 14:58:50 +0200
-Subject: [PATCH] =?UTF-8?q?preload:=20Declare=20=5F=5Fxstat*()=20prototype?=
- =?UTF-8?q?s=20for=20glibc=20=E2=89=A5=202.32.9000?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Recent glibc deprecated/dropped the `__xstat*()` family from the header
-files, so the build started to fail on "no previous prototype". However,
-umockdev still needs needs to keep the wrappers to run programs that got
-built against an earlier glibc.
-
-Thus declare the prototype explicitly. It should still fail to build if
-glibc defines it differently.
-
-Fixes #108
----
- src/libumockdev-preload.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/libumockdev-preload.c b/src/libumockdev-preload.c
-index 9328dc1..9bbec62 100644
---- a/src/libumockdev-preload.c
-+++ b/src/libumockdev-preload.c
-@@ -1215,8 +1215,11 @@ int prefix ## stat ## suffix (const char *path, struct stat ## suffix *st) \
- 
- /* wrapper template for __xstat family; note that we abuse the sticky bit in
-  * the emulated /dev to indicate a block device (the sticky bit has no
-- * real functionality for device nodes) */
-+ * real functionality for device nodes)
-+ * This family got deprecated/dropped in glibc 2.32.9000, but we still need
-+ * to keep it for a while for programs that were built against previous versions */
- #define WRAP_VERSTAT(prefix, suffix) \
-+int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \
- int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \
- { \
-     const char *p;								\
--- 
-2.31.1
-
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
deleted file mode 100644
index e1f360c4d6e0..000000000000
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="+introspection static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-	)
-	app-arch/xz-utils
-	dev-libs/libgudev[${MULTILIB_USEDEP}]
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-# Tests seem to hang forever
-# RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	econf \
-		--disable-gtk-doc \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		VALAC="$(type -P true)"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
index a831885e1ba7..d3cb4cd12c44 100644
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/umockdev/umockdev-0.16.2.ebuild b/dev-util/umockdev/umockdev-0.16.2.ebuild
index b13e0b4cd362..0a5ba10bef1f 100644
--- a/dev-util/umockdev/umockdev-0.16.2.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"