Support Python 3.1. Backported from Progress Overlay. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 22 insertions, 28 deletions

diff --git a/dev-python/dbus-python/ChangeLog b/dev-python/dbus-python/ChangeLog
index 2e0cf5e8f409..83de767585a7 100644
--- a/dev-python/dbus-python/ChangeLog
+++ b/dev-python/dbus-python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/dbus-python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.80 2012/01/25 21:07:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.81 2012/01/26 03:40:12 floppym Exp $
+
+  26 Jan 2012; Mike Gilbert <floppym@gentoo.org> dbus-python-1.0.0.ebuild:
+  Support Python 3.1. Backported from Progress Overlay. Patch by Arfrever.
 
 *dbus-python-1.0.0 (25 Jan 2012)
 
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index cc1d908bc4e0..e6cf70f36f0c 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dbus-python-0.83.1-workaround-broken-test.patch 1030 RMD160 e908c3e017fadd43d41495fa42208ee78978a37f SHA1 787792be628ce7aa6faf3278a384bcbd79470e3f SHA256 5d864bf189f991587585a7f152748c9e4db5dabe2a02dd099ffd8c49357de214
 DIST dbus-python-0.83.2.tar.gz 539838 RMD160 937946fc736d0555d08eb46074c807244cffcc6a SHA1 b01d54be646d6f903e497c2ecd612027fe595339 SHA256 883729c98f40790021e3be0f7028ae863ee1c4a7b922a5578c1342592adfff64
@@ -7,17 +7,13 @@ DIST dbus-python-0.84.0.tar.gz 563906 RMD160 ec5912e28e49e89ff3f9a3a5a05292c27f1
 DIST dbus-python-1.0.0.tar.gz 583532 RMD160 08f348e557aad118f01f88aa98b30b1f62252eeb SHA1 96e1abe10769931cd8c640e359e695c1a99286d8 SHA256 9e46f97d739dde8a5ab33ec6b11da58794c4c20804aacdad2880b7d3bc05187a
 EBUILD dbus-python-0.83.2.ebuild 1837 RMD160 17f6723dcb4c27f110a9e9f2ccc3e0b8c8236eee SHA1 acb8fc41159a62dd9c01e75750be30fab63119d1 SHA256 53c7efb00fb3bbd6b3e1777312f795c1bb1ead9d81c2a27cac94693e48d2e3e4
 EBUILD dbus-python-0.84.0.ebuild 2072 RMD160 7f4e3a17fd4ca035d4ad8935b8ec87c5ba490519 SHA1 3b5a26da7cd10cc015c54a5a003d73dbc1c999dc SHA256 feda557eaa5329e9b7e1bc7ee26b9cec98bb883c8268932384f862330ab03a05
-EBUILD dbus-python-1.0.0.ebuild 1949 RMD160 d5f0e6fc540fb92b66ce3b2a73d6f2906d17c7e7 SHA1 9017ddd44b42648f94b88177314363bbb89ce3d8 SHA256 3c0e63d0b78e82441d04256a67e4f2e892844d6b8be62b21b20fbc742f2ca81f
-MISC ChangeLog 9487 RMD160 9c3e775401539e24e35d0b50f45aa755ea306cc8 SHA1 3435ffd601110376487c3b9a64ece43feed1072e SHA256 b68188184fb4b5eab823c866ae0e8cb141d7ed578b3a83cb088ebe4d50931978
+EBUILD dbus-python-1.0.0.ebuild 1879 RMD160 7398b7dfd49212e2eb9a0108a448bce894733967 SHA1 603a8045a9f16d0627289cceb4455b9e7b16bf90 SHA256 42379b92a3adc9b5077fda406479c0e355736c846593c471a76af6da4314f860
+MISC ChangeLog 9636 RMD160 f72bac137f008f0254373f13f31954014da59aae SHA1 0923a3c83fd53828c33ec8527c0aad686c4f8bf6 SHA256 20a1396d987a03168ee6e2f9c0f40cd6d0979ce2592cdb63999780c6df176177
 MISC metadata.xml 266 RMD160 f086994faf87d2bbf3277845d79cf73c548df9e1 SHA1 3dda97a00f9b430e8e0e2a25ed36eb297a13a1d3 SHA256 e5ee15ce411096c6f86f26b190db892b26308354b657d47f8de58bde613bb7d2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPIHANAAoJEEdUh39IaPFNln8IAJwnivxLM/I7o2KRfK3Vt6M8
-Kw90uoa7kiCCV72QGMExq/hQ0XdtAenr/yBNXGbuY+ITgVXGODAPEK4j8pTKuh7O
-59rUjm+fd/8J8thn+ZprMrsu+9jSk6661Z3RaJ9EuqiJjrMIGlnfgss2W9P2lEBJ
-TKPeIbuN5ezlE/+axu6TNbWP1kcfJ8h2hxi9/FCCOVxI/50HkMroenxerYnzyUjw
-tGEjqOG/9c/PZ5GapsphN8l/z4fXpXcSAwA8e1K364WRtSPncMoQVTcE/9DUsGUb
-bKXEwcvl5Ym6DRCfGJtFpxpXq6xzOdgoeemrRJIGsnmby4CcYon09Jz4pTvoJVU=
-=plkM
+iF4EAREIAAYFAk8gyyIACgkQC77qH+pIQ6T/kgEAxZBE4IIIQNemxV9QSeZ9HAKz
+58tTSAZuOxUT9g0LYvwA/3gcOJZ8XC60iNvih6wmhtphY93NsCOC/mG6TYGfLb/3
+=HZL+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dbus-python/dbus-python-1.0.0.ebuild b/dev-python/dbus-python/dbus-python-1.0.0.ebuild
index c6d742b1ac39..90b08c48cf43 100644
--- a/dev-python/dbus-python/dbus-python-1.0.0.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.0.0.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.0.0.ebuild,v 1.3 2012/01/25 21:14:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.0.0.ebuild,v 1.4 2012/01/26 03:40:12 floppym Exp $
 
-EAPI=4
-
-PYTHON_DEPEND="2:2.6 3:3.2"
+EAPI="4"
+PYTHON_DEPEND="2:2.6 3"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.1 *-jython *-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.4 2.5 3.0 3.1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython *-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
 inherit python
@@ -21,31 +19,28 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
-RDEPEND=">=dev-libs/dbus-glib-0.98
-	>=sys-apps/dbus-1.4.16"
+RDEPEND=">=dev-libs/dbus-glib-0.70
+	>=sys-apps/dbus-1.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( =dev-python/epydoc-3* )
 	test? (
 		dev-python/pygobject:2
 		dev-python/pygobject:3
-		)"
+	)"
 
 src_prepare() {
-	# Disable compiling of .pyc files.
-	>py-compile
-
-	# Simple sed to avoid an eautoreconf
-	# bug #363679, https://bugs.freedesktop.org/show_bug.cgi?id=43735
-	sed -i -e 's/\(RST2HTMLFLAGS=\)$/\1--input-encoding=UTF-8/' configure || die
+	# Fix tests with Python 3.1.
+	sed -e 's/if sys.version_info\[:2\] >= (2, 7):/if sys.version_info[:2] == (2, 7) or sys.version_info[:2] >= (3, 2):/' -i test/test-standalone.py || die "sed failed"
 
+	python_clean_py-compile_files
 	python_src_prepare
 }
 
 src_configure() {
 	configuration() {
 		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 			--disable-html-docs \
 			$(use_enable doc api-docs)
 	}