musl provides its own iconv

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 27 insertions, 23 deletions

diff --git a/virtual/libiconv/ChangeLog b/virtual/libiconv/ChangeLog
index 1e3d3fa19bfd..3550652f9cc1 100644
--- a/virtual/libiconv/ChangeLog
+++ b/virtual/libiconv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for virtual/libiconv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libiconv/ChangeLog,v 1.12 2014/01/18 02:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libiconv/ChangeLog,v 1.13 2014/01/24 20:09:01 blueness Exp $
+
+  24 Jan 2014; Anthony G. Basile <blueness@gentoo.org> libiconv-0-r1.ebuild,
+  libiconv-0.ebuild:
+  musl provides its own iconv
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> libiconv-0-r1.ebuild,
   libiconv-0.ebuild:
diff --git a/virtual/libiconv/Manifest b/virtual/libiconv/Manifest
index 6133bd0b33cc..006257ebfa80 100644
--- a/virtual/libiconv/Manifest
+++ b/virtual/libiconv/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD libiconv-0-r1.ebuild 927 SHA256 1004dc61c3c957a1e4af3e1fc91f8533fc77cc91d9f56c5eeaa3b508728811e5 SHA512 bb15fcef48322770b0e0bb01c9b8b8b48397c7b6e0355b8a763af775e5b95cee87d2c0027a5881b2a8d597751b8cafce8d647930ad63be203ce51fa9e7701e06 WHIRLPOOL f50e27aa3c8e39efe1d9d979952b5b823983f6a7d5421b846a165fb13a2bd22a8b7f6285f7acdebc0847c6c78438780eaba0bc33cccef8a904a6ca5f6b899a6d
-EBUILD libiconv-0.ebuild 860 SHA256 a4b0d7486284d0e722b92a8eb9f29c7fb4ce2c88ec27b00bbb666d484853291a SHA512 2c2d27e020fe3bb7dbb06c1b46efed46bfde782fbbc1f7dbd1de2c601abab4a253871945209c3b542bee3754c073d282811b0ae1bdb5c4456298f0000df43ad1 WHIRLPOOL 9312d0bd0bbd6e0450c63aa3e9a80e6a0227877bb0a0a7e0a73b073616fb75e39bc98968a2ec86e6c2b74e02da6491d284326ce458638d9831591af9769872b9
-MISC ChangeLog 1820 SHA256 15cb7f619506f2961c97c0ec667cf9c5351a8688c1592f8749849323ca605e2b SHA512 96226cb4caaec04be91d062cc54d737cce3fb8d2f171c64c830a6866d498e5a5cb68c17f55dead62696cbc7d6c238391f1c2bf10078528c905241d28c5b31856 WHIRLPOOL 32008f90b13dbd2f8220e083b39523f0fd9b5d1b5ce5d130b0c34243163f7db8ca696686b188a98b80ec01e00acd6f57ba3f1a544805bbcdcb431c4f0f82dd36
+EBUILD libiconv-0-r1.ebuild 957 SHA256 c545a4e0264c635a6ca222dfa2c6fe704a970ef6b2d956ed2d4cc5955b851155 SHA512 c348c2da4c1246681079c16af9cae0b94d07f9e77660500b511a2fa9668712f1f7c5a2e864b2b7bac2963e741a3aee6eac2c29db5f9bdcf35f2269aa97ff6e52 WHIRLPOOL 1efe890057a733d1591d4cbb3d58fcbe291ff92d74279748faf1a4b56f738bcabb233cf957f2d5caa313bedab6c6cf239a6aa782e44e8c31cd4c25c29d019da7
+EBUILD libiconv-0.ebuild 890 SHA256 bea293359b0e3435681c2c789e20f8edc16a6af489913e05d7bf288825d44331 SHA512 ebdab08f357864594a9a3ace4ee8ec4d1f490c2a183ea6b1320036b8dfeddf9a0db02f69589d5d2b7cb8fe69957338bf046e0efb8e32c05925742cc6e04d1a06 WHIRLPOOL ec5fea91b0ee9cfd4adfa5ea659f92fcb28830bb4b55d2cbc33afb7cc3e2a874da20d5a7ec55a27cbf01aa5b0257cad22c76a8dac9e83f1e45ad9e0739118db4
+MISC ChangeLog 1951 SHA256 7db0f0f4054611979dd6f7126e27a66cc7de752d7ec8e35d6dc9e3a3043ea0b4 SHA512 fa481b11b921ac7a78267c0bdd0d08b069843fe1213ac784ba5704bd104a10e4c4704f0dbf3fc9eb19c02b397943187077f25f5b1e3228924a40d85c487b0527 WHIRLPOOL 4c3b5a808a29b0dfdcd6fe653510cb8d68187b60452e96c84ef0992accfc5a602c14b6812da9dd76ca0c9c80209aebca7ecab9aec3089f945bd9d1bfbcf6304a
 MISC metadata.xml 222 SHA256 8cdf49aa475bddd11d8dfa6f609f19b5522fb7df1b8be9993744d2bee0591220 SHA512 97b19cdf6a796efd400a54d71d9e0084e2453c237a778e15942f84c9baf5021af20f90056e16772e9002990d9f9b6ac513e4d2a0f7731427abdcfb939bccff98 WHIRLPOOL c487aca796552282c911e1be14b89d8163b7d6e3de49a36c0aa8651aa2d641c8bbf54b28d10b74617e0aa4e465fe51cd572aa2694a5317c19cb1c1c037c8bb96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2el/AAoJEPGu1DbS6WIA3M8P/AlzlrG9nycz5v8AKTcZcQPd
