From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4201D13835A for ; Sun, 20 Dec 2020 03:16:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3B9AE0985; Sun, 20 Dec 2020 03:16:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96E7FE0985 for ; Sun, 20 Dec 2020 03:16:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FB81341255 for ; Sun, 20 Dec 2020 03:16:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1FE3332 for ; Sun, 20 Dec 2020 03:16:04 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1608434143.a3b4786a56411de219a5f4512ff84d6ed5d854e3.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwsetup/files/, sys-apps/hwsetup/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/hwsetup/Manifest sys-apps/hwsetup/files/1.2-3-fastprobe.patch sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch sys-apps/hwsetup/files/1.2-7-gentoo.patch sys-apps/hwsetup/files/1.2-7-openchrome.patch sys-apps/hwsetup/files/1.2-strip.patch sys-apps/hwsetup/hwsetup-1.2-r3.ebuild sys-apps/hwsetup/metadata.xml X-VCS-Directories: sys-apps/hwsetup/files/ sys-apps/hwsetup/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a3b4786a56411de219a5f4512ff84d6ed5d854e3 X-VCS-Branch: master Date: Sun, 20 Dec 2020 03:16:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 60771b90-ae10-4de4-a592-788c4e2a5bed X-Archives-Hash: a6ecebd1a8f0ebe421eae581cb99ea3a commit: a3b4786a56411de219a5f4512ff84d6ed5d854e3 Author: Matt Turner gentoo org> AuthorDate: Sun Dec 20 03:14:41 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Dec 20 03:15:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b4786a sys-apps/hwsetup: Remove Closes: https://bugs.gentoo.org/755617 Signed-off-by: Matt Turner gentoo.org> sys-apps/hwsetup/Manifest | 1 - sys-apps/hwsetup/files/1.2-3-fastprobe.patch | 74 ------------------------ sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch | 62 -------------------- sys-apps/hwsetup/files/1.2-7-gentoo.patch | 20 ------- sys-apps/hwsetup/files/1.2-7-openchrome.patch | 11 ---- sys-apps/hwsetup/files/1.2-strip.patch | 11 ---- sys-apps/hwsetup/hwsetup-1.2-r3.ebuild | 69 ---------------------- sys-apps/hwsetup/metadata.xml | 8 --- 8 files changed, 256 deletions(-) diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest deleted file mode 100644 index 7acdb97c1da..00000000000 --- a/sys-apps/hwsetup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hwsetup_1.2-7.tar.gz 10706 BLAKE2B 2d0e005629f631aa3ef22f44122cf934d23929c89ee4ca7240dcdd9c2898e622a78e494a057b9eed96045e8b1a7b54252f402311360e84d57007876cd9a5f630 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e diff --git a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch deleted file mode 100644 index 600b8c4002d..00000000000 --- a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/hwsetup.c -+++ b/hwsetup.c -@@ -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(); -- currentDevs=probeDevices(dc,BUS_UNSPEC,PROBE_ALL); -+ currentDevs=probeDevices(dc,BUS_UNSPEC,probeopt); - if(verbose&VERBOSE_PROMPT&&wpid>0) { kill(wpid,SIGTERM); wpid=0; usleep(160000); write(2,"\033[0m Done.\n",11); } - if(currentDevs==NULL) return -1; - check_proc_modules(); /* Get currently loaded module list */ -@@ -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;idriver,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/files/1.2-7-openchrome.patch b/sys-apps/hwsetup/files/1.2-7-openchrome.patch deleted file mode 100644 index fb80f9dfcb1..00000000000 --- a/sys-apps/hwsetup/files/1.2-7-openchrome.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hwsetup.c -+++ b/hwsetup.c -@@ -456,7 +456,7 @@ - else if(strcasestr(xi.xdesc,"Newport")) strcpy(xi.xmodule,"newport"); - else if(strcasestr(xi.xdesc,"Siliconmotion")||strcasestr(xi.xdesc,"Silicon Motion")) strcpy(xi.xmodule,"siliconmotion"); - else if(strcasestr(xi.xdesc,"Chips")) strcpy(xi.xmodule,"chips"); -- else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"via"); -+ else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"openchrome"); - } - else strcpy(xi.xmodule,xvesa4); - } diff --git a/sys-apps/hwsetup/files/1.2-strip.patch b/sys-apps/hwsetup/files/1.2-strip.patch deleted file mode 100644 index 17de636a5dc..00000000000 --- a/sys-apps/hwsetup/files/1.2-strip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - # define BLACKLIST to avoid loading potentially dangerous modules - CFLAGS=-DBLACKLIST -Wall -fPIC - OPT=-O2 --LDFLAGS=-s -+#LDFLAGS=-s - LIBS=-lkudzu -lpci - CC=gcc - diff --git a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild deleted file mode 100644 index c535829a9ff..00000000000 --- a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -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 hppa ~ia64 -mips ppc ppc64 sparc x86" -IUSE="zlib" - -COMMON_DEPEND=" - sys-apps/pciutils[zlib?] - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-libs/libkudzu -" -RDEPEND=" - ${COMMON_DEPEND} - sys-apps/hwdata-gentoo -" - -pkg_setup() { - ewarn "This package is designed for use on the LiveCD only and will do " - ewarn "unspeakably horrible and unexpected things on a normal system." - ewarn "YOU HAVE BEEN WARNED!!!" -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \ - "${FILESDIR}"/${PV}-3-fastprobe.patch \ - "${FILESDIR}"/${MY_PV}-gentoo.patch \ - "${FILESDIR}"/${PV}-strip.patch \ - "${FILESDIR}"/${MY_PV}-openchrome.patch -} - -src_configure() { - if use zlib ; then - sed -i \ - -e '/^LIBS=/s,-lpci,-lz -lpci,g' \ - Makefile - fi -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man - dosbin ${PN} - keepdir /etc/sysconfig -} - -pkg_postinst() { - ewarn "This package is intended for use 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/metadata.xml b/sys-apps/hwsetup/metadata.xml deleted file mode 100644 index 06ddf117247..00000000000 --- a/sys-apps/hwsetup/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - releng@gentoo.org - Gentoo Release Engineering - -