Added "Contains rescan_scsi_bus." to ${DESCRIPTION} and added 1.10 - bugs #70012, #70019. Marked 1.08 stable on x86.

6 files changed, 26 insertions, 16 deletions

diff --git a/sys-apps/sg3_utils/ChangeLog b/sys-apps/sg3_utils/ChangeLog
index f0da31bea362..c00676439fcf 100644
--- a/sys-apps/sg3_utils/ChangeLog
+++ b/sys-apps/sg3_utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/sg3_utils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.8 2004/08/30 23:32:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.9 2004/11/07 20:19:10 plasmaroo Exp $
+
+*sg3_utils-1.10 (07 Nov 2004)
+
+  07 Nov 2004; <plasmaroo@gentoo.org> -sg3_utils-1.06.ebuild,
+  sg3_utils-1.08.ebuild, +sg3_utils-1.10.ebuild:
+  Added "Contains rescan_scsi_bus." to ${DESCRIPTION} and added 1.10 - bugs
+  #70012, #70019. Marked 1.08 stable on x86.
 
   31 Aug 2004; David Holm <dholm@gentoo.org> sg3_utils-1.08.ebuild:
   Added to ~ppc.
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 55f1f67507d1..9c8952f5a667 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,7 +1,7 @@
-MD5 1532dd33e9076d30a747bf7cf6218f7d ChangeLog 1116
+MD5 d17ced166459b44290f45f5eb6032e4f ChangeLog 1380
+MD5 7a552051f777c3bc4966e4b9339ebccc sg3_utils-1.08.ebuild 931
 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
-MD5 056ba9d88997262bc82bbcba5e3c5f25 sg3_utils-1.06.ebuild 725
-MD5 8d9cd17cbaba29a9ecdfe2ac2a1c4fef sg3_utils-1.08.ebuild 905
-MD5 18e1643c00f4fa0f0faf858f1677631a files/digest-sg3_utils-1.06 63
+MD5 cb9745d2b9ac34cc6143672349313ee4 sg3_utils-1.10.ebuild 916
 MD5 415ccd09bf2a67e4ccc39d50059b8c14 files/sg3_utils-llseek.patch 1948
 MD5 e309d737cc7ca64e5d5beb764d1ba316 files/digest-sg3_utils-1.08 124
+MD5 ec181135a6bdbf57f0a7d04272d93a33 files/digest-sg3_utils-1.10 124
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.06 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.06
deleted file mode 100644
index f1cfd19ef6f2..000000000000
--- a/sys-apps/sg3_utils/files/digest-sg3_utils-1.06
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8a88da18086326d612c0d0adaefb367 sg3_utils-1.06.tgz 206219
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.10 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.10
new file mode 100644
index 000000000000..eb7dc511a572
--- /dev/null
+++ b/sys-apps/sg3_utils/files/digest-sg3_utils-1.10
@@ -0,0 +1,2 @@
+MD5 b1ed372d2c2ef5ffc43f5511a5882186 sg3_utils-1.10.tgz 291946
+MD5 c134b452644dfaa3b5d7b6721492963a rescan-scsi-bus.sh 5884
diff --git a/sys-apps/sg3_utils/sg3_utils-1.08.ebuild b/sys-apps/sg3_utils/sg3_utils-1.08.ebuild
index 79e0d251c09a..cbd065e31ff2 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.08.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.08.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.08.ebuild,v 1.2 2004/08/30 23:32:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.08.ebuild,v 1.3 2004/11/07 20:19:10 plasmaroo Exp $
 
 inherit eutils
 
-DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface"
+DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface. Contains rescan_scsi_bus."
 HOMEPAGE="http://www.torque.net/sg/"
 SRC_URI="http://www.torque.net/sg/p/${P}.tgz
 	http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh"
@@ -12,7 +12,7 @@ SRC_URI="http://www.torque.net/sg/p/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/sg3_utils/sg3_utils-1.06.ebuild b/sys-apps/sg3_utils/sg3_utils-1.10.ebuild
index c502a1f519e7..74aef0875c40 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.06.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.10.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.06.ebuild,v 1.5 2004/08/09 21:38:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.10.ebuild,v 1.1 2004/11/07 20:19:10 plasmaroo Exp $
 
 inherit eutils
 
-DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface"
+DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface. Contains rescan_scsi_bus."
 HOMEPAGE="http://www.torque.net/sg/"
-SRC_URI="http://www.torque.net/sg/p/sg3_utils-1.06.tgz"
+SRC_URI="http://www.torque.net/sg/p/${P}.tgz
+	http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh"
 
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 IUSE=""
 
 DEPEND=""
 
 src_unpack() {
-	unpack ${A}
+	unpack ${P}.tgz
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-llseek.patch
-
 	sed -i "s:-O2:$CFLAGS:g" Makefile
 }
 
@@ -30,5 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall INSTDIR=${D}/usr/bin MANDIR=${D}/usr/man || die
+	exeinto /usr/bin
+	doexe ${DISTDIR}/rescan-scsi-bus.sh || die 'Failed to install rescan-scsi-bus.sh!'
+	einstall DESTDIR=${D} PREFIX=/usr || die 'Failed to install sg3_utils!'
 }