diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-04-25 23:56:10 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-04-25 23:56:10 +0000 |
| commit | 9163b6e975324d22e744888feeb67f0bb470d8a6 (patch) | |
| tree | 23d7e888b4a0804aeaeac124d32fbfad27d0fc5f /sys-apps/hwsetup | |
| parent | Added a patch for gcc 4.3 compatibility as kindly provided by Eduard Warkenti... (diff) | |
| download | gentoo-2-9163b6e975324d22e744888feeb67f0bb470d8a6.tar.gz gentoo-2-9163b6e975324d22e744888feeb67f0bb470d8a6.tar.bz2 gentoo-2-9163b6e975324d22e744888feeb67f0bb470d8a6.zip | |
Fixing 1.2-3-dyn_blacklist.patch and closing bug #218571.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'sys-apps/hwsetup')
| -rw-r--r-- | sys-apps/hwsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch | 7 | ||||
| -rw-r--r-- | sys-apps/hwsetup/hwsetup-1.2.ebuild | 3 |
3 files changed, 14 insertions, 2 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/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" |