commit: 75bc6a33728394d3341a0b0abd8875d1adb6775a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 10:35:49 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 10:35:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bc6a33
sys-fs/multipath-tools: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/multipath-tools/Manifest | 1 -
.../files/multipath-tools-0.5.0-makefile.patch | 200 ---------------------
.../multipath-tools-0.5.0-systemd-pkgconfig.patch | 24 ---
.../multipath-tools-0.5.0-r1.ebuild | 65 -------
4 files changed, 290 deletions(-)
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 9fd04cc7c00..fd21d742f18 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,3 @@
-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.8.tar.gz 415900 BLAKE2B
04c237e91f8e56484603d5b5ec7504da6be1caf9564d21a9fa4be7268fbb88089b8446c959b57f859eb9696f39cbb82bffdcd3d0a6716da6487bedd5c18c0d8b
SHA512
500a51f9e8c5cc0ad04cc69c39f657e8058a08750d506b447c4a1131ad7308d43de19d79e98fa8254c56cd7eb1e832c8ccbc439ce94054db7eeebcdf2bf225cb
DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B
29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379
SHA512
6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
b/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
deleted file mode 100644
index 691b138731f..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- multipath-tools-0.5.0/kpartx/Makefile
-+++ multipath-tools-0.5.0/kpartx/Makefile
-@@ -12,7 +12,7 @@
- CFLAGS += -DLIBDM_API_COOKIE
- endif
-
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
- gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -20,8 +20,7 @@
- all: $(EXEC)
-
- $(EXEC): $(OBJS)
-- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
-- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
-
- install: $(EXEC) $(EXEC).8
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -29,14 +28,15 @@
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
-- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+ $(INSTALL_PROGRAM) -m 644 kpartx.rules
$(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
-- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
-
- uninstall:
- rm -f $(DESTDIR)$(bindir)/$(EXEC)
-- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- rm -f $(DESTDIR)$(libudevdir)/kpartx_id
-+ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
-
- clean:
-- rm -f core *.o $(EXEC) *.gz
-+ rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/libmpathpersist/Makefile
-+++ multipath-tools-0.5.0/libmpathpersist/Makefile
-@@ -22,8 +22,6 @@
- $(CC) -Wall -fPIC -c $(CFLAGS) *.c
- $(CC) -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
- ln -s $(LIBS) $(DEVLIB)
-- $(GZIP) mpath_persistent_reserve_in.3 >
mpath_persistent_reserve_in.3.gz
-- $(GZIP) mpath_persistent_reserve_out.3 >
mpath_persistent_reserve_out.3.gz
-
- install: $(LIBS)
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-@@ -31,19 +29,17 @@
- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/
-- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/
-- ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
-- install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
-- install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
-- install -m 644 mpath_persist.h $(DESTDIR)/usr/include/
-+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3
$(DESTDIR)$(man3dir)
-+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3
$(DESTDIR)$(man3dir)
-+ $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)/usr/include/
-
- uninstall:
- rm -f $(DESTDIR)$(syslibdir)/$(LIBS)
-- rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz
-- rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz
-+ rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3
-+ rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3
-
- clean:
- rm -f core *.a *.o
- rm -f libmpathpersist.so.0
- rm -f libmpathpersist.so
-- rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz
-+ rm -f mpath_persistent_reserve_in.3 mpath_persistent_reserve_out.3
---- multipath-tools-0.5.0/Makefile.inc
-+++ multipath-tools-0.5.0/Makefile.inc
-@@ -48,8 +48,8 @@
- RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
-fstack-protector --param=ssp-buffer-size=4
- endif
-
--OPTFLAGS = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes
--CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
-
- %.o: %.c
---- multipath-tools-0.5.0/mpathpersist/Makefile
-+++ multipath-tools-0.5.0/mpathpersist/Makefile
-@@ -13,18 +13,17 @@
-
- $(EXEC): $(OBJS)
- $(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS)
-- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
-
- install:
- install -d $(DESTDIR)$(bindir)
- install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- install -d $(DESTDIR)$(mandir)
-- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
-
- clean:
- rm -f *.o $(EXEC)
-- rm -f mpathpersist.8.gz
-+ rm -f mpathpersist.8
-
- uninstall:
- rm $(DESTDIR)$(bindir)/$(EXEC)
-- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+ rm $(DESTDIR)$(mandir)/$(EXEC).8
---- multipath-tools-0.5.0/multipath/Makefile
-+++ multipath-tools-0.5.0/multipath/Makefile
-@@ -7,29 +7,27 @@
- OBJS = main.o
-
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
-+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
-
- EXEC = multipath
-
- all: $(EXEC)
-
- $(EXEC): $(OBJS)
-- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
-- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
-- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
-
- install:
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
-- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
-- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
-
- uninstall:
- rm $(DESTDIR)$(bindir)/$(EXEC)
-- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+ rm $(DESTDIR)$(mandir)/$(EXEC).8
-+ rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5
-
- clean:
-- rm -f core *.o $(EXEC) *.gz
-+ rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/multipathd/Makefile
-+++ multipath-tools-0.5.0/multipathd/Makefile
-@@ -9,11 +9,11 @@
- ifdef SYSTEMD
- CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
- endif
--LDFLAGS += -lpthread -ldevmapper -lreadline
-+LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
-- LDFLAGS += -lsystemd-daemon
-+ LIBS += -lsystemd-daemon
- endif
--LDFLAGS += -ludev -ldl \
-+LIBS += -ludev -ldl \
- -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
-
- #
-@@ -35,8 +35,7 @@
- all : $(EXEC)
-
- $(EXEC): $(OBJS)
-- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC)
-- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
-
- install:
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -48,15 +47,15 @@
- $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
-- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
-
- uninstall:
- rm -f $(DESTDIR)$(bindir)/$(EXEC)
- rm -f $(DESTDIR)$(rcdir)/$(EXEC)
-- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- rm -f $(DESTDIR)$(unitdir)/$(EXEC).service
- rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket
-
- clean:
-- rm -f core *.o $(EXEC) *.gz
-+ rm -f core *.o $(EXEC)
-
diff --git
a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
b/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
deleted file mode 100644
index d75f841361a..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru multipath-tools-0.5.0/libmultipath/Makefile
multipath-tools-0.5.0-modified/libmultipath/Makefile
---- multipath-tools-0.5.0/libmultipath/Makefile 2013-12-17
22:40:41.000000000 +0100
-+++ multipath-tools-0.5.0-modified/libmultipath/Makefile 2014-03-07
04:03:45.963309627 +0100
-@@ -9,7 +9,7 @@
- LIBS = $(DEVLIB).$(SONAME)
- LIBDEPS = -lpthread -ldl -ldevmapper -ludev
- ifdef SYSTEMD
-- LIBDEPS += -lsystemd-daemon
-+ LIBDEPS += $(shell pkg-config --libs libsystemd 2>/dev/null ||
pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
-
- OBJS = memory.o parser.o vector.o devmapper.o callout.o \
-diff -ru multipath-tools-0.5.0/multipathd/Makefile
multipath-tools-0.5.0-modified/multipathd/Makefile
---- multipath-tools-0.5.0/multipathd/Makefile 2014-03-07 04:05:09.340307633
+0100
-+++ multipath-tools-0.5.0-modified/multipathd/Makefile 2014-03-07
04:04:03.555309206 +0100
-@@ -11,7 +11,7 @@
- endif
- LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
-- LIBS += -lsystemd-daemon
-+ LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config
--libs libsystemd-daemon 2>/dev/null)
- endif
- LIBS += -ludev -ldl \
- -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
diff --git a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
b/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
deleted file mode 100644
index 0edaad0c284..00000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils systemd toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/";
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="systemd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
- >=virtual/udev-171
- dev-libs/libaio
- sys-libs/readline
- systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- epatch "${FILESDIR}"/${P}-systemd-pkgconfig.patch
- epatch_user
-}
-
-src_compile() {
- # LIBDM_API_FLUSH involves grepping files in /usr/include,
- # so force the test to go the way we want #411337.
- emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "")
-}
-
-src_install() {
- local udevdir="$(get_udevdir)"
-
- dodir /sbin /usr/share/man/man8
- emake \
- DESTDIR="${D}" \
- SYSTEMD=$(usex systemd 1 "") \
- unitdir="$(systemd_get_unitdir)" \
- libudevdir='${prefix}'/"${udevdir}" \
- install
-
- insinto /etc
- newins "${S}"/multipath.conf.annotated multipath.conf
- # /etc/udev is reserved for user modified rules!
- mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
- fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
- newinitd "${FILESDIR}"/rc-multipathd multipathd
- newinitd "${FILESDIR}"/multipath.rc multipath
-
- dodoc multipath.conf.* AUTHOR ChangeLog FAQ
- docinto kpartx
- dodoc kpartx/ChangeLog kpartx/README
-}
-
-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
-}
