From c1a85e0fb426c990c5e4425bf860fc43f21716d5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 21 May 2015 11:45:52 +0200
Subject: [PATCH] musl: conflict with gettext-devel is gone.

---
 srcpkgs/musl/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index add8afbccc..42ed3f333b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,7 +1,7 @@
 # Template file for 'musl'.
 pkgname=musl
 version=1.1.9
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--prefix=/usr --disable-gcc-wrapper"
 conflicts="glibc>=0"
@@ -12,8 +12,6 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e
 
-# libintl.h conflict
-conflicts="gettext-devel>=0"
 nostrip_files="libc.so"
 shlib_provides="libc.so"
 only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl"