Clean up sysroot handling a bit -- no real functional changes.

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

7 files changed, 54 insertions, 45 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 3f83e802ea1d..77e09fa35b4f 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.260 2014/03/08 23:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.261 2014/03/08 23:59:24 vapier Exp $
+
+  08 Mar 2014; Mike Frysinger <vapier@gentoo.org> gdb-7.6.1.ebuild,
+  gdb-7.6.2.ebuild, gdb-7.6.ebuild, gdb-7.7.ebuild, gdb-9999.ebuild:
+  Clean up sysroot handling a bit -- no real functional changes.
 
   08 Mar 2014; Mike Frysinger <vapier@gentoo.org> gdb-7.6.1.ebuild,
   gdb-7.6.2.ebuild, gdb-7.6.ebuild, gdb-7.7.ebuild, gdb-9999.ebuild,
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 8522a927cb74..4a6eb9dc3464 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -49,27 +49,27 @@ EBUILD gdb-7.4.1.ebuild 5230 SHA256 550c031d040d3b02b6d6bfeb2cb96e467f8bddcf8362
 EBUILD gdb-7.4.ebuild 5216 SHA256 cc8b3187988de8075a74a03abbe6a2f2580abc494ad5f3fbc62945cf1d2ee5a2 SHA512 d54726993520d7f6d77e01beced6ff2cbb4810733f9cdf6bfb39db88e22a6eb77f16c79f87947692195319e04ead9f253a9b92d7d4f6829b0451bd5382ceb787 WHIRLPOOL 563ee91f67a71da2295dff73772b3f8af1c266edb6a9ff0ba8f6c63246c83456302f6f1c30d8c08609402b2c8fde48a1e434f3c0b8a347bba14d825daac1eb25
 EBUILD gdb-7.5.1.ebuild 5237 SHA256 05bf85253c4e65871c550120072c8cc98264cb9e75ee6a0ff82c08e66402ef44 SHA512 3b5b23dd9610df7c8d882e2a0fcf30a24b251870fdeda6140da512b8de3e03cc06cc53d975ea3990ceb713acaad789be8eaec9c17bcf02f43edd939486439ccd WHIRLPOOL e443c485a4978fd0ac9d0fcac2896c3eaa483fdcfa309378129167da992b522b36857234e5a16e0ce107c201594781e841e4d4762efe614ccfe08c27a38ec47b
 EBUILD gdb-7.5.ebuild 5219 SHA256 eca11938053d160d0b75d022ef09ef13a8748b636bd4d1412108bb80932db4a2 SHA512 176f70b1ee6d4c7ab5f3ba96d2778df33a587c6c021430302277f08b79b9ea2abb79a0ace4e0c2e83ac164194b5c2846d69c9a10692e67063a1859d8fc0ebbc2 WHIRLPOOL 367cba8cea494ca7e3e926ace4d46552905f2ae2c11664a7668144a1e838df0ea1037c0b0114a6824aad5f1d814c0d4ca70b34f43b08900dce28e69f9e3b11c7
