Fix by Jonathan Callen for USE=-python handling #504830.

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

4 files changed, 33 insertions, 19 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 0b75bfc19b80..2f7ab462bcdc 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.265 2014/03/14 06:11:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.266 2014/03/18 01:04:59 vapier Exp $
+
+  18 Mar 2014; Mike Frysinger <vapier@gentoo.org> gdb-7.7-r1.ebuild,
+  gdb-9999.ebuild:
+  Fix by Jonathan Callen for USE=-python handling #504830.
 
 *gdb-7.7-r1 (14 Mar 2014)
 
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 6d888f2756ab..67d78421e94d 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -53,24 +53,24 @@ EBUILD gdb-7.5.ebuild 5219 SHA256 eca11938053d160d0b75d022ef09ef13a8748b636bd4d1
 EBUILD gdb-7.6.1.ebuild 5759 SHA256 a4c7e54b8534d190b93a3d40a7d10b1c4d1b0ed5315f3d0b343d7dc57a2033ec SHA512 6dd367141ca3a7ab98a01630c6a77315989c6841da5deea0eb48aaebdc4216a0cccbdd6a90df531d39c49455d23813157bf2d0aeafbbda25c530660942e70a7f WHIRLPOOL f4fa0699f4af8a0ec66e1b8d59925bbbe410aa0cfb7455b1d8b2bafde620ae31eb662a1b81f43a7030df1e25facf93d5187444aff4fa435d09a5803319ed7825
 EBUILD gdb-7.6.2.ebuild 5756 SHA256 3698e937e7e47d6792d550964228d1c6743bd1faa9779b4d25825049d55ef0bf SHA512 b366da5b3a51c3fd04773df5a1f2964469b58d0fb20543de57296ec09a4edfd9a94a5e0073ed6bf961f092bfc4fafccee2dbd9150d17525f8e18b85de5aae4b0 WHIRLPOOL 7f2dc861e4648f4d54d7de0aac98285d28e2f3994118b5e5f13a028175d60f12a1c2753f5e598086b9aeb151e1de9a6ec7bb954f843b6a9dff6ba250af54245d
 EBUILD gdb-7.6.ebuild 5297 SHA256 a83e2c2c59000facce5e3871e886b36a4bff1a3e743c059195124e08789d0763 SHA512 82d30e8aeb0a6633e36e89fca3b02b40304023585fd820e6af08757dd49cde6fffe4edf385b0c5334fcd5ea6dc5f2e3a5bfcf29cae728d60e72624657b681e0c WHIRLPOOL cbf10d47d4ee0ffb7bd6aeed24bf8aa66eb28a18a4cf97a567d6fb5af352de68d50d7001ed0aa1ed31e19d7e1f981cff6aca1a6cf36f9d77f965e404a52bfde3
-EBUILD gdb-7.7-r1.ebuild 5536 SHA256 d5cd1a37edd7514d0c6d88d81e13c51946823383562ee0784ecd0e6c443eccee SHA512 0fd091bd006fb9f63399a4080bf89933c97039240963ff2625d7713b5255324e74393719affe35c8d55cb6d29e08ab8bbe8799e336c3c87b0cba5aa6c47746ec WHIRLPOOL 4408f2f7727e6c0ec29a486f4e976da682d76ab671cee109886de65e421f060e89795d28d28ad58b47462c465e279b9b6bffc3f0a936820b36c97a15e48b022e
-EBUILD gdb-9999.ebuild 5534 SHA256 94dda22ba874c4fa746c2d86831ba3fe3f59d6c158d5f890e9eb1b04140441a3 SHA512 2ce61f6b7ae4fcacbfc20811449bca4e7bb80f53c44a974bb0b602a6deb909e564b1b86beb864dec5473e3c6cc341646ab62313c4c071c474f5c946a9fff1c01 WHIRLPOOL 0314491bad3139bdbd52aad87d92db88dab77689732acd9f4c84faa70db19b65c42217153c070faf7dcfd73f995534f1af083329c502231077c5294be68d52b7
-MISC ChangeLog 35266 SHA256 4e6011b5161c0e76cb49457dcfbe1b366eb1234aa9a4077c32e863ce60db3e88 SHA512 ce14cb7af3caf3f86e030d919d89bdd8bde18fc2a6c56fa798c48d11965fc68c3766120430bbc78e7db6c0e6168691326cfc3d3bc4135384082cc07a0a766f5b WHIRLPOOL 91ea5a05f81fcd918507d0de5e8138a7362f4a362bf8ffd7f9fcc5a9dc5a6f6f419af2f508955832bebcf11b1448bbde4b201cb081fc718fa6117d02757f50c7
+EBUILD gdb-7.7-r1.ebuild 5645 SHA256 a7afd49e74c0878776cd1856cf69d40302b2f29bf987a63e245626b0340a05d9 SHA512 017be6ac96d37239381d8e854b991117a024d3f0192a0017fd86af098747c02d5b5a49872b11ec5e18acfd70584c6406fbd4ef7400e085a598d158ed4207c31b WHIRLPOOL e024932a627e0e093bb59691858b6f2f0bba77fce85f854569d065875b7ef035a28c5381d0b9be4378483753ce2d574ef11b48c3ce54adade534601ad9f36f70
+EBUILD gdb-9999.ebuild 5643 SHA256 02c011edadf3d9d5cdfda1d7f088cb38d0c581b5a1a4f25c3678f0e93f3208a0 SHA512 2c9a1a000e5ebc870d30662fa948dd72ac5b133777ff6d0ca56aaa3cf7597f9afda8bf1f2e09f7d24a32246f0a73799ffe3f19f5c5f24ecf6fb4c2bc7e6881f7 WHIRLPOOL dbcda0bfffadc69b67502604ae70406e12c0c472bcda4d4b9c0830dba4babd6250b748b8b3acd77c5a870bbbff0e7311281bdc9bf928c72ac127517d60253215
+MISC ChangeLog 35414 SHA256 4273dfe56a447ebf62792e42c31759acbb8a9be16c6811ca460f9946a80667e5 SHA512 c83dd9133aae9cdb79200b7d76b32a60e4be15f87fd8b3068e8b9811a622511280d9a061d94984099e0f3b56f92384406de8fbc57704e468553313bf2ee92f1c WHIRLPOOL 2bb42779dbedfe3b2273569de12f74c7819755b9cbde894561f2889ab3e4b2db9eb89af5eb5d6859e060f6b92f2e685a9adfd38ea716385ca9b175397c0087f5
 MISC metadata.xml 621 SHA256 8d554d2b0ae3cf2e2f003434d507960b9c24b489a21fd14a92a789ce1880956f SHA512 709dc4c8a5d16851bf91c76887fb9da52d532a401646f4234edb159be6d0fd7d747e28afccb4436990279347c0e06203dc7003a3bf5fac2cf6ee78224e466c54 WHIRLPOOL 27573cea2d4e1484212ffcc845750de5f801c75214f3682f817dc6652d418ceeed11199a24d94cae682f45f7d9ba0c88a9c719c0cb7c6c1bb8fa8a64a7c9dd9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIp2bAAoJEPGu1DbS6WIAfO0P/3SXh6FffdkemBWTwskWqLsu
