Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libintl/
Date: Tue, 31 May 2016 17:33:52
Message-Id: 1464716128.98986a0b16ae6c3ad2a4b76e62666c58c1113e56.blueness@gentoo
1 commit: 98986a0b16ae6c3ad2a4b76e62666c58c1113e56
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 17:35:13 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 17:35:28 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98986a0b
7
8 dev-libs/libintl: block against musl which provides its own libintl
9
10 Package-Manager: portage-2.2.28
11
12 dev-libs/libintl/libintl-0.19.6.ebuild | 3 ++-
13 dev-libs/libintl/libintl-0.19.7.ebuild | 1 +
14 2 files changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.19.6.ebuild
17 index 41e1440..5bb9072 100644
18 --- a/dev-libs/libintl/libintl-0.19.6.ebuild
19 +++ b/dev-libs/libintl/libintl-0.19.6.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2015 Gentoo Foundation
22 +# Copyright 1999-2016 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -23,6 +23,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
27 # Block C libraries known to provide libintl.
28 RDEPEND="${DEPEND}
29 !sys-libs/glibc
30 + !sys-libs/musl
31 !<sys-devel/gettext-0.19.6-r1"
32
33 S="${WORKDIR}/${MY_P}/gettext-runtime"
34
35 diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
36 index df5e947..630e8d5 100644
37 --- a/dev-libs/libintl/libintl-0.19.7.ebuild
38 +++ b/dev-libs/libintl/libintl-0.19.7.ebuild
39 @@ -23,6 +23,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
40 # Block C libraries known to provide libintl.
41 RDEPEND="${DEPEND}
42 !sys-libs/glibc
43 + !sys-libs/musl
44 !<sys-devel/gettext-0.19.6-r1"
45
46 S="${WORKDIR}/${MY_P}/gettext-runtime"