-EBUILD gdb-7.6.1.ebuild 5761 SHA256 296686525347cb9ab02772d4ade0ed97f11db531c3afd5145c897664a4db3f84 SHA512 2719670e432395f943fe06fd48b60631594336999c17142b8eb7a70d777f57b245340d636d232f31590c4ebf36e11a34e09ac97f6a662614e71ea1b189f5d429 WHIRLPOOL 3a22fcc1e66c4896d09620fe1484cf3c5445ca78a0ecd93328ab3744482c05e9e53593507daf18e7f7f648469e323392b13b635cea3657edfed7cfebf08a7dd7
-EBUILD gdb-7.6.2.ebuild 5762 SHA256 06c46252829180e185ccf99f87bfdb80f59b6e9bbfcae8aea37e6f0d47ff263c SHA512 f4d7daaf0895886f3f34d8c740567c12a4a4bf92eb45c3eac221d78b9109272af78c9e8bc6dcb4f77de6507559d68dfedb097488868ee3f35a53890e95de8a78 WHIRLPOOL bf96956df30c9853940163f3000b9fc01a20cc37b1e779c5bf13fee8a5d12eec150c6080c57f8fac09e58e7aca20368ec93fde4ef47a51da0ddf3031fead1d2e
-EBUILD gdb-7.6.ebuild 5299 SHA256 4ee7d02183e1b6df971d696bdbd6c087cf9097bf3465d61a68e95426e500884e SHA512 2985dc46c24979c2ac278852ff85ed81593dff2c59387e3fb1e8541f348faf7c0145e7ae24a059376badc9ead0c94ae731aa1313a0a500028bc79fa10a008843 WHIRLPOOL 6f0fbc89d2ff23d49f817e0b132c605498576b32f9c968ba5e451a93b437061b2fc8c756e99afea19ead687a42e9ae22e40c7cc473fb80ddd17ac7c1a2a38396
-EBUILD gdb-7.7.ebuild 5951 SHA256 8067c93b5fed04371c9c59d277d1f91d0a2428f1b813e57356d6320a717f15a2 SHA512 1bcc5733906827f0a889e7138aceb705d633c843989a86ea075cf83091b46b757dddaa856055ff6c47fb670928867a0b757da39825742e840a9c8f7b2b77676f WHIRLPOOL 5d17edf704a36ecc0e4af4abf50668a23ee7dae5a05378e231235b82e7f188e50bacd1d8e8865537c183752799aa84f206e93786514a0a1d65f68d9954dab7e6
-EBUILD gdb-9999.ebuild 5953 SHA256 013b3a44cd8c36e2681d6ca224791ff59d5bd11e89cef1b5de812bc9a0ac0e9b SHA512 b410f239e8fe1c4c4a7a21025af33db7601927a667799a2ce65c93d849389a09f352ded88bf6250434090ae763b727b3a703fc58cdd067b0f363a614abe3294f WHIRLPOOL df6790e586b09815e68f925e47c7e4bfa36e887384cc01503455331f885a9009c63fb79c82ea6f1d4591b0096c80c4bef966489a4cd5328b22054bf500260b15
-MISC ChangeLog 34422 SHA256 58b4dcf938c504cfac5535b3fab07e41e49af5cfb2405cfaa46690624a31fcd4 SHA512 fd06eacd4ee206e1caa99e363f74c041ff53810281821c173f231c29b2a3e7f807c177c466b2453b3fdcccf66244de2f4ab58f2070e815a85434c8f602bd42b2 WHIRLPOOL 37c1b268bc71772681179dcbb7597f59260ce3d541ed0e1a374e23365b2375ba058cad8ce6f3c6e3078e2dbec396a1a34cd1c4d86f8a9159a9c40f2bb031344d
+EBUILD gdb-7.6.1.ebuild 5759 SHA256 a4c7e54b8534d190b93a3d40a7d10b1c4d1b0ed5315f3d0b343d7dc57a2033ec SHA512 6dd367141ca3a7ab98a01630c6a77315989c6841da5deea0eb48aaebdc4216a0cccbdd6a90df531d39c49455d23813157bf2d0aeafbbda25c530660942e70a7f WHIRLPOOL f4fa0699f4af8a0ec66e1b8d59925bbbe410aa0cfb7455b1d8b2bafde620ae31eb662a1b81f43a7030df1e25facf93d5187444aff4fa435d09a5803319ed7825
+EBUILD gdb-7.6.2.ebuild 5761 SHA256 99b3a282222ac2689a1aef9630ee8fde3e58aea7023b8258c2571bd289978770 SHA512 7270de753718fd53c631e7bbf85a8337067e92d5c15938d4d3a480e8df7a9e5ceee132cc3dbfa3d9ecb2df6926e008ea36c842e2f38ff42d4e7c0f9d9355dfa4 WHIRLPOOL 889168bac93eecc63782a0a53559a6b954a8ff439c41cabf5bf55e5c5c53732f131c4d1a5e8315dca4c78ce864785424a0d2c6187a4fb9d02c01b5979fe28c45
+EBUILD gdb-7.6.ebuild 5297 SHA256 a83e2c2c59000facce5e3871e886b36a4bff1a3e743c059195124e08789d0763 SHA512 82d30e8aeb0a6633e36e89fca3b02b40304023585fd820e6af08757dd49cde6fffe4edf385b0c5334fcd5ea6dc5f2e3a5bfcf29cae728d60e72624657b681e0c WHIRLPOOL cbf10d47d4ee0ffb7bd6aeed24bf8aa66eb28a18a4cf97a567d6fb5af352de68d50d7001ed0aa1ed31e19d7e1f981cff6aca1a6cf36f9d77f965e404a52bfde3
+EBUILD gdb-7.7.ebuild 5949 SHA256 adbcf1beedf2dddf41a784adb6f3b306cfd60519dd16bd60188a7ae3422ffb98 SHA512 feefe04cfcd54cb9b966bc7fa532d1753694c34b61af3329b5599668c108f3be328a4ccbe377da1580a08066f3be6bdf02c84025c87f404f1333cd86e6064b45 WHIRLPOOL e6ad05876f25f75676cb3ea1d54bf9e7685dced07c75d074b0c1f8b0a37c6a4b97f0d44d52498e2110f163338d58ffd98638c166158210d481cc0e98ce092d00
+EBUILD gdb-9999.ebuild 5951 SHA256 1cf101bb0e15e7a7adc625e3985f79fc331a36131a72e88b595625706e362450 SHA512 7b7bd8f50872ca6de571dcacb8c9ec5216de19e5016459de5ee8dadd21898bb2eeef69ea4e61943fd38d69683991a6af81af74ef76fd5f07b6bfb6bd327ab159 WHIRLPOOL 3ef1b2e050cf4c123db79f88a34cae6fce40c16c2553536d7b66970ecfba728f64635bea9a6a02c91815f2fdd585dd2541ac40e443060208a38d790d571ef30b
+MISC ChangeLog 34625 SHA256 4352756f119299c99a60a72b7196b861c42f98871899a654aa2e519466254803 SHA512 3e74159587b27122e280a6a8b1f773d838f25f5835a676f7fb699c3fe7ba4b659eb0f56baa3d94d4898618328f7f026a1af0044848504230cdc6f6fd8e8fce6c WHIRLPOOL bf01bbb0a8a312c0f9ee8d0b3b94f88e08c43b0c21b1e4aae71012fa587fde813faa42147339e088692f930aa4f27ad537d55543cdbea695851f15ae18a0c737
 MISC metadata.xml 621 SHA256 8d554d2b0ae3cf2e2f003434d507960b9c24b489a21fd14a92a789ce1880956f SHA512 709dc4c8a5d16851bf91c76887fb9da52d532a401646f4234edb159be6d0fd7d747e28afccb4436990279347c0e06203dc7003a3bf5fac2cf6ee78224e466c54 WHIRLPOOL 27573cea2d4e1484212ffcc845750de5f801c75214f3682f817dc6652d418ceeed11199a24d94cae682f45f7d9ba0c88a9c719c0cb7c6c1bb8fa8a64a7c9dd9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTG6MUAAoJEPGu1DbS6WIAyDUP/iRBij8HBt20zk8ITVyJhZ52