-oCPiJC9mWV4BSAzK6CRSogTDPAI/WPa3HYuCfEJ0+fG0hVc9TFvD1eZ7RZYCUh0G
-lmmhdR06iwy0W4bTGpm1o1PGyHo8abuTVGeS3lJ2JXNN25WVes98+pk/4PBrcQ6k
-xWLi4JiM+cxVmBNcW8Kso48BlLROZtGxNyIUBL0qRk161aAU8sHhbmhMba2NlRUp
-EmON4SVEjx1ZlmiPP4v6AwnMMv3ZQsnkcigrYqPhI7Owx3hb7Nsh0JfZy3JwIRma
-oPM/HbECZqpkEptpiPULFeqFsVC2ohgodaM4CFYatnDUDd1S7v3+mfWLtO+solMW
-Y4HMe2MXkj5zeeJXFKJRQtsHAwGnJkkGMX7bUL4Z1rJZqdCKmEv/6UFFRjIn45Af
-9pKtKnmhFoWZl2l9nT3uLzKk/ereaDlpDmof4QUNv3qpWN0upaXJS+Y3ub2QHPf6
-Jqiea4w2lDF7JHYCkgaV2LIsOPJW1iQYmQEC2xFgxWVQQYvldX8kCqyAxEZIxepS
-8zFQLyEwtT8XTyJ1OYD6jnJwsNyYO6s2lN+tU+a4+uzO0ME3+ZjODrCEtD6Y1e7v
-RTpNvXAtfp7A873Y47Oute0sr+iJ4dlgH4dNliNt/GYMnpA0nlR1dYoJCjRvNn07
-KYqdoaAL6kZeREP84DCS
-=jmVc
+iQIcBAEBCAAGBQJTJ5vCAAoJEPGu1DbS6WIAoosP/1IfrsSWiX5jO6c8ULjSS07b
+9pWjzVHHPNBANeFejBuDdxYjWBrjEnUWbe3MnACdYIkzJZGWUIX2CRJgjmztW4Hh
+IZ55+lhabCRClWEYNezbavU0RhbtWBDTzy97iD0v5Aoi0qhd8xigjUixxJhpnT6D
+fCsiHWHrgZH60d9KbsYiwBGukCIV9WNdZqrKooeTl0+BkqQD8r9lSg202p0YNFmq
+ikafGNZglmJzR4WIsjNTDSzw+5HCV/KYlRTio0gFLiHn+3xEexaZYw95o+XfLcsh
+LKtHg/6rBbOFr0cwEFkb0cv+rGgRNnv1/vEtN9NPdPnjdOAiDPMklXOjdc4dWZB7
+zwKRxO7Zk/eIY25FL4Scj7GtZj/F/pAmFimonwXuQvbEUJ+Exdf52sfnZTnqZd1z
+AmSE5/EqlIGJkFS4v0no2z6Oe3kJUJEjZgNzLNcM/rN+wK5rl3oY7I6inYi4M3YH
+Mx2I9rIIM7ywBELbtUtvBLn3zIICa2VpKcUTphZBR6eVu9ZCaRTRh32YfQrOvTKy
+PCZjWzNZNgg6ZsCcft9Nbp2rl5RBqaDoNqKTs1gkKyvMNMk/kz0TI5f5fyZbCniv
+d42YFVwNWQgPidKivt3IU1lHkg2FxYhdDJtFtkgGZzqptIL6NkybCnCbG73bnfn0
+VBg3HXYt2sd8nFazAeui
+=OQQJ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.7-r1.ebuild b/sys-devel/gdb/gdb-7.7-r1.ebuild
index 6068c11e4123..e52bb37de318 100644
--- a/sys-devel/gdb/gdb-7.7-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.7-r1.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-r1.ebuild,v 1.1 2014/03/14 06:11:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7-r1.ebuild,v 1.2 2014/03/18 01:04:59 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -54,6 +54,7 @@ if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="!dev-util/gdbserver
 	>=sys-libs/ncurses-5.2-r2
@@ -70,6 +71,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index aec14c4ad5c8..907b6852abda 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.25 2014/03/14 05:52:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.26 2014/03/18 01:04:59 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -54,6 +54,7 @@ if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="!dev-util/gdbserver
 	>=sys-libs/ncurses-5.2-r2
@@ -70,6 +71,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch