Cleanup of Makefile mangling.

Package-Manager: portage-2.1_pre10

8 files changed, 122 insertions, 29 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/Manifest b/sys-apps/sg3_utils/Manifest
index dffd09b9b653..b8e03108cc17 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,45 +1,68 @@
-MD5 d9ebc8e3e803f0b8cfd2cadaf5441900 ChangeLog 2396
-RMD160 5f547f2085f38c856426629fd9a1f1e1b0b67921 ChangeLog 2396
-SHA256 3e9eaa1e5a686c21bbf5ce8ec5d822c8d9109d55f8152f4751512ab432283451 ChangeLog 2396
-MD5 e309d737cc7ca64e5d5beb764d1ba316 files/digest-sg3_utils-1.08 124
-RMD160 ce9188bc534b7ee5718b20793adf60e5fb254303 files/digest-sg3_utils-1.08 124
-SHA256 24cbfa0c5ba8a7bfa65e0768c78d52e3466828e011d3c11d03bbc20fb8780502 files/digest-sg3_utils-1.08 124
-MD5 3fcc23751b641786325f54e9df3fca05 files/digest-sg3_utils-1.11 124
-RMD160 5692e094ec10c3880fbb44f9ff4e13e4e9de01ac files/digest-sg3_utils-1.11 124
-SHA256 109b1f3278df65ea241a6c1e52835e2394eeba4a8719b7fda145a294eaf2d923 files/digest-sg3_utils-1.11 124
-MD5 8dcedd2980cb1b56ed8e0a60b13f8c48 files/digest-sg3_utils-1.15 124
-RMD160 c53a60dc94f5e55306b39156b3559d7919bccaa2 files/digest-sg3_utils-1.15 124
-SHA256 78f60e927212851411a757827a5ab8dc1e88d048879a03f2f6f28ada2580cce9 files/digest-sg3_utils-1.15 124
-MD5 e61a2356faa4d56813189ce165239197 files/digest-sg3_utils-1.18 124
-RMD160 687ea666527286f1abcc1801ef6c0e9a627755bc files/digest-sg3_utils-1.18 124
-SHA256 cdcf8db5df49fa6227a33372ff15296d184ee7c53bff5bf770a33cfacce56fb4 files/digest-sg3_utils-1.18 124
-MD5 b214fc50e9a64355c98c46ea2ba4bd88 files/digest-sg3_utils-1.19 464
-RMD160 3971468af90f01ff35f7af3bfa08301762dfb018 files/digest-sg3_utils-1.19 464
-SHA256 3de2f92422557cab5060cabda3ecb1c9daa936bbaf57528b0295a39bb332b22b files/digest-sg3_utils-1.19 464
-MD5 bee4d6c8290a6878e9d661089e4914ad files/digest-sg3_utils-1.20 464
-RMD160 c6a09dc7fd9d87ad3290d00ca01f7ef275436e95 files/digest-sg3_utils-1.20 464
-SHA256 2918dd209ff1ea2df3ab2763077026ed8036c2306f3edc5258e7e5401a3e275e files/digest-sg3_utils-1.20 464
+AUX sg3_utils-llseek.patch 1948 RMD160 66f3516204a991376c19f57a322731c8d05eb23d SHA1 5a8056e81013a62dad55c0be10deed4965048fd0 SHA256 626c06bd57765e1a6772b0d05736f4542f1fa0f8a476bced614a11065758a057 size 1948
 MD5 415ccd09bf2a67e4ccc39d50059b8c14 files/sg3_utils-llseek.patch 1948
 RMD160 66f3516204a991376c19f57a322731c8d05eb23d files/sg3_utils-llseek.patch 1948
 SHA256 626c06bd57765e1a6772b0d05736f4542f1fa0f8a476bced614a11065758a057 files/sg3_utils-llseek.patch 1948
-MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
-RMD160 5fd2e8688b03168f4534b6d2e50fa7bb8a16abe2 metadata.xml 228
-SHA256 a9149d44e45790d278c94b4d7c79bdbb20f91fca57bc33ad67232a3bc0fe635e metadata.xml 228
+DIST rescan-scsi-bus.sh 5884 RMD160 3ca6340b1299fe15fa96484d6db5ea0232292aba SHA256 14bb8550a240f5eea8047a449dc8f3c33544f45ecc83c6cbcaf7c7ff5c1227d1 size 5884
+DIST sg3_utils-1.08.tgz 248876 size 248876
+DIST sg3_utils-1.11.tgz 311124 RMD160 45c8fef1f3698948c6b25069ab4a3782fd94867d SHA256 bff5846bb30e6d24a81d42e4d81a72cc62461cce573bbefeb54078dccbf714da size 311124
+DIST sg3_utils-1.15.tgz 392614 RMD160 7f360a8cb5d0685143bb10a97502d07f4fd7d6a1 SHA256 1380d5a2cffd4e8121279201dfc45749c6477232543508f2db7a1a7c05ac4c54 size 392614
+DIST sg3_utils-1.18.tgz 432958 RMD160 7bf70db01d4a0224e734e41521ead3cc35805c14 SHA256 4c054eb0007f1fd85a2ecf6a6c486a2098f85f2a1ed1c341c95ed14504c0623c size 432958
+DIST sg3_utils-1.19.tgz 460848 RMD160 fac5614066c5ed9fca6254935e95db0af7543b25 SHA256 ba1ddcf7847cd39d93d383c1ca755bd44a6a4e3e704a2453987d305b6a64e9df size 460848
+DIST sg3_utils-1.20.tgz 476670 RMD160 35e865b87a80e29668dcd9a20093cecdcc1d5d6c SHA256 9febc2018ea70d73edc94b22654fd7bab63ce9874892f9861eb25c6f66090a19 size 476670
+EBUILD sg3_utils-1.08.ebuild 938 RMD160 a2ed6c3151e2fb36d30bd1bc5f85e95b33cc45e3 SHA1 1e3d7c32af7564ca6e6e3864ebc9b7200e6e1048 SHA256 5249576a7c49095a852493944bff6c26adc08f7c5579e470eb3d682dec04cef4 size 938
 MD5 d5959d5cb2439b78b3c1d20fc555f047 sg3_utils-1.08.ebuild 938
 RMD160 a2ed6c3151e2fb36d30bd1bc5f85e95b33cc45e3 sg3_utils-1.08.ebuild 938
 SHA256 5249576a7c49095a852493944bff6c26adc08f7c5579e470eb3d682dec04cef4 sg3_utils-1.08.ebuild 938
+EBUILD sg3_utils-1.11.ebuild 871 RMD160 a389d29b53b61c2a04ff0b3322acc51703bda2ca SHA1 5c03a3eb5b9a3294f1c41db5fb35caf689a2d90e SHA256 43f66ad7a4ecefaf5c5e7a76d06a33d3727b6e4dee7b762de1601c6d8b251ef6 size 871
 MD5 c961881764f66b8f51ee5049c2d246fc sg3_utils-1.11.ebuild 871
 RMD160 a389d29b53b61c2a04ff0b3322acc51703bda2ca sg3_utils-1.11.ebuild 871
 SHA256 43f66ad7a4ecefaf5c5e7a76d06a33d3727b6e4dee7b762de1601c6d8b251ef6 sg3_utils-1.11.ebuild 871
+EBUILD sg3_utils-1.15.ebuild 954 RMD160 5d0a3c234a808eccab4a16a13dc4e4324e40212f SHA1 0796c558077e26cfa6ed567dc1f1d6013fc50859 SHA256 e92bd57d78f6dde862afe28d6da7ed835060ff76da67907a71055d665132f0dc size 954
 MD5 eae70fd0e48273e4a0443cfa34919c44 sg3_utils-1.15.ebuild 954
 RMD160 5d0a3c234a808eccab4a16a13dc4e4324e40212f sg3_utils-1.15.ebuild 954
 SHA256 e92bd57d78f6dde862afe28d6da7ed835060ff76da67907a71055d665132f0dc sg3_utils-1.15.ebuild 954
