Fixed bug 198522 (file collision with genkernel)

Package-Manager: portage-2.1.3.18

3 files changed, 21 insertions, 30 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/Manifest b/sys-fs/dmraid/Manifest
index 0c5c63373adc..eede5c129d10 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dmraid-destdir-fix.patch 902 RMD160 8641454fcab27ff5f122e50cc1cdc4559e484692 SHA1 8dac0fd6d374cbdd490f101817677ac66dfc87ce SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb254c81e596af6e1481db1d667
 MD5 83d706f175f30caa00bab6bd00f14d30 files/dmraid-destdir-fix.patch 902
 RMD160 8641454fcab27ff5f122e50cc1cdc4559e484692 files/dmraid-destdir-fix.patch 902
 SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb254c81e596af6e1481db1d667 files/dmraid-destdir-fix.patch 902
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
-EBUILD dmraid-1.0.0_rc14.ebuild 2288 RMD160 03b2a20db20179d344fc05ed008c0a2fb85dccfe SHA1 51ec7fc65dd89156c82837adb635ec736566b753 SHA256 03b1813918c0075650c7e3ad141338b76c5dff832039ebbb595936567e6ff984
-MD5 3ab05ce30b238da22c7abdc489346c2c dmraid-1.0.0_rc14.ebuild 2288
-RMD160 03b2a20db20179d344fc05ed008c0a2fb85dccfe dmraid-1.0.0_rc14.ebuild 2288
-SHA256 03b1813918c0075650c7e3ad141338b76c5dff832039ebbb595936567e6ff984 dmraid-1.0.0_rc14.ebuild 2288
-MISC ChangeLog 2694 RMD160 05fd00a9c7147c5470d110aa91f3021de680584b SHA1 a19922605813191aed5cc652300f13fab8f5c76f SHA256 1ca00e2a1ea695f6d5af296cf255a498a2389fd2b676e5841572504e21b0c2e1
-MD5 aa72bbc1680002a8d57bc508cfe9c2d3 ChangeLog 2694
-RMD160 05fd00a9c7147c5470d110aa91f3021de680584b ChangeLog 2694
-SHA256 1ca00e2a1ea695f6d5af296cf255a498a2389fd2b676e5841572504e21b0c2e1 ChangeLog 2694
+EBUILD dmraid-1.0.0_rc14.ebuild 2181 RMD160 50f22288c7f38da8060c1dfc18dfc6a395f9879b SHA1 8966dbfa0f2c55334aecfefa334bde65ad266175 SHA256 a43469ca4d9d76bdc0f1ae1692935a04568716f6c0476e076ea2b75890d95331
+MD5 3fc46a9268fdc687cd06beefd1832345 dmraid-1.0.0_rc14.ebuild 2181
+RMD160 50f22288c7f38da8060c1dfc18dfc6a395f9879b dmraid-1.0.0_rc14.ebuild 2181
+SHA256 a43469ca4d9d76bdc0f1ae1692935a04568716f6c0476e076ea2b75890d95331 dmraid-1.0.0_rc14.ebuild 2181
+MISC ChangeLog 2849 RMD160 4a2b9768e963c0c32379861430a19a56ac3a25ba SHA1 a2636708c5abc3a7c8b9346ba7b9160c025958d2 SHA256 71312f8056f7896be78a0c5ed3219270bc778b00bb5dc35eaf5ebc2588782f6c
+MD5 6c2175725e873a75ae18fd34fd08ca6b ChangeLog 2849
+RMD160 4a2b9768e963c0c32379861430a19a56ac3a25ba ChangeLog 2849
+SHA256 71312f8056f7896be78a0c5ed3219270bc778b00bb5dc35eaf5ebc2588782f6c ChangeLog 2849
 MISC metadata.xml 491 RMD160 5bebca572477871c7c6bdc7a51654ac02178fc55 SHA1 98e18a51a696533536e10a12e1b7ad0f4e98c22f SHA256 700390f4ed908daabe4704b81ae03d4052b2f9dad1199eb5b68db0d48bc48155
 MD5 0676b58e938506448baec84d50a4dc48 metadata.xml 491
 RMD160 5bebca572477871c7c6bdc7a51654ac02178fc55 metadata.xml 491
@@ -21,10 +18,3 @@ SHA256 700390f4ed908daabe4704b81ae03d4052b2f9dad1199eb5b68db0d48bc48155 metadata
 MD5 80797fa2bc66476778b60b83ba08f62c files/digest-dmraid-1.0.0_rc14 256
 RMD160 d6a523b9bbe77fd8bc7f446bc2520aa0989d38e0 files/digest-dmraid-1.0.0_rc14 256
 SHA256 d9fb1f259f913e668a2bfb57b8eef502ae2d29f3246d5b035216df6fa4f3d46d files/digest-dmraid-1.0.0_rc14 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD4DBQFGcEhgoeSe8B0zEfwRAlqzAJoCDm5QZuiZ9pjxbIOSqKBCMmwcfACWMmcn
-e9Zf6UnNsoY3YTsXHEZ1Hg==
-=JFfL
------END PGP SIGNATURE-----
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 " "
 }