Fixing 1.2-3-dyn_blacklist.patch and closing bug #218571.

Package-Manager: portage-2.1.5_rc6

4 files changed, 20 insertions, 8 deletions

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index 41f152fe516d..213b4e19e7a2 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwsetup
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.55 2008/04/09 00:44:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.56 2008/04/25 23:56:09 wolf31o2 Exp $
+
+  25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/1.2-3-dyn_blacklist.patch, hwsetup-1.2.ebuild:
+  Fixing 1.2-3-dyn_blacklist.patch and closing bug #218571.
 
 *hwsetup-1.2-r1 (09 Apr 2008)
 
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index c65dcbf20a4e..e7b52dece9e3 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.2-3-dyn_blacklist.patch 1625 RMD160 bba78724a2a9d89309f8fd2a50d8d2525cc818e2 SHA1 b94f2cb866e50b7f6d855e2aa512421a577f6f41 SHA256 87a3cf5452b96f069832b18d4fd7dfc0cac1a073f954937a0118e935cb9ad472
+AUX 1.2-3-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 SHA1 2ccdeb5f0f15c68821434a1e2b081dce229cdf70 SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b
 AUX 1.2-3-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca SHA1 9d05f2542f4fc9b8ae4ace559bec8a9720ea77b5 SHA256 9a16e4ddaada2bc115a48a6d60b5cac72d49f33c7eecf245f6337df627a4a0d0
 AUX 1.2-3-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83
 AUX 1.2-7-dyn_blacklist.patch 1996 RMD160 e299ee153e13f9a80d7a28209cf62268dfb9e8bd SHA1 192ea0961e02a1a84b6efc98a02b360d859d4ca1 SHA256 625c60827eea5f17b5d833276cf7924223e6ab1fa681f8518c4e8e1070465339
@@ -9,13 +9,13 @@ AUX 1.2-7-gentoo.patch 726 RMD160 4fee01b484f303d5a5b36099f72e18e31e165ca5 SHA1
 DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37
 DIST hwsetup_1.2-7.tar.gz 10706 RMD160 7895b32c81254b2ca1575ab12dcc6fa39d011e17 SHA1 c91cb22c07755ecbfce8e9e6826e8e2580f103f8 SHA256 aa72b37ce306b5191cabd31eb5f19ab2a5e635697a263c6735d10c7bf99f9589
 EBUILD hwsetup-1.2-r1.ebuild 1730 RMD160 02c12d37baf7eb80c5c6ed9898365934226f6b9e SHA1 5e464457820fb69d40fcad2d35582104f18ae89a SHA256 d11be9afc8fd39f5002ae94cd947718cf96db014d7f27af62f98ab70dfce934f
-EBUILD hwsetup-1.2.ebuild 1722 RMD160 f98df8e8315238b9cf824064e6ad5958aab526b0 SHA1 7a88e15f93f24f95dd436b28d8628088a60cf1dd SHA256 ec582f5e380e3b03f67523305ca63168c015d5436e5149107eafcbdcec434c93
-MISC ChangeLog 9101 RMD160 0877e6778b3f3c5676ecd295f9c6a0595364ce12 SHA1 5fbd25b0ed19f03fecb48bbe4127a5e4977d6465 SHA256 a250000e426cde2eaf6624558a7fe810cd365851aec7b97866d7ba9561f18bbe
+EBUILD hwsetup-1.2.ebuild 1739 RMD160 5700da36acc6aee986f3e376a14b5636b6e36f51 SHA1 4c22d2eb39d810e4ab8c1de48ea7ac089aa53523 SHA256 7dce693cd9bba8fd1d11974ecbc1c272861d8cad0ca8db513645cedab087aa1f
+MISC ChangeLog 9271 RMD160 cfc26fe18c6017298ef13ce69283e323f07fd61e SHA1 540e5545a0d28c892550c59da343e2ae9b0b64d7 SHA256 b076eb70551ccd473837fdd70aca6a966b8071c3ffccec5a3ab20778151cb48a
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf8ET8ACgkQkT4lNIS36YH+YACbB9q60Vaz37Bwt4XYMizxr9j/
-J30AoKX0jaW7DDMabRbZzDdQxxQvwIJN
-=2Vf/
+iEYEARECAAYFAkgSb1oACgkQkT4lNIS36YFkPgCffUyQoT3yuk4dPzgLbWTEtp3x
+05gAniUW+rSx2uqEOJ0KVG4/DnNMzUwO
+=xDEH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
index bc50cd3fe341..7348993d264b 100644
--- a/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
+++ b/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
@@ -2,6 +2,13 @@ diff -urN hwsetup-1.2.orig/hwsetup.c hwsetup-1.2/hwsetup.c
 --- hwsetup-1.2.orig/hwsetup.c	2005-05-28 18:11:51.000000000 -0400
 +++ hwsetup-1.2/hwsetup.c	2005-11-17 14:08:03.000000000 -0500
 @@ -43,12 +43,39 @@
+ /* Do not, under any circumstances, load these modules automatically, */
+ /* even if in pcitable. (libkudzu may ignore this, and the KNOPPIX    */
+ /* autoconfig scripts may probe them, too)  */
+-char *blacklist[] =
++char blacklist[200][200] =
+ { "apm","agpgart","yenta_socket","i82092","i82365","tcic",
+   "pcmcia_core","ds","ohci1394","hisax",
    /* Winmodems, unusable, can block sound slot */
    "snd-atiixp-modem", "snd-intel8x0m","snd-via82xx-modem"
  };
diff --git a/sys-apps/hwsetup/hwsetup-1.2.ebuild b/sys-apps/hwsetup/hwsetup-1.2.ebuild
index d0fc528b17e5..6582462cf582 100644
--- a/sys-apps/hwsetup/hwsetup-1.2.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.10 2008/04/09 00:44:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.11 2008/04/25 23:56:09 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 -mips ppc ppc64 sparc x86"
 IUSE="zlib"
+RESTRICT="strip"
 
 COMMON_DEPEND="zlib? ( sys-libs/zlib )
 	sys-apps/pciutils"