Call python_fix_shebang only when python_setup was called

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 23 insertions, 167 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 7b7f16d83de4..e0facfaf7245 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.49 2013/09/05 19:06:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.50 2013/10/16 12:20:01 xarthisius Exp $
+
+  16 Oct 2013; Kacper Kowalik <xarthisius@gentoo.org> -glusterfs-3.4.0.ebuild,
+  glusterfs-3.4.0-r1.ebuild:
+  Call python_fix_shebang only when python_setup was called
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> glusterfs-3.4.0-r1.ebuild,
   glusterfs-3.4.0.ebuild:
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index e5284a11d762..1b170b4a466f 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -31,26 +31,23 @@ EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d045420
 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5
 EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6
 EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924
-EBUILD glusterfs-3.4.0-r1.ebuild 4781 SHA256 7151a8960be6fc7c8d07d71fbd7fdb360fd6c20eeb031e4570a5a193b073b4be SHA512 3c9ea90a1afb49db833bfb0befac31fe3cc2f0e5b71b83d25b382648b548eb511de83b2db349602c41ddaea92c0c99b5b5aa9a38b7adc2d752669f458044f61b WHIRLPOOL ec635eba8016f861c7cdbbb3be637e5a111c477e5330bc027362fe79393a1f9539b5c1c90e604fcd1397b50357f4716ddd95cd1101ff260501b9788185c8c28c
-EBUILD glusterfs-3.4.0.ebuild 4590 SHA256 a2456d2ea00e4cf37c43dc5610d44d1acf645294961af759124a9eb89a5cd09f SHA512 d50726dbcd7f384c82166ebf4cd52c3b6c2e853cd6552fbb191a7a7783fc0d2ea5362fe78d27b61fd7c01636878e33b37593edfd5edc3e0e12f8c238eddee6b6 WHIRLPOOL a41028a8574aef158df8ca2593d141244cc852d0d619a2c9de1bbef5f8189676192fb278db21005a3d6874201f8aab01679f5c2c3bb7367f1d4b6aac16cca013
-MISC ChangeLog 9753 SHA256 e11b7c19beaadfbf63b282674d1d70f16b0e0eac02cead7877b955c8840674d8 SHA512 7d51f6cebf04879d299a6f633310f4d14ba8c75b4041f8f82f913de349a84c7de261d6a5e7a8c1bdd47671a7b20f05567f7b5c06789927615e1f81034a86a816 WHIRLPOOL cc31da35efd49f02a863ec040e5510cfac30c61373474fd4d57da34f557bf3525636c60c79e9626413199e585d74f38038489c01fcf9da809612d07e0ebc64e6
+EBUILD glusterfs-3.4.0-r1.ebuild 4807 SHA256 d139f9afdb9bbac0a266c4b8f23ca52ea44eaac238e52334ac53ac3ed964adf9 SHA512 6a20785b9fc54051eb21be72a46e91d26e6ee600868652c5fbc6a34eeecb46c20b639e7d4b09b589a240b9ad90a64f8834bb347de131aa063f0772c773d2febc WHIRLPOOL d7e39699cd19f4ed7d96588bc6192f85a5fa53a5b2dcb5bcfb48a1ab95ef1376ef773999c8edee49ea2adab57fed11d321b100e9ad39682feaf5c1cfdd90968e
+MISC ChangeLog 9926 SHA256 437af3f598b5dec3f49a7833779861818fce1da11aa2b30a1a839b68579044d9 SHA512 41d428b998b4c109a56182472927d546f25e58ae597c21a7d94efadc9fcb7401c3c989d49ba4f9056bae92112effc40c63205e137f0435cfad716d376f53f570 WHIRLPOOL 56a7069e99259ba4531d878241e953081190ff6550b33692c5a333a9610b70432337e8c2608a96a7da35e784f45f4bf1b40f2c1e712df727cf40e87c579247ab
 MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNZtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZ6MQANcuUXZeZg4hqtNFaBaqvUqg
