Closing #61455

7 files changed, 22 insertions, 66 deletions

diff --git a/sys-apps/mdadm/ChangeLog b/sys-apps/mdadm/ChangeLog
index 4641135c4c7c..4b274110061d 100644
--- a/sys-apps/mdadm/ChangeLog
+++ b/sys-apps/mdadm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/mdadm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/ChangeLog,v 1.17 2004/08/21 06:19:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/ChangeLog,v 1.18 2004/08/26 20:25:03 aliz Exp $
+
+*mdadm-1.7.0 (26 Aug 2004)
+
+  26 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> mdadm-1.7.0.ebuild:
+  Version bump, closing #61455.
+  Updated SRC_URI and HOMEPAGE.
+  Cleaned old versions.
 
   21 Aug 2004; Mike Frysinger <vapier@gentoo.org> mdadm-1.6.0.ebuild:
   Stabilize since current stable is broken #60632.
diff --git a/sys-apps/mdadm/Manifest b/sys-apps/mdadm/Manifest
index 899045c81656..c777d5f0cbd3 100644
--- a/sys-apps/mdadm/Manifest
+++ b/sys-apps/mdadm/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 31ae2adbbeb12e9e577807497d3a432f ChangeLog 1886
-MD5 aa9825103b538c38cd8d399a91fce49e mdadm-1.2.0.ebuild 1015
+MD5 832440cef8a582cd3d8e8bf7fbb923a8 mdadm-1.5.0.ebuild 989
 MD5 2f63d7e9aaf03d85c194b59716514c11 mdadm-1.6.0.ebuild 987
+MD5 aa9825103b538c38cd8d399a91fce49e mdadm-1.2.0.ebuild 1015
+MD5 36837936e7e86a7f68fe7d998e0ebb4d mdadm-1.7.0.ebuild 1032
+MD5 31ae2adbbeb12e9e577807497d3a432f ChangeLog 1886
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 832440cef8a582cd3d8e8bf7fbb923a8 mdadm-1.5.0.ebuild 989
-MD5 ad1f1decdfd29bdc6c9777e24e0ac5df files/digest-mdadm-1.6.0 60
 MD5 014cee9c27c5693a1d551858f4d93d27 files/digest-mdadm-1.2.0 59
 MD5 8b84218cb903c00be73bd721bb10051f files/digest-mdadm-1.5.0 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBJumYHTu7gpaalycRAqQBAKDT2reHMJgFPvt26h7skjSnQasp+wCfalpa
-Xlb8hNfthEJpFprtCYvd76M=
-=usSH
------END PGP SIGNATURE-----
+MD5 ad1f1decdfd29bdc6c9777e24e0ac5df files/digest-mdadm-1.6.0 60
+MD5 071af2d112127f0b1b603e6289e5cb29 files/digest-mdadm-1.7.0 59
diff --git a/sys-apps/mdadm/files/digest-mdadm-1.2.0 b/sys-apps/mdadm/files/digest-mdadm-1.2.0
deleted file mode 100644
index 762e0d776699..000000000000
--- a/sys-apps/mdadm/files/digest-mdadm-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf8e2f4c2c77ced0fe54f87164fc3c8c mdadm-1.2.0.tgz 72805
diff --git a/sys-apps/mdadm/files/digest-mdadm-1.5.0 b/sys-apps/mdadm/files/digest-mdadm-1.5.0
deleted file mode 100644
index e5876c1f1542..000000000000
--- a/sys-apps/mdadm/files/digest-mdadm-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 765286c4a22e36b70ce2f817f0c4647c mdadm-1.5.0.tgz 78066
diff --git a/sys-apps/mdadm/files/digest-mdadm-1.7.0 b/sys-apps/mdadm/files/digest-mdadm-1.7.0
new file mode 100644
index 000000000000..fcc3ec365562
--- /dev/null
+++ b/sys-apps/mdadm/files/digest-mdadm-1.7.0
@@ -0,0 +1 @@
+MD5 eb56af3d78cdc4f413bb6f0ec08c51d6 mdadm-1.7.0.tgz 88568
diff --git a/sys-apps/mdadm/mdadm-1.2.0.ebuild b/sys-apps/mdadm/mdadm-1.2.0.ebuild
deleted file mode 100644
index e2a5c451b3cc..000000000000
--- a/sys-apps/mdadm/mdadm-1.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.2.0.ebuild,v 1.8 2004/07/15 01:48:38 agriffis Exp $
-
-DESCRIPTION="An extremely useful tool for running RAID systems - it can be used as a replacement for the raidtools, or as a supplement."
-HOMEPAGE="http://www.cse.unsw.edu.au/~neilb/source"
-SRC_URI="http://www.cse.unsw.edu.au/~neilb/source/${PN}/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 alpha"
-IUSE="static"
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv Makefile Makefile.orig
-	sed -e "36s:^CXFLAGS =:CXFLAGS = $CFLAGS:" Makefile.orig > Makefile
-
-	if use static; then
-		mv Makefile Makefile.orig
-		echo "yes"
-		sed \
-			-e "42s:^# ::" \
-			-e "43s:^# ::" \
-			Makefile.orig > Makefile
-	fi
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	dodoc INSTALL COPYING TODO ANNOUNCE-${PV}
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-}
diff --git a/sys-apps/mdadm/mdadm-1.5.0.ebuild b/sys-apps/mdadm/mdadm-1.7.0.ebuild
index 63dc948a4516..65959c074e6c 100644
--- a/sys-apps/mdadm/mdadm-1.5.0.ebuild
+++ b/sys-apps/mdadm/mdadm-1.7.0.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.5.0.ebuild,v 1.4 2004/06/30 20:45:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.7.0.ebuild,v 1.1 2004/08/26 20:25:03 aliz Exp $
 
 DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools, or as a supplement."
-HOMEPAGE="http://www.cse.unsw.edu.au/~neilb/source"
-SRC_URI="http://www.cse.unsw.edu.au/~neilb/source/${PN}/${P}.tgz"
+HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/mdadm"
+SRC_URI="mirror://kernel/utils/raid/mdadm/${P}.tgz
+	http://neilb.web.cse.unsw.edu.au/source/mdadm/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 IUSE="static"
 
 RDEPEND="virtual/libc"
@@ -22,8 +23,8 @@ src_unpack() {
 	if use static ; then
 		sed -i \
 			-e "44s:^# ::" \
-			-e "45s:^# ::" Makefile \
-				|| die "sed Makefile failed"
+			-e "45s:^# ::" \
+			Makefile || die "sed Makefile failed"
 	fi
 }