Install gdb datafiles for cross-gdbs too as they need their own python/xml/etc... files since they can be different versions than the native gdb.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 41 insertions, 11 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index dbc401e937e6..c586f53b91a0 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.272 2014/08/01 09:46:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.273 2014/08/04 01:30:06 vapier Exp $
+
+  04 Aug 2014; Mike Frysinger <vapier@gentoo.org> gdb-7.8.ebuild,
+  gdb-9999.ebuild:
+  Install gdb datafiles for cross-gdbs too as they need their own
+  python/xml/etc... files since they can be different versions than the native
+  gdb.
 
   01 Aug 2014; Raúl Porcel <armin76@gentoo.org> gdb-7.6.2.ebuild:
   sparc stable wrt #501528
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 6b3fc65393ca..731cd141579d 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -58,14 +58,24 @@ EBUILD gdb-7.6.2.ebuild 5756 SHA256 2c9bc8643224bbac92570c9a8ab512526dab4a1202b1
 EBUILD gdb-7.6.ebuild 5297 SHA256 a83e2c2c59000facce5e3871e886b36a4bff1a3e743c059195124e08789d0763 SHA512 82d30e8aeb0a6633e36e89fca3b02b40304023585fd820e6af08757dd49cde6fffe4edf385b0c5334fcd5ea6dc5f2e3a5bfcf29cae728d60e72624657b681e0c WHIRLPOOL cbf10d47d4ee0ffb7bd6aeed24bf8aa66eb28a18a4cf97a567d6fb5af352de68d50d7001ed0aa1ed31e19d7e1f981cff6aca1a6cf36f9d77f965e404a52bfde3
 EBUILD gdb-7.7-r1.ebuild 5650 SHA256 87bd20c8551b90c06ead6d603f2bfba6edb6fc3a15030c3784b94fff34d20715 SHA512 9ec77f5ede4b81edc329d9da814904b47c2b13ce76bc920b7d42232e4d59e64a1bd5e1a90f07c2db2068b00416bcff4f099c7a1ce67d9db90c62a29c57e7256e WHIRLPOOL cb4f5053c7b9b3c3dc73b2d2f363a12e6e36e9981f32bf7d59ccf37f66bdf7f5c0e048ee41c443fd55a3f17f5f99c8e1a9744c5522a55b8ed4131523169ccb5b
 EBUILD gdb-7.7.1.ebuild 6081 SHA256 b61f346863efcea47d006f168abc815cd10177f6b25d71e235716755c5bba8dc SHA512 c7b38f6f6dff3f1765a4cef9787985373e6ab72dcd883b467b26a6862fc007077bf393068a2d3cacefc54ed5cb1e443aa7e774ec1e160f69ffd5aa300f6f8e6f WHIRLPOOL 1094f8213b5a4aeb253d0902f0abc82e0e8c684bb4211334200be2642e64c4b2e18f71d5eb129d5d38d8214cd47270a5e13e3d608e13e3f122656410217fc5ed
-EBUILD gdb-7.8.ebuild 5643 SHA256 7dda3259a4cee398c80ec8a7da86b5e190bb82f9ade8641274ee6537f4053239 SHA512 890bc05e90426cd39ee0d85533878bbd4fdcc2fcec510b498b3feef62ffa58ea82b52990ed7d8406cf6dc9bc5e47f364de096bd9fe8dc802ac674ab318f9e491 WHIRLPOOL 695c761998866ea927a78b2383ff38b9bfb61ad861f225150bb981ae66db2e78411424db6eb07abc53c1777bbb3ec1def485e8453e5e78e0487ad350ffec973e
-EBUILD gdb-9999.ebuild 5645 SHA256 958d4bf1272cb51c8389878b1a273ff738dc2ad7ce7c53b138f52d4c785a1246 SHA512 a5d1e60f8764328723261d9eb11bda2975488a5ec8c58561e0510eca2577326086ca7511bc87aa2fbf377369a943e89c836646f620f6d76314edf834b2f51c40 WHIRLPOOL db574a5fcdd9952ac5f6ee39f750dfded505bf581986a7374e1d69c5cfba52d9d1b6b7de39189be4138d1baea6ba659326ff6fe90d31d1eca59658eecab55c6a
-MISC ChangeLog 36068 SHA256 a0e6d81f58b5c5cac7554f28cdce77028ece10b72ffb11106ed7051f75d73fe8 SHA512 0d6299e4f2d35c1eb1f589d2bec4b50a8e13589a917a380997b7c4558b5d70026589a1b6e876ddccca4f17f1a7ca6286de1ab0c007e8f91b3e96aaf6b1392879 WHIRLPOOL d9d4eb78672c64051843a4a2e737fb0b4452d7e40d22525d75e4aadd954893198ce1021fb565ad99afb9a28ee263aedc53766a639c6d2c2c5af7cd771771cee5
+EBUILD gdb-7.8.ebuild 5871 SHA256 e05ac4e3f2fe7088514bf2bba8a52f35c7c3fb61345d3b70913f66b98f1cd812 SHA512 94e58798fbed3c261297961bbc79b5220c2d8cbe0b936d09f9803a389890ded0c76b5bf27439b6d82efed86efaa4f8fc0f7d8c680cfc2bf8bb558f238677ef11 WHIRLPOOL e04c44d06f39d252d17b67ed2a68a79a88a3d6f11d08e5cb82140abd6e4526b2df9b88f8a6088148861b1e1ca5c9dbccf469c7ce312142a5739d592a8c59e4d3
+EBUILD gdb-9999.ebuild 5873 SHA256 f43d1fcceaad5de0fb10254c8c1a0de9a75ef6ccc2d4394542db9ffb71bbb1b0 SHA512 f88dfa8c3cf67a86a01cf0f1b3a39c50e221defa563b00434628d459b4a687504474d6d91c69b9f734959d523200eade47ba0d36adc41907c7f5484303dfb5aa WHIRLPOOL 24df0cb98590b5ea0a604010cab62c32ed6f8506d8efa7f4d9c36f4db754132ae72c6db6f66de225231838007995f3ecb76ff5a9e86620a3baf82298eacfaea5
+MISC ChangeLog 36305 SHA256 ae1b9985b14c08d9fa4c42c4aaaddba341f25b96abfda7fb528d5d66f5827f37 SHA512 7c031d58f65d3a92f0e8a21f41140964578b072dde0695e08ace3ce91908f5f7d8a1088e9f54ae436faea3330ba9d9447129bd9a6e8c0bd87908f6044871a740 WHIRLPOOL 0b08935c4d19a76e3f52fa7e446a95ee29a7684b9d78d86d87e3305fceccf007ba47c90234ae4c70a3ee4727149c07c6bf2426313baa09b58baf9f739d751837
 MISC metadata.xml 694 SHA256 32f59a7ff4c58911e613a5cafeb79fa23d4cced2be2553ddd0eb6395f2853d21 SHA512 521fa566e1dcaaf5c363edf0643e9bbd9374559d01be24875451163bf4b72ec44341b5c390730727950d3af38782850c203da55248e22153d713e34eeed1a07e WHIRLPOOL 76a4ae0a5fb0efa769fb676b21c13fae274775a0bee3f95281e0f9df46d67652e2afe2e3ed1da88e64d3f39d77fb89c7fcf3c19535b6ce90290ff8d01b06ec5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPbYdwACgkQuQc30/atMkDcBgCfVSYjQWeJCHGbc2L2qwOs5ReT
