[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/

[Fabian Groffen]

commit:     1f7ac307c1e7f68d9fbcebc582d75ed16ae7bcc3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  8 10:01:06 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 10:01:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f7ac307

sys-devel/gettext: fix file collission with libintl

Package-Manager: portage-2.2.20-prefix

 sys-devel/gettext/gettext-0.19.7.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild 
b/sys-devel/gettext/gettext-0.19.7.ebuild
index 64db7f4..77d493c 100644
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
 
        # this script uses syntax that Solaris /bin/sh doesn't grok
        sed -i -e '1c\#!/usr/bin/env sh' \
-               "${S}"/gettext-tools/misc/convert-archive.in || die
+               gettext-tools/misc/convert-archive.in || die
 
        epunt_cxx
        elibtoolize
@@ -129,6 +129,10 @@ multilib_src_install_all() {
        fi
        rm -f "${ED}"/usr/share/doc/${PF}/*.html
 
+       # remove libintl stuff that we can't seem to get disabled
+       rm -f "${ED}"/usr/$(get_libdir)/libintl*
+       rm -f "${ED}"/usr/include/libintl.h
+
        dodoc AUTHORS ChangeLog NEWS README THANKS
 }