-CHwNvM85arwBn9KoGL+5RJUHn0AgFpt6oRAHW0kPSSotnlZ5Xmnhj+cpzhRd2P1j
-oZ3GJvqhcLJVCPShA6OIg8H30QAVg+hbHZiWuwoTH4aJbSRJHCvFwYWPBzD6MRcJ
-4hQe6+MKfqmJfKxz1NsiMS8LVWu0x1/nJm9LXgKvGQ1ZLFTzkb9OCCWAQrzk5MbL
-YKLK9hdWOwzBOycfdEZHRtpI4Z6c+7pYLFJUcE9M+ccYVcawnBpLNJNXYqV8hLzk
-ZVQC7UEgk+c2YoatcFZr9kl2dG1NJv2q+9Ms6dN+XmX8m1Sg6bKJk3wZTfpnTFNY
-jVRSioQ3K7YBFWlO01hP2tVw5yz2vKcwBOjNpf+iID8Ogz0lcUkJ2XJGKEzEXmKh
-jku3cIkLYpOJfCb/Q3rPrOZMVf2aZGbpyZKAhcEKfKKfJpgRnw+3KuR0FLlJPGHm
-TxFRgPulS6EehwrFhXk+yxZBl+UC/B9dNxQSFp/4g6ltpkyUB9FdWWSY4DJB94Ij
-vdNeZjlfTvlZboFA1+mteRq+l+DapVhuNHOjyrXmyyFYl/Q8Hi390ZkgYDI79HDg
-ZPdveShRRZJ7SmPHM/E9f6HqlDL2Es5P2GkCu/fgHJqKVTNRDoMFTq8fieZOiZVa
-ceAtJKyCAgzFDk5PMvsJ
-=vCGc
+iQIcBAEBCAAGBQJS4shvAAoJEJOE+m71LUu62wAP/i2iApGuMCURGZO5TCosPcZi
+5f7YkGpAAwPnKOwXFd7rwG+s2OSYkD+7li9c+sjvuj/fAyqrqeM2azKik9AEHRXe
+R3xt3r+8WVRmhSAVeyORpJdH3CQQzS6EXK8sRkwIWOR6pEToJfHY6jmoSXnJb7AJ
+J1mJctMS0RWpDYiJhzLT3FxE3rBYgQUUwy43SOSLDdob4hXu9LSUUi3y6msuoiQ7
+NVAG3bC3WCw6SmpDuB97IvpNtDI+TPk7uwZHj/5xARo0e0Ht4KtyhidYUFx6xbSJ
+7Ysfu3MulCv/vhMscptFgY+1bexiXA9KAVezYc4jJ5pz3nV75/1O165RxEtfRY8Z
+SxwYuWJDHO4rdyRhaVgsyKb83ITcTth/AEvBdstRyU3E/TUfaw+y9IFXfutlpOQg
+JXqe/IKr8zxsTBwldC0d1tVmyN9zYDOZuxv5OU6XvdZp8vwxK5LTZIp27VYYNEmT
+/Hl0Uh/xN+CAGUO8tIdRkLmBvY/K3Ldb9JhjaikRWsV6zSP5x4t2gmuO0+rLI1lO
+ELM/EqO/AAATJc4yxk3ESN2Q42vrmaw0u5JSWqmVocjHJEO8If4X0MP5vaHRtFyo
+jsuogtFKWQ/8Nr+3iT/q6H5OqDkEpeCCuCNAuGjS8Gnz8Rr6mU5c53MoCWhpn2WR
+Yuh2I4kk8mtQLy+XyJPu
+=MHnO
 -----END PGP SIGNATURE-----
diff --git a/virtual/libiconv/libiconv-0-r1.ebuild b/virtual/libiconv/libiconv-0-r1.ebuild
index 1ec351dc1ef4..5b1a2b178bc2 100644
--- a/virtual/libiconv/libiconv-0-r1.ebuild
+++ b/virtual/libiconv/libiconv-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/libiconv/libiconv-0-r1.ebuild,v 1.2 2014/01/18 02:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libiconv/libiconv-0-r1.ebuild,v 1.3 2014/01/24 20:09:01 blueness Exp $
 
 EAPI=4
 
@@ -12,9 +12,9 @@ SRC_URI=""
 LICENSE=""
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="elibc_glibc elibc_uclibc"
+IUSE="elibc_glibc elibc_uclibc elibc_musl"
 DEPEND=""
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
 # that and gcc
-RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( dev-libs/libiconv[${MULTILIB_USEDEP}] ) )"
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv[${MULTILIB_USEDEP}] ) ) )"
diff --git a/virtual/libiconv/libiconv-0.ebuild b/virtual/libiconv/libiconv-0.ebuild
index 7280bb910a97..42b4abdaf0a4 100644
--- a/virtual/libiconv/libiconv-0.ebuild
+++ b/virtual/libiconv/libiconv-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/libiconv/libiconv-0.ebuild,v 1.12 2014/01/18 02:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libiconv/libiconv-0.ebuild,v 1.13 2014/01/24 20:09:01 blueness Exp $
 
 DESCRIPTION="Virtual for the GNU conversion library"
 HOMEPAGE=""
@@ -8,9 +8,9 @@ SRC_URI=""
 LICENSE=""
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="elibc_glibc elibc_uclibc"
+IUSE="elibc_glibc elibc_uclibc elibc_musl"
 DEPEND=""
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
 # that and gcc
-RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( dev-libs/libiconv ) )"
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv ) ) )"