summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-01-04 16:49:21 +0000
committerMike Frysinger <vapier@gentoo.org>2009-01-04 16:49:21 +0000
commit24a2c83c27af13b1d16e3c8a06fc6a5991303e68 (patch)
tree1cba6b2fd32e8f2313d6b9ae0eeff0d2ca7aee4d /sys-apps/usbutils
parentAdding missing IUSE (diff)
downloadgentoo-2-24a2c83c27af13b1d16e3c8a06fc6a5991303e68.tar.gz
gentoo-2-24a2c83c27af13b1d16e3c8a06fc6a5991303e68.tar.bz2
gentoo-2-24a2c83c27af13b1d16e3c8a06fc6a5991303e68.zip
old
Diffstat (limited to 'sys-apps/usbutils')
-rw-r--r--sys-apps/usbutils/files/usbutils-0.71-new-video-format.patch83
-rw-r--r--sys-apps/usbutils/usbutils-0.71-r1.ebuild50
-rw-r--r--sys-apps/usbutils/usbutils-0.72-r4.ebuild49
3 files changed, 0 insertions, 182 deletions
diff --git a/sys-apps/usbutils/files/usbutils-0.71-new-video-format.patch b/sys-apps/usbutils/files/usbutils-0.71-new-video-format.patch
deleted file mode 100644
index dfcc00a4c94b..000000000000
--- a/sys-apps/usbutils/files/usbutils-0.71-new-video-format.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Handle new entry types in usb.ids
-
-Patch taken from upstream cvs
-
-http://bugs.gentoo.org/111781
-
---- usbutils/names.c
-+++ usbutils/names.c
-@@ -79,6 +79,12 @@
- char name[1];
- };
-
-+struct videoterminal {
-+ struct videoterminal *next;
-+ u_int16_t termt;
-+ char name[1];
-+};
-+
- struct genericstrtable {
- struct genericstrtable *next;
- unsigned int num;
-@@ -109,6 +115,7 @@
- static struct subclass *subclasses[HASHSZ] = { NULL, };
- static struct protocol *protocols[HASHSZ] = { NULL, };
- static struct audioterminal *audioterminals[HASHSZ] = { NULL, };
-+static struct videoterminal *videoterminals[HASHSZ] = { NULL, };
- static struct genericstrtable *hiddescriptors[HASHSZ] = { NULL, };
- static struct genericstrtable *reports[HASHSZ] = { NULL, };
- static struct genericstrtable *huts[HASHSZ] = { NULL, };
-@@ -356,6 +374,25 @@
- return 0;
- }
-
-+static int new_videoterminal(const char *name, u_int16_t termt)
-+{
-+ struct videoterminal *vt;
-+ unsigned int h = hashnum(termt);
-+
-+ vt = videoterminals[h];
-+ for (; vt; vt = vt->next)
-+ if (vt->termt == termt)
-+ return -1;
-+ vt = malloc(sizeof(struct videoterminal) + strlen(name));
-+ if (!vt)
-+ return -1;
-+ strcpy(vt->name, name);
-+ vt->termt = termt;
-+ vt->next = videoterminals[h];
-+ videoterminals[h] = vt;
-+ return 0;
-+}
-+
- static int new_genericstrtable(struct genericstrtable *t[HASHSZ], const char *name, unsigned int index)
- {
- struct genericstrtable *g;
-@@ -564,6 +601,27 @@
- DBG(printf("line %5u audio terminal type %02x %s\n", linectr, u, cp));
- continue;
- }
-+ if (buf[0] == 'V' && buf[1] == 'T' && isspace(buf[2])) {
-+ /* video terminal type spec */
-+ cp = buf+3;
-+ while (isspace(*cp))
-+ cp++;
-+ if (!isxdigit(*cp)) {
-+ fprintf(stderr, "Invalid video terminal type at line %u\n", linectr);
-+ continue;
-+ }
-+ u = strtoul(cp, &cp, 16);
-+ while (isspace(*cp))
-+ cp++;
-+ if (!*cp) {
-+ fprintf(stderr, "Invalid video terminal type at line %u\n", linectr);
-+ continue;
-+ }
-+ if (new_videoterminal(cp, u))
-+ fprintf(stderr, "Duplicate video terminal type spec at line %u terminal type %04x %s\n", linectr, u, cp);
-+ DBG(printf("line %5u video terminal type %02x %s\n", linectr, u, cp));
-+ continue;
-+ }
- if (buf[0] == 'H' && buf[1] == 'C' && buf[2] == 'C' && isspace(buf[3])) {
- /* HID Descriptor bCountryCode */
- cp = buf+3;
diff --git a/sys-apps/usbutils/usbutils-0.71-r1.ebuild b/sys-apps/usbutils/usbutils-0.71-r1.ebuild
deleted file mode 100644
index 99eb0ee7ad89..000000000000
--- a/sys-apps/usbutils/usbutils-0.71-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.71-r1.ebuild,v 1.13 2008/10/10 09:00:39 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-usb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/libusb"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # put usb.ids in same place as pci.ids (/usr/share/misc)
- sed -i \
- -e 's:/usr/share/usb.ids:/usr/share/misc/usb.ids:' \
- lsusb.8 || die "sed lsusb.8"
- sed -e '/^DEST=/s:=usb.ids:=/usr/share/misc/usb.ids:' \
- update-usbids.sh > update-usbids
-
- epatch "${FILESDIR}"/${P}-new-video-format.patch #111781
-
- # replace usb.ids with an updated version
- ebegin "Updating usb.ids"
- ./update-usbids.sh &> /dev/null
- eend 0
-}
-
-src_compile() {
- econf \
- --datadir=/usr/share/misc \
- --enable-usbmodules \
- || die "./configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
- dosbin update-usbids || die "update-usbids failed"
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-apps/usbutils/usbutils-0.72-r4.ebuild b/sys-apps/usbutils/usbutils-0.72-r4.ebuild
deleted file mode 100644
index 6176d4357953..000000000000
--- a/sys-apps/usbutils/usbutils-0.72-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.72-r4.ebuild,v 1.11 2008/10/10 09:00:39 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-usb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="network-cron"
-
-DEPEND="dev-libs/libusb"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- cp update-usbids.sh update-usbids.sh.orig
- epatch "${FILESDIR}"/${P}-update-usbids.patch
-
- # put usb.ids in same place as pci.ids (/usr/share/misc)
- sed -i \
- -e 's:/usr/share/usb.ids:/usr/share/misc/usb.ids:' \
- lsusb.8 || die "sed lsusb.8"
- sed -e '/^DEST=/s:=usb.ids:=/usr/share/misc/usb.ids:' \
- update-usbids.sh > update-usbids
-}
-
-src_compile() {
- econf \
- --datadir=/usr/share/misc \
- --enable-usbmodules \
- || die "./configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dosbin update-usbids || die "update-usbids failed"
- dodoc AUTHORS ChangeLog NEWS README
-
- use network-cron || return 0
- exeinto /etc/cron.monthly
- newexe "${FILESDIR}"/usbutils.cron update-usbids || die
-}