drop old, specially the ones still requiring obsolete sys-fs/sysfsutils

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

8 files changed, 19 insertions, 471 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index 56a108c6447a..a7d2d6291c36 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.38 2011/11/30 04:30:50 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.39 2012/04/20 19:43:21 ssuominen Exp $
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/multipath-tools-0.4.7-build.patch,
+  -files/multipath-tools-0.4.7-udev-rules.patch, -multipath-tools-0.4.8.ebuild,
+  -multipath-tools-0.4.9-r1.ebuild, -multipath-tools-0.4.9-r2.ebuild,
+  -files/init.d-multipath:
+  old
 
 *multipath-tools-0.4.9-r3 (30 Nov 2011)
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 7bc73951e448..6a67edb88fbd 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,12 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX init.d-multipath 676 RMD160 88fc59447975de5728499c9946b63c1f17f7d345 SHA1 27997c9285ebddebcfbdf2425a0b5e73aa1c4f7c SHA256 3555b42a7da9cc8d976b51a8371ba00bdd04f9ed855cf740080a8ce620ca23af
 AUX init.d-multipath-0.4.8-r1 990 RMD160 7ae4a8decafaa6fe226a37b658e7e88a9be04aea SHA1 4af4d8242116835eeb4627eb10087b3e1b3eb3e2 SHA256 4b6e4d09828c58fbe7394c33d7950a54ecd2ae48064594e2117516367119f677
 AUX multipath-start.sh 763 RMD160 ed533183995bdd24c7f0118c2bc7a25ad9c064b3 SHA1 e571a7e60587df14960db6d0c327730532ef3b73 SHA256 523398049d7c2f640355d7552c2fefe064b9026f8796e4ffe8b71acdca80a01c
 AUX multipath-stop.sh 527 RMD160 d13470e422342833aa4ce05511d67bd984088cf0 SHA1 24d22ee278f4cd608d86cbe4cc729511aac4c6b4 SHA256 601995e60d6e75cd51f6cd7176a1757a93dc7d163042373ddfe3a4b9a1735984
-AUX multipath-tools-0.4.7-build.patch 5389 RMD160 aedc8321511402f951a9bf8534f7d82ec718f7b8 SHA1 6209e90c5964e030f15fc8c9474032bc1965d4bc SHA256 f03657968ce0db5b7502f1eba89570a9ec38396939d234aa08972e3906174fe0
-AUX multipath-tools-0.4.7-udev-rules.patch 1927 RMD160 3fd2ff93da07a6446fe9cdae6a5097e971a6710b SHA1 da769d174673f7ac136239b2ca71b17f968a893d SHA256 85dedab1da1899f55aa747f141224b6211694dee7a659245981919745f064293
 AUX multipath-tools-0.4.8-build.patch 9529 RMD160 a7cfcbe99242de7de1281ba4c525e35ae36b1118 SHA1 3c78a5cd3e8752b00548edecff7a4d391ed5dd77 SHA256 e2f81548ff91d53f93dceeb8a4bd5a0f17f206996a797b39380733c0a319b5d8
 AUX multipath-tools-0.4.8-kparted-ext-partitions.patch 1046 RMD160 57b30b9299aa9f65f32970ba3ce6fd3f809844f5 SHA1 f32a4349fa1dacd1a2b734d98328d44801c2795b SHA256 4cd2e75782dbaba715b85ef1ececdc130e24d7497897ceea9802c779e79c1c73
 AUX multipath-tools-0.4.8-r1-kpartx.patch 7076 RMD160 a5933b1a143fb7817e991a4a26d096259d7da534 SHA1 a1c18e52e36ab700c4a51dfe6817e7720d630c66 SHA256 0de7a21f1be7eba1ff389203e24c64b28d59be645e752de56c06d00275e0b703
@@ -22,16 +19,17 @@ DIST multipath-tools-0.4.9.tar.bz2 169180 RMD160 54b178ad23cefceb6b42131bd7079c2
 EBUILD multipath-tools-0.4.7-r1.ebuild 1624 RMD160 d57ed47bf52f1943db5010bbd959097ad65c4d5c SHA1 66b461c473d26be477918eed3bb63be66e3893b5 SHA256 e9ce5c4681dfe45848ff222c36e5ec38fb01abfe3ef1120396820a07835fd59d
 EBUILD multipath-tools-0.4.7-r2.ebuild 1666 RMD160 cb1022eff5a6e32af02f73ee07de3b20482c978d SHA1 77f0adf406a16412679fc0b8258411466785c318 SHA256 c918d16867c229178ffdae654cd56566b29d19b53335ab40f73c13d20e7b7c83
 EBUILD multipath-tools-0.4.8-r1.ebuild 2779 RMD160 a55cc868ed8b8f5828fbb0933de6a3292fbd8db3 SHA1 6e4e825ff7789a36ec617edd45634bf5404d2418 SHA256 caa5b8d68141b82919d29cb05f1af70c48c7e6ccba5c5931c08ea19886925c0f
