diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-01-26 03:40:12 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-01-26 03:40:12 +0000 |
| commit | a0e793eb237e92eed842076293190767b68d282d (patch) | |
| tree | 0f1500fde5972589a783f73f060c702662bf9fcd /dev-python | |
| parent | Set PYTHON_UPDATER_IGNORE to resolve bug 364273. Suggested by Arfrever. (diff) | |
| download | gentoo-2-a0e793eb237e92eed842076293190767b68d282d.tar.gz gentoo-2-a0e793eb237e92eed842076293190767b68d282d.tar.bz2 gentoo-2-a0e793eb237e92eed842076293190767b68d282d.zip | |
Support Python 3.1. Backported from Progress Overlay. Patch by Arfrever.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/dbus-python/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/dbus-python/dbus-python-1.0.0.ebuild | 27 |
2 files changed, 15 insertions, 17 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/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) } |