diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2011-12-21 08:44:17 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2011-12-21 08:44:17 +0000 |
| commit | 765c8ee1b1955a19477365af2d420e14f0fa5a55 (patch) | |
| tree | c144c5a42c1c36182477b09de9a4affa0249af35 | |
| parent | x86 stable wrt bug #394017 (diff) | |
| download | gentoo-2-765c8ee1b1955a19477365af2d420e14f0fa5a55.tar.gz gentoo-2-765c8ee1b1955a19477365af2d420e14f0fa5a55.tar.bz2 gentoo-2-765c8ee1b1955a19477365af2d420e14f0fa5a55.zip | |
Force python2 usage. Should resolve bug 372689. Patch by Ian Delaney.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
| -rw-r--r-- | sys-cluster/glusterfs/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-cluster/glusterfs/glusterfs-3.2.4.ebuild | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog index 6e544ce5c10e..b3bb7c28957e 100644 --- a/sys-cluster/glusterfs/ChangeLog +++ b/sys-cluster/glusterfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/glusterfs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.33 2011/11/28 17:39:11 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.34 2011/12/21 08:44:17 floppym Exp $ + + 21 Dec 2011; Mike Gilbert <floppym@gentoo.org> glusterfs-3.2.4.ebuild: + Force python2 usage. Should resolve bug 372689. Patch by Ian Delaney. 28 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> -glusterfs-3.1.4-r1.ebuild, -glusterfs-3.2.3.ebuild, glusterfs-3.1.2.ebuild, diff --git a/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild index 9e0bbfccaff6..0e7554ce6d50 100644 --- a/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild +++ b/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild,v 1.2 2011/11/28 17:39:11 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild,v 1.3 2011/12/21 08:44:17 floppym Exp $ EAPI=4 -inherit autotools elisp-common eutils multilib versionator +PYTHON_DEPEND="2" +inherit autotools elisp-common eutils multilib python versionator DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" HOMEPAGE="http://www.gluster.org/" @@ -25,6 +26,11 @@ DEPEND="${RDEPEND} SITEFILE="50${PN}-mode-gentoo.el" +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_prepare() { epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \ "${FILESDIR}/${PN}-docdir.patch" \ @@ -79,6 +85,8 @@ src_install() { keepdir /var/log/${PN} keepdir /var/lib/glusterd + + python_convert_shebangs -r 2 "${ED}" } pkg_postinst() { |