Cleanup of Makefile mangling.

(Portage version: 2.1_pre10)

7 files changed, 75 insertions, 5 deletions

diff --git a/sys-apps/sg3_utils/ChangeLog b/sys-apps/sg3_utils/ChangeLog
index 9c82e5b5a5b6..1a47d7419b4d 100644
--- a/sys-apps/sg3_utils/ChangeLog
+++ b/sys-apps/sg3_utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sg3_utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.17 2006/04/20 20:30:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.18 2006/04/30 18:46:23 robbat2 Exp $
+
+*sg3_utils-1.20-r1 (30 Apr 2006)
+
+  30 Apr 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +sg3_utils-1.20-r1.ebuild:
+  Cleanup of Makefile mangling.
 
 *sg3_utils-1.20 (20 Apr 2006)
 
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.08 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.08
index 43b35747e497..951f3414fbfd 100644
--- a/sys-apps/sg3_utils/files/digest-sg3_utils-1.08
+++ b/sys-apps/sg3_utils/files/digest-sg3_utils-1.08
@@ -1,2 +1,4 @@
-MD5 07a69f2f58e3954617b99021d002bd39 sg3_utils-1.08.tgz 248876
 MD5 c134b452644dfaa3b5d7b6721492963a rescan-scsi-bus.sh 5884
+RMD160 3ca6340b1299fe15fa96484d6db5ea0232292aba rescan-scsi-bus.sh 5884
+SHA256 14bb8550a240f5eea8047a449dc8f3c33544f45ecc83c6cbcaf7c7ff5c1227d1 rescan-scsi-bus.sh 5884
+MD5 07a69f2f58e3954617b99021d002bd39 sg3_utils-1.08.tgz 248876
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.11 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.11
index 6896a05181e5..ae1142613ad2 100644
--- a/sys-apps/sg3_utils/files/digest-sg3_utils-1.11
+++ b/sys-apps/sg3_utils/files/digest-sg3_utils-1.11
@@ -1,2 +1,6 @@
-MD5 c12b37816ec233bbedd2367f967721ba sg3_utils-1.11.tgz 311124
 MD5 c134b452644dfaa3b5d7b6721492963a rescan-scsi-bus.sh 5884
+RMD160 3ca6340b1299fe15fa96484d6db5ea0232292aba rescan-scsi-bus.sh 5884
+SHA256 14bb8550a240f5eea8047a449dc8f3c33544f45ecc83c6cbcaf7c7ff5c1227d1 rescan-scsi-bus.sh 5884
+MD5 c12b37816ec233bbedd2367f967721ba sg3_utils-1.11.tgz 311124
+RMD160 45c8fef1f3698948c6b25069ab4a3782fd94867d sg3_utils-1.11.tgz 311124
+SHA256 bff5846bb30e6d24a81d42e4d81a72cc62461cce573bbefeb54078dccbf714da sg3_utils-1.11.tgz 311124
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.15 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.15
index 274f32848200..e21d67ae9718 100644
--- a/sys-apps/sg3_utils/files/digest-sg3_utils-1.15
+++ b/sys-apps/sg3_utils/files/digest-sg3_utils-1.15
@@ -1,2 +1,6 @@
-MD5 94730fa515587081ae748339671e0aa1 sg3_utils-1.15.tgz 392614
 MD5 c134b452644dfaa3b5d7b6721492963a rescan-scsi-bus.sh 5884