-EBUILD multipath-tools-0.4.8.ebuild 2336 RMD160 fa7d183ad6c1609fc30291d969380b46a902d807 SHA1 74be5fd61b425431a491fe02a11921eb618fe030 SHA256 5cea0e666f4b2091b2205b677b92ececba1fdd1654768fdf3623ba2f9d49055c
-EBUILD multipath-tools-0.4.9-r1.ebuild 2454 RMD160 04efb847332a75d4ab21870ac77fb38234ef9971 SHA1 06f71d6f4a5c7c6ee2136851a4ec24fa7ea75b9c SHA256 7cde59dccb5ea57d6dd8bba16c20079243036b0c044cf61648a043b6c128139e
-EBUILD multipath-tools-0.4.9-r2.ebuild 1983 RMD160 e54ea15c214c4413d894246980bb9c201bac9c2b SHA1 a09ab793ca0e7d4ca9d8921a699cacd65c974f6a SHA256 9cbad7258b0a7778e0c4fbd87a8647187ca10f98cf6d12e848ea287c915d61ae
 EBUILD multipath-tools-0.4.9-r3.ebuild 1999 RMD160 5cb9c087183749f407713e1770b255475dd2eabb SHA1 a1dcd6bac98a4f9ae8c75c1c8919fe0b70eee187 SHA256 4790b7dc623e0fb4f9029567ec18e821b7ee9144e8f138c27c691fa3eb070e81
