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

Package-Manager: portage-2.1.2_pre1-r1

6 files changed, 256 insertions, 43 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/Manifest b/sys-fs/multipath-tools/Manifest
index 03dd7c6f33a9..bd20f9e300b5 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,49 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX multipath-tools-0.4.6.1-udev-rules.patch 469 RMD160 486a10aa8e5f930bfc0ddabf6153d667de978d67 SHA1 75efc8d0ae3baad00744d01bbd533eb5c86df82a SHA256 916a389699324f6bee303febfe105a2e73f6e3c6d9f15f2f0a44c7de06d1bfab
-MD5 03c2a26ee058b1f021538b1b34fa3d91 files/multipath-tools-0.4.6.1-udev-rules.patch 469
-RMD160 486a10aa8e5f930bfc0ddabf6153d667de978d67 files/multipath-tools-0.4.6.1-udev-rules.patch 469
-SHA256 916a389699324f6bee303febfe105a2e73f6e3c6d9f15f2f0a44c7de06d1bfab files/multipath-tools-0.4.6.1-udev-rules.patch 469
-AUX rc-multipathd 503 RMD160 dd089ece6f315da56b6f685f0b3c027ed80c09ad SHA1 ec6e77f59691fea48069029d82158b45b3e6e791 SHA256 97cd9172034f9fd5cc12e63984df69687945847d57129bad6af0b7ad11d3a9d0
-MD5 7cd2431a33f3bd590b824e48243b53dc files/rc-multipathd 503
-RMD160 dd089ece6f315da56b6f685f0b3c027ed80c09ad files/rc-multipathd 503
-SHA256 97cd9172034f9fd5cc12e63984df69687945847d57129bad6af0b7ad11d3a9d0 files/rc-multipathd 503
-DIST multipath-tools-0.4.6.1.tar.bz2 138759 RMD160 ba3dba34ca93d6d4deac7d65faf3ed1c37c082a0 SHA256 72bbf5eb7a6cc81ef2fbff04d3f7c873bb2dbaad8b520f3b5df287d6a33898d8
-DIST multipath-tools-0.4.7.tar.bz2 139312 RMD160 b9ecd84e01e03fe631e9ee9953ea7dbadb04c01d SHA256 1b48684c9ce956bb2294640a92f1da8ddea4e991e4d7b974697660de5e44a9d7
-EBUILD multipath-tools-0.4.6.1-r1.ebuild 1775 RMD160 872cfb7a7b45915b06ed04ed99bb282df645f088 SHA1 cfd316954c0dc02b0b2c23f796b2334c3e054000 SHA256 ff76415d1cdbcb4cbf90cb7018c88421c1b9414974d30776a57508fb3cf50f7f
-MD5 44def5072b3f477f3061f437b71424db multipath-tools-0.4.6.1-r1.ebuild 1775
-RMD160 872cfb7a7b45915b06ed04ed99bb282df645f088 multipath-tools-0.4.6.1-r1.ebuild 1775
-SHA256 ff76415d1cdbcb4cbf90cb7018c88421c1b9414974d30776a57508fb3cf50f7f multipath-tools-0.4.6.1-r1.ebuild 1775
-EBUILD multipath-tools-0.4.6.1.ebuild 1667 RMD160 5c6cce2e919042054a25808e940e632ce285ab4b SHA1 15c02dfea57153b19384275286f0febc71324bbe SHA256 cb376a62369032d168f0a29b8eb5b6501ae169be20686bff66bd6608aa643b81
-MD5 78f233ca871b17e2d5a08def242bcb09 multipath-tools-0.4.6.1.ebuild 1667
-RMD160 5c6cce2e919042054a25808e940e632ce285ab4b multipath-tools-0.4.6.1.ebuild 1667
-SHA256 cb376a62369032d168f0a29b8eb5b6501ae169be20686bff66bd6608aa643b81 multipath-tools-0.4.6.1.ebuild 1667
-EBUILD multipath-tools-0.4.7.ebuild 1672 RMD160 3504d02fd54e8858bd0e6fc0c39e546d615b2966 SHA1 1e345e31582d63bb806fa0de05fc5799daf3c588 SHA256 bc232faaf2032ee5f8eeeae0d8a9e527b3c5703267ab353b021197ee9520bd5e
-MD5 1e7547b4661c3cca7fabb3c1d7e7cb5f multipath-tools-0.4.7.ebuild 1672
-RMD160 3504d02fd54e8858bd0e6fc0c39e546d615b2966 multipath-tools-0.4.7.ebuild 1672
-SHA256 bc232faaf2032ee5f8eeeae0d8a9e527b3c5703267ab353b021197ee9520bd5e multipath-tools-0.4.7.ebuild 1672
-MISC ChangeLog 2155 RMD160 be8717149b1208fd8e74008655fed0f7c9e7848d SHA1 1a1f5a8852378baa03fd2436ca6ebc0b89f04f43 SHA256 9d0b95ccfed1cf30443de91041b41b4b3ced4366ff7366606a8e38d7d87e4546
-MD5 f19dd3b3fe1ca07c54813e269a92daa8 ChangeLog 2155
-RMD160 be8717149b1208fd8e74008655fed0f7c9e7848d ChangeLog 2155
-SHA256 9d0b95ccfed1cf30443de91041b41b4b3ced4366ff7366606a8e38d7d87e4546 ChangeLog 2155
+AUX multipath-tools-0.4.7-build.patch 5389 RMD160 aedc8321511402f951a9bf8534f7d82ec718f7b8 SHA1 6209e90c5964e030f15fc8c9474032bc1965d4bc SHA256 f03657968ce0db5b7502f1eba89570a9ec38396939d234aa08972e3906174fe0
+MD5 a2e4b84dc88a8269d4f15477c1dcbf22 files/multipath-tools-0.4.7-build.patch 5389
+RMD160 aedc8321511402f951a9bf8534f7d82ec718f7b8 files/multipath-tools-0.4.7-build.patch 5389
+SHA256 f03657968ce0db5b7502f1eba89570a9ec38396939d234aa08972e3906174fe0 files/multipath-tools-0.4.7-build.patch 5389
+AUX rc-multipathd 499 RMD160 e241726f9e584a959dc357910b85a91c0b1a9fb8 SHA1 c2409ea510a7f32ad88211e6f89d5c6f7785bf57 SHA256 4b29f5e8e2da89f47dc903fc0e14c24c57f87b94bc194caef6bc2b300b10bce6
+MD5 9126bdd73ba2ada366ee7180450a1a58 files/rc-multipathd 499
+RMD160 e241726f9e584a959dc357910b85a91c0b1a9fb8 files/rc-multipathd 499
+SHA256 4b29f5e8e2da89f47dc903fc0e14c24c57f87b94bc194caef6bc2b300b10bce6 files/rc-multipathd 499
+DIST multipath-tools-0.4.7.tar.bz2 139312 RMD160 b9ecd84e01e03fe631e9ee9953ea7dbadb04c01d SHA1 c78e53ec5934180e37f376348d5ef5db790f3689 SHA256 1b48684c9ce956bb2294640a92f1da8ddea4e991e4d7b974697660de5e44a9d7
+EBUILD multipath-tools-0.4.7-r1.ebuild 1588 RMD160 a9661a850dc935efb19549c05716a2913c602b99 SHA1 2026a7c940317964d97a40695ea9b6329abee0b8 SHA256 ee1e8d69a3f80df481cc440bec59334d9e9408d0e3152da0c569660ad61149fb
+MD5 b8cf82c06212d3b0555a62a8896d7cd2 multipath-tools-0.4.7-r1.ebuild 1588
+RMD160 a9661a850dc935efb19549c05716a2913c602b99 multipath-tools-0.4.7-r1.ebuild 1588
+SHA256 ee1e8d69a3f80df481cc440bec59334d9e9408d0e3152da0c569660ad61149fb multipath-tools-0.4.7-r1.ebuild 1588
+MISC ChangeLog 2416 RMD160 c663bf77d21cf67db13232942156145f354f191c SHA1 69c0a8159d52d84e248fe18db9b19aab0616cefc SHA256 470a3f82b0273ecc100b599c3189550f6ef49ec1fa8216e34781a9e144723887
+MD5 45f7f1daa8f1ea01fd8ea980d8450de1 ChangeLog 2416
+RMD160 c663bf77d21cf67db13232942156145f354f191c ChangeLog 2416
+SHA256 470a3f82b0273ecc100b599c3189550f6ef49ec1fa8216e34781a9e144723887 ChangeLog 2416
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 3c87ecbe3c1d31b45aa83798b203a8f2 files/digest-multipath-tools-0.4.6.1 274
-RMD160 f92fb520ee2743dc3cf8c5fb30976aa06984f230 files/digest-multipath-tools-0.4.6.1 274
-SHA256 705d114d3a513522c085ca2fe5716bb91559d4e332538748f8011869a6f87c49 files/digest-multipath-tools-0.4.6.1 274
-MD5 3c87ecbe3c1d31b45aa83798b203a8f2 files/digest-multipath-tools-0.4.6.1-r1 274
-RMD160 f92fb520ee2743dc3cf8c5fb30976aa06984f230 files/digest-multipath-tools-0.4.6.1-r1 274
-SHA256 705d114d3a513522c085ca2fe5716bb91559d4e332538748f8011869a6f87c49 files/digest-multipath-tools-0.4.6.1-r1 274
-MD5 89106fb0c6e5705700bdf79e981b3588 files/digest-multipath-tools-0.4.7 268
-RMD160 79e1107d6e6fec7f68eb14a77b08bc78f15cd381 files/digest-multipath-tools-0.4.7 268
-SHA256 76b875dc5cb844d2224dafb9b9389b30c6ca09edf7f7549fb1c8767e25b18a01 files/digest-multipath-tools-0.4.7 268
+MD5 89106fb0c6e5705700bdf79e981b3588 files/digest-multipath-tools-0.4.7-r1 268
+RMD160 79e1107d6e6fec7f68eb14a77b08bc78f15cd381 files/digest-multipath-tools-0.4.7-r1 268
+SHA256 76b875dc5cb844d2224dafb9b9389b30c6ca09edf7f7549fb1c8767e25b18a01 files/digest-multipath-tools-0.4.7-r1 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEcZHZ1ZcsMnZjRyIRAlVVAKCPx0bo4AiT3VcjHbbKiaFFCrOK2ACghiev
-KZnn2GK9suMZ90TOa6RBqfQ=
-=bOTU
+iD8DBQFFG44EamhnQswr0vIRAiJHAJ9VDX/QtJFq99EqVEn1ppBXkVk9xACeKiYu
+q5YJWUurzIDMvBLYAm5a7rc=
+=WbUy
 -----END PGP SIGNATURE-----
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
+}