-pAUAoK+q+x9upuzJeLb02bvT62xD0Thh
-=sDpe
+iQIcBAEBCAAGBQJT3uIlAAoJEPGu1DbS6WIAGBEP/jky72SeBU4devk+/M2TZs7q
+XhRQ8GJk/CGh3VL5NDNw0YgZN6NIwkud20HblHaTgB2vV+aE29xaJGnJW1RRlhCN
+OG0vyALCurQTuJwj5SslG6PQQ+elBLtBDwPxvMCp2B2WamNt/kgTeNfwLVgpi9Uj
+UyaRyCYSvM1AJArcc5Z8bQxdh01VlUQNxyoYZrOtZyQQ5g5ePMW6PeVO22XBye5s
+jMGkyQSR4fDT/jkFYPZfowW/R1Ofn7eaF0+SelxznU4ulZAs98tcRF28L6nvTD6T
+7gIQUZOveF+fCxI4PFnC1J2T3SWlocvnJXZ0NkyzYuD3+XbC8uFXpnJiEXlysQO2
+jPkSec+DKDx5rN2RWz7j75u4nZqGaYz6GcrZfuAlhl+3W5zKAGTI/fF4L5KLenVW
+tUl4RpJj1vZB7NteoFko9u75YhFSvXjJCtOV3DMYYdzqNWABdgdFBG+xBdjfJT5a
+D/hD32fiHegCXBP6M3xPTKLDsMNSexrFD3FwrJ6tom45Z9LRHG920/NGIVTsrxV1
+Up2CO8gvvPEfKwnVaBKRQLVNGyraJvgczBw/aAkRnTZdrJ0dnqeCVGwOU6GHE57H
+nlF4EvYaYm57QVkPxSBAyrGZ+hA5VR8cu+8FcgI+Zbp4/RE/3mM38zmvQMOM0pjs
+JRrQOrN9ZTk0YsyOJV29
+=PI8D
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.8.ebuild b/sys-devel/gdb/gdb-7.8.ebuild
index e7a288694985..6ad82efcdcfb 100644
--- a/sys-devel/gdb/gdb-7.8.ebuild
+++ b/sys-devel/gdb/gdb-7.8.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-devel/gdb/gdb-7.8.ebuild,v 1.1 2014/07/30 12:42:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.8.ebuild,v 1.2 2014/08/04 01:30:06 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -105,6 +105,7 @@ src_configure() {
 	is_cross && myconf+=(
 		--with-sysroot="${sysroot}"
 		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
 	)
 
 	if use server && ! use client ; then
@@ -157,7 +158,13 @@ src_install() {
 
 	# Don't install docs when building a cross-gdb
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -r "${ED}"/usr/share
+		rm -r "${ED}"/usr/share/{doc,info,locale}
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
 		return 0
 	fi
 	# Install it by hand for now:
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 9b27de69eaaf..475ec20a833f 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-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-devel/gdb/gdb-9999.ebuild,v 1.28 2014/07/30 12:42:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.29 2014/08/04 01:30:06 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -105,6 +105,7 @@ src_configure() {
 	is_cross && myconf+=(
 		--with-sysroot="${sysroot}"
 		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
 	)
 
 	if use server && ! use client ; then
@@ -157,7 +158,13 @@ src_install() {
 
 	# Don't install docs when building a cross-gdb
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -r "${ED}"/usr/share
+		rm -r "${ED}"/usr/share/{doc,info,locale}
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
 		return 0
 	fi
 	# Install it by hand for now: