Improve Python-related code, patch by arfrever, bug 317035

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 16 insertions, 17 deletions

diff --git a/x11-proto/xcb-proto/ChangeLog b/x11-proto/xcb-proto/ChangeLog
index 50efa0e40140..c0a5947bcf32 100644
--- a/x11-proto/xcb-proto/ChangeLog
+++ b/x11-proto/xcb-proto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-proto/xcb-proto
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.44 2010/04/18 19:51:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.45 2010/04/25 14:57:01 chithanh Exp $
+
+  25 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xcb-proto-1.6.ebuild:
+  Improve Python-related code, patch by arfrever, bug 317035
 
   18 Apr 2010; Markus Meier <maekke@gentoo.org> xcb-proto-1.6.ebuild:
   arm stable, bug #308521
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index 341b149060e5..75e5d19b625a 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xcb-proto-1.5.tar.bz2 89241 RMD160 cdf1537134432a32be588b60f15a83d1b40e8cf4 SHA1 c3f93ba6b75635c1e9d1accdfa7907f43a0e986f SHA256 0cf35b258e8f32773bcbd397ef3aca3ee6cac152260c99d2bd851488884c4638
 DIST xcb-proto-1.6.tar.bz2 92829 RMD160 61ffea8c3ab4b745f04eccc10c64f7f1c356692c SHA1 e82418557c7f59f29da9ec18e0906d6d78e3a164 SHA256 f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2
 EBUILD xcb-proto-1.5.ebuild 620 RMD160 4b6144280f29ba09f9f6ff9ea577027edcef7d47 SHA1 a3fe03f10803723b27d90acd607715efa610fd82 SHA256 60e9d349ec97028d6ade79990057d8d34f3e4a1db8d35ce6e9d224d88fd35014
-EBUILD xcb-proto-1.6.ebuild 776 RMD160 b551ce745eb491fc54177c5ae92dd08b3006f3b8 SHA1 3523b89d0d9e6a84f434cf24a504b2dbd99be9e5 SHA256 f64447014e66020cc240dd6526822a75d34c49adde88ad1c1ba8fc63fa1c3f74
-MISC ChangeLog 5310 RMD160 634f6b33d98193b256eabe089d90661841cc24b4 SHA1 fe50dd68ba5b091db5fadffd6b06bfbf6832f36b SHA256 0086a095775c6e3f701c66032c35f4f452122dd473191013609dffa7ebb86401
+EBUILD xcb-proto-1.6.ebuild 831 RMD160 a61f78c5fdff70ad8d5a8cf8496bec7a59b1f0ed SHA1 7a277a975e5e7a2f22153a50835445045d98fb02 SHA256 8f1b9cea41c99f24d7d0a4cd8b590afc8f579e31582a5c5c772c6372b10d24a1
+MISC ChangeLog 5467 RMD160 c54ab490429257ec79c62d18480e5cbd974e761f SHA1 efb1ce9a3f13418478f2355e92a6ba381dd30b39 SHA256 9b092e93d2b1eb9a59a5678c91803b6328fc0bc398eca183aaf64316400064ab
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvLYnIACgkQkKaRLQcq0GI47wCdF1snAEaZ2JXWBW4DSTUpjYQq
-bYwAn2O3JFv0XtziWOjVlM4YTv56JyrP
-=nXM2
------END PGP SIGNATURE-----
diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.ebuild b/x11-proto/xcb-proto/xcb-proto-1.6.ebuild
index 4ba7bff4bf1a..e26b157ff407 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.6.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.6.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.6.ebuild,v 1.6 2010/04/18 19:51:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.6.ebuild,v 1.7 2010/04/25 14:57:01 chithanh Exp $
 
-inherit x-modular
+PYTHON_DEPEND="2:2.5"
+
+inherit python x-modular
 
 DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="http://xcb.freedesktop.org/"
@@ -15,5 +17,8 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	>=dev-lang/python-2.5"
+	dev-libs/libxml2"
+
+pkg_setup() {
+	python_set_active_version 2
+}