Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/files/, dev-util/umockdev/
Date: Sun, 28 Nov 2021 12:04:59
Message-Id: 1638101086.b984690b5120262b132d653809e92e54e4f237d6.asturm@gentoo
1 commit: b984690b5120262b132d653809e92e54e4f237d6
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 26 09:34:53 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 28 12:04:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b984690b
7
8 dev-util/umockdev: Drop 0.12.1
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-util/umockdev/Manifest | 1 -
14 ...lare-__xstat-prototypes-for-glibc-2.32.90.patch | 42 ----------------
15 dev-util/umockdev/umockdev-0.12.1.ebuild | 57 ----------------------
16 3 files changed, 100 deletions(-)
17
18 diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
19 index 0ce3fdf45d72..dc53898428da 100644
20 --- a/dev-util/umockdev/Manifest
21 +++ b/dev-util/umockdev/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
24 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
25 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
26
27 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
28 deleted file mode 100644
29 index 15f5ddbe99c0..000000000000
30 --- a/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
31 +++ /dev/null
32 @@ -1,42 +0,0 @@
33 -From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001
34 -From: Martin Pitt <martin@××××××.de>
35 -Date: Fri, 23 Oct 2020 14:58:50 +0200
36 -Subject: [PATCH] =?UTF-8?q?preload:=20Declare=20=5F=5Fxstat*()=20prototype?=
37 - =?UTF-8?q?s=20for=20glibc=20=E2=89=A5=202.32.9000?=
38 -MIME-Version: 1.0
39 -Content-Type: text/plain; charset=UTF-8
40 -Content-Transfer-Encoding: 8bit
41 -
42 -Recent glibc deprecated/dropped the `__xstat*()` family from the header
43 -files, so the build started to fail on "no previous prototype". However,
44 -umockdev still needs needs to keep the wrappers to run programs that got
45 -built against an earlier glibc.
46 -
47 -Thus declare the prototype explicitly. It should still fail to build if
48 -glibc defines it differently.
49 -
50 -Fixes #108
51 ----
52 - src/libumockdev-preload.c | 5 ++++-
53 - 1 file changed, 4 insertions(+), 1 deletion(-)
54 -
55 -diff --git a/src/libumockdev-preload.c b/src/libumockdev-preload.c
56 -index 9328dc1..9bbec62 100644
57 ---- a/src/libumockdev-preload.c
58 -+++ b/src/libumockdev-preload.c
59 -@@ -1215,8 +1215,11 @@ int prefix ## stat ## suffix (const char *path, struct stat ## suffix *st) \
60 -
61 - /* wrapper template for __xstat family; note that we abuse the sticky bit in
62 - * the emulated /dev to indicate a block device (the sticky bit has no
63 -- * real functionality for device nodes) */
64 -+ * real functionality for device nodes)
65 -+ * This family got deprecated/dropped in glibc 2.32.9000, but we still need
66 -+ * to keep it for a while for programs that were built against previous versions */
67 - #define WRAP_VERSTAT(prefix, suffix) \
68 -+int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \
69 - int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \
70 - { \
71 - const char *p; \
72 ---
73 -2.31.1
74 -
75
76 diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
77 deleted file mode 100644
78 index e1f360c4d6e0..000000000000
79 --- a/dev-util/umockdev/umockdev-0.12.1.ebuild
80 +++ /dev/null
81 @@ -1,57 +0,0 @@
82 -# Copyright 1999-2021 Gentoo Authors
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=6
86 -PYTHON_COMPAT=( python3_{7..9} )
87 -
88 -inherit multilib-minimal python-any-r1
89 -
90 -DESCRIPTION="Mock hardware devices for creating unit tests"
91 -HOMEPAGE="https://github.com/martinpitt/umockdev/"
92 -SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
93 -
94 -LICENSE="LGPL-2.1+"
95 -SLOT="0"
96 -KEYWORDS="amd64 ~arm64 ~ppc64 x86"
97 -IUSE="+introspection static-libs test"
98 -RESTRICT="!test? ( test )"
99 -
100 -RDEPEND="
101 - virtual/libudev:=[${MULTILIB_USEDEP}]
102 - >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
103 - introspection? ( >=dev-libs/gobject-introspection-1.32:= )
104 -"
105 -DEPEND="${RDEPEND}
106 - test? (
107 - ${PYTHON_DEPS}
108 - )
109 - app-arch/xz-utils
110 - dev-libs/libgudev[${MULTILIB_USEDEP}]
111 - >=dev-util/gtk-doc-am-1.14
112 - virtual/pkgconfig
113 -"
114 -
115 -# Tests seem to hang forever
116 -# RESTRICT="test"
117 -
118 -PATCHES=(
119 - "${FILESDIR}"/${P}-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
120 -)
121 -
122 -pkg_setup() {
123 - use test && python-any-r1_pkg_setup
124 -}
125 -
126 -multilib_src_configure() {
127 - local ECONF_SOURCE="${S}"
128 - econf \
129 - --disable-gtk-doc \
130 - $(multilib_native_use_enable introspection) \
131 - $(use_enable static-libs static) \
132 - VALAC="$(type -P true)"
133 -}
134 -
135 -multilib_src_install_all() {
136 - einstalldocs
137 - find "${D}" -name '*.la' -delete || die
138 -}