Drop unused init.d munging and only show elog messages at first install.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 28 insertions, 21 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 6dda2974057c..40bb255e78a6 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.158 2012/10/26 08:17:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.159 2012/11/11 07:53:37 vapier Exp $
+
+  11 Nov 2012; Mike Frysinger <vapier@gentoo.org> mdadm-3.2.6.ebuild:
+  Drop unused init.d munging and only show elog messages at first install.
 
 *mdadm-3.2.6 (26 Oct 2012)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 1894b8043f18..429cdbf10aba 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -16,7 +16,7 @@ AUX mdraid.rc 838 SHA256 73303ec32b7010c7f6d4fd66dde1a5baea07e73c79d3e516dce3100
 AUX mdraid.rc-3.1.1 815 SHA256 95f759ba9d4f719bb5122546fdcce18dd9b0060df1296cf8ae17a04137e163e2 SHA512 4bf2235bdffde101d10c408de486e9629caf1eed3f574bf3ed206d7013e8a715016066069272d24894a4c428009003de4ee3d8291323e2aaae3157fbce4318ed WHIRLPOOL 65fed6723b508405ea67d4d5973a617b21c8b90ea480c69bc7da843718c16c98ed89a32013d102860c62fe0de8b8e8002180649e0176e303a887698baa7f053e
 AUX raid-start.sh-3.0 799 SHA256 7f4e6b5d148578f417bcc05d4d4d5c65641c2a810b74b2f7f43b808c7c52a9ce SHA512 ee4adfe57c28c0af00e6ca84c4e3c22eefee70dc57e0a362f56364e6f4c6d5f153e50505d7b067385843e0ecfd291fa6e589db33f0287763609e8b8bbe0b5015 WHIRLPOOL 8323589e8fb1694912e887ed5e9c296f0692be2e91641cc2be62af0ec7057db9993543adcbfbbf4fd45ada4ed9873db630e26e9be14f066490d09d6e629c1792
 AUX raid-stop.sh 645 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db SHA512 8ee27e586dccf75bed3026f4beb42f429b53b0f11791122674122b90482010cd278c9d714a397bf1636617068e3e440c5fbc5babd89109f3c8e7a5a04dc82c05 WHIRLPOOL 14f76b1155299e7febd95e27e878e08997f4d57d5ef14e19b973a0917305617a47c242806399d17776e4d42885a199eec61dac8e0a12286f0ddf04f345283777
-DIST mdadm-3.1.4.tar.bz2 288578 SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
+DIST mdadm-3.1.4.tar.bz2 288578 SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63 SHA512 b668773d4f43bc90fba0ac27f01fc869aa2068d958ccc84de2bf8a64ac7e9a40cc8e461ff04a3619b17459d05478843b9fff0894868d9cbc97fc2cfa80faac73 WHIRLPOOL 28a3b43d4edfa4a097d2c410a9d67b75707dfa20d30c72870cc0584132bd2f896c02be26f97ca0d588be8cabdcf90e89d33c3f23ca727e966597ffea9af9a3a9
 DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
 DIST mdadm-3.2.3.tar.bz2 366770 SHA256 0ff49a04c6250834ce1b5be5a1581532e70e2221a87e1eedec46d6656b37ab40 SHA512 e6f024af5001c94f6f90e48b6942bb4ba3689ef8aaf8d1451c48f962c1f3ec6b80dcf4ff56ab11ecc38b6da577e5059cd7faabfb0424e23d18970c65a1bfd9b6 WHIRLPOOL 8663b3572c0e1704120833c7c3d806e78a25975c9f46068e810163713664dacf0c160020ca6dca749ed4714dc209a0c9260920ab8f7962ee009a564eb7effd3d
 DIST mdadm-3.2.5.tar.bz2 369582 SHA256 5ae2bfd241c88601c1ef9072806248491e025fa09a388c40230d72d65eabbd3c SHA512 021a28adf1793df2010ea34e9ece27bb10c79343bc96cc70fc479eb2404a3bc8f428afbc9e2b6a09533d77262c3045047bf06f9e72a9590f298665b69dd6282d WHIRLPOOL 165e5af840b460adbe3651402dfc763e1727c17bf1a8ffc62e5336b4658cfab94b34665cdfd3f7c035e58f35cd3577aee0f6fdf3cea0883d0ff99b758f0ed23d
