Fixed bug 198522 (file collision with genkernel)

(Portage version: 2.1.3.18)

2 files changed, 13 insertions, 12 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index 0516915a4041..bec1c8e9301c 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/dmraid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.11 2007/06/13 19:41:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.12 2007/11/09 07:45:41 genstef Exp $
+
+  09 Nov 2007; Ian Stakenvicius (_AxS_) <ian@syndicated-productions.com>
+  dmraid-1.0.0_rc14.ebuild:
+  Fixed bug 198522 (file collision with genkernel)
+
 
   13 Jun 2007; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   if you commit it, even though it's proxy. you're responsible
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
index 592ae8851635..55b13d303889 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_rc14.ebuild,v 1.1 2007/06/13 14:16:16 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild,v 1.2 2007/11/09 07:45:41 genstef Exp $
 
 inherit linux-info flag-o-matic
 
@@ -51,26 +51,22 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
-
-	# Put the distfile into /usr/share/genkernel/pkg for genkernel
-	# in case the user wants to uuse this instead of genkernel's internal version
-	insinto /usr/share/genkernel/pkg
-	doins "${DISTDIR}"/${A} || die
 }
 
 pkg_postinst() {
 	einfo "For booting Gentoo from Device-Mapper RAID you can use Genkernel."
 	einfo " "
 	einfo "Genkernel will generate the kernel and the initrd with a statically "
-	einfo "linked dmraid binary (its own version - not this version):"
+	einfo "linked dmraid binary (its own version which may not be the same as this version):"
 	einfo "emerge -av sys-kernel/genkernel"
 	einfo "genkernel --dmraid --udev all"
 	einfo " "
-	einfo "If you would rather use this version of DMRAID with Genkernel, update"
-	einfo "the following in /etc/genkernel.conf:"
+	einfo "If you would rather use this version of DMRAID with Genkernel, copy the distfile"
+	einfo "from your distdir to '/usr/share/genkernel/pkg/' and update the following"
+	einfo "in /etc/genkernel.conf:"
 	einfo "DMRAID_VER=\"${MY_PV/_/.}\""
 	einfo "DMRAID_SRCTAR=\"\${GK_SHARE}/pkg/${A}\""
-	ewarn " "
+	einfo " "
 	ewarn "DMRAID should be safe to use, but no warranties can be given"
-	ewarn " "
+	einfo " "
 }