Revision bump to match the latest upstream revision.

(Portage version: 2.1.4.4)

8 files changed, 155 insertions, 12 deletions

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index f6388652cc1e..41f152fe516d 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,16 @@
 # 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.54 2008/04/03 00:27:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.55 2008/04/09 00:44:56 wolf31o2 Exp $
+
+*hwsetup-1.2-r1 (09 Apr 2008)
+
+  09 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/hwsetup-1.2-dyn_blacklist.patch,
+  -files/hwsetup-1.2-fastprobe.patch, -files/hwsetup-1.2-gentoo.patch,
+  +files/1.2-3-dyn_blacklist.patch, +files/1.2-3-fastprobe.patch,
+  +files/1.2-3-gentoo.patch, +files/1.2-7-dyn_blacklist.patch,
+  +files/1.2-7-gentoo.patch, hwsetup-1.2.ebuild, +hwsetup-1.2-r1.ebuild:
+  Revision bump to match the latest upstream revision.
 
   03 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild:
   Added keepdir /etc/sysconfig for bug #215824.
diff --git a/sys-apps/hwsetup/files/hwsetup-1.2-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
index 7348993d264b..bc50cd3fe341 100644
--- a/sys-apps/hwsetup/files/hwsetup-1.2-dyn_blacklist.patch
+++ b/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
@@ -2,13 +2,6 @@ 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/files/hwsetup-1.2-fastprobe.patch b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch
index 0122a6aee8e7..0122a6aee8e7 100644
--- a/sys-apps/hwsetup/files/hwsetup-1.2-fastprobe.patch
+++ b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch
diff --git a/sys-apps/hwsetup/files/hwsetup-1.2-gentoo.patch b/sys-apps/hwsetup/files/1.2-3-gentoo.patch
index 2cd8597a2cc9..2cd8597a2cc9 100644
--- a/sys-apps/hwsetup/files/hwsetup-1.2-gentoo.patch
+++ b/sys-apps/hwsetup/files/1.2-3-gentoo.patch
diff --git a/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch
new file mode 100644
index 000000000000..22092d2a1969
--- /dev/null
+++ b/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch
@@ -0,0 +1,63 @@
+diff -urN hwsetup-1.2.orig/hwsetup.c hwsetup-1.2/hwsetup.c
+--- hwsetup-1.2.orig/hwsetup.c	2008-04-07 18:32:34.000000000 -0700
++++ hwsetup-1.2/hwsetup.c	2008-04-07 18:49:20.000000000 -0700
+@@ -51,13 +51,40 @@
+ /* 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", "hisax_fcpcipnp",
+   "hisax_isac","hisax_st5481",
+   /* Winmodems, unusable, can block sound slot */
+   "snd-atiixp-modem", "snd-intel8x0m","snd-via82xx-modem"
+ };
++
++int blacklistsize = 13;
++void gen_blacklist(){
++	int n = 13;
++	int size = 0;
++	char *comment;
++	char module[1024];
++	FILE *stream;
++
++	if((stream = fopen ("/usr/share/hwdata/blacklist", "r")) != (FILE *)0) {
++		while((fgets(module, 1023, stream)) != (char *)0 ) {
++
++			comment = strchr(module, '#');
++			if (comment != 0) *comment = '\0';
++			comment = strchr(module, '\n');
++			if (comment != 0) *comment = '\0';
++			size = strlen(module);
++			if (size < 2) continue;
++			strcat (module , " \0");
++			strcpy(blacklist[n] , module);
++			n++;
++			if ( n == 200 ) break;
++			//printf(module);
++		}
++		blacklistsize = n;
++	}
++}
+ #endif
+ 
+ /* If a conflicting module in a row is already loaded, the new module will not be probed anymore */
+@@ -547,7 +574,7 @@
+  char *cc;
+  if((m==NULL)||(!strcmp("unknown",m))||(!strcmp("ignore",m))|| check_loaded(m)) return 0;
+ #ifdef BLACKLIST
+- for(i=0;i<(sizeof(blacklist)/sizeof(char*));i++)
++ for(i=0;i<blacklistsize;i++)
+   {
+    if(!modcmp(blacklist[i],m))
+     {
+@@ -781,5 +808,8 @@
+  /* Allow SIGTERM, SIGINT: rmmod depends on this. */
+  signal(SIGTERM,SIG_DFL); signal(SIGINT,SIG_DFL);
+  signal(SIGALRM,alarm_handler); alarm(MAX_TIME);
++#ifdef BLACKLIST
++ gen_blacklist();
++#endif
+  return hw_setup(dc,verbose,probeonly,skip);
+ }
diff --git a/sys-apps/hwsetup/files/1.2-7-gentoo.patch b/sys-apps/hwsetup/files/1.2-7-gentoo.patch
new file mode 100644
index 000000000000..cc78e2705c20
--- /dev/null
+++ b/sys-apps/hwsetup/files/1.2-7-gentoo.patch
@@ -0,0 +1,21 @@
+diff -urN hwsetup-1.2.fastprobe/hwsetup.c hwsetup-1.2/hwsetup.c
+--- hwsetup-1.2.fastprobe/hwsetup.c	2008-04-07 19:09:08.000000000 -0700
++++ hwsetup-1.2/hwsetup.c	2008-04-07 19:07:55.000000000 -0700
+@@ -388,7 +388,7 @@
+          sprintf(fullpath,"%.90s%.32s",xpath,server[i]);
+          if(!exists(fullpath)) continue;
+          strncpy(xi.xserver,server[i],sizeof(xi.xserver));
+-	}
++        }
+       }
+     }
+    if((xpos=strstr(d->driver,xorg))!=NULL) /* Check for Xorg */
+@@ -653,7 +653,7 @@
+ int writeconfig(char *name,struct device *d,int verbose)
+ {
+  FILE *f,*k;
+- const char *kconfig="/etc/sysconfig/knoppix";
++ const char *kconfig="/etc/sysconfig/gentoo";
+  char *desc;
+  unlink(name);
+  if((f=fopen(name,"w"))==NULL)
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild
new file mode 100644
index 000000000000..f0e4d636459f
--- /dev/null
+++ b/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2008/04/09 00:44:56 wolf31o2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_PV=${PV}-7
+DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD"
+HOMEPAGE="http://www.knopper.net/"
+SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"
+#http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="zlib"
+
+COMMON_DEPEND="zlib? ( sys-libs/zlib )
+	sys-apps/pciutils"
+DEPEND="${COMMON_DEPEND}
+	sys-libs/libkudzu"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwdata-gentoo"
+
+src_unpack() {
+	unpack ${A}
+	epatch \
+		"${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \
+		"${FILESDIR}"/${PV}-3-fastprobe.patch \
+		"${FILESDIR}"/${MY_PV}-gentoo.patch
+}
+
+src_compile() {
+	append-ldflags -s
+	filter-ldflags -Wl,--as-needed --as-needed
+	if use zlib
+	then
+		append-ldflags -lz
+	elif built_with_use --missing false sys-apps/pciutils zlib
+	then
+		die "You need to build with USE=zlib to match sys-apps/pcituils"
+	fi
+	emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
+	keepdir /etc/sysconfig
+}
+
+pkg_postinst() {
+	ewarn "This package is intended for usage on the Gentoo release media.  If"
+	ewarn "you are not building a CD, remove this package.  It will not work"
+	ewarn "properly on a running system, as Gentoo does not use any of the"
+	ewarn "Knoppix-style detection except for CD builds."
+}
diff --git a/sys-apps/hwsetup/hwsetup-1.2.ebuild b/sys-apps/hwsetup/hwsetup-1.2.ebuild
index 0903ed96af2f..d0fc528b17e5 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.9 2008/04/03 00:27:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.10 2008/04/09 00:44:56 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -25,9 +25,9 @@ RDEPEND="${COMMON_DEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch \
-		"${FILESDIR}"/${P}-dyn_blacklist.patch \
-		"${FILESDIR}"/${P}-fastprobe.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
+		"${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \
+		"${FILESDIR}"/${MY_PV}-fastprobe.patch \
+		"${FILESDIR}"/${MY_PV}-gentoo.patch
 }
 
 src_compile() {