[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/files/, dev-util/umockdev/

2021-11-28 Thread Andreas Sturmlechner
commit: b984690b5120262b132d653809e92e54e4f237d6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 26 09:34:53 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 28 12:04:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b984690b

dev-util/umockdev: Drop 0.12.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/umockdev/Manifest |  1 -
 ...lare-__xstat-prototypes-for-glibc-2.32.90.patch | 42 
 dev-util/umockdev/umockdev-0.12.1.ebuild   | 57 --
 3 files changed, 100 deletions(-)

diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 0ce3fdf45d72..dc53898428da 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1,2 @@
-DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B 
a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac
 SHA512 
a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 
3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c79095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983
 SHA512 
baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 
8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596
 SHA512 
82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea

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..
--- 
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 
-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..
--- 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:= )
-"

[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/files/, dev-util/umockdev/

2021-07-26 Thread Matt Turner
commit: 74b3fb71af8fd929503cd51c76b9d51ba361776f
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jul 27 00:48:47 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jul 27 00:49:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b3fb71

dev-util/umockdev: Apply patch to fix glibc-2.33 compatibility

Closes: https://bugs.gentoo.org/774267
Signed-off-by: Matt Turner  gentoo.org>

 ...lare-__xstat-prototypes-for-glibc-2.32.90.patch | 42 ++
 dev-util/umockdev/umockdev-0.12.1.ebuild   |  4 +++
 2 files changed, 46 insertions(+)

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
new file mode 100644
index 000..15f5ddbe99c
--- /dev/null
+++ 
b/dev-util/umockdev/files/umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch
@@ -0,0 +1,42 @@
+From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001
+From: Martin Pitt 
+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
index e66cf61108d..e1f360c4d6e 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 # 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
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/files/, dev-util/umockdev/

2020-08-15 Thread Mart Raudsepp
commit: 726722241eb44c7471701d2cb11ab0b7f077b564
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Aug 15 06:32:25 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Aug 15 06:32:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72672224

dev-util/umockdev: remove old

Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/umockdev/Manifest |  2 -
 .../umockdev/files/umockdev-0.9.4-sysmacros.patch  | 20 --
 dev-util/umockdev/umockdev-0.11.3.ebuild   | 44 --
 dev-util/umockdev/umockdev-0.9.4.ebuild| 34 -
 4 files changed, 100 deletions(-)

diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 2ffad98ea21..976dbbd1c42 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1 @@
-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

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 bfc8bc9ed53..000
--- 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 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
 umockdev-0.9.4/tests/test-umockdev-vala.c
-+++ umockdev-0.9.4/tests/test-umockdev-vala.c
-@@ -36,6 +36,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #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 edd87b90f8a..000
--- 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.9.4.ebuild 
b/dev-util/umockdev/umockdev-0.9.4.ebuild
deleted file mode 100644
index 4845f7ae319..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/files/, dev-util/umockdev/

2016-04-20 Thread Mike Frysinger
commit: 39a50ac279d25e74e00f26d41d7ab4488f0221e1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Apr 21 04:15:47 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Apr 21 04:15:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a50ac2

dev-util/umockdev: fix build w/newer glibc #579988

 .../umockdev/files/umockdev-0.8.11-sysmacros.patch | 43 ++
 dev-util/umockdev/umockdev-0.8.11.ebuild   |  4 ++
 2 files changed, 47 insertions(+)

diff --git a/dev-util/umockdev/files/umockdev-0.8.11-sysmacros.patch 
b/dev-util/umockdev/files/umockdev-0.8.11-sysmacros.patch
new file mode 100644
index 000..17ee6b2
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.8.11-sysmacros.patch
@@ -0,0 +1,43 @@
+https://github.com/martinpitt/umockdev/pull/52
+https://bugs.gentoo.org/579988
+
+--- a/src/libumockdev-preload.c
 b/src/libumockdev-preload.c
+@@ -39,6 +39,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/src/umockdev-record.c
 b/src/umockdev-record.c
+@@ -31,6 +31,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/tests/test-umockdev-vala.c
 b/tests/test-umockdev-vala.c
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free 
(var), NULL)))
+--- a/tests/test-umockdev.c
 b/tests/test-umockdev.c
+@@ -29,6 +29,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/dev-util/umockdev/umockdev-0.8.11.ebuild 
b/dev-util/umockdev/umockdev-0.8.11.ebuild
index a65cd56..d3b6456 100644
--- a/dev-util/umockdev/umockdev-0.8.11.ebuild
+++ b/dev-util/umockdev/umockdev-0.8.11.ebuild
@@ -25,3 +25,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-sysmacros.patch #579988
+)