From 6a79452768ef7e35a21887fa768a6fa49dd446c5 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sun, 26 Jan 2014 18:41:17 +0000
Subject: musl provides its own intl
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
---
virtual/libintl/ChangeLog | 6 +++++-
virtual/libintl/libintl-0-r1.ebuild | 4 ++--
virtual/libintl/libintl-0.ebuild | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
(limited to 'virtual')
diff --git a/virtual/libintl/ChangeLog b/virtual/libintl/ChangeLog
index 748a78c110c8..f831bc1f15b8 100644
--- a/virtual/libintl/ChangeLog
+++ b/virtual/libintl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for virtual/libintl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libintl/ChangeLog,v 1.15 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libintl/ChangeLog,v 1.16 2014/01/26 18:41:17 blueness Exp $
+
+ 26 Jan 2014; Anthony G. Basile <blueness@gentoo.org> libintl-0-r1.ebuild,
+ libintl-0.ebuild:
+ musl provides its own intl
17 Jan 2014; Mike Frysinger <vapier@gentoo.org> libintl-0-r1.ebuild,
libintl-0.ebuild:
diff --git a/virtual/libintl/libintl-0-r1.ebuild b/virtual/libintl/libintl-0-r1.ebuild
index e48ea33cac56..a09971236584 100644
--- a/virtual/libintl/libintl-0-r1.ebuild
+++ b/virtual/libintl/libintl-0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libintl/libintl-0-r1.ebuild,v 1.2 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libintl/libintl-0-r1.ebuild,v 1.3 2014/01/26 18:41:17 blueness Exp $
EAPI=4
@@ -17,4 +17,4 @@ DEPEND=""
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
# that and gcc. And don't force uClibc to dep on this.
-RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) )"
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) ) )"
diff --git a/virtual/libintl/libintl-0.ebuild b/virtual/libintl/libintl-0.ebuild
index 934143a07d1c..83bcc225a2a6 100644
--- a/virtual/libintl/libintl-0.ebuild
+++ b/virtual/libintl/libintl-0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libintl/libintl-0.ebuild,v 1.14 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libintl/libintl-0.ebuild,v 1.15 2014/01/26 18:41:17 blueness Exp $
DESCRIPTION="Virtual for the GNU Internationalization Library"
HOMEPAGE=""
@@ -13,4 +13,4 @@ DEPEND=""
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
# that and gcc. And don't force uClibc to dep on this.
-RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( sys-devel/gettext ) )"
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext ) ) )"
--
cgit v1.2.3-65-gdbad