commit: aba80c258a5c7e4f3a1dd22b61b67b1507377dac Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com> AuthorDate: Wed May 25 08:40:50 2016 +0000 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> CommitDate: Wed May 25 08:40:50 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aba80c25
sys-devel/gettext: really deactivate included libintl sys-devel/gettext/gettext-0.19.7.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild index ba8005d..924f9a3 100644 --- a/sys-devel/gettext/gettext-0.19.7.ebuild +++ b/sys-devel/gettext/gettext-0.19.7.ebuild @@ -61,6 +61,13 @@ src_prepare() { epunt_cxx elibtoolize + + # Never build libintl since it's in dev-libs/libintl now. + einfo "Deactivating included intl library ..." + sed -i -e \ + '/gt_use_preinstalled_gnugettext=yes/s/^/:;fi;if :;then /' \ + gettext-{runtime,tools}/configure || die + eend $? } multilib_src_configure() { @@ -79,8 +86,6 @@ multilib_src_configure() { # this will _disable_ libunistring (since it is not bundled), # see bug #326477 --with-included-libunistring - # Never build libintl since it's in dev-libs/libintl now. - --without-included-gettext $(use_enable acl) $(use_enable cxx c++)