@@ -25,17 +25,23 @@ EBUILD mdadm-3.1.4.ebuild 2277 SHA256 63890f88df3b70f7ccc7584f99a6c66ae7435eb4e4
 EBUILD mdadm-3.1.5.ebuild 2235 SHA256 038781a904accd76b9484df7317765c374d5c910beb0c0f7ec57deaafd0737a8 SHA512 ea4a730844ef093defd9a91acedbd00865a1d35eec9f378484c5290959685727d1ef38c4d7056584fe647fc034ae81b21ba504f2e25f7f77a1a310bf7e9ba889 WHIRLPOOL 39f25b4c53fbe3caa8a577b5089f3c8d79c32c49930c5166ee674250d3969b5a7ca7af013d0793da06be59170179779b9175af5d3b8def7d26dcd32d8829564b
 EBUILD mdadm-3.2.3-r2.ebuild 2159 SHA256 9a40db1883f7aed4c497ee4bb55ed98b605cf6b746fd0a4e916ae3e28b71d4c7 SHA512 5b36ff6f514d5ff10995d0bee6db03b9851e48773f1f4ed8fbe0a2df28a43d14a23015dc3df32b58710a26c628fd4456d72cd36b5221dc85c34a57a305e8d070 WHIRLPOOL f46b86ac596d1b9832e006ab2b94020e35b48084024f60b603fe5fa9291d46d0860a6ac170cd0889702736b185475b82616dc03df363d80c28a1f2d188156018
 EBUILD mdadm-3.2.5-r1.ebuild 1989 SHA256 6cc4f775d1bc3bb6204f80db64c14104da5f13aa3a0a5245577a845063f37211 SHA512 d1f784fbefafe5393a97313dfc372201ace3d7f2caa10f52eb81a6bf9d004e17b5cf2efdd83fc2e165ecb1051a60db6494d8d79bb59446fbb2cb5943668678a9 WHIRLPOOL 3df9ab6b72c2b582bbd16576e25c9533587bdc421a57e4086a41a53388a6a7e2a3abe404fe103df60700803b1c94a2752ae05660bcc257d448b33aa8509989e7