+EBUILD sg3_utils-1.18.ebuild 996 RMD160 2ef56a9dabd39521099afa78d3ba0fe0de17ff4d SHA1 568f65f0bcbe2ccd1fec20adcbd66cb88f126c7e SHA256 9e707324fc15cbedfe6b318d811aa0e0eca13092b442c22d9b34a9f18b016f23 size 996
 MD5 107afb7232b799cbb4f5f38facdcf432 sg3_utils-1.18.ebuild 996
 RMD160 2ef56a9dabd39521099afa78d3ba0fe0de17ff4d sg3_utils-1.18.ebuild 996
 SHA256 9e707324fc15cbedfe6b318d811aa0e0eca13092b442c22d9b34a9f18b016f23 sg3_utils-1.18.ebuild 996
+EBUILD sg3_utils-1.19.ebuild 1270 RMD160 3f93712a7a0e8c34bb08e6c2ba750349a8b218db SHA1 6e6ed2e45a0cd000f368809366c38ddb6df9deb1 SHA256 d7c46fe8c01f000594a29ac6538f745e3e64efcb2b8f32efd01d75e4d33b909d size 1270
 MD5 5430951c73e3ffb149c8cfaeae22ca09 sg3_utils-1.19.ebuild 1270
 RMD160 3f93712a7a0e8c34bb08e6c2ba750349a8b218db sg3_utils-1.19.ebuild 1270
 SHA256 d7c46fe8c01f000594a29ac6538f745e3e64efcb2b8f32efd01d75e4d33b909d sg3_utils-1.19.ebuild 1270
+EBUILD sg3_utils-1.20-r1.ebuild 1281 RMD160 33dc7f76b4a06227127c896a8993ff4b45a8ccc4 SHA1 ffd0f74b6e72ea7e0ab29f04b7f9fbe6bbfdb4b9 SHA256 8b4258af7ceda0aeb6ca821988fadc58ddddfcf666b6b5a96943fa322d76fed5 size 1281
+MD5 607991b0d6d530bb6b7453b94711c057 sg3_utils-1.20-r1.ebuild 1281
+RMD160 33dc7f76b4a06227127c896a8993ff4b45a8ccc4 sg3_utils-1.20-r1.ebuild 1281
+SHA256 8b4258af7ceda0aeb6ca821988fadc58ddddfcf666b6b5a96943fa322d76fed5 sg3_utils-1.20-r1.ebuild 1281
+EBUILD sg3_utils-1.20.ebuild 1270 RMD160 873b2ea69529235651ba590412546bcf37d1ae14 SHA1 c31261ed1610c712cfe6d11f22f87c28d8a3af8e SHA256 e0a4b672ea2f4201d5fd5031e515970d983faff11de393fa48ec24ba5e816041 size 1270
 MD5 5d66bad45a109c839e08a63e2696a93a sg3_utils-1.20.ebuild 1270
 RMD160 873b2ea69529235651ba590412546bcf37d1ae14 sg3_utils-1.20.ebuild 1270
 SHA256 e0a4b672ea2f4201d5fd5031e515970d983faff11de393fa48ec24ba5e816041 sg3_utils-1.20.ebuild 1270
