From: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Date: Sun, 25 Apr 2010 14:56:02 +0000 (+0000)
Subject: Improve Python-related code, patch by arfrever, bug 316995
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d212b550388c2576fde5736b263bd75c9e87a6f7;p=gentoo.git

Improve Python-related code, patch by arfrever, bug 316995
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
index d181e6a5898f..4e44df882580 100644
--- a/x11-libs/libxcb/ChangeLog
+++ b/x11-libs/libxcb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxcb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.57 2010/04/20 21:06:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.58 2010/04/25 14:56:02 chithanh Exp $
+
+  25 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  libxcb-1.6.ebuild:
+  Improve Python-related code, patch by arfrever, bug 316995
 
 *libxcb-1.6 (20 Apr 2010)
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index c54a2cefecba..98ecb2977f4d 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -4,6 +4,6 @@ DIST libxcb-1.5.tar.bz2 333760 RMD160 ef50acaf3961ab6b988b97eac3b30ce940b0668a S
 DIST libxcb-1.6.tar.bz2 317321 RMD160 44b885490e91d225eeeaa5862c9b8cc439b0e8a3 SHA1 b0a6fec4c02ec876f32bbd4b64ffe8a25f0da518 SHA256 1ae6c81774a4637e90879d50db9017a2cc6c3f524e1baedc63ba72d44cad2936
 EBUILD libxcb-1.4-r1.ebuild 1663 RMD160 b153257f2b1570685083d0eabe9d62213a22df7e SHA1 6cab667e3229afd7cf1380e0771380d14c5833bb SHA256 104c247d93d11f2d99760c0aeac89a5804e883383275e10ed9f52aa7d575c3da
 EBUILD libxcb-1.5.ebuild 880 RMD160 86d0be38f10a0e375089473e561305942c819ead SHA1 9490961e0fb9cf8588f1e5d37673d4908c7ba71b SHA256 359c86481405e74f1153fbf0584055147e5ecdff437fdd881f62b1d16dc91f17
-EBUILD libxcb-1.6.ebuild 898 RMD160 ae828f1900168e18bfb77cef8aba042fda6ac632 SHA1 394a9acd3d0433e545eb5f81f9a9ea5442235677 SHA256 f16f7cbc381367ba42bb18ef2b2f905bd0c239f7b42d611bc3a00e0c7a8fcce9
-MISC ChangeLog 6876 RMD160 f1770ef6c4368391f0ed2536649b87cd36c97283 SHA1 7d5780dc3dc6b64bb2e60f716d49aca1ead1cae9 SHA256 889c377e5d9bf270b507010bbe188200fb7c5f7a24f0363d9c6c7ba4201899cc
+EBUILD libxcb-1.6.ebuild 933 RMD160 f1679d01c29bf97474c6eeab01a45557621fef54 SHA1 8bfd71897d198b7a282dab2eee75d799d9dc8e57 SHA256 cb44069c3791ee04556611b1994925fa776aa4d050e98ebeea14e03f870dc87c
+MISC ChangeLog 7028 RMD160 07f59fe73eef29fadf6e910483b9af0926348ac7 SHA1 a0bb59c9df1e05843265df19e88bbe883c2dd146 SHA256 08c858318da764456eecbb8b4432d92e120ea9c1486a98ab689dde4d62e46351
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libxcb/libxcb-1.6.ebuild b/x11-libs/libxcb/libxcb-1.6.ebuild
index 71a760a64b71..ce20ca17a22c 100644
--- a/x11-libs/libxcb/libxcb-1.6.ebuild
+++ b/x11-libs/libxcb/libxcb-1.6.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.6.ebuild,v 1.1 2010/04/20 21:06:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.6.ebuild,v 1.2 2010/04/25 14:56:02 chithanh Exp $
 
 EAPI=3
-inherit xorg-2
+
+inherit python xorg-2
 
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="http://xcb.freedesktop.org/"
@@ -21,9 +22,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-libs/libxslt
 	>=x11-proto/xcb-proto-1.6
-	>=dev-lang/python-2.5[xml]"
+	=dev-lang/python-2*[xml]"
 
 pkg_setup() {
+	python_set_active_version 2
 	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="$(use_enable doc build-docs)
 		$(use_enable selinux)