summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2007-06-19 17:56:02 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2007-06-19 17:56:02 +0000
commit0b0bc6e78207236c1b52c21cef56590e77528323 (patch)
treef3f126e9921f93dcca94003bfa8305aa4d0ca09e /sys-apps/hwsetup
parentVersion bump. See bug #180693 for details. (diff)
downloadhistorical-0b0bc6e78207236c1b52c21cef56590e77528323.tar.gz
historical-0b0bc6e78207236c1b52c21cef56590e77528323.tar.bz2
historical-0b0bc6e78207236c1b52c21cef56590e77528323.zip
Removing older ebuilds and patches, since they're no longer needed.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'sys-apps/hwsetup')
-rw-r--r--sys-apps/hwsetup/ChangeLog8
-rw-r--r--sys-apps/hwsetup/Manifest38
-rw-r--r--sys-apps/hwsetup/files/digest-hwsetup-1.13
-rw-r--r--sys-apps/hwsetup/files/hwsetup-1.1-dyn_blacklist.patch62
-rw-r--r--sys-apps/hwsetup/files/hwsetup-1.1-fastprobe.patch75
-rw-r--r--sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch121
-rw-r--r--sys-apps/hwsetup/hwsetup-1.1.ebuild44
7 files changed, 11 insertions, 340 deletions
diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index 555af1e3155c..61df8f97051f 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/hwsetup
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.46 2007/01/31 18:11:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.47 2007/06/19 17:56:02 wolf31o2 Exp $
+
+ 19 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+ -files/hwsetup-1.1-dyn_blacklist.patch,
+ -files/hwsetup-1.1-fastprobe.patch, -files/hwsetup-1.1-gentoo.patch,
+ -hwsetup-1.1.ebuild:
+ Removing older ebuilds and patches, since they're no longer needed.
31 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild:
Added append-ldflags -lz for bug #160937.
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index 1a2b43c70e9c..1503be6625af 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -1,18 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hwsetup-1.1-dyn_blacklist.patch 1978 RMD160 523ca0c33b4877635a098ce0eb6139a3a3992007 SHA1 78b4028bc58feb35c5a8f63698be842607c5f3e3 SHA256 44f3ed169dfc4882d20ade009b747ce6bd04846b9b678979185e8d7c1ac07f6a
-MD5 d374ea118a38b12a7372efa0eb41a3ad files/hwsetup-1.1-dyn_blacklist.patch 1978
-RMD160 523ca0c33b4877635a098ce0eb6139a3a3992007 files/hwsetup-1.1-dyn_blacklist.patch 1978
-SHA256 44f3ed169dfc4882d20ade009b747ce6bd04846b9b678979185e8d7c1ac07f6a files/hwsetup-1.1-dyn_blacklist.patch 1978
-AUX hwsetup-1.1-fastprobe.patch 2802 RMD160 e35bccb86525b1fe52d12a8f5e88d797a87589ca SHA1 a8b4e60940ecb4fd15c572306ade766c720f0874 SHA256 156cbb40ea082a573d6913b6a12481ccb1ec7f0afe4638b6e29bdbf33b1a2dc1
-MD5 a01ba41c868d97350621a124fece8d25 files/hwsetup-1.1-fastprobe.patch 2802
-RMD160 e35bccb86525b1fe52d12a8f5e88d797a87589ca files/hwsetup-1.1-fastprobe.patch 2802
-SHA256 156cbb40ea082a573d6913b6a12481ccb1ec7f0afe4638b6e29bdbf33b1a2dc1 files/hwsetup-1.1-fastprobe.patch 2802
-AUX hwsetup-1.1-gentoo.patch 4249 RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd SHA1 872d0e0d2ba0d2f60ca1b7084c6627d83393c2e8 SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd
-MD5 ad0bc16bdb6e632f71a2768e270c9372 files/hwsetup-1.1-gentoo.patch 4249
-RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd files/hwsetup-1.1-gentoo.patch 4249
-SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd files/hwsetup-1.1-gentoo.patch 4249
AUX hwsetup-1.2-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 SHA1 2ccdeb5f0f15c68821434a1e2b081dce229cdf70 SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b
MD5 5921b87f60624d577b64bbf50f0115e3 files/hwsetup-1.2-dyn_blacklist.patch 1972
RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 files/hwsetup-1.2-dyn_blacklist.patch 1972
@@ -25,34 +10,19 @@ AUX hwsetup-1.2-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f78
MD5 6086609ba91c117fd71bd208548f966a files/hwsetup-1.2-gentoo.patch 1430
RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 files/hwsetup-1.2-gentoo.patch 1430
SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83 files/hwsetup-1.2-gentoo.patch 1430
-DIST hwsetup_1.1-1.tar.gz 9062 RMD160 e0728e9d79b83e815586c6af8e70baae0ac913c4 SHA1 b784b2ac947e2c98321875c83cb23fb2e3e8b342 SHA256 86fa767b6ceb74ce71fc6895e9db43445058025e4c0d6834a2c60159e3ea1199
DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37
-EBUILD hwsetup-1.1.ebuild 1367 RMD160 5231250e5a76b10ddd6fc78a210d51566c9d15c6 SHA1 af43fc33583e71b435aa996f7091e6acab2ecce3 SHA256 d077ee8a442a4bea7d6803636736f6ca99f8075c5b0c844f76c75e723b577b16
-MD5 64bede0a046727779d907915051de906 hwsetup-1.1.ebuild 1367
-RMD160 5231250e5a76b10ddd6fc78a210d51566c9d15c6 hwsetup-1.1.ebuild 1367
-SHA256 d077ee8a442a4bea7d6803636736f6ca99f8075c5b0c844f76c75e723b577b16 hwsetup-1.1.ebuild 1367
EBUILD hwsetup-1.2.ebuild 1396 RMD160 117ac8ecc908b64fb1f5ddda5fd2ab6d470dd412 SHA1 a22853b756e1df3c932564d73298c644b4ad40f3 SHA256 ef1f44a3e5405490f54169c176feee1c38adb9e2c3c576935d7f2db1d5b9fcb8
MD5 06a02f095a7f3b090f7d6c3b1e4b67c1 hwsetup-1.2.ebuild 1396
RMD160 117ac8ecc908b64fb1f5ddda5fd2ab6d470dd412 hwsetup-1.2.ebuild 1396
SHA256 ef1f44a3e5405490f54169c176feee1c38adb9e2c3c576935d7f2db1d5b9fcb8 hwsetup-1.2.ebuild 1396
-MISC ChangeLog 7120 RMD160 b9992e2b01b706e72a35b0599341cd539a133b6a SHA1 6b6f70c07ec6e164e35d880b26493d355a3770ff SHA256 73ff2ca7a7243bbe1f4132f705c24d1b35be199d758fb884d16c804ec207552a
-MD5 f4b44d0859f2dc0e385c95bd262be6f6 ChangeLog 7120
-RMD160 b9992e2b01b706e72a35b0599341cd539a133b6a ChangeLog 7120
-SHA256 73ff2ca7a7243bbe1f4132f705c24d1b35be199d758fb884d16c804ec207552a ChangeLog 7120
+MISC ChangeLog 7381 RMD160 64ffdacd451cb17f456008f9c598742fe46a9030 SHA1 73a2f7145e4e7e5a3ff65bddd1ed39a5c1e58621 SHA256 ba9be97bc5f86448dde3d7e89ced83d5608ac696e2e5e1a61dfe07628cc0d4f4
+MD5 08ad8d3b7bba2cea961f05a78d1ab3a4 ChangeLog 7381
+RMD160 64ffdacd451cb17f456008f9c598742fe46a9030 ChangeLog 7381
+SHA256 ba9be97bc5f86448dde3d7e89ced83d5608ac696e2e5e1a61dfe07628cc0d4f4 ChangeLog 7381
MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata.xml 159
-MD5 dc992bac6f5f8dfb9dbb29a6543d072f files/digest-hwsetup-1.1 235
-RMD160 2a96256e2cb11c05b062b141c94ecbb07f56772a files/digest-hwsetup-1.1 235
-SHA256 95efc35c3ca6de4f79085ffa3e41c0bd9bc5498d2ebbdbe92423da33c56b06cf files/digest-hwsetup-1.1 235
MD5 32fe03d6753fd120a255bc34406df63d files/digest-hwsetup-1.2 238
RMD160 eb4d62c171333cbd026cd5a639092a72a16d86f2 files/digest-hwsetup-1.2 238
SHA256 aed4897e28932ad6a8981b961ea8490a2a068dec41d0e659f275204a0b5da30c files/digest-hwsetup-1.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFwNvJkT4lNIS36YERAjB3AJ9UoI7T6MOAcrDfOM35j5qIxUOPQwCgoG3q
-C/nbDHwxmXeie+HGl0qbtfs=
-=+b2C
------END PGP SIGNATURE-----
diff --git a/sys-apps/hwsetup/files/digest-hwsetup-1.1 b/sys-apps/hwsetup/files/digest-hwsetup-1.1
deleted file mode 100644
index 623696daacba..000000000000
--- a/sys-apps/hwsetup/files/digest-hwsetup-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da9be279ef57f697436fe37fbaa93976 hwsetup_1.1-1.tar.gz 9062
-RMD160 e0728e9d79b83e815586c6af8e70baae0ac913c4 hwsetup_1.1-1.tar.gz 9062
-SHA256 86fa767b6ceb74ce71fc6895e9db43445058025e4c0d6834a2c60159e3ea1199 hwsetup_1.1-1.tar.gz 9062
diff --git a/sys-apps/hwsetup/files/hwsetup-1.1-dyn_blacklist.patch b/sys-apps/hwsetup/files/hwsetup-1.1-dyn_blacklist.patch
deleted file mode 100644
index 90ada1a6c93e..000000000000
--- a/sys-apps/hwsetup/files/hwsetup-1.1-dyn_blacklist.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN hwsetup-1.1.orig/hwsetup.c hwsetup-1.1/hwsetup.c
---- hwsetup-1.1.orig/hwsetup.c 2005-05-28 18:11:51.000000000 -0400
-+++ hwsetup-1.1/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) */
--const 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"
- };
-+
-+int blacklistsize = 13;
-+void gen_blacklist(){
-+ int n = 13;
-+ int size = 0;
-+ char *comment;
-+ char module[1024];
-+ FILE *stream;
-+
-+ if((stream = fopen ("/etc/hotplug/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 */
-@@ -412,7 +438,7 @@
- pid_t mpid;
- if((m==NULL)||(!strcmp("unknown",m))||(!strcmp("ignore",m))) return 0;
- #ifdef BLACKLIST
-- for(i=0;i<(sizeof(blacklist)/sizeof(char*));i++)
-+ for(i=0;i < blacklistsize;i++)
- {
- if(!strcmp(blacklist[i],m))
- {
-@@ -638,5 +664,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/hwsetup-1.1-fastprobe.patch b/sys-apps/hwsetup/files/hwsetup-1.1-fastprobe.patch
deleted file mode 100644
index a19589a8ca96..000000000000
--- a/sys-apps/hwsetup/files/hwsetup-1.1-fastprobe.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -urN hwsetup-1.1.dyn_blacklist/hwsetup.c hwsetup-1.1/hwsetup.c
---- hwsetup-1.1.dyn_blacklist/hwsetup.c 2005-11-17 14:20:14.000000000 -0500
-+++ hwsetup-1.1/hwsetup.c 2005-11-17 14:24:54.000000000 -0500
-@@ -140,14 +140,15 @@
-
- int syntax(char *option)
- {
-- printf(VERSION);
-+ puts(VERSION);
- if(option) fprintf(stderr,"hwsetup: Unknown option '%s'\n\n",option);
-- printf("Usage: hwsetup\n"
-- " -v be verbose\n"
-- " -p print rotating prompt\n"
-- " -a ignore audio devices\n"
-- " -s ignore scsi controllers\n"
-- " -n probe only, don't configure anything.\n");
-+ puts("Usage: hwsetup\n"
-+ "\t\t-v\tbe verbose\n"
-+ "\t\t-p\tprint rotating prompt\n"
-+ "\t\t-a\tignore audio devices\n"
-+ "\t\t-s\tignore scsi controllers\n"
-+ "\t\t-n\tprobe only, don't configure anything.\n"
-+ "\t\t-f\trun a fast probe.");
- return option?1:0;
- }
-
-@@ -425,7 +426,7 @@
- {
- signal(SIGALRM,SIG_IGN);
- fprintf(stderr,"\nWARNING: Autodetection seems to hang,\n"
-- "please check your computers BIOS settings.\n");
-+ "please check your computer's BIOS settings.\n");
- fflush(stderr);
- if(wpid) { kill(wpid,SIGTERM); usleep(2500000); kill(wpid,SIGKILL); wpid=0; }
- exit(1); /* exit program */
-@@ -591,12 +592,13 @@
- return 0;
- }
-
--int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip)
-+int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip, int fastprobe)
- {
- int i,mouse=0,cdrom=0,modem=0,scanner=0;
-+ int probeopt=fastprobe?PROBE_SAFE:PROBE_ALL;
- struct device **currentDevs, *d, *serialmouse=NULL, *usbmouse=NULL;
- if(verbose&VERBOSE_PROMPT) wpid=startwheel();
-- if((currentDevs=probeDevices(dc,BUS_UNSPEC,PROBE_ALL))==NULL) return -1;
-+ if((currentDevs=probeDevices(dc,BUS_UNSPEC,probeopt))==NULL) return -1;
- if(verbose&VERBOSE_PROMPT&&wpid>0) { kill(wpid,SIGTERM); wpid=0; usleep(160000); write(2,"\033[0m Done.\n",11); }
- for(i=0;(d=currentDevs[i]);i++)
- {
-@@ -650,7 +652,7 @@
-
- int main(int argc, char **argv)
- {
-- int i, verbose=0, probeonly=0, skip=0;
-+ int i, verbose=0, probeonly=0, skip=0, fast=0;
- enum deviceClass dc=CLASS_UNSPEC;
- for(i=1;i<argc;i++)
- {
-@@ -659,6 +661,7 @@
- else if(!strcasecmp(argv[i],"-a")) skip|=SKIP_AUDIO;
- else if(!strcasecmp(argv[i],"-s")) skip|=SKIP_SCSI;
- else if(!strcasecmp(argv[i],"-n")) probeonly=1;
-+ else if(!strcasecmp(argv[i],"-f")) fast=1;
- else return syntax(argv[i]);
- }
- /* Allow SIGTERM, SIGINT: rmmod depends on this. */
-@@ -667,5 +670,5 @@
- #ifdef BLACKLIST
- gen_blacklist();
- #endif
-- return hw_setup(dc,verbose,probeonly,skip);
-+ return hw_setup(dc,verbose,probeonly,skip,fast);
- }
diff --git a/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch b/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch
deleted file mode 100644
index cff145434b78..000000000000
--- a/sys-apps/hwsetup/files/hwsetup-1.1-gentoo.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -urN hwsetup-1.1.orig/hwsetup.c hwsetup-1.1/hwsetup.c
---- hwsetup-1.1.orig/hwsetup.c 2005-12-06 08:42:39.000000000 -0500
-+++ hwsetup-1.1/hwsetup.c 2005-12-06 08:42:18.000000000 -0500
-@@ -23,14 +23,15 @@
- #endif
-
- #define VERSION "HWSETUP 1.1, an automatic hardware configuration tool\n" \
-- "(C) 2005 Klaus Knopper <knoppix@knopper.net>\n\n"
-+ "(C) 2005 Klaus Knopper <knoppix@knopper.net>\n" \
-+ "Modified for Gentoo Linux\n\n"
-
- #define CARDSDB "/usr/share/hwdata/Cards"
--#define XPATH "/usr/X11R6/bin/"
--#define XMODPATH "/usr/X11R6/lib/modules/drivers/"
-+#define XPATH "/usr/bin/"
-+#define XMODPATH "/usr/lib/xorg/modules/drivers/"
-
- #define VERBOSE_PRINT 1
--#define VERBOSE_PROMPT 2
-+#define VERBOSE_PROMPT 0
-
- #define SKIP_AUDIO 1
- #define SKIP_SCSI 2
-@@ -193,7 +194,7 @@
-
- struct xinfo *getxinfo(struct device *d)
- {
-- const char *xfree4="XFree86", *xvesa4="vesa";
-+ const char *xorg="X", *xvesa="vesa";
- const char *xpath=XPATH;
- static struct xinfo xi;
- int rescanned=0;
-@@ -203,10 +204,10 @@
- {
- const char *driver[]={"3DLabs", "Mach64", "Mach32", "Mach8", "AGX",
- "P9000", "S3 ViRGE", "S3V", "S3", "W32",
-- "8514", "I128", "SVGA", xfree4, NULL};
-+ "8514", "I128", "SVGA", xorg, NULL};
- const char *server[]={driver[0], driver[1], driver[2], driver[3], driver[4],
- driver[5], "S3V", driver[7], driver[8], driver[9],
-- driver[10], driver[11], driver[12], xfree4, NULL};
-+ driver[10], driver[11], driver[12], xorg, NULL};
- if(!strncasecmp(d->driver,"Card:",5)) /* RedHat Cards-DB */
- { /* Kudzu "Cards" format */
- FILE *cardsdb;
-@@ -255,7 +256,7 @@
- char xmodule[32];
- char fullpath[128];
- sscanf(&buffer[7],"%31s",xmodule);
-- sprintf(fullpath,XMODPATH"%.31s_drv.o",xmodule);
-+ sprintf(fullpath,XMODPATH"%.31s_drv.so",xmodule);
- if(exists(fullpath))
- {
- strncpy(xi.xmodule,xmodule,sizeof(xi.xmodule));
-@@ -279,9 +280,9 @@
- if(*xfree3server&&!*xi.xmodule)
- strncpy(xi.xserver,xfree3server,sizeof(xi.xserver));
- else
-- strncpy(xi.xserver,xfree4,sizeof(xi.xserver));
-+ strncpy(xi.xserver,xorg,sizeof(xi.xserver));
- }
-- if(!*xi.xmodule) strcpy(xi.xmodule,xvesa4);
-+ if(!*xi.xmodule) strcpy(xi.xmodule,xvesa);
- return &xi;
- }
- }
-@@ -292,14 +293,14 @@
- if(strstr(d->driver,driver[i]))
- {
- char *xpos;
-- if((xpos=strstr(d->driver,xfree4))!=NULL) /* Check for XFree 4 */
-+ if((xpos=strstr(d->driver,xorg))!=NULL)
- {
- char xm[32]="";
-- strcpy(xi.xserver,xfree4);
-- if(sscanf(xpos,"XFree86(%30[^)])",xm)==1)
-+ strcpy(xi.xserver,xorg);
-+ if(sscanf(xpos,"X(%30[^)])",xm)==1)
- strcpy(xi.xmodule,xm);
- else
-- strcpy(xi.xmodule,xvesa4);
-+ strcpy(xi.xmodule,xvesa);
- }
- else
- {
-@@ -330,22 +331,22 @@
- if(strstr(d->desc,"Trident")||strstr(d->desc,"TGUI")
- ||strstr(d->desc,"Cirrus")||strstr(d->desc,"clgd"))
- {
-- if(!strcmp(xi.xserver,xfree4))
-+ if(!strcmp(xi.xserver,xorg))
- strncpy(xi.xopts,"-depth 16",sizeof(xi.xopts)-1);
- else
- strncpy(xi.xopts,"-bpp 16",sizeof(xi.xopts)-1);
- }
- else if(strstr(d->desc,"Savage 4")) /* S3 Inc.|Savage 4 */
- {
-- if(!strcmp(xi.xserver,xfree4))
-+ if(!strcmp(xi.xserver,xorg))
- strncpy(xi.xopts,"-depth 32",sizeof(xi.xopts)-1);
- else
- strncpy(xi.xopts,"-bpp 32",sizeof(xi.xopts)-1);
- }
- }
- /* Fallback values */
-- if(!*xi.xserver) strcpy(xi.xserver,xfree4);
-- if(!*xi.xmodule) strcpy(xi.xmodule,xvesa4);
-+ if(!*xi.xserver) strcpy(xi.xserver,xorg);
-+ if(!*xi.xmodule) strcpy(xi.xmodule,xvesa);
- return &xi;
- }
-
-@@ -517,7 +518,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";
- unlink(name);
- if((f=fopen(name,"w"))==NULL)
- { /* Read-only filesystem on /etc ?! */
diff --git a/sys-apps/hwsetup/hwsetup-1.1.ebuild b/sys-apps/hwsetup/hwsetup-1.1.ebuild
deleted file mode 100644
index 91ea87b3350d..000000000000
--- a/sys-apps/hwsetup/hwsetup-1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.16 2007/01/05 19:44:46 wolf31o2 Exp $
-
-inherit eutils toolchain-funcs
-
-MY_PV=${PV}-1
-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=""
-
-DEPEND="sys-libs/libkudzu
- sys-apps/pciutils"
-RDEPEND="${DEPEND}
- sys-apps/hwdata-gentoo"
-
-src_unpack() {
- unpack ${A}
- epatch \
- "${FILESDIR}"/${P}-dyn_blacklist.patch \
- "${FILESDIR}"/${P}-fastprobe.patch \
- "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
- emake LDFLAGS="-s ${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
- einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-}
-
-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."
-}