Remove old ebuild, clean up existing, version bump for sysfs scanning stuff.

Package-Manager: portage-2.1.4

8 files changed, 106 insertions, 80 deletions

diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index ed9c024827ab..88dd76319e36 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -38,14 +38,14 @@ EBUILD iscsitarget-0.4.15.ebuild 1746 RMD160 89f74d4e956ef1134aa68edb2d896166dac
 MD5 d67f4ef09bd2332e31fca9dd99a91d3d iscsitarget-0.4.15.ebuild 1746
 RMD160 89f74d4e956ef1134aa68edb2d896166dac6d981 iscsitarget-0.4.15.ebuild 1746
 SHA256 68ca87e41c42b0047f9220254066709b53347bc8fa734a7db880fb8bb030eea1 iscsitarget-0.4.15.ebuild 1746
-MISC ChangeLog 1549 RMD160 6cdfd0680b6476fba2d3f63828645964a5d5566c SHA1 b01eb1402427499b01287b7bd4c6aa71ffd1c938 SHA256 facdf9a5b4e5c1871962668e10baad4b5b0a5441bb6186c3878679e2b1708bbe
-MD5 83f6fbef21a1cc9f6ac520752e6e4b87 ChangeLog 1549
-RMD160 6cdfd0680b6476fba2d3f63828645964a5d5566c ChangeLog 1549
-SHA256 facdf9a5b4e5c1871962668e10baad4b5b0a5441bb6186c3878679e2b1708bbe ChangeLog 1549
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
-MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
-SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
+MISC ChangeLog 1632 RMD160 27a20f0fe3f22a0d6c6a158b9a55c77e5f0d89c7 SHA1 e87e25fc28807cde95cceefe1a5413cdc77fddef SHA256 ad0fe79954c01b626f4004ad51e5beadb091f85ef5b5e43ec7d56e3a456fcc3d
+MD5 c202dc4423f7a739c8b926e7957bd57d ChangeLog 1632
+RMD160 27a20f0fe3f22a0d6c6a158b9a55c77e5f0d89c7 ChangeLog 1632
+SHA256 ad0fe79954c01b626f4004ad51e5beadb091f85ef5b5e43ec7d56e3a456fcc3d ChangeLog 1632
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 1487fdbce503f060db9e0aa0c1acd1d7 files/digest-iscsitarget-0.4.12 253
 RMD160 b42a829fe809f810fa0d0da73a73ce6742b6b8e0 files/digest-iscsitarget-0.4.12 253
 SHA256 ef24582b5debdc6a30822f6a5651c58a1665166b1754a0ca80a804715c49ede6 files/digest-iscsitarget-0.4.12 253
diff --git a/sys-block/scsirastools/ChangeLog b/sys-block/scsirastools/ChangeLog
index f7b2bc1454cb..212852234e7e 100644
--- a/sys-block/scsirastools/ChangeLog
+++ b/sys-block/scsirastools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/scsirastools
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/scsirastools/ChangeLog,v 1.5 2007/05/24 07:29:46 robbat2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/scsirastools/ChangeLog,v 1.6 2008/01/14 01:56:04 robbat2 Exp $
+
+*scsirastools-1.5.6 (14 Jan 2008)
+
+  14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
+  -scsirastools-1.4.16.ebuild, scsirastools-1.5.4.ebuild,
+  +scsirastools-1.5.6.ebuild:
+  Remove old ebuild, clean up existing, version bump for sysfs scanning stuff.
 
 *scsirastools-1.5.4 (24 May 2007)
 
diff --git a/sys-block/scsirastools/Manifest b/sys-block/scsirastools/Manifest
index f544b061afa6..84e85149a675 100644
--- a/sys-block/scsirastools/Manifest
+++ b/sys-block/scsirastools/Manifest
@@ -1,24 +1,24 @@
-DIST scsirastools-1.4.16.tar.gz 467232 RMD160 a97243bef43b8527eb9086625eac7787c85d33b0 SHA1 3f23ce102bd7dfe235df99114fa1c0468c452895 SHA256 008a9297e45d6b03ddcb6840386c48999ccacffd734063d2e6988632ce36ccce
 DIST scsirastools-1.5.4.tar.gz 632340 RMD160 6e3d797b4c0d3274108ce65e3aa60f2f4da559e5 SHA1 93c5f67fb10bc0ea7c8888557b0afeda21bd6bf4 SHA256 d22c4917d8d2277710ea6bd4742874a62fc5666154ee6715966216daa865297c
