Clean up build system and fix path in init.d #149308 by Jiri Tyr.

(Portage version: 2.1.2_pre1-r1)

5 files changed, 232 insertions, 4 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index a2e38c6ad2d1..ac97d0513023 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/multipath-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.12 2006/05/22 10:16:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.13 2006/09/28 08:55:06 vapier Exp $
+
+*multipath-tools-0.4.7-r1 (28 Sep 2006)
+
+  28 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/multipath-tools-0.4.7-build.patch, files/rc-multipathd,
+  +multipath-tools-0.4.7-r1.ebuild:
+  Clean up build system and fix path in init.d #149308 by Jiri Tyr.
 
 *multipath-tools-0.4.7 (22 May 2006)
 
diff --git a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.7-r1 b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.7-r1
new file mode 100644
index 000000000000..57225a5b6b98
--- /dev/null
+++ b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.7-r1
@@ -0,0 +1,3 @@
+MD5 0a7574f0dd85f2b50f6aff91d83633ad multipath-tools-0.4.7.tar.bz2 139312
+RMD160 b9ecd84e01e03fe631e9ee9953ea7dbadb04c01d multipath-tools-0.4.7.tar.bz2 139312
+SHA256 1b48684c9ce956bb2294640a92f1da8ddea4e991e4d7b974697660de5e44a9d7 multipath-tools-0.4.7.tar.bz2 139312
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.7-build.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.7-build.patch
new file mode 100644
index 000000000000..423c8624aefa
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.7-build.patch
@@ -0,0 +1,163 @@
+ - respect CFLAGS
+ - respect LDFLAGS
+ - dont strip
+ - dont compress manpages
+
+--- multipath-tools-0.4.7/devmap_name/Makefile
++++ multipath-tools-0.4.7/devmap_name/Makefile
+@@ -12,3 +12,3 @@
+ else
+-	LDFLAGS = -ldevmapper
++	LDFLAGS += -ldevmapper
+ endif
+@@ -24,3 +24,2 @@
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+@@ -28,3 +27,2 @@
+ 	$(CC) -static -o $(EXEC) $(OBJS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+@@ -32,5 +30,5 @@
+ 	install -d $(DESTDIR)$(bindir)
+-	install -s -m 755 $(EXEC) $(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)
+ 
+--- multipath-tools-0.4.7/kpartx/Makefile
++++ multipath-tools-0.4.7/kpartx/Makefile
+@@ -15,3 +15,3 @@
+ else
+-	LDFLAGS = -ldevmapper
++	LDFLAGS += -ldevmapper
+ 	OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o \
+@@ -29,3 +29,2 @@
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 	
+@@ -33,3 +32,2 @@
+ 	$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+@@ -40,5 +38,5 @@
+ 	install -d $(DESTDIR)$(bindir)
+-	install -s -m 755 $(EXEC) $(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)
+ 
+--- multipath-tools-0.4.7/libmultipath/Makefile
++++ multipath-tools-0.4.7/libmultipath/Makefile
+@@ -8,3 +8,3 @@
+ 
+-CFLAGS = -I$(checkersdir)
++CFLAGS += -I$(checkersdir)
+ 
+--- multipath-tools-0.4.7/Makefile.inc
++++ multipath-tools-0.4.7/Makefile.inc
+@@ -35,4 +35,4 @@
+ 
+-OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
+-CFLAGS	     = $(OPTFLAGS)
++OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
++CFLAGS	     += $(OPTFLAGS)
+ 
+--- multipath-tools-0.4.7/multipath/Makefile
++++ multipath-tools-0.4.7/multipath/Makefile
+@@ -27,3 +27,2 @@
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+@@ -31,3 +30,2 @@
+ 	$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+@@ -41,10 +39,10 @@
+ 	install -d $(DESTDIR)$(bindir)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 	install -d $(DESTDIR)/etc/udev/rules.d
+-	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
++	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
+ 	install -d $(DESTDIR)$(mandir)
+-	install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+ uninstall:
+-	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
++	rm $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
+ 	rm $(DESTDIR)$(bindir)/$(EXEC)
+--- multipath-tools-0.4.7/multipathd/Makefile
++++ multipath-tools-0.4.7/multipathd/Makefile
+@@ -9,3 +9,3 @@
+ CFLAGS += -DDAEMON -I$(multipathdir) -I$(checkersdir)
+-LDFLAGS = -lpthread -ldevmapper -lsysfs -lreadline -lncurses
++LDFLAGS += -lpthread -ldevmapper -lsysfs -lreadline -lncurses
+ 
+@@ -37,3 +37,2 @@
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+@@ -47,6 +46,6 @@
+ 	install -d $(DESTDIR)$(bindir)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)
+ 	install -d $(DESTDIR)$(rcdir)
+ 	install -d $(DESTDIR)$(mandir)
+-	install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+--- multipath-tools-0.4.7/path_priority/pp_alua/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_alua/Makefile
+@@ -37,5 +37,5 @@
+ 
+-install: $(BUILD) $(EXEC).8.gz
+-	$(INSTALL) -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(INSTALL) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)/$(EXEC).8.gz
++install: $(BUILD) $(EXEC).8
++	$(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++	$(INSTALL) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/$(EXEC).8
+ 
+--- multipath-tools-0.4.7/path_priority/pp_balance_units/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_balance_units/Makefile
+@@ -15,3 +15,3 @@
+ 	CFLAGS += -I$(multipathdir) -DDEBUG=$(DEBUG)
+-	LDFLAGS = -ldevmapper
++	LDFLAGS += -ldevmapper
+ 	OBJS = pp_balance_units.o $(MULTIPATHLIB)-$(BUILD).a
+@@ -37,3 +37,3 @@
+ 	install -d $(DESTDIR)$(bindir)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 
+--- multipath-tools-0.4.7/path_priority/pp_emc/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_emc/Makefile
+@@ -16,3 +16,3 @@
+ install: $(EXEC)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ 
+--- multipath-tools-0.4.7/path_priority/pp_netapp/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_netapp/Makefile
+@@ -16,3 +16,3 @@
+ install: $(EXEC)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ 
+--- multipath-tools-0.4.7/path_priority/pp_random/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_random/Makefile
+@@ -16,3 +16,3 @@
+ install: $(EXEC)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ 
+--- multipath-tools-0.4.7/path_priority/pp_tpc/Makefile
++++ multipath-tools-0.4.7/path_priority/pp_tpc/Makefile
+@@ -16,3 +16,3 @@
+ install: $(EXEC)
+-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
++	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ 
diff --git a/sys-fs/multipath-tools/files/rc-multipathd b/sys-fs/multipath-tools/files/rc-multipathd
index d13b236455bb..8c39bcb19726 100644
--- a/sys-fs/multipath-tools/files/rc-multipathd
+++ b/sys-fs/multipath-tools/files/rc-multipathd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/files/rc-multipathd,v 1.2 2005/02/21 15:10:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/files/rc-multipathd,v 1.3 2006/09/28 08:55:06 vapier Exp $
 
 depend() {
 	need localmount
@@ -9,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting multipathd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/multipathd
+	start-stop-daemon --start --quiet --exec /sbin/multipathd
 	eend $?
 }
 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..e83068c43aa6
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild,v 1.1 2006/09/28 08:55:06 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/wiki/wakka.php?wiki=Home"
+SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-fs/device-mapper-1.00.19
+	sys-fs/udev
+	sys-fs/sysfsutils"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	emake -j1 CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man8
+	make DESTDIR="${D}" install || die "install failed"
+
+	insinto /etc
+	newins "${S}"/multipath.conf.annotated multipath.conf
+	fperms 644 /etc/udev/rules.d/40-multipath.rules
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+
+	dodoc AUTHOR ChangeLog FAQ README TODO
+	docinto dmadm; dodoc README
+	docinto kpartx; dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# The dev.d script was previously wrong and is now removed (the udev rules
+	# file does the job instead), but it won't be removed from live systems due
+	# to cfgprotect.
+	# This should help out a little...
+	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
+		mkdir -p "${D}"/etc/dev.d/block
+		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/40-multipath.rules" \
+			> "${D}"/etc/dev.d/block/multipath.dev
+	fi
+}