-EBUILD mdadm-3.2.6.ebuild 1986 SHA256 94bf36752edaa2f22d385f1e6bab8a44acf35e5a8a325603b14952c850e31b2f SHA512 b40869ff11f2fb9d0d8610180f6319598927df4c0f28cd1aefd7020808b229118eebfee74c164cab31287ee3488c37b43ddd62691d002397fad49094d32bf0a5 WHIRLPOOL fa1061f7894cbab8da0db031fca5e481442b14b941d111f423b5f173f105ed50a11bf934aa828d41b2495e3cea5084d2743d65f8b4c7a470d34bf5914e091692
-MISC ChangeLog 24259 SHA256 d37223b273031a0569aaf6ceca2554d7033b15a724cc9e2f3e78eafdab0258e1 SHA512 2a0c5f06b07200cabf9fc3d5c3deff7c1f41f81d33d2034dea1596d9a024a26c79a4603fc4943675b8b7c48c9f8c097cccf89cc502081d414b27b46e2a9f5186 WHIRLPOOL 705f2e33da1c637ba37a3af4a19cdd12bd92cea6253ac86a9e86810945ccf118603ce35a0b303afe572a2a5f868090a089828a556f20c3e08e90feac6358b6cb
+EBUILD mdadm-3.2.6.ebuild 1960 SHA256 6acbe9258f052b821d6396b7565684a1a2bad0caf9c2c73e7d84d37c98071569 SHA512 aaa111b614a1cccd30143da2d9fef989960ac4897dc97d84d8af536681ab7be562ef59d0d3978a092a194fe700807e5f5ffd67bbf82e01338bd5b8b4384e2a17 WHIRLPOOL 11a5ff3ca2fb7e71ff0c48567079aa2a3a460aaea85d566ef8354be6ad1ca494c61ac90e545ce0bff04af432948e8d19bd859469c09157ad65098f8b1c560662
+MISC ChangeLog 24402 SHA256 ef27b7359ab7d48fcbc20846910a2c40b5f8c86a10fc2a72653aead23c026a8d SHA512 102b44a39277cd79a2123e9db4392a318dc7ce4f9a076c853fc0a35c37b08ae9961155171a0084b43c625abee7d21a1ff15bbe6efdcb25a9a2134ab1e7930de0 WHIRLPOOL 0a9735d49d0ee028b1e5cf78f9847d45310fc3442ec56a7fd9bfe63bfc58554167bb4edb40a5872ff9b9f3ef87be71ba39d0b22e989e5df51125ae1a3b532399
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQikciAAoJEEqz6FtPBkyjB14H/3jaH+IIfzjJTeAw8R5ea8q0
-13UyYRoNyFbKAmv0LgOznYryMBPAKJdjtgvkTLYAl7FeyU8ekWxABocJwx3uqib2
-RSQBP+nMlLbO5xhgp1LdkO3vxQbLr6SnFVrC9KINscW3GfEDM0L9f8VunOOk63Z5
-4Z9OcKPFjd7AysTEZ1BFxaUe+27NEfV8hiCT3Q16C04A4YFwGMe6VTLY0KQbkbhl
-aPgYq5DbMgCpfRgBcBUUsbtH0FwX57bqs93h94asmlqAauOQZfgBTRS+9V3o7fvr
-IvA9wsOctTd1TY1epPvuz+gJ21bcK+AAFPnPNQtuYmsjd84RdVrWFd6d1qJRonc=
-=4miS
+iQIcBAEBCAAGBQJQn1mDAAoJELEHsLL7fEFWL2wP/ihbKqmRO/Y6xCVzB5wxVk4z
+ghznJdvwKM/GJBOLxyd8UbHt4N1+kGEb5vZAb0L7ydKQOHqEKe3s/hziYxrpr0eN
+mzdoY0oogMWAWdfrnp2tfOuoDz+KnXi0KCo+UtdK71Lvv7ueQsgj4X1WqUL1pDpv
+BoWCUeTtYNmvMqcTPO+67nzqGkl9J/UGzFslgLtkWeGEx/qoO/V3S8hh+oHhvbDr
+9Eni9MSOHPE8WvS7X1QpxhrCZ3STXi+y+7y2zRI6FWA/GZ0my8E5/CcgUBIJT2sx
+ygeIhSPV/mGbYEovcTJUhFKpQCrCzLK5xOvwLznzrJ2P2o45wc5i+m67uIDWzeRl
+rEnteRFZpSSa7Pe+0AThBVPh0Pr7rK0iP+8vaOvYm9oWLseF3OHexTO/n0wqzBNq
+hGx+1WwR3rHpF3YZMSFUdPYmchNz6s5Ej92fs09p5NKyIqczpdAqm5XEMZexnQTv
+uRXQXww/JoZatY8YvU/GrckxnIR+L+rc/f4YRCvYbxNw8Po+1hOUmtZizalk62zv
+xNExYte9WXOMl7H1qcp7p9P4s9m8z27whEv0PlT8wBcuxt6NzWpUdN44QPhcEuW8
+ALpytzZAWNqNuSHcSNIZymp1z6bBsY7Pi+4cZb3mXOslHHn/OROtGDyqmiLY6LzX
+/8Du8ZPlTNcz9/bTMnSz
+=amcV
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/mdadm-3.2.6.ebuild b/sys-fs/mdadm/mdadm-3.2.6.ebuild
index 5aa220a979ac..591459ce5ea0 100644
--- a/sys-fs/mdadm/mdadm-3.2.6.ebuild
+++ b/sys-fs/mdadm/mdadm-3.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.6.ebuild,v 1.1 2012/10/26 08:17:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.6.ebuild,v 1.2 2012/11/11 07:53:37 vapier Exp $
 
 EAPI="4"
 inherit multilib eutils flag-o-matic toolchain-funcs
@@ -60,15 +60,13 @@ src_install() {
 	newconfd "${FILESDIR}"/mdadm.confd mdadm
 	newinitd "${FILESDIR}"/mdraid.rc mdraid
 	newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-	# do not rely on /lib -> /libXX link
-	sed -i \
-		-e "s:/lib/rcscripts/:/$(get_libdir)/rcscripts/:" \
-		"${D}"/etc/init.d/*
 }
 
-pkg_postinst() {
-	elog "If you're not relying on kernel auto-detect of your RAID devices,"
-	elog "you need to add 'mdraid' to your 'boot' runlevel:"
-	elog "rc-update add mdraid boot"
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		# Only inform people the first time they install.
+		elog "If you're not relying on kernel auto-detect of your RAID"
+		elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
+		elog "	rc-update add mdraid boot"
+	fi
 }