gentoo resync : 25.08.2020

5 files changed, 2 insertions, 105 deletions

diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 1413f3916a33..f8c18ed8260c 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,8 +1,3 @@
-AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae9ee9c84c52a02fe16aaa86a94c4b84bcdad6782be590b0f163f679281764595b2679ff0898f502621ea6c2427533138 SHA512 3deb38bb44ea4bb2cf7f4b2dc88db0c0d71045ccaae48acecd3fde9e0006262111202c8e3ae490a5fccd610abf0c24ca11699720872998dfc55bc29f58f923b6
-DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
-DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1008 BLAKE2B 2c759f19cab5a3386d0c0fd5226e08d82c903577e7923ee2fd5ed035de80aaee3d2414d20fd9b5aee6d031ec46b999d39818d58bdf5e70ca61ea6973f149df08 SHA512 c59bc1154a73886962f992517da4b4585c8ac8ce99642cebe815d5a691240b1efc2ed323002c2bbd2ecbc752cc24341d2e367987f9eecc46f0a24f6ff79e9b79
-EBUILD umockdev-0.12.1.ebuild 1195 BLAKE2B 96364a0cbac6f75dbc5368b3e31092bced2d3abf726a882c8ca21132f032c6e627913709bb2b1875d873f3144de3f25c6845730d1d8cbcbb2f23f5143a397491 SHA512 0b687886638645c816b8442011cc3eff3b452629804a0f665a1b516deac6b8e8b524a4364df854367bf4815c2e7362547a1403d91afe356ea04fbf012bd03ae7
-EBUILD umockdev-0.9.4.ebuild 717 BLAKE2B d68eec4ddf6087fb9f0768c487595bc0617f6b746b9cd4002b8dd95a25579de89eb582703defaef005c0087c87dba0ccae28a03a9e6ccc414c393d28b9780e19 SHA512 555af33316a54fa0e7ec4c6211a0b1322b9e762b47084fe4698638c7feb95b0f1c025e80d4fcf5c3f8a09ab526f25db38b440c722beb62089b13fae3c60a0b23
+EBUILD umockdev-0.12.1.ebuild 1200 BLAKE2B c9f99392023e772edc55c016224778cc76204d232a7e29e7756f68a62cbe3e468e8a09f27db8022781c239fdd1e6ce8ec39930494c334624b4f706b535d69b36 SHA512 1604fe4fc9e3af3e5907bc2f0865da6a8af6c9612c6067b3b329b3ceb91b9484d0dd8c0776c6dbd0a9ca7d3aefe150fe172cfbff46647ca41bc193cdd1b11be7
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
deleted file mode 100644
index bfc8bc9ed535..000000000000
--- a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- umockdev-0.9.4/src/umockdev-record.c
-+++ umockdev-0.9.4/src/umockdev-record.c
-@@ -30,6 +30,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/types.h>
- #include <glib/gstdio.h>
---- umockdev-0.9.4/tests/test-umockdev-vala.c
-+++ umockdev-0.9.4/tests/test-umockdev-vala.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <glib/gstdio.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <gobject/gvaluecollector.h>
- 
- #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
deleted file mode 100644
index edd87b90f8a2..000000000000
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-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 ~x86"
-IUSE="+introspection static-libs test"
-
-RDEPEND="
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-# Tests seem to hang forever
-RESTRICT="test"
-
-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.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 6f0275625128..a3ebfc339420 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
deleted file mode 100644
index 4845f7ae319d..000000000000
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/libgudev:=
-	virtual/libudev:=
-	>=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch #579988
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}