+RMD160 3ca6340b1299fe15fa96484d6db5ea0232292aba rescan-scsi-bus.sh 5884
+SHA256 14bb8550a240f5eea8047a449dc8f3c33544f45ecc83c6cbcaf7c7ff5c1227d1 rescan-scsi-bus.sh 5884
+MD5 94730fa515587081ae748339671e0aa1 sg3_utils-1.15.tgz 392614
+RMD160 7f360a8cb5d0685143bb10a97502d07f4fd7d6a1 sg3_utils-1.15.tgz 392614
+SHA256 1380d5a2cffd4e8121279201dfc45749c6477232543508f2db7a1a7c05ac4c54 sg3_utils-1.15.tgz 392614
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.18 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.18
index 99c55a5972cc..68743b195332 100644
--- a/sys-apps/sg3_utils/files/digest-sg3_utils-1.18
+++ b/sys-apps/sg3_utils/files/digest-sg3_utils-1.18
@@ -1,2 +1,6 @@
-MD5 555ecbeb08af32a07839f69973c47951 sg3_utils-1.18.tgz 432958
 MD5 c134b452644dfaa3b5d7b6721492963a rescan-scsi-bus.sh 5884
+RMD160 3ca6340b1299fe15fa96484d6db5ea0232292aba rescan-scsi-bus.sh 5884
+SHA256 14bb8550a240f5eea8047a449dc8f3c33544f45ecc83c6cbcaf7c7ff5c1227d1 rescan-scsi-bus.sh 5884
+MD5 555ecbeb08af32a07839f69973c47951 sg3_utils-1.18.tgz 432958
+RMD160 7bf70db01d4a0224e734e41521ead3cc35805c14 sg3_utils-1.18.tgz 432958
+SHA256 4c054eb0007f1fd85a2ecf6a6c486a2098f85f2a1ed1c341c95ed14504c0623c sg3_utils-1.18.tgz 432958
diff --git a/sys-apps/sg3_utils/files/digest-sg3_utils-1.20-r1 b/sys-apps/sg3_utils/files/digest-sg3_utils-1.20-r1
new file mode 100644
index 000000000000..33d1dff5ecda
--- /dev/null
+++ b/sys-apps/sg3_utils/files/digest-sg3_utils-1.20-r1
@@ -0,0 +1,6 @@
+MD5 c134b452644dfaa3b5d7b6721492963a rescan-scsi-bus.sh 5884
+RMD160 3ca6340b1299fe15fa96484d6db5ea0232292aba rescan-scsi-bus.sh 5884
+SHA256 14bb8550a240f5eea8047a449dc8f3c33544f45ecc83c6cbcaf7c7ff5c1227d1 rescan-scsi-bus.sh 5884
+MD5 497804ae918ab470d3fb0ed1d62f77d8 sg3_utils-1.20.tgz 476670
+RMD160 35e865b87a80e29668dcd9a20093cecdcc1d5d6c sg3_utils-1.20.tgz 476670
+SHA256 9febc2018ea70d73edc94b22654fd7bab63ce9874892f9861eb25c6f66090a19 sg3_utils-1.20.tgz 476670
diff --git a/sys-apps/sg3_utils/sg3_utils-1.20-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.20-r1.ebuild
new file mode 100644
index 000000000000..bb8647c04140
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.20-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 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.20-r1.ebuild,v 1.1 2006/04/30 18:46:23 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="apps for querying the sg SCSI interface (contains rescan_scsi_bus.sh)"
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tgz
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-llseek.patch
+	for i in Makefile utils/Makefile; do
+		sed -i \
+			-e "/^CFLAGS/s:-g -O2:${CFLAGS}:g" \
+			-e '/^PREFIX=/s:/local::' \
+			-e 's:$(DESTDIR)/:$(DESTDIR):' \
+			-e "/^LIBDIR=/s:/lib$:/$(get_libdir):" \
+			$i || die "sed of $i failed"
+	done
+}
+
+src_compile() {
+	emake || die "emake failed"
+	emake -C utils || die "emake utils failed"
+}
+
+src_install() {
+	dobin "${DISTDIR}"/rescan-scsi-bus.sh || die "rescan-scsi-bus.sh failed"
+	dodoc examples/*.txt CHANGELOG COVERAGE CREDITS README*
+	dohtml doc/*html
+	make install DESTDIR="${D}" || die "make install failed"
+	make -C utils install DESTDIR="${D}" || die "make install failed"
+}