Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/skypeforlinux/
Date: Wed, 01 Dec 2021 18:34:59
Message-Id: 1638383675.98e54131b99e8f38cd9a191fd15fb4bea1620abb.sam@gentoo
1 commit: 98e54131b99e8f38cd9a191fd15fb4bea1620abb
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 18:33:41 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 18:34:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e54131
7
8 net-im/skypeforlinux: fix glibc[-clone3] dependency
9
10 We need to consider two cases:
11
12 - stable users (2.33-r7 right now) who do not have the flag and are therefore fine =>
13 -clone3(-)
14
15 - ~arch users (2.34* right now) who do have the flag and when it doesn't exist for
16 older versions of 2.34, it's on => -clone3(+)
17
18 Reported-by: Miezhiko
19 Signed-off-by: Sam James <sam <AT> gentoo.org>
20
21 ...rlinux-8.78.0.161-r1.ebuild => skypeforlinux-8.78.0.161-r2.ebuild} | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24 diff --git a/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r1.ebuild b/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild
25 similarity index 96%
26 rename from net-im/skypeforlinux/skypeforlinux-8.78.0.161-r1.ebuild
27 rename to net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild
28 index 224261273a21..69bae224b928 100644
29 --- a/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r1.ebuild
30 +++ b/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild
31 @@ -19,7 +19,7 @@ S="${WORKDIR}"
32 QA_PREBUILT="*"
33 RESTRICT="mirror bindist strip" #299368
34
35 -# Need to drop -clone3(-) from glibc once Electron is updated
36 +# Need to drop -clone3(+) from glibc once Electron is updated
37 # bug #823790
38 RDEPEND="
39 app-crypt/libsecret[${MULTILIB_USEDEP}]
40 @@ -34,7 +34,7 @@ RDEPEND="
41 media-libs/libv4l[${MULTILIB_USEDEP}]
42 net-print/cups[${MULTILIB_USEDEP}]
43 sys-apps/dbus[${MULTILIB_USEDEP}]
44 - sys-libs/glibc[-clone3(-)]
45 + || ( <sys-libs/glibc-2.34 >=sys-libs/glibc-2.34[-clone3(+)] )
46 sys-devel/gcc[cxx]
47 virtual/ttf-fonts
48 x11-libs/cairo[${MULTILIB_USEDEP}]