From 44f4f1abefb4d56fdb29d596b86ea01682df71b4 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Mon, 28 Nov 2011 17:39:11 +0000 Subject: [PATCH] Add missing dependencies wrt #392301 by Fabian Henze . Drop old Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- sys-cluster/glusterfs/ChangeLog | 8 +- sys-cluster/glusterfs/Manifest | 30 +++-- sys-cluster/glusterfs/glusterfs-3.1.2.ebuild | 9 +- .../glusterfs/glusterfs-3.1.4-r1.ebuild | 110 ----------------- sys-cluster/glusterfs/glusterfs-3.2.3.ebuild | 111 ------------------ sys-cluster/glusterfs/glusterfs-3.2.4.ebuild | 9 +- 6 files changed, 36 insertions(+), 241 deletions(-) delete mode 100644 sys-cluster/glusterfs/glusterfs-3.1.4-r1.ebuild delete mode 100644 sys-cluster/glusterfs/glusterfs-3.2.3.ebuild 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 + -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 . Drop + old *glusterfs-3.2.4 (13 Oct 2011) diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 7ed14d18eb8e..601c74a08d19 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d AUX glusterd-3.2.0-workdir.patch 1651 RMD160 9986cb7035cf62c1c38e74668c36d29ecb4d1ed4 SHA1 df422a386cbff7c463ceb4ac003fb6a22b0c2a46 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 @@ -11,21 +11,25 @@ AUX glusterfs.confd 129 RMD160 ba0a6f22452b70cb3a7eb6f3bdd2b06e7c441b04 SHA1 c83 AUX glusterfs.initd 3134 RMD160 6606d3c3ee825e1af9624d66f5a46e30270e73a3 SHA1 68fcfa5b64dc6b133036b645c64ba75a7afbc126 SHA256 ffa622d26add72dafc1b1f8e6de716b14a6d99911888a344dc7d236fb7667d6e AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa880c49a7bd1a0e185539acede53840b138746 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 DIST glusterfs-3.1.2.tar.gz 2086469 RMD160 f9e744ef999f82b70f173930f1f1cee96fe61e84 SHA1 ccae6965595abf8af881b736a3fe4873fc6b28e4 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 -DIST glusterfs-3.1.4.tar.gz 2173373 RMD160 dc7db013790dc2366f574e6e8a4fca6a67078cdc SHA1 1166063b4a3fa25927b16c88025cc1186c73f420 SHA256 a3d284e63b4d5fcbd1e8df99350b7254dd7e877476206a32f6b5877515f5fe04 -DIST glusterfs-3.2.3.tar.gz 2376000 RMD160 89d6a5f9c1362e1fe4d88e69465311069552d319 SHA1 7a36e496d9ac3fbf11123bb42884445334d07f06 SHA256 19255e42968b5eb04bbd0669e19aeb0c87eb984e7cc04d593b2626c32ca53434 DIST glusterfs-3.2.4.tar.gz 2386706 RMD160 15c2a6407d8c9bf799c8adcf8c3f8540b1c8ecfb SHA1 7102ce8ea497cad61844d60e5b374869fa51da02 SHA256 8a30fb1fa4aa3d745521b1667e40b9bc8404ced99e519992d8c18a3c883dafb5 -EBUILD glusterfs-3.1.2.ebuild 3593 RMD160 e2c6261ee2c4118112f850d1b282c2e1863d1b8e SHA1 8918ee77e65bbab8b587753fb1421b2b94262918 SHA256 73c6236936f64983d3b115d878a207d42ab8836e2b110f23ce15b3c2f4e07424 -EBUILD glusterfs-3.1.4-r1.ebuild 3689 RMD160 6b670b27fe0b82c7723219a5f86841b693a62c48 SHA1 d97db4606d2da820f7a59c3b9df03f4d402fed4a SHA256 6b52f755d94a08ff66828248ae3d53c8c65f75443ec7184e0453148a3901c803 -EBUILD glusterfs-3.2.3.ebuild 3517 RMD160 095f9986aea02fd5425a43b0d336e60d6e4a9450 SHA1 9373e4e4fe0434ee1454147bb9a17ad3a66b6674 SHA256 63bf1880f62d5140133bb93f7176b0cd5a8c17e218bde0d9036f5adb987d9665 -EBUILD glusterfs-3.2.4.ebuild 3521 RMD160 ef40bfd46b2cbcabd1c36a615a987a9ebac290fa SHA1 70f0eaba497a4ce49f3a2f86ad6957319ff6f4b5 SHA256 85699673aff29ab5ee6fd452fcbcbc258c4f335654d3d6fa560acad8a3d1109b -MISC ChangeLog 5709 RMD160 3b30464f616856e35540c0a9393a75ee1809fa8a SHA1 9e26cde6c059fe5da47572246ef410b6c0e9cb07 SHA256 767239608e7afe02a4d9b5c9ac15dae14920cb21e23dc87429eaf181d8c5788d +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 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk6XJYUACgkQIiMqcbOVdxTnIAP9GGDnZIbdQR3prLG+tQuJ/G0C -MnnvRfzyzpYxhthzI3rsdyEI4kHWDKfiRwF/G/tLqwmn7Wwf7n8lOEElCj2Lbk3X -KxBVLLuKqsUXVMrSx1CcEePWn24mlz2mGAYolhPF97HdcvSj+lyG9Fn36POYcvjL -L6OcO/ZgXc+f+votxxo= -=H+y3 +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 -----END PGP SIGNATURE----- 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" -- 2.26.2