-MISC ChangeLog 7442 RMD160 42acda86623c273e665761fd5c5530e4d31416e4 SHA1 f6a8259f654c3c6fe103e88aa5ca28614411dae5 SHA256 fb1b7061c0780f3c1ef8861a754a8bd03408a0be8b7db8b44916d3c436f6f241
+MISC ChangeLog 7727 RMD160 819b07f4e63a5d91e10df5c760a9a81c97ad9bf6 SHA1 8bb311dee684db5a9a731beb298579f99004b698 SHA256 1815bbae53a9e42088ecdb74d43eb33556444cfd34877718a2776a3ccfc2880f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk7VsYIACgkQaC/OocHi7JbqIAD+L2rAvc/S2xrqbLsg1oOACNzK
-UUued3sDSBdAkAK07HgA/3gZI7t2TP+Bc4bJfv6w+R5rBAt15vv5gSEM6aO/WXXv
-=c3gp
+iQEcBAEBAgAGBQJPkbv7AAoJEEdUh39IaPFNMyAH/jmRj1IBP3gqhle7kfKjALtE
+c3uVOCaqhm7raWd8TDUthcm7bPZfDcw6m3vkcQr5oBf75WR2ELjrUofcEPxFAFBi
+c9x5LntV3apkHhswh4lmRxHia4otCGE209dEKAu1DKGli7zf1cs2qO79O66CBz+Z
+9dglz4CFljJOmjSBloYk0a3l57UqAlMOqKnWPfd2x9kEicR9HK09cvH4WIA3uKBq
+yogfo4CkYL9idseioBS39xovF6bS2mA/DORn+8x41mx+SeENB91Q2Ov6VYuInfLS
+hOwJUnQKHGwKzBET+XEQ5GtJ8Ie0Aoy0uimmllIRwpaX61G1YoPldGVktWDQnVA=
+=mbqD
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/init.d-multipath b/sys-fs/multipath-tools/files/init.d-multipath
deleted file mode 100644
index 68e5a2e7a98d..000000000000
--- a/sys-fs/multipath-tools/files/init.d-multipath
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/files/init.d-multipath,v 1.1 2008/06/20 23:57:19 robbat2 Exp $
-
-depend() {
-	if [ -e /lib/librc.so ]; then
-		# on baselayout-1 this causes
-		# dependency-cycles with checkroot (before *)
-		before checkfs fsck multipathd lvm
-		after modules
-	fi
-}
-
-start() {
-	if [ ! -e /lib/librc.so ]; then
-		eerror "The $SVCNAME init-script is written for baselayout-2!"
-		eerror "Please do not use it with baselayout-1!".
-		return 1
-	fi
-
-	start_addon multipath
-}
-
-stop() {
-	stop_addon multipath
-}
-
-# vim:ts=4
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
deleted file mode 100644
index 423c8624aefa..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.7-build.patch
+++ /dev/null
@@ -1,163 +0,0 @@
- - 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/multipath-tools-0.4.7-udev-rules.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.7-udev-rules.patch
deleted file mode 100644
index 6bd6300ccb93..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.7-udev-rules.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru multipath-tools-0.4.7-orig/multipath/Makefile multipath-tools-0.4.7/multipath/Makefile
---- multipath-tools-0.4.7-orig/multipath/Makefile	2007-08-22 16:19:00.877039944 +0200
-+++ multipath-tools-0.4.7/multipath/Makefile	2007-08-22 16:20:00.382334855 +0200
-@@ -39,12 +39,12 @@
- 	install -d $(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/40-multipath.rules
-+	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
- 	install -d $(DESTDIR)$(mandir)
- 	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
--	rm $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
-+	rm $(DESTDIR)/etc/udev/rules.d/64-multipath.rules
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
- 	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
- 
-diff -ru multipath-tools-0.4.7-orig/multipath/multipath.rules multipath-tools-0.4.7/multipath/multipath.rules
---- multipath-tools-0.4.7-orig/multipath/multipath.rules	2007-08-22 16:19:22.878997659 +0200
-+++ multipath-tools-0.4.7/multipath/multipath.rules	2007-08-22 16:21:02.887896761 +0200
-@@ -1,18 +1,13 @@
-+# do not edit this file, it will be overwritten on update
- #
- # multipath and multipath partitions nodes are created in /dev/mapper/
- # this file should be installed in /etc/udev/rules.d
- #
--# !! udev must not discard DM events !!
--# !! check the other installed rules !!
--#
- 
--# lookup the devmap name
--#ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
--#	PROGRAM="/sbin/devmap_name %M %m"
--ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
--	PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info"
-+# DM_NAME is set in 64-device-mapper.rules
- 
- # take care of devmap partitioning
- ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
--	RUN+="/sbin/kpartx -a /dev/mapper/%c"
-+	ENV{DM_NAME}=="?*", \
-+	RUN+="/sbin/kpartx -a /dev/mapper/$env{DM_NAME}"
- 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.8.ebuild
deleted file mode 100644
index d4b42d93cf88..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 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.8.ebuild,v 1.9 2011/08/06 08:12:30 ssuominen Exp $
-
-inherit eutils toolchain-funcs
-
-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="amd64 ppc ppc64 x86 ~arm"
-IUSE=""
-
-RDEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.19-r1
-	)
-	sys-fs/udev
-	dev-libs/libaio"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.8-build.patch
-	# Merged together
-	#epatch "${FILESDIR}"/${PN}-0.4.7-udev-rules.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/65-multipath.rules
-	fperms 644 /etc/udev/rules.d/66-kpartx.rules
-	# This is the monitoring daemon
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	# This is the init script that fires the multipath addon for baselayout2
-	newinitd "${FILESDIR}"/init.d-multipath multipath
-	# Handle early-boot startup as well as shutdown of multipath devices
-	insinto /lib/rcscripts/addons
-	doins "${FILESDIR}"/multipath-start.sh
-	doins "${FILESDIR}"/multipath-stop.sh
-
-	dodoc multipath.conf.*
-	dodoc AUTHOR ChangeLog FAQ README TODO
-	docinto kpartx; dodoc kpartx/ChangeLog kpartx/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/65-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}
-pkg_postinst() {
-	elog "If you need multipath on your system, you should ensure that a"
-	elog "'multipath' entry is present in your RC_VOLUME_ORDER variable!"
-	elog "If you use baselayout2, you must add 'multipath' into"
-	elog "your boot runlevel!"
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r1.ebuild
deleted file mode 100644
index 487170921bac..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 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.9-r1.ebuild,v 1.2 2011/08/06 08:12:30 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-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="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.19-r1
-	)
-	>=sys-fs/udev-124
-	dev-libs/libaio"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	 epatch "${FILESDIR}"/${PN}-0.4.9-build.patch
-	 epatch "${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
-	 # kpartx fails on extended partitions
-	 epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man8
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	fperms 644 /etc/udev/rules.d/65-multipath.rules
-	fperms 644 /etc/udev/rules.d/66-kpartx.rules
-	# This is the monitoring daemon
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	# This is the init script that fires the multipath addon for baselayout2
-	newinitd "${FILESDIR}"/init.d-multipath-0.4.8-r1 multipath
-	# Handle early-boot startup as well as shutdown of multipath devices
-	insinto /lib/rcscripts/addons
-	doins "${FILESDIR}"/multipath-start.sh
-	doins "${FILESDIR}"/multipath-stop.sh
-
-	dodoc multipath.conf.*
-	dodoc AUTHOR ChangeLog FAQ README TODO
-	docinto kpartx; dodoc kpartx/ChangeLog kpartx/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/65-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}
-
-pkg_postinst() {
-	elog "If you need multipath on your system, you should ensure that a"
-	elog "'multipath' entry is present in your RC_VOLUME_ORDER variable!"
-	elog "If you use baselayout2, you must add 'multipath' into"
-	elog "your boot runlevel!"
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild
deleted file mode 100644
index 0142df1e790d..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.9-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 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.9-r2.ebuild,v 1.2 2011/08/06 08:12:30 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-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="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.19-r1
-	)
-	>=sys-fs/udev-124
-	dev-libs/libaio
-	!<sys-apps/baselayout-2"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	 epatch "${FILESDIR}"/${PN}-0.4.9-build.patch
-	 epatch "${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
-	 epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man8
-	emake DESTDIR="${D}" install || die
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	fperms 644 /etc/udev/rules.d/65-multipath.rules
-	fperms 644 /etc/udev/rules.d/66-kpartx.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd || die
-	newinitd "${FILESDIR}"/multipath.rc multipath || die
-
-	dodoc multipath.conf.* AUTHOR ChangeLog FAQ README TODO
-	docinto kpartx
-	dodoc kpartx/ChangeLog kpartx/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/65-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}
-
-pkg_postinst() {
-	elog "If you need multipath on your system, you must"
-	elog "add 'multipath' into your boot runlevel!"
-}