Remove the Maxtor DiamondMax patch (bug #141391).

(Portage version: 2.1.1_pre4-r4)
 (Signed Manifest commit)

2 files changed, 18 insertions, 78 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index b2118d4aa649..fe37011aec03 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hddtemp-0.3_beta13-setsid.patch 370 RMD160 675fbd60d3a0b6dfdac14c94b852a6e587cb381e SHA1 ed4909b58930d9bd095cb0e2f451c72f0475d978 SHA256 5bf094e13c797eac602cdb2199b17a750ae74d3094fc01762455f5f59614ee1a
 MD5 91e4b7762278d6c80f97ce6039442e8d files/hddtemp-0.3_beta13-setsid.patch 370
 RMD160 675fbd60d3a0b6dfdac14c94b852a6e587cb381e files/hddtemp-0.3_beta13-setsid.patch 370
@@ -10,10 +13,6 @@ AUX hddtemp-0.3_beta15-byteswap.patch 1037 RMD160 969720123d9d100ae83f6d9f3b48d2
 MD5 bed032d7702ec78e736362ce4a9d5796 files/hddtemp-0.3_beta15-byteswap.patch 1037
 RMD160 969720123d9d100ae83f6d9f3b48d2c4cd2b58b5 files/hddtemp-0.3_beta15-byteswap.patch 1037
 SHA256 85eeaff97c96d2f77a93caa3270ee598f756c4eb0da6753e5ee8602fa1a5bdec files/hddtemp-0.3_beta15-byteswap.patch 1037
-AUX hddtemp-0.3_beta15-maxtor-diamondmax10.patch 4492 RMD160 d85800176bcb35baddb3862f5fa5ea0365a1fccc SHA1 6969b577941273b49fca0ecd8d6b8c414ea48d5e SHA256 18d9c1c209e03c87f475e8bf9df3014e7d59613105d1de0ca349f8003302b15b
-MD5 0a51e3e432458748ae24bdab9f717922 files/hddtemp-0.3_beta15-maxtor-diamondmax10.patch 4492
-RMD160 d85800176bcb35baddb3862f5fa5ea0365a1fccc files/hddtemp-0.3_beta15-maxtor-diamondmax10.patch 4492
-SHA256 18d9c1c209e03c87f475e8bf9df3014e7d59613105d1de0ca349f8003302b15b files/hddtemp-0.3_beta15-maxtor-diamondmax10.patch 4492
 AUX hddtemp-conf.d 410 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 SHA1 3a642df90eb05bbd4524b622c58ce35b5f4dd4e8 SHA256 4b7b6793edbe54669965bf49dac95b273f128481aabe4b2b9e6c263f0e0a9ff5
 MD5 a4981932b07890d6292e068fb4ee8264 files/hddtemp-conf.d 410
 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 files/hddtemp-conf.d 410
@@ -41,14 +40,14 @@ EBUILD hddtemp-0.3_beta14.ebuild 1213 RMD160 702736dc74bb1988bf0c92880c954471bfe
 MD5 9b53ba9cc450e52ffb3892d0ffbe0c79 hddtemp-0.3_beta14.ebuild 1213
 RMD160 702736dc74bb1988bf0c92880c954471bfe1633b hddtemp-0.3_beta14.ebuild 1213
 SHA256 312a1d64ad61d7a26aa0d39a3c7380d344b16b2f04995809cfa1548990a67b09 hddtemp-0.3_beta14.ebuild 1213
-EBUILD hddtemp-0.3_beta15.ebuild 1573 RMD160 bd1f73f676977bc9a0ee411f23867a55c5d38282 SHA1 257179af1a01cbbecd0df81ac2b03ad2c065cce6 SHA256 60acad20d21458522f2d3370d9dfe6f5fb2d8edc3f297a294b13b62ef93d9ab3
-MD5 92dcdd3a6816f558394723d0cdc5eb2a hddtemp-0.3_beta15.ebuild 1573
-RMD160 bd1f73f676977bc9a0ee411f23867a55c5d38282 hddtemp-0.3_beta15.ebuild 1573
-SHA256 60acad20d21458522f2d3370d9dfe6f5fb2d8edc3f297a294b13b62ef93d9ab3 hddtemp-0.3_beta15.ebuild 1573
-MISC ChangeLog 7624 RMD160 dbdb8a14910a98883f5542f6198d474bc6b0717f SHA1 9ec5f20597a64e27f175368d22b4dece026a9234 SHA256 00adb4f0e657401bcede87624a304bc67b7cdf80f8bdecd84ec0686fa22a7ad2
-MD5 bc39ec654bf8f48525eb7be170a5c846 ChangeLog 7624
-RMD160 dbdb8a14910a98883f5542f6198d474bc6b0717f ChangeLog 7624
-SHA256 00adb4f0e657401bcede87624a304bc67b7cdf80f8bdecd84ec0686fa22a7ad2 ChangeLog 7624
+EBUILD hddtemp-0.3_beta15.ebuild 1351 RMD160 8445147f0136ec9dbb8496ea1bf3948fcac89b14 SHA1 a4827a58ce571acef9bdd00dcc9f1b34715fa797 SHA256 1ad2ec2c59906d15cb1bc8a383d50c75d77d21ca1ffd2a5c43399430d25b4d7e
+MD5 37ce4bea909676f1e1570eb0a312bc13 hddtemp-0.3_beta15.ebuild 1351
+RMD160 8445147f0136ec9dbb8496ea1bf3948fcac89b14 hddtemp-0.3_beta15.ebuild 1351
+SHA256 1ad2ec2c59906d15cb1bc8a383d50c75d77d21ca1ffd2a5c43399430d25b4d7e hddtemp-0.3_beta15.ebuild 1351
+MISC ChangeLog 7945 RMD160 67bc183502a953a7bcad01b3618e2cc2f5143312 SHA1 8762db4eb3f23b6fd03f873fc3961f24f8906ccb SHA256 8ffd33eebca0384ec1629026ab0e9952ef46838da796131ffc41108111bdffa3
+MD5 06d3ff57663b7dd5ad33602e61ab73dd ChangeLog 7945
+RMD160 67bc183502a953a7bcad01b3618e2cc2f5143312 ChangeLog 7945
+SHA256 8ffd33eebca0384ec1629026ab0e9952ef46838da796131ffc41108111bdffa3 ChangeLog 7945
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -65,3 +64,10 @@ SHA256 19c2949d994d20fb862af5857246e0ec440d4d219caf528f3d8e6bf4baebbe9c files/di
 MD5 f39545c75ab43d19430ab8abfe9ea3b9 files/digest-hddtemp-0.3_beta15 259
 RMD160 0c7e37e16231df916c483eb49074bb7529f400ec files/digest-hddtemp-0.3_beta15 259
 SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/digest-hddtemp-0.3_beta15 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE2P0rchej4aZK9/cRAhbZAJ90wndlDlCi3gErbQF5yvfv3gIptACfTmo/
+yIqvY6gj6YlOzt0SC7KezYA=
+=Pqgk
+-----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-maxtor-diamondmax10.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-maxtor-diamondmax10.patch
deleted file mode 100644
index e90dfef3e732..000000000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-maxtor-diamondmax10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- hddtemp.db.orig	2006-05-14 02:22:02.000000000 -0700
-+++ hddtemp.db	2006-05-14 03:02:22.000000000 -0700
-@@ -185,11 +185,42 @@
- "Maxtor 5A250J0"					194  C	"Maxtor MaXline II 250GB 5400RPM"
- "Maxtor 5A300J0"					194  C	"Maxtor 5A300J0"
- "Maxtor 5T0[24]0H[24]"					0    C	"Maxtor DiamondMax Plus 60"
--"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0"		194  C	"Maxtor DiamondMax Plus 10"
- "Maxtor 6E0[234]0L0"					194  C	"Maxtor DiamondMax Plus 8"
- "MAXTOR 6L0[2468]0[LJ][1234]"				194  C	"Maxtor DiamondMax Plus D740X family"
--"Maxtor 6L250R0"					194  C	"Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
--"Maxtor 6L300R0"					194  C	"Maxtor DiamondMax 10 300GB 16MB 7200RPM"
-+# The following was gained from http://maxtor.com/_files/maxtor/en_us/documentation/data_sheets/diamondmax_10_data_sheet.pdf
-+# And tested for at least one drive of each series eg (6x...y0) for all values of (x,y).
-+# Thanks to a Vancouver-local hardware supplier for brief access to the drives.
-+# - robbat2@gentoo.org
-+#"Maxtor 6[BLV](08|12|16|20|25|30)0[EFLMPRS]0"		194  C	"Maxtor DiamondMax Plus 10"
-+"Maxtor 6B080M0"					194  C  "Maxtor DiamondMax 10 80GB 8MB SATA"
-+"Maxtor 6B120M0"					194  C  "Maxtor DiamondMax 10 120GB 8MB SATA"
-+"Maxtor 6B160M0"					194  C  "Maxtor DiamondMax 10 160GB 8MB SATA"
-+"Maxtor 6B160P0"					194  C  "Maxtor DiamondMax 10 160GB 8MB ATA/133"
-+"Maxtor 6B200M0"					194  C  "Maxtor DiamondMax 10 200GB 8MB SATA"
-+"Maxtor 6B200P0"					194  C  "Maxtor DiamondMax 10 200GB 8MB ATA/133"
-+"Maxtor 6B250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB ATA/133"
-+"Maxtor 6B250S0"					194  C  "Maxtor DiamondMax 10 250GB 16MB SATA"
-+"Maxtor 6B300R0"					194  C  "Maxtor DiamondMax 10 300GB 16MB ATA/133"
-+"Maxtor 6B300S0"					194  C  "Maxtor DiamondMax 10 300GB 16MB SATA"
-+"Maxtor 6L080L0"					194  C  "Maxtor DiamondMax 10 80GB 2MB ATA/133 RoHS"
-+"Maxtor 6L080M0"					194  C  "Maxtor DiamondMax 10 80GB 8MB SATA RoHS"
-+"Maxtor 6L080P0"					194  C  "Maxtor DiamondMax 10 80GB 8MB ATA/133 RoHS"
-+"Maxtor 6L120M0"					194  C  "Maxtor DiamondMax 10 120GB 8MB SATA RoHS"
-+"Maxtor 6L120P0"					194  C  "Maxtor DiamondMax 10 120GB 8MB ATA/133 RoHS"
-+"Maxtor 6L160M0"					194  C  "Maxtor DiamondMax 10 160GB 8MB SATA RoHS"
-+"Maxtor 6L160P0"					194  C  "Maxtor DiamondMax 10 160GB 8MB ATA/133 RoHS"
-+"Maxtor 6L200M0"					194  C  "Maxtor DiamondMax 10 200GB 8MB SATA RoHS"
-+"Maxtor 6L200P0"					194  C  "Maxtor DiamondMax 10 200GB 8MB ATA/133 RoHS"
-+"Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB ATA/133 RoHS"
-+"Maxtor 6L250S0"					194  C  "Maxtor DiamondMax 10 250GB 16MB SATA RoHS"
-+"Maxtor 6L300R0"					194  C  "Maxtor DiamondMax 10 300GB 16MB ATA/133 RoHS"
-+"Maxtor 6L300S0"					194  C  "Maxtor DiamondMax 10 300GB 16MB SATA RoHS"
-+"Maxtor 6V080E0"					194  C  "Maxtor DiamondMax 10 80GB 8MB SATAII RoHS"
-+"Maxtor 6V160E0"					194  C  "Maxtor DiamondMax 10 160GB 8MB SATAII RoHS"
-+"Maxtor 6V200E0"					194  C  "Maxtor DiamondMax 10 200GB 8MB SATAII RoHS"
-+"Maxtor 6V250F0"					194  C  "Maxtor DiamondMax 10 250GB 16MB SATAII RoHS"
-+"Maxtor 6V300F0"					194  C  "Maxtor DiamondMax 10 300GB 16MB SATAII RoHS"
-+# end of DiamondMax 10 series.
- "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C	"Maxtor DiamondMax Plus 9" 
- "Maxtor 7L300R0"					194  C	"Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
- "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
-@@ -293,7 +324,8 @@
- "ST3250823A"				194  C	"Seagate Barracuda 7200.8 250GB"
- "ST3250823A"				194  C	"Seagate Barracuda 7200.7 Plus 250GB"
- "ST3250823NS"				194  C	"Seagate NL35 SATA (RAID-Edition) 7200 250GB"
--"ST3300831A"				194  C	"Seagate 300GB ST3300831A"
-+"ST3300622AS"				194  C  "Seagate Barracuda 7200.9 SATA2.5 300GB"
-+"ST3300831A"				194  C	"Seagate Barracuda 7200.8 PATA 300GB"
- "ST3400832A"				194  C	"Seagate Barracuda 7200.8 Plus 400GB"
- "ST3802110A"				194  C	"Seagate Barracuda 7200.9 80 GB"
- "ST910021A"				194  C	"Seagate Momentus 7200.1 100GB" 
-@@ -402,6 +434,7 @@
- "WDC WD2500JB-00GVC0"						194 C "Western Digital 250GB"
- "WDC WD2500JD-(00G|32H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
- "WDC WD2500JD-40HBC0"						194 C "Western Digital WD2500JD-40HBC0" 
-+"WDC WD2500JS-41MVB1"						194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB"
- "WDC WD2500PB-98FBA0"						194 C "Western Digital Caviar 250GB Special Edition 8MB"
- "WDC WD2500PD-00FZB1"						194 C "Western Digital WD2500PD-00FZB1" 
- "WDC WD2500SD-01KCB0"						194 C "Western Digital Caviar RE 250GB 8MB"