-EBUILD scsirastools-1.4.16.ebuild 1103 RMD160 125cfe08268a624092ca9717ae9052a101056da2 SHA1 497fc98be63655f76901cf821b23b3266f8f6fee SHA256 76507497e96abf0f0f0bc2e06bb3679c0b0b9c2f1637f6dbd810702625c9b5f8
-MD5 b3b02b8bca798c423d3b197a0f8a424f scsirastools-1.4.16.ebuild 1103
-RMD160 125cfe08268a624092ca9717ae9052a101056da2 scsirastools-1.4.16.ebuild 1103
-SHA256 76507497e96abf0f0f0bc2e06bb3679c0b0b9c2f1637f6dbd810702625c9b5f8 scsirastools-1.4.16.ebuild 1103
-EBUILD scsirastools-1.5.4.ebuild 1585 RMD160 3aa7f5567f277baba6b13e37ba69085aff2ccd92 SHA1 2094076a9f5d640c26a00b1c2e21a2fe65d6cf7e SHA256 02bd0688eba2d783bd1b9eca21995ef93ef46a843062a7258a6af4301079fda0
-MD5 8841e29a9f9fda6a05a0048830c5e09d scsirastools-1.5.4.ebuild 1585
-RMD160 3aa7f5567f277baba6b13e37ba69085aff2ccd92 scsirastools-1.5.4.ebuild 1585
-SHA256 02bd0688eba2d783bd1b9eca21995ef93ef46a843062a7258a6af4301079fda0 scsirastools-1.5.4.ebuild 1585
-MISC ChangeLog 839 RMD160 d2953bae3288d2a2c5a0751bf87a2c433189f8d3 SHA1 3f994ad9889cfe1502491f8a69a51dd81c745c45 SHA256 b43fe2a4961278efcd442de1eafd906371640d983faf4a2c242fed7f6a7b8fb5
-MD5 39f0520f9bed96d9f8d9c8caa8939a12 ChangeLog 839
-RMD160 d2953bae3288d2a2c5a0751bf87a2c433189f8d3 ChangeLog 839
-SHA256 b43fe2a4961278efcd442de1eafd906371640d983faf4a2c242fed7f6a7b8fb5 ChangeLog 839
+DIST scsirastools-1.5.6.tar.gz 549895 RMD160 1ec760e644d43fb9d31204b79075df66511fc95a SHA1 a94afd4c8666cde2ccc5f4c8c985634ead2d68a9 SHA256 fc3663bdd78ef14c75cc45d1922329a1be80a433627b4936593175f728b5b48a
+EBUILD scsirastools-1.5.4.ebuild 1596 RMD160 a367909eb0929e065395d7e1e36969de7c023228 SHA1 0aae0568bb8862e8b599513239c51abb6f8ce712 SHA256 c4395ec40c0f95af62c5714e38079025a94a94e9973a40cdfd1cb247dda2de01
+MD5 3205b002f6eb826c1452f5cda4049397 scsirastools-1.5.4.ebuild 1596
+RMD160 a367909eb0929e065395d7e1e36969de7c023228 scsirastools-1.5.4.ebuild 1596
+SHA256 c4395ec40c0f95af62c5714e38079025a94a94e9973a40cdfd1cb247dda2de01 scsirastools-1.5.4.ebuild 1596
+EBUILD scsirastools-1.5.6.ebuild 1608 RMD160 c97a1ab6341eaf5d8f3b012fb6f4fe34458f3e0d SHA1 c63f043bb768c75f9e0e812415b8060b18a9937a SHA256 83a22dec0b7cba04d5e09e92467a5ff0f33f39e6a8ff49c09b57644782e68d9b
+MD5 be9346ac682bc7e6bf1dfd482003d53b scsirastools-1.5.6.ebuild 1608
+RMD160 c97a1ab6341eaf5d8f3b012fb6f4fe34458f3e0d scsirastools-1.5.6.ebuild 1608
+SHA256 83a22dec0b7cba04d5e09e92467a5ff0f33f39e6a8ff49c09b57644782e68d9b scsirastools-1.5.6.ebuild 1608
+MISC ChangeLog 1095 RMD160 52e00d7ec44f50d81423d2b9130dd9a39a03bc11 SHA1 f60b3d76413aced9e52222be15872b6787df4e3c SHA256 dba477c9202865a1f3547ece06090187c6c1dd5e08a1adae0cd5bc30db4988d2
+MD5 39d920efd4d9bf3be47e42d995e7ec55 ChangeLog 1095
+RMD160 52e00d7ec44f50d81423d2b9130dd9a39a03bc11 ChangeLog 1095
+SHA256 dba477c9202865a1f3547ece06090187c6c1dd5e08a1adae0cd5bc30db4988d2 ChangeLog 1095
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
-MD5 8496ae7ba929159680774f4a8fbc7214 files/digest-scsirastools-1.4.16 259
-RMD160 e7d114e1e4da3a30cabc663af09e652ed564f6d1 files/digest-scsirastools-1.4.16 259
-SHA256 a96ae547feb44c9f9672480038b4029287271e9012fd8ee2967df660b4d1b059 files/digest-scsirastools-1.4.16 259
 MD5 f2fe767548e975a5f9c4a8204129cd23 files/digest-scsirastools-1.5.4 256
 RMD160 9e08bceeacf974be8ec93f5fc7c34b42c25feed7 files/digest-scsirastools-1.5.4 256
 SHA256 3edf0f38fe45de35f0af896bc92b876e5ad75a7388d73c2416a0725ad2e16d85 files/digest-scsirastools-1.5.4 256
