summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2017-02-21 13:22:02 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2017-02-21 13:22:02 +0000
commit8f09f308689ddbdbc31663ff242caedc3a4361cd (patch)
tree5a1745a1d74b57935118c3382074d08311848ef2
parent2017-02-21 13:02:50 UTC (diff)
parentwww-client/seamonkey: no dev-libs/libexecinfo on musl (bug #609348). (diff)
downloadgentoo-8f09f308689ddbdbc31663ff242caedc3a4361cd.tar.gz
gentoo-8f09f308689ddbdbc31663ff242caedc3a4361cd.tar.bz2
gentoo-8f09f308689ddbdbc31663ff242caedc3a4361cd.zip
Merge updates from master
-rw-r--r--dev-lang/php/php-7.0.15.ebuild2
-rw-r--r--www-client/seamonkey/seamonkey-2.46-r1.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/dev-lang/php/php-7.0.15.ebuild b/dev-lang/php/php-7.0.15.ebuild
index 0c274ddff702..9e4dffbbfbfb 100644
--- a/dev-lang/php/php-7.0.15.ebuild
+++ b/dev-lang/php/php-7.0.15.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/www-client/seamonkey/seamonkey-2.46-r1.ebuild b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
index d01f30ff11c0..92cb6cbd8b35 100644
--- a/www-client/seamonkey/seamonkey-2.46-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
@@ -96,7 +96,7 @@ RDEPEND=">=dev-libs/nss-3.25
=app-crypt/gnupg-1.4* ) )"
DEPEND="${RDEPEND}
- !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
+ !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
crypt? ( dev-lang/perl )
amd64? ( ${ASM_DEPEND}
virtual/opengl )