From 76cba73c47c8694e74377004634daca18f2d9c08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Apr 2018 01:05:40 +0100 Subject: gentoo resync : 14.04.2018 --- sys-fs/multipath-tools/Manifest | 4 +- .../multipath-tools/multipath-tools-0.7.4.ebuild | 96 ---------------------- .../multipath-tools/multipath-tools-0.7.6.ebuild | 94 +++++++++++++++++++++ 3 files changed, 96 insertions(+), 98 deletions(-) delete mode 100644 sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild create mode 100644 sys-fs/multipath-tools/multipath-tools-0.7.6.ebuild (limited to 'sys-fs/multipath-tools') diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index e221d099d7d9..8f52d56d4dfb 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -8,10 +8,10 @@ AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6 AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11 DIST multipath-tools-0.5.0.tar.bz2 184024 BLAKE2B 1e1b0fdd52bf0aaea3ed281e0cd89d04aed58c03b9b42ac094173bebdf3b81e368d0c7efb23a8748d4598c99d1502fdf5f8b2c9b64a2be4ce7d6b30fa607984a SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea -DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254 DIST multipath-tools-0.7.5.tar.gz 367762 BLAKE2B de24d3d2b3b06638ba05465125422032044a779e8aa10d6c3aa62d2d4b12c9061c4ede7f03185ea9acb68a6f25d263362416c90076e8c1c1aa3ef8db3045fbdc SHA512 4808d0cea08558ba6c24ee4d12e1caf67603b124044e5c38a10471fb52b0e3ed898c4ca0f1ec01373fc316cd999277da47698968db2b352890c002bbf9e76746 +DIST multipath-tools-0.7.6.tar.gz 366278 BLAKE2B 1725bddf3174dc12c7635fa9d4c5e4c12f69b703b35079ef6a845e5b4997a9cc226f1cf96f2e50ba94cbae1f78f452800d033d629bced765c7c7e40747cc7a5c SHA512 87b8473152245bfb7fb0183ac91812bdac10c1d18c13687706c4a3a9488ee66da230c786c153a2207f6ba0412814e84851f1d17c0633dc9132f39634f058a5cc EBUILD multipath-tools-0.5.0-r1.ebuild 1728 BLAKE2B dd525f001463684fe5cb6ccbb112a658bcf02fcf94d672c44b3a9330bd275809486bbd3bd10e35a19185837b1bff349cfe037054e8e4d9fab5f87e7677e1a98c SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86 EBUILD multipath-tools-0.6.4-r1.ebuild 2533 BLAKE2B 5af1de5f156e9274f503e554bccd362e16d138ae52dae6984a5381377e3f4501682602dbd98987c817f8d00007a10d3ec7642a510f52d5582f6b6b5858b4d6e7 SHA512 d25c82d35f79567cb0ff05282743db33b62aa0540e60ae4e0dff6601273dea21d115fa69856ac976a1ec1ea43574a289155d15555123b8d39547e2832e763269 -EBUILD multipath-tools-0.7.4.ebuild 2253 BLAKE2B 0cf74d33ac951fbf2f906d35d9ab707320141d33977207a12f264a779011ea9c3b20bee7a02d4a43af42b6f87d228ffd2166f02fa99fd88cc2f563d33fff096d SHA512 72e5403c0c3869074b50d5d00d956b2582fcc297c1bc02cd61f3a2bc9ca57d228cd993499537d0b28d48ec712a43075bfb5e2033058ba71c3ed312572b08f0ab EBUILD multipath-tools-0.7.5.ebuild 2056 BLAKE2B d70ce245c7e4f2db669631414b7536402bd4844df5f583eaf5f320a6ea3cc2893b3aab16920e4afc946bcc1e379af78dbcb25d09bac91d6e829eb32fdb141d16 SHA512 e2c4c8c0a86fdb53dd79c492d3196b67bfb5c57c2ab1c14097b417bc07ab14b7c12a038f0b6b6967d1a8c57224792854fb18a8866e4b23f824842ef9b46e51ec +EBUILD multipath-tools-0.7.6.ebuild 2056 BLAKE2B d70ce245c7e4f2db669631414b7536402bd4844df5f583eaf5f320a6ea3cc2893b3aab16920e4afc946bcc1e379af78dbcb25d09bac91d6e829eb32fdb141d16 SHA512 e2c4c8c0a86fdb53dd79c492d3196b67bfb5c57c2ab1c14097b417bc07ab14b7c12a038f0b6b6967d1a8c57224792854fb18a8866e4b23f824842ef9b46e51ec MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134 diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild deleted file mode 100644 index 2a9e296b4f4f..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="systemd rbd" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu - >=sys-fs/lvm2-2.02.45 - >=virtual/udev-171 - sys-libs/readline:0= - rbd? ( sys-cluster/ceph ) - systemd? ( sys-apps/systemd ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( "${FILESDIR}"/${PN}-0.7.4-respect-flags.patch ) - -get_systemd_pv() { - use systemd && \ - $(tc-getPKG_CONFIG) --modversion systemd -} - -pkg_pretend() { - linux-info_pkg_setup -} - -pkg_setup() { - linux-info_pkg_setup -} - -src_prepare() { - default - - # Fix for bug #624884 - if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then - sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die - else - elog "DM_TABLE_STATE sed hack is no longer necessary." - fi - - # The upstream lacks any way to configure the build at present - # and ceph is a huge dependency, so we're using sed to make it - # optional until the upstream has a proer configure system - if ! use rbd ; then - sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile - sed -i -e "s/-lrados//" libmultipath/checkers/Makefile - fi -} - -src_compile() { - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - CC="$(tc-getCC)" \ - LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" -} - -src_install() { - dodir /sbin /usr/share/man/man{5,8} - emake \ - DESTDIR="${D}" \ - SYSTEMD=$(get_systemd_pv) \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='${prefix}'/"$(get_udevdir)" \ - install - - newinitd "${FILESDIR}"/rc-multipathd multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - einstalldocs -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.6.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.6.ebuild new file mode 100644 index 000000000000..60962fedf534 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.7.6.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=" + dev-libs/json-c:= + dev-libs/libaio + dev-libs/userspace-rcu + >=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +CONFIG_CHECK="~DM_MULTIPATH" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch ) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proper configure system + if ! use rbd ; then + sed \ + -e "s/libcheckrbd.so/# libcheckrbd.so/" \ + -e "s/-lrados//" \ + -i libmultipath/checkers/Makefile \ + || die + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} -- cgit v1.2.3