commit: 6069fdca6bbd4c6ee4711f1c600aa4dbe633b217 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Dec 20 03:14:56 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Dec 20 03:15:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6069fdca
sys-libs/libkudzu: Remove Closes: https://bugs.gentoo.org/755617 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> sys-libs/libkudzu/Manifest | 1 - .../libkudzu/files/kudzu-1.2.57.1-sbusfix.patch | 72 -------- .../files/kudzu-1.2.57.1-sparc-keyboard.patch | 195 --------------------- sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild | 63 ------- sys-libs/libkudzu/metadata.xml | 8 - 5 files changed, 339 deletions(-) diff --git a/sys-libs/libkudzu/Manifest b/sys-libs/libkudzu/Manifest deleted file mode 100644 index a47c798e00f..00000000000 --- a/sys-libs/libkudzu/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kudzu-1.2.57.1.tar.gz 165855 BLAKE2B cd7a71a45a234701dd3e94b7378b37017a03cc78bf5230cc267c273fee4baf5338a5509572f0ba1bb23c8f585ec452c4a7f2d02159326c4133ad6abd80d36c3f SHA512 799e7cea840b7495fc007f4e34adc50fecd2fa7ceda2e2779e39639d0b93b10419bd44a0eb910b2e47024a49a4376330653a6fd96e5560c4828d55e18ab5d641 diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch deleted file mode 100644 index 5c186ed631d..00000000000 --- a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/sbus.c -+++ b/sbus.c -@@ -162,6 +162,7 @@ - devClass = CLASS_NETWORK; - } else if (!strcmp(prop, "le")) { - type = "Sun Lance Ethernet"; -+ module = "sunlance"; - devClass = CLASS_NETWORK; - } else if (!strcmp(prop, "qe")) { - prop = prom_getproperty("channel#", &len); -@@ -206,9 +207,11 @@ - devClass = CLASS_SCSI; - } else if (!strcmp(prop, "esp")) { - type = "Sun Enhanced SCSI Processor (ESP)"; -+ module = "esp"; - devClass = CLASS_SCSI; - } else if (!strcmp(prop, "fas")) { - type = "Sun Swift (ESP)"; -+ module = "esp"; - devClass = CLASS_SCSI; - } else if (!strcmp(prop, "ptisp")) { - type = "Performance Technologies ISP"; -@@ -232,19 +235,19 @@ - while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',') - if (*prop++ == ',') break; - if (!strcmp(prop, "audio")) { -- type = "AMD7930"; -- module = "amd7930"; -+ type = "Sun|AMD7930"; -+ module = "snd-sun-amd7930"; - devClass = CLASS_AUDIO; - } else if (!strcmp(prop, "CS4231")) { - if (ebus) -- type = "CS4231 EB2 DMA (PCI)"; -+ type = "Sun|CS4231 EB2 DMA (PCI)"; - else -- type = "CS4231 APC DMA (SBUS)"; -- module = "cs4231"; -+ type = "Sun|CS4231 APC DMA (SBUS)"; -+ module = "snd-sun-cs4231"; - devClass = CLASS_AUDIO; - } else if (!strcmp(prop, "DBRIe")) { -- type = "SS10/SS20 DBRI"; -- module = "dbri"; -+ type = "Sun|SS10/SS20 DBRI"; -+ module = "snd-sun-dbri"; - devClass = CLASS_AUDIO; - } - prop = prom_getproperty("device_type", &len); -@@ -452,22 +455,6 @@ - - struct device *sbusProbe( enum deviceClass probeClass, int probeFlags, - struct device *devlist) { -- if (probeClass & CLASS_MOUSE) { -- int fd; -- struct sbusDevice *mousedev; -- -- if ((fd = open("/dev/sunmouse", O_RDONLY)) != -1) { -- /* FIXME: Should probably talk to the mouse to see -- if the connector is not empty. */ -- close (fd); -- mousedev = sbusNewDevice(NULL); -- mousedev->type = CLASS_MOUSE; -- mousedev->device = strdup("sunmouse"); -- mousedev->desc = strdup("Sun Mouse"); -- mousedev->next = devlist; -- devlist = (struct device *)mousedev; -- } -- } - if ( - (probeClass & CLASS_OTHER) || - (probeClass & CLASS_NETWORK) || diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch deleted file mode 100644 index 5626a357345..00000000000 --- a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch +++ /dev/null @@ -1,195 +0,0 @@ ---- a/keyboard.c -+++ b/keyboard.c -@@ -21,7 +21,6 @@ - #include "keyboard.h" - - #ifdef __sparc__ --#include <asm/kbio.h> - #include <asm/openpromio.h> - #include <asm/types.h> - #endif -@@ -96,7 +95,15 @@ - {0, 0} - }; - --#if !defined(__s390__) && !defined(__s390x__) -+#if defined(__sparc__) -+static int termcmp(struct termios *a, struct termios *b) -+{ -+ if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || -+ a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag) -+ return 1; -+ return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); -+} -+#elif !defined(__s390__) && !defined(__s390x__) - static int termcmp(struct termios *a, struct termios *b) - { - if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || -@@ -110,150 +117,6 @@ - struct device *keyboardProbe(enum deviceClass probeClass, int probeFlags, - struct device *devlist) - { --#ifdef __sparc__ -- int fd; -- char buf[256]; -- struct keyboardDevice *kbddev; -- -- if (probeClass & CLASS_KEYBOARD) { -- static struct { -- int layout0, layout1, layout2; -- char *symbols; -- int use_iso9995_3; -- } sunkbd_translate[] = { -- { 0, 33, 80, "", 0, }, -- { 1, 34, 81, "", 0, }, -- { 2, -1, -1, "fr_BE", 0, }, -- { 3, -1, -1, "ca", 0, }, -- { 4, 36, 83, "dk", 1, }, -- { 5, 37, 84, "de", 1, }, -- { 6, 38, 85, "it", 1, }, -- { 7, 39, 86, "nl", 0, }, -- { 8, 40, 87, "no", 1, }, -- { 9, 41, 88, "pt", 1, }, -- { 10, 42, 89, "es", 1, }, -- { 11, 43, 90, "se", 1, }, -- { 12, 44, 91, "fr_CH",1, }, -- { 13, 45, 92, "de_CH",1, }, -- { 14, 46, 93, "gb", 1, }, -- { 16, 47, 94, "ko", 0, }, -- { 17, 48, 95, "tw", 0, }, -- { 32, 49, 96, "jp", 0, }, -- { 50, 97, -1, "fr_CA",0, }, -- { 51, -1, -1, "hu", 0, }, -- { 52, -1, -1, "pl", 0, }, -- { 53, -1, -1, "cs", 0, }, -- { 54, -1, -1, "ru", 0, }, -- { -1, -1, -1, NULL, 0, } -- }; -- -- char twelve = 12; -- int fdstd = 0; -- char buf[4096]; -- -- for (fd = 0; fd <= 2; fd++) { -- sprintf (buf, "/proc/self/fd/%d", fd); -- if (readlink (buf, buf, 4096) == 12 && -- !strncmp (buf, "/dev/console", 12)) { -- fdstd = 1; -- break; -- } -- } -- if (!fdstd) { -- fd = open("/dev/console", O_RDWR); -- if (fd < 0) return devlist; -- } -- -- kbddev=keyboardNewDevice(NULL); -- kbddev->type=CLASS_KEYBOARD; -- if (devlist) -- kbddev->next = devlist; -- devlist = (struct device *) kbddev; -- -- if (ioctl (fd, TIOCLINUX, &twelve) < 0) { -- /* Serial console */ -- char desc[64]; -- struct serial_struct si; -- int line = 0; -- -- if (ioctl (fd, TIOCGSERIAL, &si) >= 0) { -- if (si.line & 1) -- /* ttyb */ -- line = 1; -- } -- if (!fdstd) close(fd); -- sprintf (desc, "Serial console tty%c", line + 'a'); -- fd = open("/dev/openprom", O_RDONLY); -- if (fd >= 0) { -- struct openpromio *op = (struct openpromio *)buf; -- sprintf (op->oprom_array, "tty%c-mode", line + 'a'); -- op->oprom_size = 4096-128-4; -- if (ioctl (fd, OPROMGETOPT, op) >= 0 && -- op->oprom_size > 0 && op->oprom_size < 40) { -- strcat (desc, " "); -- op->oprom_array [op->oprom_size] = 0; -- strcat (desc, op->oprom_array); -- } -- close (fd); -- } -- kbddev->desc=strdup(desc); -- kbddev->device=strdup("console"); -- return devlist; -- } -- -- if (!fdstd) close(fd); -- fd=open("/dev/kbd", O_RDWR); -- if (fd < 0) { -- /* PS/2 keyboard */ -- kbddev->desc=strdup("Generic PS/2 Keyboard"); -- } else { -- /* Sun keyboard */ -- int kbdtype, kbdlayout, i; -- char *desc, *desclayout = NULL; -- -- kbddev->device=strdup("kbd"); -- desc = "Sun Type4 "; -- if (ioctl(fd, KIOCTYPE, &kbdtype) >= 0) -- switch (kbdtype) { -- case 2: desc = "Sun Type2 "; break; -- case 3: desc = "Sun Type3 "; break; -- case 4: ioctl(fd, KIOCLAYOUT, &kbdlayout); -- if (kbdlayout < 33) -- desc = "Sun Type4 "; -- else switch (kbdlayout) { -- case 33: case 47: case 48: case 49: -- case 80: case 94: case 95: case 96: -- desc = "Sun Type5 "; break; -- case 34: case 81: -- desc = "Sun Type5 Unix "; break; -- default: -- desc = "Sun Type5 Euro "; break; -- } -- for (i = 0; sunkbd_translate[i].layout0 != -1; i++) { -- if (sunkbd_translate[i].layout0 == kbdlayout || -- sunkbd_translate[i].layout1 == kbdlayout || -- sunkbd_translate[i].layout2 == kbdlayout) -- break; -- } -- if (sunkbd_translate[i].layout0 != -1 && -- sunkbd_translate[i].symbols[0]) -- desclayout = sunkbd_translate[i].symbols; -- break; -- } -- if (desclayout) { -- kbddev->desc = malloc(strlen(desc) + strlen(desclayout) + 1 + strlen("Keyboard") + 1); -- strcpy (kbddev->desc, desc); -- strcat (kbddev->desc, desclayout); -- strcat (kbddev->desc, " Keyboard"); -- } else { -- kbddev->desc = malloc(strlen(desc) + strlen("Keyboard") + 1); -- strcpy (kbddev->desc, desc); -- strcat (kbddev->desc, "Keyboard"); -- } -- } -- close (fd); -- } --#else - int fd; - char twelve = 12; - int fdstd = 0; -@@ -311,7 +174,7 @@ - kbddev->device = strdup("ttySG0"); - } - #endif --#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) -+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined(__sparc__) - int cfd; - struct termios cmode, mode; - -@@ -397,7 +260,6 @@ - kbddev->device=strdup(desc); - } - } --#endif - out: - return devlist; - } diff --git a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild deleted file mode 100644 index e37cf4c2de6..00000000000 --- a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils linux-info flag-o-matic toolchain-funcs - -DESCRIPTION="Red Hat Hardware detection tools" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; -SRC_URI="mirror://gentoo/kudzu-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 -mips ppc ppc64 sparc x86" -IUSE="zlib" - -DEPEND=" - dev-libs/popt - >=sys-apps/pciutils-2.2.4[zlib?] - zlib? ( sys-libs/zlib ) -" -RDEPEND=" - ${DEPEND} - sys-apps/hwdata-gentoo - !sys-apps/kudzu -" - -S=${WORKDIR}/kudzu-${PV} - -src_prepare() { - sed -i -e 's/-fpic/-fPIC/g' Makefile || die - - epatch \ - "${FILESDIR}"/kudzu-${PV}-sbusfix.patch \ - "${FILESDIR}"/kudzu-${PV}-sparc-keyboard.patch -} - -src_configure() { - if use zlib; then - sed -i -e 's| -lpci| -lz -lpci|g' Makefile || die - fi - # Fix the modules directory to match Gentoo layout. - sed -i -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.* || die - - tc-export CC -} - -src_compile() { - emake \ - $( usex ppc ARCH='ppc' ARCH=$(tc-arch-kernel) ) \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) \ - RPM_OPT_FLAGS="${CFLAGS}" \ - libkudzu.a libkudzu_loader.a -} - -src_install() { - insinto /usr/include/kudzu - doins *.h - - dolib.a libkudzu.a libkudzu_loader.a - - keepdir /etc/sysconfig -} diff --git a/sys-libs/libkudzu/metadata.xml b/sys-libs/libkudzu/metadata.xml deleted file mode 100644 index 06ddf117247..00000000000 --- a/sys-libs/libkudzu/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>rel...@gentoo.org</email> - <name>Gentoo Release Engineering</name> -</maintainer> -</pkgmetadata>