+MISC ChangeLog 2545 RMD160 81bc34b025c300aadaa0542eda3224e8cd974bde SHA1 42c86f7c2939ab9f1f16d299338f333d1ecb3a53 SHA256 d0c4f0dd3dd1d17e60f03c9de5aaadf62d6ceb1112f99a970dd078cb4c257313 size 2545
+MD5 b49f84969b7ddc02c0ef3b51ba0289b9 ChangeLog 2545
+RMD160 81bc34b025c300aadaa0542eda3224e8cd974bde ChangeLog 2545
+SHA256 d0c4f0dd3dd1d17e60f03c9de5aaadf62d6ceb1112f99a970dd078cb4c257313 ChangeLog 2545
+MISC metadata.xml 228 RMD160 5fd2e8688b03168f4534b6d2e50fa7bb8a16abe2 SHA1 74bb2dd3f708404f1e5de1a8438f207c99615123 SHA256 a9149d44e45790d278c94b4d7c79bdbb20f91fca57bc33ad67232a3bc0fe635e size 228
+MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
+RMD160 5fd2e8688b03168f4534b6d2e50fa7bb8a16abe2 metadata.xml 228
+SHA256 a9149d44e45790d278c94b4d7c79bdbb20f91fca57bc33ad67232a3bc0fe635e metadata.xml 228
+MD5 38afad67c181414ac8fa41d6823699a2 files/digest-sg3_utils-1.08 292
+RMD160 ccaa3fb6e84782b83e1595020ce7769675a1a99b files/digest-sg3_utils-1.08 292
+SHA256 63e7ee9bafa4c29f159854840017ff83b770cc2acb7dd0f6bdd4af252f0c1b70 files/digest-sg3_utils-1.08 292
+MD5 27ce6b31ec162ebfe0b4c4d25b28b434 files/digest-sg3_utils-1.11 464
+RMD160 99ff3dedd7d71d6ca69d6a5d9bcc497759026494 files/digest-sg3_utils-1.11 464
+SHA256 eff639c3047e6e9577d753f638d21575ce63356304d8a3d855bbdf0dc3469f3d files/digest-sg3_utils-1.11 464
+MD5 1ff0b8511b476c870b8c11893cd1b4e7 files/digest-sg3_utils-1.15 464
+RMD160 6deab7e9ebc1c97e1f4be20dee95bc55d0549a34 files/digest-sg3_utils-1.15 464
+SHA256 34b0dfadc630efe364a23022df67e0333ae3f3dc6037ea4cf9546311cef0adb1 files/digest-sg3_utils-1.15 464
+MD5 c030e6107227401738db25a96ce656c8 files/digest-sg3_utils-1.18 464
+RMD160 dbb0e1a06edec5ee9e128437f19e89966edb21c1 files/digest-sg3_utils-1.18 464
+SHA256 b129431eb5e364e02c223e9c147e9c21d56350c902707aae21344de1bf057184 files/digest-sg3_utils-1.18 464
+MD5 b214fc50e9a64355c98c46ea2ba4bd88 files/digest-sg3_utils-1.19 464
+RMD160 3971468af90f01ff35f7af3bfa08301762dfb018 files/digest-sg3_utils-1.19 464
+SHA256 3de2f92422557cab5060cabda3ecb1c9daa936bbaf57528b0295a39bb332b22b files/digest-sg3_utils-1.19 464
+MD5 bee4d6c8290a6878e9d661089e4914ad files/digest-sg3_utils-1.20 464
+RMD160 c6a09dc7fd9d87ad3290d00ca01f7ef275436e95 files/digest-sg3_utils-1.20 464
+SHA256 2918dd209ff1ea2df3ab2763077026ed8036c2306f3edc5258e7e5401a3e275e files/digest-sg3_utils-1.20 464
+MD5 bee4d6c8290a6878e9d661089e4914ad files/digest-sg3_utils-1.20-r1 464
+RMD160 c6a09dc7fd9d87ad3290d00ca01f7ef275436e95 files/digest-sg3_utils-1.20-r1 464
+SHA256 2918dd209ff1ea2df3ab2763077026ed8036c2306f3edc5258e7e5401a3e275e files/digest-sg3_utils-1.20-r1 464
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"
+}