Shuffle files around.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64)

5 files changed, 14 insertions, 8 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index a62f7d456841..6a76673a11e9 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.98 2008/05/12 15:42:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.99 2008/06/28 16:36:45 vapier Exp $
+
+  28 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  -files/raid-stop.sh-2.6.3-r2, +files/64-md-raid.rules,
+  -files/64-md-raid.rules-2.6.3-r2, +files/raid-stop.sh,
+  mdadm-2.6.4-r1.ebuild, mdadm-2.6.4-r2.ebuild:
+  Shuffle files around.
 
   12 May 2008; Markus Meier <maekke@gentoo.org> mdadm-2.6.4-r1.ebuild:
   amd64 stable, bug #215353
diff --git a/sys-fs/mdadm/files/64-md-raid.rules-2.6.3-r2 b/sys-fs/mdadm/files/64-md-raid.rules
index 6bbfd126dffd..6bbfd126dffd 100644
--- a/sys-fs/mdadm/files/64-md-raid.rules-2.6.3-r2
+++ b/sys-fs/mdadm/files/64-md-raid.rules
diff --git a/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2 b/sys-fs/mdadm/files/raid-stop.sh
index b76e56ac4e29..a59fd317a5df 100644
--- a/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2
+++ b/sys-fs/mdadm/files/raid-stop.sh
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/raid-stop.sh:  Stop raid volumes at shutdown
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-stop.sh-2.6.3-r2,v 1.1 2007/10/03 11:58:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-stop.sh,v 1.4 2008/06/28 16:36:46 vapier Exp $
 
 [ -f /proc/mdstat ] || exit 0
 
diff --git a/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild b/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild
index 763a306abee6..ba9e0dcb2a17 100644
--- a/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild,v 1.5 2008/05/12 15:42:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.4-r1.ebuild,v 1.6 2008/06/28 16:36:45 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -33,7 +33,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	exeinto /$(get_libdir)/rcscripts/addons
 	newexe "${FILESDIR}"/raid-start.sh-2.6.4 raid-start.sh || die "addon failed"
-	newexe "${FILESDIR}"/raid-stop.sh-2.6.3-r2 raid-stop.sh || die "addon failed"
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die "addon failed"
 	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
 
 	insinto /etc
@@ -43,7 +43,7 @@ src_install() {
 	newinitd "${FILESDIR}"/mdraid.rc-2.6.3-r4 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
+	newins "${FILESDIR}"/64-md-raid.rules 64-md-raid.rules || die
 }
 
 pkg_postinst() {
diff --git a/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild b/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild
index 391bbd956edd..8b994e78391d 100644
--- a/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild,v 1.1 2008/03/29 19:21:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.6.4-r2.ebuild,v 1.2 2008/06/28 16:36:45 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,7 +39,7 @@ src_install() {
 
 	exeinto /$(get_libdir)/rcscripts/addons
 	newexe "${FILESDIR}"/raid-start.sh-2.6.4 raid-start.sh || die "addon failed"
-	newexe "${FILESDIR}"/raid-stop.sh-2.6.3-r2 raid-stop.sh || die "addon failed"
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die "addon failed"
 
 	insinto /etc
 	newins mdadm.conf-example mdadm.conf
@@ -48,7 +48,7 @@ src_install() {
 	newinitd "${FILESDIR}"/mdraid.rc-2.6.3-r4 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
+	newins "${FILESDIR}"/64-md-raid.rules 64-md-raid.rules || die
 }
 
 pkg_postinst() {