From 0dd66c233c9b1b476853457b21b6cea9fd31c108 Mon Sep 17 00:00:00 2001 From: Alexys Jacob Date: Mon, 21 Mar 2011 14:43:05 +0000 Subject: fix build using extras USE flag, drop old. (Portage version: 2.1.9.43/cvs/Linux x86_64) --- sys-cluster/glusterfs/ChangeLog | 8 +- sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild | 110 ++++++++++++++++++++++++ sys-cluster/glusterfs/glusterfs-3.1.3.ebuild | 109 ----------------------- 3 files changed, 117 insertions(+), 110 deletions(-) create mode 100644 sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild delete mode 100644 sys-cluster/glusterfs/glusterfs-3.1.3.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog index 332a8d7c7eb6..345041247c99 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.22 2011/03/21 11:40:06 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.23 2011/03/21 14:43:05 ultrabug Exp $ + +*glusterfs-3.1.3-r1 (21 Mar 2011) + + 21 Mar 2011; Ultrabug -glusterfs-3.1.3.ebuild, + +glusterfs-3.1.3-r1.ebuild: + fix build using extras USE flag, drop old. 21 Mar 2011; Markos Chandras glusterfs-3.1.2.ebuild: Stable on amd64 wrt bug #359143 diff --git a/sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild new file mode 100644 index 000000000000..8bc1ddb4c807 --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild @@ -0,0 +1,110 @@ +# 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.3-r1.ebuild,v 1.1 2011/03/21 14:43:05 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" 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.1.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.3.ebuild deleted file mode 100644 index 6ebed3cb4278..000000000000 --- a/sys-cluster/glusterfs/glusterfs-3.1.3.ebuild +++ /dev/null @@ -1,109 +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.3.ebuild,v 1.2 2011/03/18 15:53:42 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" 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/volgen/glusterfs-volgen glusterfs-volgen || die - newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die - newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || 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 -} -- cgit v1.2.3-65-gdbad