Convert python support to use python-single-r1 and allow python 2.7 and 3.3 versions #503852 by Nikoli.

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

4 files changed, 32 insertions, 47 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 77e09fa35b4f..0e316ab4984f 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,11 @@
 # 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.261 2014/03/08 23:59:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.262 2014/03/09 00:04:37 vapier Exp $
+
+  09 Mar 2014; Mike Frysinger <vapier@gentoo.org> gdb-7.7.ebuild,
+  gdb-9999.ebuild:
+  Convert python support to use python-single-r1 and allow python 2.7 and 3.3
+  versions #503852 by Nikoli.
 
   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 4a6eb9dc3464..b299cf7ffd7e 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -52,24 +52,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 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
+EBUILD gdb-7.7.ebuild 5519 SHA256 5d94ee1e223434a5d965d17071407a34d5bd74565c169eb59be6092c02ced413 SHA512 cbee3f81c3a551c70663f79ec59ac2e406b3f675ae010637dc8b6a49d0ee4b6fb991714ecf4d5a6066f7b48aca938bdc97c6505954e44d9e8877fe7fae189b26 WHIRLPOOL b57fcac7aa7fa8e906a6a4d9639b4ecff73f01d4c1614a3b7641993a8ba8673375387ee7b4abcddcb4586601d8f46dcb16e19386f86156fa1b08927a5b225d0e
+EBUILD gdb-9999.ebuild 5521 SHA256 7f67cf7223e21f4867c058cf9ecb0e2773c5bdcbd11350f087d669062e2f2dcc SHA512 0e2b41b555b356f65554436920a32bd7e973e02fa6fa7a1a6a4291c0b91357eea8f50965ff695897bc7702b7a8b495de0c85b4f2fd7f01b8b32e67a9b9798f40 WHIRLPOOL c8855c5d6ee9cdf1c448e20e656857f24c9757f28b0adfe236a9392875d2c7c2bcfb60d43fb56839c2f6a6556fde420f55cb152045ee3eb6950ef87b6bac36fc
+MISC ChangeLog 34819 SHA256 8a45f976e1788d19a5db3dc37906ff48fe57efaf581fabbfcb6d1259a52455f7 SHA512 c059020c5728b0319013ae5bc48110599979ec8e6167db2f4a72a9dc4aab358561507f267e3348f33436858de02e764fc49f9baabaccb21091d3037abac19a33 WHIRLPOOL 2e9468026c6151af4835116cc997fcdce58238c574804f13fcb023de07abb4036b36050eb987fbd0a054b0e728976ddf9c293e73aaaff9a0df3d4f4dcb732bdc
 MISC metadata.xml 621 SHA256 8d554d2b0ae3cf2e2f003434d507960b9c24b489a21fd14a92a789ce1880956f SHA512 709dc4c8a5d16851bf91c76887fb9da52d532a401646f4234edb159be6d0fd7d747e28afccb4436990279347c0e06203dc7003a3bf5fac2cf6ee78224e466c54 WHIRLPOOL 27573cea2d4e1484212ffcc845750de5f801c75214f3682f817dc6652d418ceeed11199a24d94cae682f45f7d9ba0c88a9c719c0cb7c6c1bb8fa8a64a7c9dd9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJTG7AbAAoJEPGu1DbS6WIAoKIQAIjObx1LIsE8/VcOR97OQarK
