Force python2 usage. Should resolve bug 372689. Patch by Ian Delaney.

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

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 6e544ce5c10e513c3a273e3a61dd22afb168380c..b3bb7c28957e5ba3fc03cefd6d7f111732539f37 100644 (file)
--- 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/Manifest b/sys-cluster/glusterfs/Manifest
index 601c74a08d192394ec51f0e241d05877bf1331e6..13e7539ac934a80cf76f608aad05bc51edc94695 100644 (file)
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -13,23 +13,13 @@ AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa88
 DIST glusterfs-3.1.2.tar.gz 2086469 RMD160 f9e744ef999f82b70f173930f1f1cee96fe61e84 SHA1 ccae6965595abf8af881b736a3fe4873fc6b28e4 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838
 DIST glusterfs-3.2.4.tar.gz 2386706 RMD160 15c2a6407d8c9bf799c8adcf8c3f8540b1c8ecfb SHA1 7102ce8ea497cad61844d60e5b374869fa51da02 SHA256 8a30fb1fa4aa3d745521b1667e40b9bc8404ced99e519992d8c18a3c883dafb5
 EBUILD glusterfs-3.1.2.ebuild 3652 RMD160 ff4adc4517cbe293d61edf2e72cf8ab690229d44 SHA1 6e850fc8894da152512ee49ae9f70fe2e0375702 SHA256 c7c607c87492fe366f805eaad997d30debd0062a668dede08c8d5749cb594836
-EBUILD glusterfs-3.2.4.ebuild 3575 RMD160 c13635fc05c2ab2f06f892788c0af1538b401500 SHA1 542c3206c2f9ff313c5881d23ccd88151e1b3229 SHA256 6f4a35a99a5687fd33eaa96c903b2cb74b884334275ba4b46c12044da0df5d19
-MISC ChangeLog 5954 RMD160 0a9e750892d684df6efefd68cfe2f541f7847b7a SHA1 e33688ecfbdf1d1de0be0c974f34de40108f0887 SHA256 9fc2721bf47c5b463d12153716e5b7f1ebb4a086aab8fe6733cc76ced4106216
+EBUILD glusterfs-3.2.4.ebuild 3700 RMD160 0cbf0736bff357371d10c2fe23a096b663a9feda SHA1 7c00eae0c809938921389b38c7a1f2b6a11b68fa SHA256 1737e4caddc2306769316a3836dfdc4380944d44ae15dadae4f504b1cc50df88
+MISC ChangeLog 6097 RMD160 c0288e8120629619bc9f550b05b0294022f9c5d5 SHA1 8270ec52b53f9f43eee441c209ee5e8dce4a8240 SHA256 2a45a08e630186f5ec54022be00597256778e1f5b4824d4555c7a972f416b532
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO08dJAAoJEF0huFKJUZL5Ry0P/AkybH6Iq26GpT0gFQXOE1SF
-vB57WM5hhiQG4JWQyG0t7NASqw4kvau0MoNtCV0a7YEl75FDAi5UXG6wEDnmGesl
-Ytk4QBWpyfKyHYVhnl4Py3/yCKXYqpYgE+41dUSvt9+7r2aiqI80rzz+9hdehKLi
-vJ7Pa3nuF6wot7iuC4TWHSv/GFKKH6pQWsDOeDAXuBGfPKDBrKY7VPg6oUQYOPJE
-WDDRuCHBLYNcXMI6kmXwAZyQSMAkbhKXFYsLEVlgc8uiuUM8SnmII/OerA7YSSR0
-be+ZDJZE3rEWl3oNaN+CD8PvM3Dyr3Fcvs4sJcMmAAtft3b/7w7a2vrRqeZ5hv4z
-VnH/RBUuxC35vHAi5fRoE71tiLz2VNOKb/yzfi2fuZ4Qeaangkmns/3aXjDej2kP
-fC+DGFrw0qiBGzC0E4wtvXYMsfUIqJa8ylYDkjJyk4g9lzO2KrsKvqJeO365Xi29
-zQpVaWCw31LFkSbYcDDW6SiG9j9l4oFfFcx3O835Th5SQlXKcSNWujpTW06VIGfG
-tGi59FjKokLoQ47SMCn2fxxaWRhEPuCBPT3JVPRcEtfRVEu1UBbjZmhbZ7oUAWt1
-2euyzXOc7wZgGJx2ZgkwFMfBGkKPQWcJPTzWf+0+FC7cLzftRTmbZe8Xy78iybVl
-gGX6nB5lUPIXy5yQ4aMj
-=a2YV
+iF4EAREIAAYFAk7xnGYACgkQC77qH+pIQ6TRhgEAhn+theU8VLm+eqMVb3wbF3Zj
+ffmxLhMWFzEvBudOKvAA/RTkmjgAJsstN7rn+dbDnjvPdlhZxsA/lzN+tBqr9eaj
+=XbQ7
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild
index 9e0bbfccaff602fa76ff2687049a59272e4c6bc2..0e7554ce6d50896cf3a32219dc3cc3044f49df62 100644 (file)
--- 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() {