-2iQYIpi8hU7sIYyKz1coGiSVGErJM9Oeu4hpZRT2JwxQ5IX6RrTIWz8PgWUUKVUd
-zU1UFfPXbCl2Cvk7Rhe9+0aIIGklJzjHvmYVzkupcDnvQR9ddnBnBLjeFf52AWz2
-Nv0BBgttocI/Z5kd4M1dHgMSxv3qVWKWvUR9unE1v46Xv2ZPdWfs5iuAvTzi9eNW
-tj6KO52ixZVBJNwpFMwlJleLMOWMPwEndRL6KZgKBK+/QZLXKC9wMs16cJgSVgU0
-QlKWcKuP2d540Y1mRU3V+g65wWBHqH0dH2lztNHLbJ26hv71oj0LB+0O9FU1HeS0
-ucmlRgh3dqfRZ5OKxUZ25qmgOYY5saOowkRuNQ5vpg1Z/E4VOlSYt89IfUfHGhHk
-0+UXPYu6tKZQ0gqr0uQ2xpDQHFGHyxFpaGJeE+SlfW/+hpt5tZoUBMEYnWh10Qjm
-KY49g8aaH2tSeEiGWGTVQ0WbisfMECfBCE5DHa6Dv566rZaN83VPRzvONc3l3MZW
-87pKOBKtSaRscLI0zVZzkzXizMPrKjon2NGkrTf3gpj6Y4ynlNwS/ZH1cZZv6zcQ
-mZPejduGlNgIKoitqiQRIwPHfBPpyK9co87FdR8p+t9QI3KihMoI14OOUZIxxu77
-lqgTANTDPs8MZCoYLQWW
-=FDhc
+iQIcBAEBCAAGBQJSXoRIAAoJEF0huFKJUZL5HvEQAJrRt01ycCypP9/iCQOieTxI
+70ouqvIdcmuyvCOo3IaDaMnQTJh5Eim3u0c7IzF79LyihSa28HV2869RjeapcTnZ
++nGLGjeXgB6McNP+2JBbjxN6He4792TVffxb3mN3xWgT/QP7kFtlJ9NXJKOodsb5
+9yCVbrVrEq8vXG94B+42U+9nNXCYGmZCXLLYglUpQx9T9oWzWym5RG3fRvaHsxuf
+9yoBJPWgUWxNfvy8vtKl5dTACNxVxwnX+F1ZNNO3cYDDG5pt3vsG5HLV6XYRJF6m
+vfJmNlw+7neWvFH/9TLAtrn5OyQHkDehvABOidPl7Pg55H38KJcj+1FgvVthbtMc
+uTsjXVWJd14K8XKTQK1dhWHL0AtVqG0E+7+OQRIkhK/5wn7wsw3n7kdXR6Cj4cPA
+ObCGkVt/e48H1CWnjQL9uIh5Yy7ipePJIgDElm7zUFdNsQRVypCkUGgS2/C3pR8B
+da3THaAhLFl9qdiqjjiqO8FOAOUe8EnbVBdfKc8oefMHM1tbYU9uLJ5BUpMw8xnf
+jaQauJbRT3hKOMwpuNJI+NtFM977PEjgSecP9SKxklAbCe8TdblXLE13siEmN526
+pS9oO0Jrh288B+iWc4OfTkyTsry5Gg8Hpt7fpwFTuuKJxJvXpSJ4zdWYOwQ1Usvf
+T6EUFVN8O3B29uVNrtE0
+=2n6X
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
index 57b09f6329e9..8e26e8e1e2bd 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.2 2013/09/05 19:06:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.3 2013/10/16 12:20:01 xarthisius Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ src_install() {
 	keepdir /var/log/${PN}
 	keepdir /var/lib/glusterd
 
-	python_fix_shebang "${ED}"
+	use georeplication && python_fix_shebang "${ED}"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild
deleted file mode 100644
index a51d0baa7a15..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild,v 1.2 2013/09/05 19:06:56 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
-	systemtap? ( dev-util/systemtap )
-	sys-libs/readline
-	dev-libs/libaio
-	dev-libs/libxml2
-	dev-libs/openssl
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
-	"${FILESDIR}/${PN}-3.4.0-parallel-build.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	 use georeplication && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator )
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication fuse-client)
-		$(use_enable infiniband ibverbs)
-		$(use_enable static-libs static)
-		$(use_enable systemtap)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
-	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	if use extras ; then
-		sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed"
-		for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do
-			newbin extras/${e}.sh ${PN}-${e}
-		done
-		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}