Add missing dependencies wrt #392301 by Fabian Henze <flyser42@gmx.de>. Drop old

(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

5 files changed, 19 insertions, 228 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 5fd148c9896f..6e544ce5c10e 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2011/10/13 17:52:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.33 2011/11/28 17:39:11 xarthisius Exp $
+
+  28 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -glusterfs-3.1.4-r1.ebuild, -glusterfs-3.2.3.ebuild, glusterfs-3.1.2.ebuild,
+  glusterfs-3.2.4.ebuild:
+  Add missing dependencies wrt #392301 by Fabian Henze <flyser42@gmx.de>. Drop
+  old
 
 *glusterfs-3.2.4 (13 Oct 2011)
 
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
index b51e58f7c22c..7eda6a07557b 100644
--- a/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.2.ebuild,v 1.4 2011/04/17 14:57:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.1.2.ebuild,v 1.5 2011/11/28 17:39:11 xarthisius Exp $
 
 EAPI="3"
 
@@ -15,10 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
 
-DEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( virtual/emacs )
 		fuse? ( >=sys-fs/fuse-2.7.0 )
 		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
 
 SITEFILE="50${PN}-mode-gentoo.el"
 
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.4-r1.ebuild
deleted file mode 100644
index 3cd616ae966a..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.1.4-r1.ebuild,v 1.1 2011/04/29 15:53:54 ultrabug Exp $
-
-EAPI="3"
-
-inherit autotools elisp-common eutils multilib versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-DEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
-		"${FILESDIR}/${PN}-docdir.patch" \
-		"${FILESDIR}/glusterd-workdir.patch"
-	sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake || die
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" || die
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim || die
-	fi
-
-	if use extras ; then
-		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die
-		newbin extras/backend-cleanup.sh glusterfs-backend-cleanup || die
-		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die
-		newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync || die
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die
-	newinitd "${FILESDIR}/glusterd.initd" glusterd || die
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die
-
-	keepdir /var/log/${PN} || die
-	keepdir /var/lib/glusterd || die
-}
-
-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
-	elog "For more information on how to mount exported GlusterFS filesystems visit:"
-	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
-	elog
-	elog "If you are upgrading from glusterfs 3.0.x please read:"
-	elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide"
-	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."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.3.ebuild
deleted file mode 100644
index 0f28602b2bee..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.2.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.3.ebuild,v 1.1 2011/08/31 15:16:39 alexxy Exp $
-
-EAPI=4
-
-inherit autotools elisp-common eutils multilib versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-DEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
-		"${FILESDIR}/${PN}-docdir.patch" \
-		"${FILESDIR}/glusterd-3.2.0-workdir.patch"
-	sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		--enable-georeplication \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim"
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim
-	fi
-
-	if use extras ; then
-		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize
-		newbin extras/backend-cleanup.sh glusterfs-backend-cleanup
-		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute
-		newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-}
-
-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."
-
-	if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then
-		elog
-		elog "You are upgrading from a previous version of ${PN}, please read:"
-		elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide"
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild
index e8bbd5f045ef..9e0bbfccaff6 100644
--- a/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2011/10/13 17:52:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.4.ebuild,v 1.2 2011/11/28 17:39:11 xarthisius Exp $
 
 EAPI=4
 
@@ -15,10 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
 
-DEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( virtual/emacs )
 		fuse? ( >=sys-fs/fuse-2.7.0 )
 		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
 
 SITEFILE="50${PN}-mode-gentoo.el"