remove old; bump rc16 to EAPI=5, add epatch_user and make elog messages contextual to reduce elog spam

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 57 insertions, 146 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index 69d4bc1ec369..1b2df92756e6 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/dmraid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.27 2012/05/24 02:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.28 2012/11/04 02:19:51 axs Exp $
+
+  04 Nov 2012; Ian Stakenvicius <axs@gentoo.org> -dmraid-1.0.0_rc16-r2.ebuild,
+  dmraid-1.0.0_rc16-r3.ebuild:
+  remove old; bump rc16 to EAPI=5, add epatch_user and make elog messages
+  contextual to reduce elog spam
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> dmraid-1.0.0_rc14.ebuild,
   dmraid-1.0.0_rc15.ebuild, dmraid-1.0.0_rc16-r2.ebuild,
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 10a77572bc3f..1b1486ad0586 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,37 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX dmraid-1.0.0_rc15-devsk-isw.patch 723 RMD160 e5843d1f06eb78db37281a22571905dc8e9f3f19 SHA1 4a8029f5709c3b86ec317461721f3808075cbc52 SHA256 fa7f184b8f76812fbc379265a2e5563cf0242bdf381f8485e4ea781b7172fd43
-AUX dmraid-1.0.0_rc15-undo-p-rename.patch 531 RMD160 118b97bb99868033d37c8ce7bebb485f4600af2f SHA1 cbcc203e42894b936ce3adce0ff36eaf1ebe7edf SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670
-AUX dmraid-1.0.0_rc16-as-needed2.patch 429 RMD160 f78e5cafba9bda8bd1d82820755752435c20dead SHA1 b430be423178b8419253b89893f308be8c6e27e7 SHA256 d66d681b126c3fbdd34a177436b6ee7f925403467b65ce688bd957cfd28560ee
-AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 RMD160 04fceadf5893d2860e74f9966d8010e39c0939a4 SHA1 79cb330ed0576381b98544f0b7fd9a672d5ba976 SHA256 a45054960405e41ec81bfe113adbf273d5c3292897233d58500ea12305c3c7cc
-AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 RMD160 42b442d4e20f9571b757d1b7876d0febb14df61f SHA1 684f79bd14743f0c7cc76c2a8788854155bcbd0b SHA256 ba062ea97d9193f3bf567e031077393890349f01dad3c5864556e82d4d44f767
-AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 RMD160 118b97bb99868033d37c8ce7bebb485f4600af2f SHA1 cbcc203e42894b936ce3adce0ff36eaf1ebe7edf SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670
-AUX dmraid-destdir-fix.patch 902 RMD160 8641454fcab27ff5f122e50cc1cdc4559e484692 SHA1 8dac0fd6d374cbdd490f101817677ac66dfc87ce SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb254c81e596af6e1481db1d667
-DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
-DIST dmraid-1.0.0.rc15.tar.bz2 190475 RMD160 045a58855a93082a7758cfedc6f9cd4cfd91668b SHA1 3fa1f184a497fd2cc6cefa4cb2892ffb1ede64bf SHA256 30847258b7f946ed908e79af4058bbf2c9a3791728b8231f7c490ca601566c05
-DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 RMD160 b661f5c465a11a4dcbb17db6b6632b32bcb7b723 SHA1 162b6173b91a0121a52402d2ed939b43d74ff605 SHA256 93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8
-DIST dmraid-1.0.0.rc16.tar.bz2 1042907 RMD160 b5fe992f4bc2e1a0716fc0c9e689b214667982d1 SHA1 99e76332bb03c5a79406e3c8cb12b6746288635d SHA256 f849c44d041f8891c61419ddf906e6e34b44948939ae9e550be662ffc2492255
-EBUILD dmraid-1.0.0_rc14.ebuild 2217 RMD160 c531db62cd3badeec76ba498dabdc3d16b97ffb0 SHA1 7f64be1b57b1047ca3c3c38051ab131d27be5d02 SHA256 27e053c77811dcb7b7e520b1c1a1f3205d8ad378fb1e8d6d79d5cfdae18f76af
-EBUILD dmraid-1.0.0_rc15.ebuild 2230 RMD160 f96c997cc1a50540d204032c36a43cf6f8fd7642 SHA1 602c78c7dbf7f6156bf18eb638f2b6b07852405b SHA256 ce4b1b44478ec559825af94b51ee4d9a8941a17e82d24b379ee396ec709119b2
-EBUILD dmraid-1.0.0_rc16-r2.ebuild 2680 RMD160 bd51d44937ada08cee46db3e05b454d426dea566 SHA1 a7fd4835cb195b41a577a17d45f16b1c6f756e2f SHA256 6f0ff4ec71d7bb3b3ad250cd987214f3fee22630a7e6786ad6d649e01a3c4d33
-EBUILD dmraid-1.0.0_rc16-r3.ebuild 3104 RMD160 30fde2574e3d6ef44de352e68727c0e44654a4b2 SHA1 e2b0efec2311fb5692975ca9f75f2a627cf1a54a SHA256 72105c0487f27ffe82880b7aee19fe330e6122dc95081511b2e1c0e9f5591983
-MISC ChangeLog 5740 RMD160 d582a1452079f1498969e49be4767db1b5ad06a5 SHA1 0a5d3c8f14d8969ae7cbb1532ba30182b6cf3306 SHA256 bf96504ab793967a479d727eb32e438035786ba041372ef900c022ae263fadd2
-MISC metadata.xml 755 RMD160 d306e23f0078c7bff73fe3d9fea190756441bf28 SHA1 a6dfb28e33ce77c36dda32bf4ad95972b2896260 SHA256 591b8a7af76f3ae419d525f4f527a753edcbb2ad6365f0567d693ee29ea8d66b
+AUX dmraid-1.0.0_rc15-devsk-isw.patch 723 SHA256 fa7f184b8f76812fbc379265a2e5563cf0242bdf381f8485e4ea781b7172fd43 SHA512 c270134917c7305c7b9e5f09d451c8dfd022e134cfc59ea3aadf5c20543476287e6bc1fcd3ea2950d32f7f3f08247d4094f1758235919db3e9e9edaaf7aabe25 WHIRLPOOL 4a56f0dc3d1d9c2fa12a4371fe6a5c76f9047bf041a2302cc1f106fc01b212adeb070a780812f26fa035094501dbb8ed368a4b45ac3daaade055565b89d11ecf
+AUX dmraid-1.0.0_rc15-undo-p-rename.patch 531 SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 WHIRLPOOL 0343c2619499c43478438081c751c2e23133d39a45ef12e2fb6664babf6e4d1e385f07714cc487603e8b0962f2a0314bb56bc0df81c179e51d7013df94222102
+AUX dmraid-1.0.0_rc16-as-needed2.patch 429 SHA256 d66d681b126c3fbdd34a177436b6ee7f925403467b65ce688bd957cfd28560ee SHA512 663b779261c30d5aa40184da10f56243a1ed4faaa9f387ff85dc4c7ebee2e5375bd78fdf43ce8d1952f17460b7e802cf5053971ea4fc652777fb70b569e8ea0e WHIRLPOOL 5d6a0586f25789bc5ab5e80e1ca571bf0e4153d55113d72d7b82098d9915e1c289a0f74c7c762976e043affbac9d31912e7bd6868f01063753d1f81925f685cf
+AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 SHA256 a45054960405e41ec81bfe113adbf273d5c3292897233d58500ea12305c3c7cc SHA512 28da140287f7ed8625fc6a7131948b76898df8fbbdce9be278852ddc8f466a8e6352c7d4e1e96aa51a3737895e12c0607501bc657a43f1ab54d879d5510c310e WHIRLPOOL 061bf2a9d789c0a0e0385b28345889c380ba3d824351639a9c2c84ab193956f62e61d4c04116a9128783d653118f7598a65071109b9779749a295a5226e3c0ea
+AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 SHA256 ba062ea97d9193f3bf567e031077393890349f01dad3c5864556e82d4d44f767 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67 WHIRLPOOL ef57ad27eb7919d66ac46353b19a00405a0937505f960d7952b65d90137b0ae0d8ea12d13df4461c8e737bae620e736b5d0c2bf41a91fe3eb35850d2a804ca89
+AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 WHIRLPOOL 0343c2619499c43478438081c751c2e23133d39a45ef12e2fb6664babf6e4d1e385f07714cc487603e8b0962f2a0314bb56bc0df81c179e51d7013df94222102
+AUX dmraid-destdir-fix.patch 902 SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb254c81e596af6e1481db1d667 SHA512 812a913eef0b2cf8dabd802d0f5035633c5d993f5d8e9958597243bf96e8f8c75535b50bec5423ceadae55fdff7bf9a7136033b0b5987767f93d4a9121d558e1 WHIRLPOOL 2d573f2d928bc5d24446ed7e5362c14a298ba608624d0b991d5c738caba6db73c8b6da88bc951c03674a6fbd4cb94a513a8f6662fbbcc83e84af26762c1dc2b5
+DIST dmraid-1.0.0.rc14.tar.bz2 164234 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec SHA512 0804e1bf91f4707b8845affeb987e68c5a85d97119af27ddba2927c87735a59b86b1fec4f03ac0fbdcde89d779d77e21cab4e6936dd1a82b53a0d8b16eb59768 WHIRLPOOL c5612139d3f24be710fb8e6d51eb6ebe0847dcf804c0c0ba1a5f3142a2680de2b33bfae74bbf3cff704b0da5d9d273c432906f1b7fd46e1057b8ef53cc89ca1e
+DIST dmraid-1.0.0.rc15.tar.bz2 190475 SHA256 30847258b7f946ed908e79af4058bbf2c9a3791728b8231f7c490ca601566c05
+DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 SHA256 93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e WHIRLPOOL 87915ea0013766da8a9722b437bfe146b4b2c7560a7814ac6caab92054ddc3b4b59ceb4d413609d5eaab92b5cee67886ade7924455f1dba19f1b8dabc25d3498
+EBUILD dmraid-1.0.0_rc14.ebuild 2217 SHA256 27e053c77811dcb7b7e520b1c1a1f3205d8ad378fb1e8d6d79d5cfdae18f76af SHA512 6d4151f39f34cf1940f51cf340a1912097e18bd7fde13f2411daf1e5135a5bfe7b076c647e0ca019adb28cd970f87f40a7414dd36f454839b838dd881dfb1351 WHIRLPOOL 650b039be62de90bfd1204009176b28726f2a41a31f0c2be3158bdf723f30bf23b28a3ea1d3e2a68bc992084538045b892461ad024b10bdadf5004d4a617315d
+EBUILD dmraid-1.0.0_rc15.ebuild 2230 SHA256 ce4b1b44478ec559825af94b51ee4d9a8941a17e82d24b379ee396ec709119b2 SHA512 fcf25e1917bd2c4c73f1214a022a8816ef98a7f4ea932a4c215482adea8047ac2b7a89f81efaccf7e1bab8e40acddcf1ebc9bc731618835c3dc9b02537b2dac9 WHIRLPOOL 446f561f17c894b7fd5b1c75985d2cc07925dced9a7c1c819d98fb564b040a47958dbefd9473b658f2e539e8392f079a892b0a33a71ea15e5e163748be12eca2
+EBUILD dmraid-1.0.0_rc16-r3.ebuild 3214 SHA256 a4eaab9b21c9e98237aaf55e7541b625234c0310d25edb0da51a0a176286da79 SHA512 b056ec82630ac60f78d4f200147f93b3b1b0015738baee4cab2506d77352d092047009c0c6a91dc7d8b05704f87c32f6c028f31dd3741a8628a91c68d25634f1 WHIRLPOOL 714d82b6b0e40f15411cf8ecabd480ad2e4ae8aed7cc365d943eed44b6dfb14dcd443059f5e41d8652dd4b617110f94ffd28950530671980c866eb7f57c769e3
+MISC ChangeLog 5955 SHA256 ce9518790c19286127c52d3e26b92c0f10d4fcdb1871b823d37690bcaa33394e SHA512 966769768ce6f0e66806096a32884b410077bd5ba1c44cc0b4eecfc266db7118a303a2a38567f731618bee6eadc6e594254b9977931c6c282dd8bc4186770775 WHIRLPOOL 6b5ce66abfab1f25ecf23d485d5d90bbf3499c0b743e1828cf9ee9e1d4ba0eed554581d320ce62937dc425c41e7ee30f9f1b5769f66d378ed7a809b8549390aa
+MISC metadata.xml 755 SHA256 591b8a7af76f3ae419d525f4f527a753edcbb2ad6365f0567d693ee29ea8d66b SHA512 d809919145c449a429a2aaf6c4cc9743526eb027aa73e4d2d8276113be1d23504596be8bd0609fb6b86b66da2262d2ac5cfae5b2d9034d3367768db931977824 WHIRLPOOL f31aa451fec1b31efcc371554417dedd58c285a247a309ea0d148902bff1d1ec073d9f9f98dbdcf178dace168cc2349df4ebf1bff8b9b51b8421be2a4b25ad0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvaKQAAoJELEHsLL7fEFWaZ0P/i0aBFhL0o0GEqo/+zMTnf1Q
-7K055p0mD2Wtt0uVcpNOJ258hSkSIO67qCaSv16qCJvRcNJxJSoS+z3R6V/RKk20
-gLeo/4+nKBynUoXRC9SwCrV3WobI+FohYeA4Ga+EOMT854A0qYeoe3xHiD+/KHa7
-OLf8kRnLw1sJwKFMegqKgi1pBbbTBVQgTYVIvQwoRjz5Tr0Ol8no6FGTRUZQ4hvm
-Wjnppxug5lXrAzuEz+Mq8vYhQyQVg+mty3qsBcVErSA3GG3Z0NRWfz4csQSZouo9
-r9eRbH761lpO9AtPVJa71TjtB3aQEkZSa5hJHFqLAQFNbw21ipEC7W94DH1+t5te
-Rlavm48EXICKX9TNowrNJpCOdiBCEPx5pZMSAuPJ92V8Ke3/6ruKJfCKPVKZhTxL
-KDrpU6HLH1LLBVlMZ29lrOKqZn6RSXj+iMH2AfkUxuknLASU1Wxi/ZBO1KLYnQIT
-qJrqah1dtV0M5ye+3wByzRhUnFhJS4CxVs6gs2tsN53DevAUDEuSJXu5L7vyq328
-UQ6qQzn6lP8dDwEpyXFscPbRtCNrroqe45kSvn44+O1OHbQCQYkIORhuGv5oeOm9
-982L16J8sVpoCRiU9sqy9u9dGxT3hpLarP8Dcaf4lvoztYFvkwgpClOWYkLnNwv6
-Hx1eNgcPkc5oK/W3k1vH
-=Uxoy
+iF4EAREIAAYFAlCV0NYACgkQ2ugaI38ACPDYugD/SpeazHhI8etmqwKrcsp9pWfJ
+zN+xi3DguKJyn9nTw2oA/igHc9fKmejnKG6pARhadzp3+4fNOhh0+foYXtWsy654
+=ljma
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild
deleted file mode 100644
index a9211c2e741d..000000000000
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild,v 1.3 2012/05/24 02:51:41 vapier Exp $
-
-EAPI="2"
-
-inherit linux-info flag-o-matic eutils
-
-MY_PV=${PV/_/.}
-
-DESCRIPTION="Device-mapper RAID tool and library"
-HOMEPAGE="http://people.redhat.com/~heinzm/sw/dmraid/"
-SRC_URI="http://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static selinux"
-
-RDEPEND="|| ( >=sys-fs/lvm2-2.02.45
-		sys-fs/device-mapper )
-	selinux? ( sys-libs/libselinux
-		   sys-libs/libsepol )"
-DEPEND="${RDEPEND}
-	static? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${PN}/${MY_PV}
-
-pkg_setup() {
-	if kernel_is lt 2 6 ; then
-		ewarn "You are using a kernel < 2.6"
-		ewarn "DMraid uses recently introduced Device-Mapper features."
-		ewarn "These might be unavailable in the kernel you are running now."
-	fi
-	if use static && use selinux ; then
-		eerror "ERROR - cannot compile static with libselinux / libsepol"
-		die "USE flag conflicts."
-	fi
-}
-
-src_prepare() {
-	epatch	"${FILESDIR}"/${P}-undo-p-rename.patch \
-		"${FILESDIR}"/${P}-return-all-sets.patch \
-		"${FILESDIR}"/${PN}-destdir-fix.patch \
-		"${FILESDIR}"/${P}-as-needed2.patch
-
-	if use static; then
-		local myflags
-		myflags=`/usr/bin/pkg-config --libs --static devmapper`
-		sed -i -e "s#^LIBS += -ldl#LIBS += -ldl $myflags#" \
-			tools/Makefile.in || die "sed failed"
-	fi
-
-	# archive the patched source for use with genkernel
-	cd "${WORKDIR}"
-	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static static_link) \
-		$(use_enable selinux libselinux) \
-		$(use_enable selinux libsepol)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGELOG README TODO KNOWN_BUGS doc/* || die "dodoc failed"
-	insinto /usr/share/${PN}
-	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 || die
-}
-
-pkg_postinst() {
-	elog "For booting Gentoo from Device-Mapper RAID you can use Genkernel."
-	elog " "
-	elog "Genkernel will generate the kernel and the initrd with a statically "
-	elog "linked dmraid binary (its own version which may not be the same as this version):"
-	elog "\t emerge -av sys-kernel/genkernel"
-	elog "\t genkernel --dmraid all"
-	elog " "
-	elog "If you would rather use this version of DMRAID with Genkernel, update the following"
-	elog "in /etc/genkernel.conf:"
-	elog "\t DMRAID_VER=\"${MY_PV}\""
-	elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
-	elog " "
-	ewarn "DMRAID should be safe to use, but no warranties can be given"
-}
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
index 4c499a2d6a78..9eec5c4be653 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v 1.3 2012/05/24 02:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v 1.4 2012/11/04 02:19:51 axs Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit autotools linux-info flag-o-matic eutils
 
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dietlibc intel_led klibc led mini static"
+REQUIRED_USE="klibc? ( !dietlibc )"
 
 RDEPEND="|| ( >=sys-fs/lvm2-2.02.45
 		sys-fs/device-mapper )
@@ -39,56 +40,60 @@ src_prepare() {
 		"${FILESDIR}"/${P}-return-all-sets.patch \
 		"${FILESDIR}"/${P}-static-build-fixes.patch
 	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
-	elog "Appending pkg.m4 from system to aclocal.m4"
+	einfo "Appending pkg.m4 from system to aclocal.m4"
 	cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
+	epatch_user
 	eautoreconf
 
-	elog "Creating prepatched source archive for use with Genkernel"
+	einfo "Creating prepatched source archive for use with Genkernel"
 	# archive the patched source for use with genkernel
-	cd "${WORKDIR}"
-	mkdir -p "tmp/${PN}"
-	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}"
-	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}"
-	cd tmp
+	cd "${WORKDIR}" || die
+	mkdir -p "tmp/${PN}" || die
+	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die
+	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die
+	cd tmp || die
 	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
-	mv ${PN}-${MY_PV}-prepatched.tar.bz2 ..
+	mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die
 }
 
 src_configure() {
-	local mylibc
-	if use klibc && use dietlibc; then
-		ewarn "Cannot compile against both klibc and dietlibc -- choosing klibc."
-		mylibc="--enable-klibc --disable-dietlibc"
-	else
-		mylibc="$(use_enable klibc) $(use_enable dietlibc)"
-	fi
 	econf --with-usrlibdir='${prefix}'/$(get_libdir) \
 		$(use_enable static static_link) \
 		$(use_enable mini) \
 		$(use_enable led) \
 		$(use_enable intel_led) \
-		${mylibc}
+		$(use_enable klibc) \
+		$(use_enable dietlibc)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGELOG README TODO KNOWN_BUGS doc/* || die "dodoc failed"
+	emake DESTDIR="${D}" install
+	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
 	insinto /usr/share/${PN}
-	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 || die
+	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2
 }
 
 pkg_postinst() {
-	elog "For booting Gentoo from Device-Mapper RAID you can use Genkernel."
-	elog " "
-	elog "Genkernel will generate the kernel and the initrd with a statically "
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs."
+	elog
+	elog "Genkernel will generate the kernel and the initramfs with a statically "
 	elog "linked dmraid binary (its own version which may not be the same as this version):"
 	elog "\t emerge -av sys-kernel/genkernel"
 	elog "\t genkernel --dmraid all"
-	elog " "
+	fi
+	if [[ ${REPLACING_VERSIONS} != ${PVR} ]]; then
+	elog
+	elog "A pre-patched distfile of this version of DMRAID has been installed at"
+	elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a"
+	elog "Genkernel initramfs."
+	elog
+	fi
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 	elog "If you would rather use this version of DMRAID with Genkernel, update the following"
 	elog "in /etc/genkernel.conf:"
 	elog "\t DMRAID_VER=\"${MY_PV}\""
 	elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
-	elog " "
-	ewarn "DMRAID should be safe to use, but no warranties can be given"
+	elog
+	fi
 }