diff options
author | Maciej Mrozowski <reavertm@gentoo.org> | 2011-09-12 22:26:15 +0000 |
---|---|---|
committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-09-12 22:26:15 +0000 |
commit | a591ac9012ebe9e785ff1628d3566028f8882eb5 (patch) | |
tree | de11299c30fd9b0c7c8600aa05689a2ad3bccd4f | |
parent | Version bump (diff) | |
download | gentoo-2-a591ac9012ebe9e785ff1628d3566028f8882eb5.tar.gz gentoo-2-a591ac9012ebe9e785ff1628d3566028f8882eb5.tar.bz2 gentoo-2-a591ac9012ebe9e785ff1628d3566028f8882eb5.zip |
Does not build against python3, bug 382579 - backport fix to older ebuilds as none works with python3.
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
-rw-r--r-- | dev-python/pycups/ChangeLog | 5 | ||||
-rw-r--r-- | dev-python/pycups/pycups-1.9.49.ebuild | 11 | ||||
-rw-r--r-- | dev-python/pycups/pycups-1.9.57.ebuild | 12 |
3 files changed, 18 insertions, 10 deletions
diff --git a/dev-python/pycups/ChangeLog b/dev-python/pycups/ChangeLog index 15dd25da4e48..2d23b9e0aab9 100644 --- a/dev-python/pycups/ChangeLog +++ b/dev-python/pycups/ChangeLog @@ -1,8 +1,9 @@ # ChangeLog for dev-python/pycups # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/ChangeLog,v 1.38 2011/09/12 22:12:30 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/ChangeLog,v 1.39 2011/09/12 22:26:15 reavertm Exp $ - 12 Sep 2011; Maciej Mrozowski <reavertm@gentoo.org> pycups-1.9.58.ebuild: + 12 Sep 2011; Maciej Mrozowski <reavertm@gentoo.org> pycups-1.9.58.ebuild, + pycups-1.9.49.ebuild, pycups-1.9.57.ebuild: Does not build against python3, bug 382579 06 Sep 2011; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml: diff --git a/dev-python/pycups/pycups-1.9.49.ebuild b/dev-python/pycups/pycups-1.9.49.ebuild index c005939230ea..2935d9f5a5af 100644 --- a/dev-python/pycups/pycups-1.9.49.ebuild +++ b/dev-python/pycups/pycups-1.9.49.ebuild @@ -1,12 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.49.ebuild,v 1.12 2011/01/27 16:38:40 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.49.ebuild,v 1.13 2011/09/12 22:26:15 reavertm Exp $ -EAPI="2" +EAPI="3" PYTHON_DEPEND="2:2.5" -RESTRICT_PYTHON_ABIS="2.4 3.* *-jython" -SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="*-jython" inherit distutils flag-o-matic DESCRIPTION="Python bindings for the CUPS API" @@ -25,6 +24,10 @@ DEPEND="${RDEPEND} doc? ( dev-python/epydoc ) " +pkg_setup() { + python_set_active_version 2 +} + src_compile() { append-cflags -DVERSION=\\\"${PV}\\\" distutils_src_compile diff --git a/dev-python/pycups/pycups-1.9.57.ebuild b/dev-python/pycups/pycups-1.9.57.ebuild index f9cc15df7c69..1e9f284b7813 100644 --- a/dev-python/pycups/pycups-1.9.57.ebuild +++ b/dev-python/pycups/pycups-1.9.57.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.57.ebuild,v 1.6 2011/08/10 21:03:44 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.57.ebuild,v 1.7 2011/09/12 22:26:15 reavertm Exp $ -EAPI="2" +EAPI="3" -RESTRICT_PYTHON_ABIS="3.* *-jython" -SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="2:2.5" +RESTRICT_PYTHON_ABIS="*-jython" inherit distutils flag-o-matic DESCRIPTION="Python bindings for the CUPS API" @@ -24,6 +24,10 @@ DEPEND="${RDEPEND} doc? ( dev-python/epydoc ) " +pkg_setup() { + python_set_active_version 2 +} + src_compile() { append-cflags -DVERSION=\\\"${PV}\\\" distutils_src_compile |