+rBml+PeSxVVd8jiA0UJ5e3/eGzCoctFzKmMlEz7yfVxmtFH0QqSEsSQUe28wIGRW
+CrCYR+wbuRttnBFx3SxRCd2pht00JrwDNbRxSyiiEmw0Sw0yCjX8eHUZ95aqCNFG
+2iP+g+jMHfDvOsqwqpSd6YYHM4hd27We393RrxjkaaYupCWP3LAdtglhlcwsb98F
+/0DLXM2Poir0TCsTAHBG5wUeWMTOPb4ABwJU/ZDYGGs5a3nFV2KXe8tjAz0Zjoie
+NKrc/n6Egm8qi0ZEO0fylqF3XHOznx3T+SZcm4FVeWNJvuq0z2R/uuhDZ0wWZDyC
+6DLQ+VPcRghCRrxOZ3WaVThvfU3GCeWONpLiR9VMFvVjCmHfK5WEsi3wXi6yH4r5
+tgQSg1ufltimLNxSgnHBxeHXmcxHs6cHWvIc7jP5NBgb4z5+GcdHTljc/3uWgLaA
+mB1UFyMadD1s5fpiRtSA87Yp7b7eiD3xPBH5B8AlLDav6GVsPc4azMHLkhDd0VaL
+C0EAybmSEjwZT0ibtpJxjDOSzsA/axeBtD71lKv+nj906QrRkJh7xZo751gxubU6
+xFP89p5yAk9rZwQg5rFohUGdAuqaNMh6XeH4mmVMP/E7BoaQBljvDQgMG+dbiqQU
+nvl0U/ztuHLFXd3pqxOl
+=M6zn
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.7.ebuild b/sys-devel/gdb/gdb-7.7.ebuild
index 69255bcdc599..d8ca55c4ac55 100644
--- a/sys-devel/gdb/gdb-7.7.ebuild
+++ b/sys-devel/gdb/gdb-7.7.ebuild
@@ -1,10 +1,11 @@
 # 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.3 2014/03/08 23:59:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild,v 1.4 2014/03/09 00:04:37 vapier Exp $
 
 EAPI="4"
+PYTHON_COMPAT=( python{2_7,3_3} )
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -59,7 +60,7 @@ RDEPEND="!dev-util/gdbserver
 	sys-libs/readline
 	expat? ( dev-libs/expat )
 	lzma? ( app-arch/xz-utils )
-	python? ( =dev-lang/python-2* )
+	python? ( ${PYTHON_DEPS} )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
@@ -73,17 +74,6 @@ src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	strip-linguas -u bfd/po opcodes/po
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# make sure we have a python-config that matches our install,
-		# such that the python check doesn't fail just because the
-		# gdb-provided copy isn't quite what our python installed
-		# version is
-		rm -f "${S}"/gdb/python/python-config.py || die
-		pushd "${S}"/gdb/python > /dev/null || die
-		ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \
-			python-config.py || die
-		popd > /dev/null || die
-	fi
 }
 
 gdb_branding() {
@@ -141,7 +131,7 @@ src_configure() {
 			$(use_with lzma)
 			$(use_enable nls)
 			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPREFIX}/usr/bin/python2")
+			$(use_with python python "${EPYTHON}")
 			$(use_with zlib)
 		)
 	fi
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index ab725dbe355c..14655f445118 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,10 +1,11 @@
 # 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.23 2014/03/08 23:59:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.24 2014/03/09 00:04:37 vapier Exp $
 
 EAPI="4"
+PYTHON_COMPAT=( python{2_7,3_3} )
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -59,7 +60,7 @@ RDEPEND="!dev-util/gdbserver
 	sys-libs/readline
 	expat? ( dev-libs/expat )
 	lzma? ( app-arch/xz-utils )
-	python? ( =dev-lang/python-2* )
+	python? ( ${PYTHON_DEPS} )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
@@ -73,17 +74,6 @@ src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	strip-linguas -u bfd/po opcodes/po
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# make sure we have a python-config that matches our install,
-		# such that the python check doesn't fail just because the
-		# gdb-provided copy isn't quite what our python installed
-		# version is
-		rm -f "${S}"/gdb/python/python-config.py || die
-		pushd "${S}"/gdb/python > /dev/null || die
-		ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \
-			python-config.py || die
-		popd > /dev/null || die
-	fi
 }
 
 gdb_branding() {
@@ -141,7 +131,7 @@ src_configure() {
 			$(use_with lzma)
 			$(use_enable nls)
 			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPREFIX}/usr/bin/python2")
+			$(use_with python python "${EPYTHON}")
 			$(use_with zlib)
 		)
 	fi