diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-16 16:37:07 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-16 16:37:07 +0000 |
| commit | 23051b7245aea62b98f813da82555adfde44de8a (patch) | |
| tree | 7e4b1df43dfb31863e5f6355e6290ce079f2cf35 /dev-util | |
| parent | Stable for amd64, wrt bug #440872 (diff) | |
| download | gentoo-2-23051b7245aea62b98f813da82555adfde44de8a.tar.gz gentoo-2-23051b7245aea62b98f813da82555adfde44de8a.tar.bz2 gentoo-2-23051b7245aea62b98f813da82555adfde44de8a.zip | |
Fix py3 crasher by restricting py3. Fixes bug#443514.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/osc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/osc/osc-0.136.0.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/osc/osc-9999.ebuild | 10 |
3 files changed, 21 insertions, 5 deletions
diff --git a/dev-util/osc/ChangeLog b/dev-util/osc/ChangeLog index d0bd28272088..1ccee8133e64 100644 --- a/dev-util/osc/ChangeLog +++ b/dev-util/osc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/osc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.7 2012/11/15 21:05:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/ChangeLog,v 1.8 2012/11/16 16:37:07 scarabeus Exp $ + + 16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> osc-0.136.0.ebuild, + osc-9999.ebuild: + Fix py3 crasher by restricting py3. Fixes bug#443514. 15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> osc-0.136.0.ebuild, osc-9999.ebuild: diff --git a/dev-util/osc/osc-0.136.0.ebuild b/dev-util/osc/osc-0.136.0.ebuild index b06bae47a256..2f7b45ef81c0 100644 --- a/dev-util/osc/osc-0.136.0.ebuild +++ b/dev-util/osc/osc-0.136.0.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.136.0.ebuild,v 1.3 2012/11/15 21:05:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.136.0.ebuild,v 1.4 2012/11/16 16:37:07 scarabeus Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://github.com/openSUSE/osc.git" +PYTHON_DEPEND="2:2.6" if [[ "${PV}" == "9999" ]]; then EXTRA_ECLASS="git-2" @@ -37,6 +38,11 @@ RDEPEND="${DEPEND} dev-util/obs-service-meta " +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_install() { distutils_src_install dosym osc-wrapper.py /usr/bin/osc diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild index c1640c2259ce..ca0b5dbc5e13 100644 --- a/dev-util/osc/osc-9999.ebuild +++ b/dev-util/osc/osc-9999.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.5 2012/11/15 21:05:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.6 2012/11/16 16:37:07 scarabeus Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://github.com/openSUSE/osc.git" +PYTHON_DEPEND="2:2.6" if [[ "${PV}" == "9999" ]]; then EXTRA_ECLASS="git-2" @@ -37,6 +38,11 @@ RDEPEND="${DEPEND} dev-util/obs-service-meta " +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_install() { distutils_src_install dosym osc-wrapper.py /usr/bin/osc |