-M58lcY1vntCIiduCt9hN9lfS6qwE0MXJdYrnIZe8iVCXwwex13iD1IgIXZtVqR10
-Gx2cwbQ8MlqkZZBc52HihtQq6gmnEkpBB9/Qd+6AoE5t1fjqEqy2n5uLAwsTpiLq
-W86xM7cped+U7RuONqDbMNfiqsOy5rL0LWqzTOMhbl40Y0dcFb0VGoqmNmU2wu7I
-m+jOuz2O7weFtO4XCF+QmRYa7Fo3X+GNF2aqlQjm6FDhAin8VPBq4W1CUjqGrqoq
-tBiZVAreWp0CDm2F/+Gs4GpUf67oNllQLBcpAHc1XsmuwhJ27/imWcmkodmVbXpp
-RkcbHQ0isOln/DsGKuw5zzfTeCW5wL1NHdi8LHZduJZj5Sy5MqNQAJzwGxiN5yu3
-eOlEv3Ya4YwroS2e2TMfEi7+N5CECsNR1Y7yE09VTWy2dYQsnf9c2dROHUdveLEk
-fY0IbGj2OYsCwnZVfg8Mi5iktoB424R4ArKASbCBvV907Q7DP/xTvuyUQwhBd0tq
-OPT4RnpULTJa5pwFOhrQs08gBpuHSbFtJGJyh8fT+cWe2eDcYFzgZIt50oUMWWqr
-HdPaYJyr8OmOJ9z/y1jNw09ZxXrf0b8vi0N5gSQVcW7Qi6gpuSgQZ1Lpruaic6qM
-YlHnGSwbynI8OUA1YMsP
-=q+8z
+iQIcBAEBCAAGBQJTG67jAAoJEPGu1DbS6WIAkQkP/0k7rN4dqyxpEYuvBsxBLbb8
+PRR+e7uDWMDxwszhXcit4mI66/NpW/otq0se82fc0KD1X0pQiJ1LWKVQZr7ArYxv
+Z+3Z65udX8+FtwOzvNkWJkGd4YwQboXOpcuB4R3tzHoWnMO4wsxGhvHE37fnNGg1
+A1omP43m7dodLevfrx1qSljuAuOh++Kd5Xv9+pYMaue2jtXpNvh6ueGcYO7cvSDv
+vIynxwrQoMEBZecJicjImMsDF+/wFceurjPvC3Vpk3DXZz/JZId/0AEjpUR0oZU7
+UUbk74a3wU3psrBti+JJArH5MFyVuozfLpoYWcfKPxq52YWkayhD8fz+6ZM1aiDV
+yarRBzsN0QYjpVDrJl5vMLnhQQCkgRoODTlSkarkly2/P/FDU6b6pmPbQU2GVEHZ
+LbD9UTKDwq+SQSxN4eXt7QZ5+nxcZS2kmqb+yZhOvji0hwn2qzO1ZXXfwnIf5+gI
++IQKb2yVTvFE/1KHH44f1+C8/crBDSAYKEEyX9atJ1hiE2TAbaKr4rh4tVxkz+gf
+SCdyAjFwcZQm8C3hTdtn2fZT5Gb8UT9S5LzrMKtDWVeHeTPhra52MqBZAy0Yj8D8
+7rqjVU1SW1k1cKgcAPoDRgIfuBKV0J8s2qUWiC4/SAGqJebHZBM8n0LMYMgl0wiN
++jkJEQ+/WaaTGsSM0vjt
+=CZES
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.6.1.ebuild b/sys-devel/gdb/gdb-7.6.1.ebuild
index 2d61737dc9d4..d217294014c4 100644
--- a/sys-devel/gdb/gdb-7.6.1.ebuild
+++ b/sys-devel/gdb/gdb-7.6.1.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.6.1.ebuild,v 1.6 2014/03/08 23:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.1.ebuild,v 1.7 2014/03/08 23:59:24 vapier Exp $
 
 EAPI="3"
 
