Version bump which has some minor fixes over 0.4.6.1, plus clean out old cruft

(Portage version: 2.1_pre3-r1)

7 files changed, 25 insertions, 64 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index a456d0276726..9a3e2627fca7 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.8 2005/12/06 19:45:17 dsd Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.9 2006/01/26 21:41:10 seemant Exp $
+
+*multipath-tools-0.4.6.1 (26 Jan 2006)
+
+  26 Jan 2006; Seemant Kulleen <seemant@gentoo.org>
+  -multipath-tools-0.4.2.ebuild, -multipath-tools-0.4.5.ebuild,
+  +multipath-tools-0.4.6.1.ebuild:
+  Version bump which has some minor fixes over 0.4.6.1, plus clean out old cruft
 
 *multipath-tools-0.4.6 (06 Dec 2005)
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 8755930758fc..690052f6c838 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7bfb4bd8e09fb8eb9e8b97ab84b97eb3 ChangeLog 1291
-MD5 68c0760f1e402683c1b76f5cb2ceca9c files/digest-multipath-tools-0.4.2 74
-MD5 db20d21b52883b72f71f8a3fe8b3b3ef files/digest-multipath-tools-0.4.5 74
 MD5 8e2673e3b0b4f9d3617e1138868a997d files/digest-multipath-tools-0.4.6 74
+MD5 d2d722394bcb70bb5b8ea68d41b53d99 files/digest-multipath-tools-0.4.6.1 76
 MD5 7cd2431a33f3bd590b824e48243b53dc files/rc-multipathd 503
 MD5 cf274d10abad475cbb2a5ac340dda64c metadata.xml 231
-MD5 6cc582a3f4840cca1cc3e7551b2ec356 multipath-tools-0.4.2.ebuild 1159
-MD5 c8bf9dbd1ca4a2140bcc45ed3f9a366b multipath-tools-0.4.5.ebuild 1240
+MD5 3c314d91d5daee8226b025e4f4f2bcc6 multipath-tools-0.4.6.1.ebuild 1682
 MD5 3c314d91d5daee8226b025e4f4f2bcc6 multipath-tools-0.4.6.ebuild 1682
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDleqSTOXg++0VvJQRAlD2AKDaZ2ZLCFU6+lv2O4uNR6pN9uAxGgCfSbkJ
-4VWLfpEyXycSjGfTXsYBbzE=
-=KTuW
------END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.2 b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.2
deleted file mode 100644
index ffe6d9e56bdc..000000000000
--- a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48a1174ed4a6afb30f80764a5e67285a multipath-tools-0.4.2.tar.bz2 323062
diff --git a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.5 b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.5
deleted file mode 100644
index 740ef70d00f0..000000000000
--- a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8f87a4f08448a209d6e5bb7aa426830 multipath-tools-0.4.5.tar.bz2 133178
diff --git a/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.6.1 b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.6.1
new file mode 100644
index 000000000000..f4e0a6469904
--- /dev/null
+++ b/sys-fs/multipath-tools/files/digest-multipath-tools-0.4.6.1
@@ -0,0 +1 @@
+MD5 d826dcce21b824d37c2709aeddd288de multipath-tools-0.4.6.1.tar.bz2 138759
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.2.ebuild
deleted file mode 100644
index 54464fa5b826..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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.2.ebuild,v 1.5 2005/03/01 23:14:27 azarah Exp $
-
-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="~x86 ~amd64"
-
-IUSE=""
-
-RDEPEND=">=sys-fs/device-mapper-1.00.19
-	sys-fs/udev
-	sys-fs/sysfsutils"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-	sed -i -e 's:^bindir.*:bindir = /usr/sbin:' \
-		${S}/multipathd/Makefile
-	sed -i -e 's:rules.d/.*:rules.d/40-multipath.rules:' \
-		${S}/multipath/Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-
-	insinto /etc
-	newins ${S}/multipath.conf.annotated multipath.conf
-	fperms 644 /etc/udev/rules.d/multipath.rules
-	newinitd ${FILESDIR}/rc-multipathd multipathd
-
-	dodoc AUTHOR COPYING ChangeLog FAQ README TODO
-	docinto dmadm; dodoc README
-	docinto kpartx; dodoc ChangeLog README
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.6.1.ebuild
index 3d7a26d8703c..d668c9e0ab8e 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.4.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.6.1.ebuild
@@ -1,6 +1,6 @@
-# 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/multipath-tools-0.4.5.ebuild,v 1.1 2005/09/02 15:01:44 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.6.1.ebuild,v 1.1 2006/01/26 21:41:10 seemant Exp $
 
 inherit toolchain-funcs
 
@@ -38,9 +38,19 @@ src_install() {
 
 	insinto /etc
 	newins ${S}/multipath.conf.annotated multipath.conf
-	fperms 644 /etc/udev/rules.d/multipath.rules
+	fperms 644 /etc/udev/rules.d/40-multipath.rules
 	newinitd ${FILESDIR}/rc-multipathd multipathd
 
+	# 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
+
 	dodoc AUTHOR COPYING ChangeLog FAQ README TODO
 	docinto dmadm; dodoc README
 	docinto kpartx; dodoc ChangeLog README