+MD5 d579588b64456961fe55444ba823bbdd files/digest-scsirastools-1.5.6 256
+RMD160 ed5b094b21edfeb6332aa793795b8f3f0441426f files/digest-scsirastools-1.5.6 256
+SHA256 ae1ad29b67dcdcfb3756550db2926092005235358f018f0bbaff3b42dcd4080f files/digest-scsirastools-1.5.6 256
diff --git a/sys-block/scsirastools/files/digest-scsirastools-1.4.16 b/sys-block/scsirastools/files/digest-scsirastools-1.4.16
deleted file mode 100644
index 3a979f3c40f1..000000000000
--- a/sys-block/scsirastools/files/digest-scsirastools-1.4.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f6c092af64a2518b285bac93de78cb3 scsirastools-1.4.16.tar.gz 467232
-RMD160 a97243bef43b8527eb9086625eac7787c85d33b0 scsirastools-1.4.16.tar.gz 467232
-SHA256 008a9297e45d6b03ddcb6840386c48999ccacffd734063d2e6988632ce36ccce scsirastools-1.4.16.tar.gz 467232
diff --git a/sys-block/scsirastools/files/digest-scsirastools-1.5.6 b/sys-block/scsirastools/files/digest-scsirastools-1.5.6
new file mode 100644
index 000000000000..eec4a94b2095
--- /dev/null
+++ b/sys-block/scsirastools/files/digest-scsirastools-1.5.6
@@ -0,0 +1,3 @@
+MD5 77701908cf311e4fddeaf6ec105ff62a scsirastools-1.5.6.tar.gz 549895
+RMD160 1ec760e644d43fb9d31204b79075df66511fc95a scsirastools-1.5.6.tar.gz 549895
+SHA256 fc3663bdd78ef14c75cc45d1922329a1be80a433627b4936593175f728b5b48a scsirastools-1.5.6.tar.gz 549895
diff --git a/sys-block/scsirastools/scsirastools-1.4.16.ebuild b/sys-block/scsirastools/scsirastools-1.4.16.ebuild
deleted file mode 100644
index 4e96d87d6a7f..000000000000
--- a/sys-block/scsirastools/scsirastools-1.4.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/scsirastools/scsirastools-1.4.16.ebuild,v 1.3 2006/06/30 00:57:28 robbat2 Exp $
-
-inherit autotools
-
-DESCRIPTION="Serviceability for SCSI Disks and Arrays"
-HOMEPAGE="http://scsirastools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-DEPEND="virtual/libc"
-#RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	# this builds a really old mdadm
-	sed -i.orig \
-		-e '/^SUBDIRS/s,mdadm.d,,' \
-		-e '/^SUBDIRS/s,files,,' \
-		${S}/Makefile.am || die "sed Makefile.am failed"
-	eautomake
-}
-
-src_compile() {
-	econf --sbindir=/usr/sbin || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	docdir="/usr/share/doc/${PF}/"
-	emake install DESTDIR="${D}" datato="${D}${docdir}" \
-		|| "emake install failed"
-	# unneeded files
-	rm ${D}${docdir}/{SCSIRAS,COPYING}
-	# install modepage files
-	insinto /usr/share/${PN}
-	doins files/*.mdf
-	# new docs
-	dodoc ChangeLog AUTHORS TODO
-	prepalldocs
-}
diff --git a/sys-block/scsirastools/scsirastools-1.5.4.ebuild b/sys-block/scsirastools/scsirastools-1.5.4.ebuild
index dafa2b971d0c..8f29efd1ce16 100644
--- a/sys-block/scsirastools/scsirastools-1.5.4.ebuild
+++ b/sys-block/scsirastools/scsirastools-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/scsirastools/scsirastools-1.5.4.ebuild,v 1.2 2007/06/26 02:49:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/scsirastools/scsirastools-1.5.4.ebuild,v 1.3 2008/01/14 01:56:04 robbat2 Exp $
 
 inherit autotools
 
@@ -22,15 +22,15 @@ src_unpack() {
 	sed -i.orig \
 		-e '/^SUBDIRS/s,mdadm.d,,' \
 		-e '/^SUBDIRS/s,files,,' \
-		${S}/Makefile.am || die "sed Makefile.am failed"
-	cd ${S}
+		"${S}"/Makefile.am || die "sed Makefile.am failed"
+	cd "${S}"
 	eautoreconf
 	# i386 ELF binaries in tarball = bad
-	rm -f ${S}/files/alarms*
+	rm -f "${S}"/files/alarms*
 
 	# Fix up /sbin instances to be /usr/sbin instead
 	for i in src/sgraidmon.c src/sgdiskmon.c ; do
-		sed -i ${S}/${i} \
+		sed -i "${S}"/${i} \
 			-e '/evtcmd\[\].*\"\/sbin\//s,/sbin/,/usr/sbin/,' \
 			|| die "Failed to set /sbin in sources"
 	done
@@ -51,7 +51,7 @@ src_install() {
 	dosbin files/sgevt
 	dosbin files/mdevt
 	# unneeded files
-	rm ${D}${docdir}/{SCSIRAS,COPYING}
+	rm -f "${D}"${docdir}/{SCSIRAS,COPYING}
 	# install modepage files
 	insinto /usr/share/${PN}
 	doins files/*.mdf
diff --git a/sys-block/scsirastools/scsirastools-1.5.6.ebuild b/sys-block/scsirastools/scsirastools-1.5.6.ebuild
new file mode 100644
index 000000000000..58c34b807609
--- /dev/null
+++ b/sys-block/scsirastools/scsirastools-1.5.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/scsirastools/scsirastools-1.5.6.ebuild,v 1.1 2008/01/14 01:56:04 robbat2 Exp $
+
+inherit autotools
+
+DESCRIPTION="Serviceability for SCSI Disks and Arrays"
+HOMEPAGE="http://scsirastools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+DEPEND="virtual/libc
+		sys-apps/rescan-scsi-bus
+		sys-apps/sg3_utils"
+#RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	# this builds a really old mdadm
+	sed -i \
+		-e '/RPMB/d' \
+		-e '/^SUBDIRS/s,mdadm.d,,' \
+		-e '/^SUBDIRS/s,files,,' \
+		"${S}"/Makefile.am || die "sed Makefile.am failed"
+	cd "${S}"
+	eautoreconf
+	# i386 ELF binaries in tarball = bad
+	rm -f "${S}"/files/alarms*
+
+	# Fix up /sbin instances to be /usr/sbin instead
+	for i in src/sgraidmon.c src/sgdiskmon.c ; do
+		sed -i "${S}"/${i} \
+			-e '/evtcmd\[\].*\"\/sbin\//s,/sbin/,/usr/sbin/,' \
+			|| die "Failed to set /sbin in sources"
+	done
+}
+
+src_compile() {
+	econf --sbindir=/usr/sbin \
+		|| die "econf failed"
+	emake \
+		|| die "emake failed"
+}
+
+src_install() {
+	into /usr
+	docdir="/usr/share/doc/${PF}/"
+	emake install DESTDIR="${D}" datato="${D}${docdir}" \
+		|| "emake install failed"
+	dosbin files/sgevt
+	dosbin files/mdevt
+	# unneeded files
+	rm -f "${D}"${docdir}/{SCSIRAS,COPYING}
+	# install modepage files
+	insinto /usr/share/${PN}
+	doins files/*.mdf
+	# new docs
+	dodoc ChangeLog AUTHORS TODO
+	# ensure that other docs from the emake install are compressed too.
+	prepalldocs
+}