[gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/

[Mike Frysinger]

commit:     21049b7dd9e07fc5320d8e28348d8e1b46dc5bc5
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 17:38:21 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 18:15:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21049b7d

sys-devel/gdb: stop installing bfd/opcodes translations #528088

The binutils-libs package will install the canonical files for the
various binutils libraries and that includes translations.  Delete
the copies in gdb until we can figure out how to localize them.

 sys-devel/gdb/{gdb-7.10.ebuild => gdb-7.10-r1.ebuild} | 8 ++++++++
 sys-devel/gdb/gdb-9999.ebuild                         | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/sys-devel/gdb/gdb-7.10.ebuild b/sys-devel/gdb/gdb-7.10-r1.ebuild
similarity index 96%
rename from sys-devel/gdb/gdb-7.10.ebuild
rename to sys-devel/gdb/gdb-7.10-r1.ebuild
index 5cd44b4..ec3031d 100644
--- a/sys-devel/gdb/gdb-7.10.ebuild
+++ b/sys-devel/gdb/gdb-7.10-r1.ebuild
@@ -170,6 +170,14 @@ src_install() {
        use client && find "${ED}"/usr -name libiberty.a -delete
        cd "${S}"
 
+       # Delete translations that conflict with binutils-libs. #528088
+       # Note: Should figure out how to store these in an internal gdb dir.
+       if use nls ; then
+               find "${ED}" \
+                       -regextype posix-extended -regex 
'.*/(bfd|opcodes)[.]g?mo$' \
+                       -delete
+       fi
+
        # Don't install docs when building a cross-gdb
        if [[ ${CTARGET} != ${CHOST} ]] ; then
                rm -r "${ED}"/usr/share/{doc,info,locale}

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 5cd44b4..ec3031d 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -170,6 +170,14 @@ src_install() {
        use client && find "${ED}"/usr -name libiberty.a -delete
        cd "${S}"
 
+       # Delete translations that conflict with binutils-libs. #528088
+       # Note: Should figure out how to store these in an internal gdb dir.
+       if use nls ; then
+               find "${ED}" \
+                       -regextype posix-extended -regex 
'.*/(bfd|opcodes)[.]g?mo$' \
+                       -delete
+       fi
+
        # Don't install docs when building a cross-gdb
        if [[ ${CTARGET} != ${CHOST} ]] ; then
                rm -r "${ED}"/usr/share/{doc,info,locale}