public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/wps-office/
Date: Fri, 30 Jul 2021 14:56:26 +0000 (UTC)	[thread overview]
Message-ID: <1627656983.cf95f817339e208cadeb97217681a6772b87e1d4.slyfox@gentoo> (raw)

commit:     cf95f817339e208cadeb97217681a6772b87e1d4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 21:24:57 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 14:56:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf95f817

app-office/wps-office: allow libffi-compat:7 alternative

Allow libffi.so.8 from dev-libs/libffi and libffi.so.7 from
libffi-compat:7 to coexist in a single system.

Otherwise this binary package attempts to downgrade libffi.

Closes: https://bugs.gentoo.org/805182
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 ...-office-11.1.0.10161-r1.ebuild => wps-office-11.1.0.10161-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
similarity index 97%
rename from app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild
rename to app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild
index 03337b3698f..1dcdf6a0c44 100644
--- 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
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/libbsd
-	dev-libs/libffi:0/7
+	|| ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
 	dev-libs/libgcrypt:0
 	dev-libs/libgpg-error
 	dev-libs/libpcre:3


             reply	other threads:[~2021-07-30 14:56 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-30 14:56 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-02 13:00 [gentoo-commits] repo/gentoo:master commit in: app-office/wps-office/ Pacho Ramos
2024-08-01  8:34 Pacho Ramos
2024-08-01  8:34 Pacho Ramos
2024-03-03 19:18 Pacho Ramos
2024-02-25 15:20 Pacho Ramos
2023-06-19 13:31 Pacho Ramos
2023-05-11 17:03 Pacho Ramos
2023-04-18 15:08 Pacho Ramos
2023-02-24 14:21 Pacho Ramos
2022-12-16 15:48 Ionen Wolkens
2022-10-28 15:15 Pacho Ramos
2022-10-28 15:15 Pacho Ramos
2022-09-11 20:12 Sam James
2022-06-11 17:44 Pacho Ramos
2022-05-15 18:41 Pacho Ramos
2022-05-15 18:41 Pacho Ramos
2022-05-15 18:39 Pacho Ramos
2022-02-05 11:15 Pacho Ramos
2022-01-29  9:35 Pacho Ramos
2021-11-11 17:57 Pacho Ramos
2021-09-08  8:48 Pacho Ramos
2021-07-25  0:36 Sam James
2021-01-22 21:56 Pacho Ramos
2021-01-22 21:56 Pacho Ramos
2020-12-09 20:39 Pacho Ramos
2020-12-09 20:39 Pacho Ramos
2020-08-07  9:37 Pacho Ramos
2020-07-23 10:39 Pacho Ramos
2020-07-22 16:07 Pacho Ramos
2020-07-21  1:36 Aaron Bauman
2020-05-31 12:42 Pacho Ramos
2020-05-31 12:42 Pacho Ramos
2020-03-11 18:44 Pacho Ramos
2020-03-11 18:44 Pacho Ramos
2020-01-27 21:38 Pacho Ramos
2019-12-26 20:23 Pacho Ramos
2019-12-15 13:08 Pacho Ramos
2019-12-15 13:08 Pacho Ramos
2019-11-08  6:48 Michał Górny
2019-09-15 12:18 Pacho Ramos
2019-04-25 18:39 Pacho Ramos
2019-04-07 13:00 Pacho Ramos
2019-03-23 12:59 Pacho Ramos
2019-03-23 12:59 Pacho Ramos
2019-01-19  8:56 Pacho Ramos
2018-09-15 13:29 Pacho Ramos
2018-09-15 11:58 Pacho Ramos
2018-03-13 12:54 Pacho Ramos
2018-02-19 19:31 Pacho Ramos
2018-02-13 21:30 Pacho Ramos
2018-02-13 21:30 Pacho Ramos
2017-07-21  8:46 Pacho Ramos
2017-06-23  9:18 Pacho Ramos
2017-03-22 19:17 Pacho Ramos
2017-03-22 19:06 Pacho Ramos
2016-07-09 11:41 Pacho Ramos
2016-07-06 12:29 Heather Cynede
2016-02-07 12:28 Pacho Ramos
2016-02-07 12:28 Pacho Ramos
2016-01-16 10:00 Pacho Ramos
2016-01-16 10:00 Pacho Ramos
2015-12-26 13:22 Pacho Ramos
2015-12-26 13:22 Pacho Ramos
2015-09-08 18:05 Pacho Ramos
2015-09-05  7:53 Pacho Ramos
2015-09-05  7:50 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1627656983.cf95f817339e208cadeb97217681a6772b87e1d4.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox