remove lvm from before check since this needs to be user configurable

Package-Manager: portage-2.1.3.11

5 files changed, 115 insertions, 5 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 8da1c7dadc4c..9961107c3e07 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.82 2007/10/03 11:58:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.83 2007/10/04 14:27:23 cardoe Exp $
+
+*mdadm-2.6.3-r3 (04 Oct 2007)
+
+  04 Oct 2007; Doug Goldstein <cardoe@gentoo.org> +files/mdraid.rc-2.6.3-r3,
+  +mdadm-2.6.3-r3.ebuild:
+  remove lvm from before check since this needs to be user configurable
 
 *mdadm-2.6.3-r2 (03 Oct 2007)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index b61c0738ae42..b6b7d7d193b6 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 64-md-raid.rules-2.6.3-r2 738 RMD160 95f8934aded76f5b85e5f2ff9f9f250f8c4a4300 SHA1 4c4a103fd8ed7134f8b86b1f7d2f4f6cf439184e SHA256 9ad68b9efc5bf7785c1a5cc4b49568f54b25ad0b9783a7642e60a131ef238f3b
 MD5 8b8c842143cd257e0492e10949111e0c files/64-md-raid.rules-2.6.3-r2 738
 RMD160 95f8934aded76f5b85e5f2ff9f9f250f8c4a4300 files/64-md-raid.rules-2.6.3-r2 738
@@ -22,6 +25,10 @@ AUX mdraid.rc 608 RMD160 9687cc3bc538ef42ac49cf4bee89eaccd6ee3486 SHA1 00f2b5a77
 MD5 fda2c052132a68bd7c0a3d434792905b files/mdraid.rc 608
 RMD160 9687cc3bc538ef42ac49cf4bee89eaccd6ee3486 files/mdraid.rc 608
 SHA256 6183ee2f39cf8a8c6a2e6798870e89dc1dceef262133022641761245b350ba41 files/mdraid.rc 608
+AUX mdraid.rc-2.6.3-r3 613 RMD160 543d7dedb116b5b95fd0bd3e6f32bbb818006022 SHA1 88fc0f3c7a8b4a7d59eefb76f6d718ca32953424 SHA256 989e7bea95d71d724409f83d8239383c263afca5c78c5e0ddb781b9029f44d17
+MD5 5a145766383e4c8cde0dff553c9b8432 files/mdraid.rc-2.6.3-r3 613
+RMD160 543d7dedb116b5b95fd0bd3e6f32bbb818006022 files/mdraid.rc-2.6.3-r3 613
+SHA256 989e7bea95d71d724409f83d8239383c263afca5c78c5e0ddb781b9029f44d17 files/mdraid.rc-2.6.3-r3 613
 AUX raid-start.sh 1606 RMD160 8adf7b5a60bb3b7e69fcd317b7866072acb9c3c9 SHA1 03daf3b0a4b0f64f6b35b7f6596b7edc2725db10 SHA256 bd6923697c571e29cbbbba7f36a71993f7af30579e1ee176303c3ced39ff16f6
 MD5 49f82cf9a0a1343b71400a2d2d4706af files/raid-start.sh 1606
 RMD160 8adf7b5a60bb3b7e69fcd317b7866072acb9c3c9 files/raid-start.sh 1606
@@ -52,14 +59,18 @@ EBUILD mdadm-2.6.3-r2.ebuild 1826 RMD160 785d03732eb62c68f916947e8c8f6b8874c80ae
 MD5 000e0b8fb94f5230c1f1babb855907a2 mdadm-2.6.3-r2.ebuild 1826
 RMD160 785d03732eb62c68f916947e8c8f6b8874c80ae9 mdadm-2.6.3-r2.ebuild 1826
 SHA256 f360b4e0e3db5f01c544ddac7083ca74090b51c456e2dfecb1349abaedd471e7 mdadm-2.6.3-r2.ebuild 1826
+EBUILD mdadm-2.6.3-r3.ebuild 1832 RMD160 95dc27da94a6d1143a9025b69acac9ef657557bf SHA1 10081ebddd27a452401b7eaee02bdc025652da39 SHA256 43f2a0f93bf68471dd987fb2b1325ffd2abf723dd20b2f42ce3a2357ab55ce65
+MD5 c5960073b5515e2ba4fdbcb6fe8474e0 mdadm-2.6.3-r3.ebuild 1832
+RMD160 95dc27da94a6d1143a9025b69acac9ef657557bf mdadm-2.6.3-r3.ebuild 1832
+SHA256 43f2a0f93bf68471dd987fb2b1325ffd2abf723dd20b2f42ce3a2357ab55ce65 mdadm-2.6.3-r3.ebuild 1832
 EBUILD mdadm-2.6.3.ebuild 1247 RMD160 f53ae47db3ee0540384c848adf1828127372f71f SHA1 ffab0c6351454cef193582f598a977a37661a2e4 SHA256 460b31566602f886f18593598edd0a11278caaba12aa069a7b6dc515981026d8
 MD5 7a85f7cdee9603e4369511f1a51a719c mdadm-2.6.3.ebuild 1247
 RMD160 f53ae47db3ee0540384c848adf1828127372f71f mdadm-2.6.3.ebuild 1247
 SHA256 460b31566602f886f18593598edd0a11278caaba12aa069a7b6dc515981026d8 mdadm-2.6.3.ebuild 1247
-MISC ChangeLog 13183 RMD160 94361f3b7ffbfad323608daebe40e04d0c465f3f SHA1 8f71d347c39a758f31c1571a476a4bbda8734d51 SHA256 125bd04e524c8812ef647b2abbee4340a9dbf8e6115335f71904b05954abc490
-MD5 0bb11e005e4b5274db4026a20ab95dbb ChangeLog 13183
-RMD160 94361f3b7ffbfad323608daebe40e04d0c465f3f ChangeLog 13183
-SHA256 125bd04e524c8812ef647b2abbee4340a9dbf8e6115335f71904b05954abc490 ChangeLog 13183
+MISC ChangeLog 13389 RMD160 983250281e1ff9c20071c3728e33374301182a0a SHA1 c21761183fe359174d8539277daf1074a7e8afee SHA256 e3709ca2fa60b42ec0c06c9a316f64a70b0c62a6426f12b643b72bf6d2263930
+MD5 245384deab7b94027cb6bc9fc9f8b857 ChangeLog 13389
+RMD160 983250281e1ff9c20071c3728e33374301182a0a ChangeLog 13389
+SHA256 e3709ca2fa60b42ec0c06c9a316f64a70b0c62a6426f12b643b72bf6d2263930 ChangeLog 13389
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -76,3 +87,13 @@ SHA256 a6eaa12879f5f167738448a0be8ff5251c8c44113546fcbcb196fb2b34cd1a22 files/di
 MD5 64ca76f35ba4abc60fb0f6da895b5e94 files/digest-mdadm-2.6.3-r2 238
 RMD160 5ae321c8144c93becbc4fba6248b4fe1f7a04302 files/digest-mdadm-2.6.3-r2 238
 SHA256 a6eaa12879f5f167738448a0be8ff5251c8c44113546fcbcb196fb2b34cd1a22 files/digest-mdadm-2.6.3-r2 238
+MD5 64ca76f35ba4abc60fb0f6da895b5e94 files/digest-mdadm-2.6.3-r3 238
+RMD160 5ae321c8144c93becbc4fba6248b4fe1f7a04302 files/digest-mdadm-2.6.3-r3 238
+SHA256 a6eaa12879f5f167738448a0be8ff5251c8c44113546fcbcb196fb2b34cd1a22 files/digest-mdadm-2.6.3-r3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHBPhToeSe8B0zEfwRAr/GAJ90RN+43ggBUP8+vBW2i03LOH+BKQCeMT+m
+mS9zSGiIRMeDvhVULoUB4+c=
+=+DsD
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/digest-mdadm-2.6.3-r3 b/sys-fs/mdadm/files/digest-mdadm-2.6.3-r3
new file mode 100644
index 000000000000..53e49f8e561a
--- /dev/null
+++ b/sys-fs/mdadm/files/digest-mdadm-2.6.3-r3
@@ -0,0 +1,3 @@
+MD5 2d3950028253a856f065763e5bd78b1c mdadm-2.6.3.tar.bz2 151822
+RMD160 236f38c021d92e387cf00f66a28d1a35d160740b mdadm-2.6.3.tar.bz2 151822
+SHA256 5da1da7e2e9df39071016e6914769f685574dc50d94b6b2bbfaec18e376c070c mdadm-2.6.3.tar.bz2 151822
diff --git a/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3 b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3
new file mode 100644
index 000000000000..622c40b1faa2
--- /dev/null
+++ b/sys-fs/mdadm/files/mdraid.rc-2.6.3-r3
@@ -0,0 +1,26 @@
+#!/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/mdadm/files/mdraid.rc-2.6.3-r3,v 1.1 2007/10/04 14:27:24 cardoe Exp $
+
+depend() {
+	if [ -e /lib/librc.so ]; then
+		# on baselayout-1 this could cause
+		# dependency-cycles with checkroot (before *)
+		before checkfs
+	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 raid
+}
+
+stop() {
+	stop_addon raid
+}
diff --git a/sys-fs/mdadm/mdadm-2.6.3-r3.ebuild b/sys-fs/mdadm/mdadm-2.6.3-r3.ebuild
new file mode 100644
index 000000000000..5dd856be430a
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.6.3-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.3-r3.ebuild,v 1.1 2007/10/04 14:27:23 cardoe Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/mdadm"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake \
+		CROSS_COMPILE=${CHOST}- \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-2.6.3-r2 raid-start.sh || die "addon failed"
+	newexe "${FILESDIR}"/raid-stop.sh-2.6.3-r2 raid-stop.sh || die "addon failed"
+	dodoc INSTALL TODO "ANNOUNCE-${PV}"
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die "installing mdadm.rc failed"
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die "installing mdadm.confd failed"
+	newinitd "${FILESDIR}"/mdraid.rc-2.6.3-r3 mdraid || die "installing mdraid.rc failed"
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-md-raid.rules-2.6.3-r2 64-md-raid.rules || die
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}