Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/wps-office/
Date: Fri, 30 Jul 2021 14:56:30
Message-Id: 1627656983.cf95f817339e208cadeb97217681a6772b87e1d4.slyfox@gentoo
1 commit: cf95f817339e208cadeb97217681a6772b87e1d4
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 27 21:24:57 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 30 14:56:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf95f817
7
8 app-office/wps-office: allow libffi-compat:7 alternative
9
10 Allow libffi.so.8 from dev-libs/libffi and libffi.so.7 from
11 libffi-compat:7 to coexist in a single system.
12
13 Otherwise this binary package attempts to downgrade libffi.
14
15 Closes: https://bugs.gentoo.org/805182
16 Package-Manager: Portage-3.0.20, Repoman-3.0.3
17 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
18
19 ...-office-11.1.0.10161-r1.ebuild => wps-office-11.1.0.10161-r2.ebuild} | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 diff --git a/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild
23 similarity index 97%
24 rename from app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild
25 rename to app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild
26 index 03337b3698f..1dcdf6a0c44 100644
27 --- a/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild
28 +++ b/app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild
29 @@ -31,7 +31,7 @@ RDEPEND="
30 dev-libs/expat
31 dev-libs/glib:2
32 dev-libs/libbsd
33 - dev-libs/libffi:0/7
34 + || ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
35 dev-libs/libgcrypt:0
36 dev-libs/libgpg-error
37 dev-libs/libpcre:3