@@ -98,14 +98,15 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
-	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo \
-			--with-sysroot="${sysroot}" \
-			--includedir="${sysroot}/usr/include")
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
 	)
 
 	if use server && ! use client ; then
diff --git a/sys-devel/gdb/gdb-7.6.2.ebuild b/sys-devel/gdb/gdb-7.6.2.ebuild
index f719b8fd96e1..dc64093b5291 100644
--- a/sys-devel/gdb/gdb-7.6.2.ebuild
+++ b/sys-devel/gdb/gdb-7.6.2.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.6.2.ebuild,v 1.9 2014/03/08 23:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.2.ebuild,v 1.10 2014/03/08 23:59:24 vapier Exp $
 
 EAPI="3"
 
@@ -98,14 +98,15 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
-	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo \
-			--with-sysroot="${sysroot}" \
-			--includedir="${sysroot}/usr/include")
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
 	)
 
 	if use server && ! use client ; then
diff --git a/sys-devel/gdb/gdb-7.6.ebuild b/sys-devel/gdb/gdb-7.6.ebuild
index e3d5c310491d..a6b2110bed17 100644
--- a/sys-devel/gdb/gdb-7.6.ebuild
+++ b/sys-devel/gdb/gdb-7.6.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.6.ebuild,v 1.6 2014/03/08 23:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.ebuild,v 1.7 2014/03/08 23:59:24 vapier Exp $
 
 EAPI="3"
 
@@ -87,14 +87,15 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
-	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo \
-			--with-sysroot="${sysroot}" \
-			--includedir="${sysroot}/usr/include")
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
 	)
 
 	if use server && ! use client ; then
diff --git a/sys-devel/gdb/gdb-7.7.ebuild b/sys-devel/gdb/gdb-7.7.ebuild
index 26b198034e7a..69255bcdc599 100644
--- a/sys-devel/gdb/gdb-7.7.ebuild
+++ b/sys-devel/gdb/gdb-7.7.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.7.ebuild,v 1.2 2014/03/08 23:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild,v 1.3 2014/03/08 23:59:24 vapier Exp $
 
 EAPI="4"
 
@@ -98,17 +98,18 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
-	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo \
-			--with-sysroot="${sysroot}" \
-			--includedir="${sysroot}/usr/include")
 		# Disable modules that are in a combined binutils/gdb tree. #490566
 		--disable-{binutils,etc,gas,gold,gprof,ld}
 	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+	)
 
 	if use server && ! use client ; then
 		# just configure+build in the gdbserver subdir to speed things up
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 13e471a68f63..ab725dbe355c 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.22 2014/03/08 23:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.23 2014/03/08 23:59:24 vapier Exp $
 
 EAPI="4"
 
@@ -98,17 +98,18 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
-	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo \
-			--with-sysroot="${sysroot}" \
-			--includedir="${sysroot}/usr/include")
 		# Disable modules that are in a combined binutils/gdb tree. #490566
 		--disable-{binutils,etc,gas,gold,gprof,ld}
 	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+	)
 
 	if use server && ! use client ; then
 		# just configure+build in the gdbserver subdir to speed things up