diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-01-24 20:09:01 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-01-24 20:09:01 +0000 |
| commit | 12ed8d50bcbb9114146844206b7b0daefef1e233 (patch) | |
| tree | 136b192e98f7055a5517b51cece45633c5ffac00 /virtual/libiconv | |
| parent | linux/musl: fix linker path and remove libiconv (diff) | |
| download | gentoo-2-12ed8d50bcbb9114146844206b7b0daefef1e233.tar.gz gentoo-2-12ed8d50bcbb9114146844206b7b0daefef1e233.tar.bz2 gentoo-2-12ed8d50bcbb9114146844206b7b0daefef1e233.zip | |
musl provides its own iconv
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'virtual/libiconv')
| -rw-r--r-- | virtual/libiconv/ChangeLog | 6 | ||||
| -rw-r--r-- | virtual/libiconv/libiconv-0-r1.ebuild | 6 | ||||
| -rw-r--r-- | virtual/libiconv/libiconv-0.ebuild | 6 |
3 files changed, 11 insertions, 7 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/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 ) ) )" |