diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-01-27 16:11:07 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-01-27 16:11:07 +0000 |
| commit | 221dd0e30dbb686f3111b22125bbf064d98de7d8 (patch) | |
| tree | 3eb80638f5a60c93cb3f072ee4ce63c55656c7af /sys-libs/musl | |
| parent | Version bump to 3.0.10.3; fixes bug #499276, reported by Thomas Raschbacher (... (diff) | |
| download | gentoo-2-221dd0e30dbb686f3111b22125bbf064d98de7d8.tar.gz gentoo-2-221dd0e30dbb686f3111b22125bbf064d98de7d8.tar.bz2 gentoo-2-221dd0e30dbb686f3111b22125bbf064d98de7d8.zip | |
Add nls support with gettext
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'sys-libs/musl')
| -rw-r--r-- | sys-libs/musl/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-0.9.15.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/musl/musl-9999.ebuild | 12 |
3 files changed, 23 insertions, 7 deletions
diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog index 432a6107199f..a7a7a70ea786 100644 --- a/sys-libs/musl/ChangeLog +++ b/sys-libs/musl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/musl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.16 2014/01/23 14:17:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.17 2014/01/27 16:11:07 blueness Exp $ + + 27 Jan 2014; Anthony G. Basile <blueness@gentoo.org> musl-0.9.15.ebuild, + musl-9999.ebuild: + Add nls support with gettext 23 Jan 2014; Anthony G. Basile <blueness@gentoo.org> musl-0.9.15.ebuild, musl-9999.ebuild: diff --git a/sys-libs/musl/musl-0.9.15.ebuild b/sys-libs/musl/musl-0.9.15.ebuild index 94afb2fe298a..8b756c42f822 100644 --- a/sys-libs/musl/musl-0.9.15.ebuild +++ b/sys-libs/musl/musl-0.9.15.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/sys-libs/musl/musl-0.9.15.ebuild,v 1.2 2014/01/23 14:17:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-0.9.15.ebuild,v 1.3 2014/01/27 16:11:07 blueness Exp $ EAPI=5 @@ -28,9 +28,11 @@ fi LICENSE="MIT" SLOT="0" -IUSE="crosscompile_opts_headers-only" +IUSE="crosscompile_opts_headers-only nls" -RDEPEND="sys-apps/getent" +RDEPEND=" + nls? ( sys-devel/gettext ) + sys-apps/getent" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] @@ -79,6 +81,10 @@ src_install() { if is_crosscompile ; then dosym usr/include /usr/${CTARGET}/sys-include fi + + # If we are going to use gnu's gettext then we have to + # move musl's libintl out of the way. + use nls && mv "${D}"/usr/include/libintl{,-musl}.h } pkg_postinst() { diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 733a77bb2ef3..8633a711bc8f 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.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/sys-libs/musl/musl-9999.ebuild,v 1.6 2014/01/23 14:17:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.7 2014/01/27 16:11:07 blueness Exp $ EAPI=5 @@ -28,9 +28,11 @@ fi LICENSE="MIT" SLOT="0" -IUSE="crosscompile_opts_headers-only" +IUSE="crosscompile_opts_headers-only nls" -RDEPEND="sys-apps/getent" +RDEPEND=" + nls? ( sys-devel/gettext ) + sys-apps/getent" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] @@ -79,6 +81,10 @@ src_install() { if is_crosscompile ; then dosym usr/include /usr/${CTARGET}/sys-include fi + + # If we are going to use gnu's gettext then we have to + # move musl's libintl out of the way. + use nls && mv "${D}"/usr/include/libintl{,-musl}.h } pkg_postinst() { |