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

(Portage version: 2.1.4)

6 files changed, 82 insertions, 56 deletions

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/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
+}