diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-06-10 11:42:54 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-10 11:42:54 +0000 |
commit | 9d2055c8bd4b16cde6dda9e650c03afdc7486dda (patch) | |
tree | 8772003b6a61e966d8a5e2a0d60bcdf19273d251 /sys-apps | |
parent | Bump patchset to fix typo. (diff) | |
download | historical-9d2055c8bd4b16cde6dda9e650c03afdc7486dda.tar.gz historical-9d2055c8bd4b16cde6dda9e650c03afdc7486dda.tar.bz2 historical-9d2055c8bd4b16cde6dda9e650c03afdc7486dda.zip |
old
Package-Manager: portage-2.1
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/usbutils/Manifest | 58 | ||||
-rw-r--r-- | sys-apps/usbutils/files/0.11/lsusb-endian.patch | 45 | ||||
-rw-r--r-- | sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch | 28 | ||||
-rw-r--r-- | sys-apps/usbutils/files/digest-usbutils-0.11-r5 | 2 | ||||
-rw-r--r-- | sys-apps/usbutils/files/digest-usbutils-0.11-r6 | 2 | ||||
-rw-r--r-- | sys-apps/usbutils/files/digest-usbutils-0.71 | 1 | ||||
-rw-r--r-- | sys-apps/usbutils/files/usbutils-0.11-fix-usb-ids-man-page-ref.patch | 12 | ||||
-rw-r--r-- | sys-apps/usbutils/usbutils-0.11-r5.ebuild | 53 | ||||
-rw-r--r-- | sys-apps/usbutils/usbutils-0.11-r6.ebuild | 52 | ||||
-rw-r--r-- | sys-apps/usbutils/usbutils-0.71.ebuild | 47 |
10 files changed, 18 insertions, 282 deletions
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest index aed0c01bb761..bdb1f4305f23 100644 --- a/sys-apps/usbutils/Manifest +++ b/sys-apps/usbutils/Manifest @@ -1,52 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 7c60768282548711a351cfe1b4c925d3 ChangeLog 5795 -RMD160 a28798c9de168f9c8549c224b3a8039ec9aa7738 ChangeLog 5795 -SHA256 7cb3f2214990a3e4da8668f35b909cb3627a6c63d3d574e7d00bf032dc70883d ChangeLog 5795 -MD5 02a749d768d2c60df972e04643b4a071 files/0.11/lsusb-endian.patch 1834 -RMD160 77e46e8986e78636af16412b5776e4fad02b749b files/0.11/lsusb-endian.patch 1834 -SHA256 e474ead0a67d74a7a28da62771224df0aef3941ac01ab19052002ae51f816ea3 files/0.11/lsusb-endian.patch 1834 -MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621 -RMD160 1a4d6474d7dc5865084a3759971bf56d1e93b81e files/0.11/ppc64-usbutils-kheaderfix.patch 621 -SHA256 c0217e45806fafbf2855d0126f8fd6607c8ffd528f7ef63355a63dd91db6fe1a files/0.11/ppc64-usbutils-kheaderfix.patch 621 -MD5 f703ade59119743d4225df9fb4623aa8 files/digest-usbutils-0.11-r5 128 -RMD160 5b51752863fa33c9f22a97b37c2d4dc4c3ddad16 files/digest-usbutils-0.11-r5 128 -SHA256 2c684aaf0e374e919905cebe9d9342370b2e501642cf5026000a864cfb143e61 files/digest-usbutils-0.11-r5 128 -MD5 ab0f2b4ad3bb0eaf089d8538ec6586de files/digest-usbutils-0.11-r6 128 -RMD160 9fddce36e3bb5dd365ecfdbde3193acd55598bea files/digest-usbutils-0.11-r6 128 -SHA256 53f3e5ccf707bcce02db861b69472d524cb0d00fe0cde0f473f434a7656b48ed files/digest-usbutils-0.11-r6 128 -MD5 85ab89963a7fd11f8611547fb202cd72 files/digest-usbutils-0.71 65 -RMD160 378211009ccd3e9e6805df5b035117377222c051 files/digest-usbutils-0.71 65 -SHA256 f64b04a3b9c2b7558b97441647b2b9c1af7c02933b657a4ed57c6aa7f35db99d files/digest-usbutils-0.71 65 -MD5 85ab89963a7fd11f8611547fb202cd72 files/digest-usbutils-0.71-r1 65 -RMD160 378211009ccd3e9e6805df5b035117377222c051 files/digest-usbutils-0.71-r1 65 -SHA256 f64b04a3b9c2b7558b97441647b2b9c1af7c02933b657a4ed57c6aa7f35db99d files/digest-usbutils-0.71-r1 65 -MD5 d20a32b2ea8220b81490216ee51cba82 files/usbutils-0.11-fix-usb-ids-man-page-ref.patch 384 -RMD160 e208db9a9aa11494500c31c388ab6e515a76c5af files/usbutils-0.11-fix-usb-ids-man-page-ref.patch 384 -SHA256 c9dc723dca7b924485958988f1a9d81077ac91f55f6aa3fdbc558d45aa947df9 files/usbutils-0.11-fix-usb-ids-man-page-ref.patch 384 +AUX usbutils-0.71-new-video-format.patch 2391 RMD160 683496cfc8a8021406083a73e011ee3e206c718a SHA1 43b7ee15f01c84681cdee9b4b547327d71534d37 SHA256 14b39cb2981ec852dc2a0bb17a5b96d4c9854db088e3b077e3f709219b6cf0e8 MD5 e092e74597092401bebd1db3c9ce6122 files/usbutils-0.71-new-video-format.patch 2391 RMD160 683496cfc8a8021406083a73e011ee3e206c718a files/usbutils-0.71-new-video-format.patch 2391 SHA256 14b39cb2981ec852dc2a0bb17a5b96d4c9854db088e3b077e3f709219b6cf0e8 files/usbutils-0.71-new-video-format.patch 2391 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 -SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 b71d482eb7915edd69fe53b2b92e4959 usbutils-0.11-r5.ebuild 1444 -RMD160 831b9631c67bc1f5e1c839e14cfddadad9421c5c usbutils-0.11-r5.ebuild 1444 -SHA256 8cf000107a80d01ca04dfcfbbd7dbcf50e44c0df78afaf51157b5a9ac2c3d376 usbutils-0.11-r5.ebuild 1444 -MD5 3bf5ce706718e4c6b91aa5399624c849 usbutils-0.11-r6.ebuild 1486 -RMD160 062357b362ae2ba1eecd3b2ca1f22749803d7ec3 usbutils-0.11-r6.ebuild 1486 -SHA256 1a542b52f8cbf139832ba69435f0d3e8f829c4b93f214728b6ae4d2d7366cc8a usbutils-0.11-r6.ebuild 1486 +DIST usbutils-0.71.tar.gz 163811 +EBUILD usbutils-0.71-r1.ebuild 1288 RMD160 ff10d901037028a01748bdd4731e704c246bcb46 SHA1 1f68f71ac6189064fa8233b7abc025f0288bb993 SHA256 1f0e575f31b9a63d8f8c08a89188289737b9b659f6f2c52fd646341659fd68f5 MD5 9e455c19f62460848676e4ab6bf613ef usbutils-0.71-r1.ebuild 1288 RMD160 ff10d901037028a01748bdd4731e704c246bcb46 usbutils-0.71-r1.ebuild 1288 SHA256 1f0e575f31b9a63d8f8c08a89188289737b9b659f6f2c52fd646341659fd68f5 usbutils-0.71-r1.ebuild 1288 -MD5 2f96f4804743b4736dc41cd054df0d12 usbutils-0.71.ebuild 1215 -RMD160 aae74cd893cf314fdec94ccb9a1dcdffc82daf9a usbutils-0.71.ebuild 1215 -SHA256 a25873f4e43dea938d96e74b810d96d21a6c6ac861a2b17f521a14b70918b623 usbutils-0.71.ebuild 1215 +MISC ChangeLog 5795 RMD160 a28798c9de168f9c8549c224b3a8039ec9aa7738 SHA1 4a667f2d73f349c1865f056ad9527ed70f2b9306 SHA256 7cb3f2214990a3e4da8668f35b909cb3627a6c63d3d574e7d00bf032dc70883d +MD5 7c60768282548711a351cfe1b4c925d3 ChangeLog 5795 +RMD160 a28798c9de168f9c8549c224b3a8039ec9aa7738 ChangeLog 5795 +SHA256 7cb3f2214990a3e4da8668f35b909cb3627a6c63d3d574e7d00bf032dc70883d ChangeLog 5795 +MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 +SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 +MD5 85ab89963a7fd11f8611547fb202cd72 files/digest-usbutils-0.71-r1 65 +RMD160 378211009ccd3e9e6805df5b035117377222c051 files/digest-usbutils-0.71-r1 65 +SHA256 f64b04a3b9c2b7558b97441647b2b9c1af7c02933b657a4ed57c6aa7f35db99d files/digest-usbutils-0.71-r1 65 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) +Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEMjyoAiZjviIA2XgRAkqgAJ9vj49krYlzJk0+Nqd9dEuTpQOotwCfZLVF -Q7nroqECmvwMBS5sQImPm3M= -=oxZx +iD8DBQFEirE82+ySkm8kpY0RArdsAJ9UJQeuNqO/ytPPhMU2QhiEbvyqlQCePh8h +PPDbwwrlkhjSqde7/qSK9CA= +=V0sk -----END PGP SIGNATURE----- diff --git a/sys-apps/usbutils/files/0.11/lsusb-endian.patch b/sys-apps/usbutils/files/0.11/lsusb-endian.patch deleted file mode 100644 index 0ea38c34ee38..000000000000 --- a/sys-apps/usbutils/files/0.11/lsusb-endian.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- lsusb.c.orig 2002-08-06 08:35:21.000000000 +0200 -+++ lsusb.c 2004-06-14 23:46:50.620570416 +0200 -@@ -69,6 +69,14 @@ - - #define VERBLEVEL_DEFAULT 0 /* 0 gives lspci behaviour; 1, lsusb-0.9 */ - -+/* Handle endian-ness */ -+#if __BYTE_ORDER == __BIG_ENDIAN || BYTE_ORDER == BIG_ENDIAN -+//#define SWAP(n) ((n << 24) | ((n&65280)<<8) | ((n&16711680)>>8) | (n>>24)) -+#define SWAP(n) (((n) & 0x00ff) << 8 | ((n) & 0xff00) >> 8) -+#else -+#define SWAP(n) (n) -+#endif -+ - static const char *procbususb = "/proc/bus/usb"; - static unsigned int verblevel = VERBLEVEL_DEFAULT; - static int do_report_desc = 1; -@@ -293,7 +301,8 @@ - " iSerial %5u %s\n" - " bNumConfigurations %5u\n", - buf[0], buf[1], buf[3], buf[2], buf[4], cls, buf[5], subcls, buf[6], proto, buf[7], -- vid, vendor, pid, product, buf[13], buf[12], buf[14], mfg, buf[15], prod, buf[16], serial, buf[17]); -+ SWAP(vid), vendor, SWAP(pid), product, buf[13], buf[12], buf[14], mfg, buf[15], -+ prod, buf[16], serial, buf[17]); - dump_junk(buf, " ", 18); - } - -@@ -1374,7 +1383,7 @@ - pid = buf[10] | (buf[11] << 8); - get_vendor_string(vendor, sizeof(vendor), vid); - get_product_string(product, sizeof(product), vid, pid); -- printf("Device: ID %04x:%04x %s %s\n", vid, pid, vendor, product); -+ printf("Device: ID %04x:%04x %s %s\n", SWAP(vid), SWAP(pid), vendor, product); - dumpdev(buf, fd, flags); - status=0; - err: -@@ -1432,7 +1441,7 @@ - get_product_string(product, sizeof(product), vid, pid); - if (verblevel > 0) - printf("\n"); -- printf("Bus %s Device %s: ID %04x:%04x %s %s\n", de->d_name, de2->d_name, vid, pid, vendor, product); -+ printf("Bus %s Device %s: ID %04x:%04x %s %s\n", de->d_name, de2->d_name, SWAP(vid), SWAP(pid), vendor, product); - if (verblevel > 0) - dumpdev(buf, fd, flags); - err: diff --git a/sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch b/sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch deleted file mode 100644 index 849baff7be4d..000000000000 --- a/sys-apps/usbutils/files/0.11/ppc64-usbutils-kheaderfix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- libusb/access.c.orig 2004-03-04 03:24:41.028301880 +0000 -+++ libusb/access.c 2004-03-04 03:35:05.013231200 +0000 -@@ -30,6 +30,9 @@ - - #include "libusb.h" - -+#include <asm/types.h> -+typedef unsigned long kernel_ulong_t; -+ - #ifdef HAVE_LINUX_USB_H - #include <linux/usb.h> - #else ---- libusb/descparse.c.orig 2004-03-04 03:15:39.897292152 +0000 -+++ libusb/descparse.c 2004-03-04 03:35:33.585280600 +0000 -@@ -30,9 +30,13 @@ - - #include "libusb.h" - -+typedef unsigned long kernel_ulong_t; -+ - #ifdef HAVE_LINUX_USB_H -+#include <asm/types.h> - #include <linux/usb.h> - #else -+#include <asm/types.h> - #include "usb.h" - #endif - diff --git a/sys-apps/usbutils/files/digest-usbutils-0.11-r5 b/sys-apps/usbutils/files/digest-usbutils-0.11-r5 deleted file mode 100644 index 451d9c57e9b9..000000000000 --- a/sys-apps/usbutils/files/digest-usbutils-0.11-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 05157bed61af65749f02713c10b8ef26 usbutils-0.11.tar.gz 229161 -MD5 efeabe86dc3ab36dc48a7c07b21cb7df usb.ids-20040902.gz 49178 diff --git a/sys-apps/usbutils/files/digest-usbutils-0.11-r6 b/sys-apps/usbutils/files/digest-usbutils-0.11-r6 deleted file mode 100644 index b559b137d135..000000000000 --- a/sys-apps/usbutils/files/digest-usbutils-0.11-r6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 05157bed61af65749f02713c10b8ef26 usbutils-0.11.tar.gz 229161 -MD5 7734441ada5e18f18bb554b111aea172 usb.ids-20050408.gz 54354 diff --git a/sys-apps/usbutils/files/digest-usbutils-0.71 b/sys-apps/usbutils/files/digest-usbutils-0.71 deleted file mode 100644 index 53fcaeb741e9..000000000000 --- a/sys-apps/usbutils/files/digest-usbutils-0.71 +++ /dev/null @@ -1 +0,0 @@ -MD5 479d7c7098ef44cc95e7978fd71c712c usbutils-0.71.tar.gz 163811 diff --git a/sys-apps/usbutils/files/usbutils-0.11-fix-usb-ids-man-page-ref.patch b/sys-apps/usbutils/files/usbutils-0.11-fix-usb-ids-man-page-ref.patch deleted file mode 100644 index 0297f4cd4a82..000000000000 --- a/sys-apps/usbutils/files/usbutils-0.11-fix-usb-ids-man-page-ref.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN usbutils-0.11.orig/lsusb.8 usbutils-0.11/lsusb.8 ---- usbutils-0.11.orig/lsusb.8 2004-08-30 14:23:51.152236968 -0500 -+++ usbutils-0.11/lsusb.8 2004-08-30 14:26:17.194035240 -0500 -@@ -80,7 +80,7 @@ - - .SH FILES - .TP --.B /usr/share/usb.ids -+.B /usr/share/misc/usb.ids - A list of all known USB ID's (vendors, products, classes, subclasses and protocols). - .TP - .B /proc/bus/usb diff --git a/sys-apps/usbutils/usbutils-0.11-r5.ebuild b/sys-apps/usbutils/usbutils-0.11-r5.ebuild deleted file mode 100644 index db7612f838c0..000000000000 --- a/sys-apps/usbutils/usbutils-0.11-r5.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r5.ebuild,v 1.10 2005/12/29 09:29:14 vapier Exp $ - -inherit eutils multilib - -# note: update these regularly from http://www.linux-usb.org/usb.ids -# and upload to gentoo mirrors - <liquidx@gentoo.org> -USB_IDS_VER="20040902" - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="http://usb.cs.tum.edu/" -SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz - mirror://gentoo/usb.ids-${USB_IDS_VER}.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - - # replace usb.ids with an updated version - mv "${WORKDIR}"/usb.ids-${USB_IDS_VER} ${S}/usb.ids || die "unable to replace usb.ids" - - use ppc64 && epatch ${FILESDIR}/0.11/ppc64-usbutils-kheaderfix.patch - - # Fix endian-issues - epatch "${FILESDIR}/0.11/lsusb-endian.patch" - - epatch "${FILESDIR}"/usbutils-0.11-fix-usb-ids-man-page-ref.patch #62786 -} - -src_compile() { - # put usb.ids in same place as pci.ids (/usr/share/misc) - econf \ - --datadir=/usr/share/misc \ - || die "./configure failed" - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - - # we don't need libusb.* from usbutils because it conflicts - # with dev-libs/libusb - rm -r "${D}"/usr/$(get_libdir) - rm -r "${D}"/usr/include -} diff --git a/sys-apps/usbutils/usbutils-0.11-r6.ebuild b/sys-apps/usbutils/usbutils-0.11-r6.ebuild deleted file mode 100644 index ec7986e7a0ec..000000000000 --- a/sys-apps/usbutils/usbutils-0.11-r6.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r6.ebuild,v 1.1 2005/05/09 11:09:28 liquidx Exp $ - -inherit eutils gnuconfig - -# note: update these regularly from http://www.linux-usb.org/usb.ids -# and upload to gentoo mirrors - <liquidx@gentoo.org> -USB_IDS_VER="20050408" - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="http://usb.cs.tum.edu/" -SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz - mirror://gentoo/usb.ids-${USB_IDS_VER}.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="virtual/libc" - -src_unpack() { - unpack ${A} - gnuconfig_update - - # replace usb.ids with an updated version - mv ${WORKDIR}/usb.ids-${USB_IDS_VER} ${S}/usb.ids || die "unable to replace usb.ids" - - use ppc64 && ( cd ${S}; epatch ${FILESDIR}/0.11/ppc64-usbutils-kheaderfix.patch ) - - # Fix endian-issues - ( cd "${S}" && epatch "${FILESDIR}/0.11/lsusb-endian.patch" ) - - epatch ${FILESDIR}/usbutils-0.11-fix-usb-ids-man-page-ref.patch #bug #62786 -} - -src_compile() { - # put usb.ids in same place as pci.ids (/usr/share/misc) - econf \ - --datadir=/usr/share/misc || die "./configure failed" - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - # we don't need libusb.* from usbutils because it conflicts - # with dev-libs/libusb - rm -rf ${D}/usr/lib* - rm -rf ${D}/usr/include -} diff --git a/sys-apps/usbutils/usbutils-0.71.ebuild b/sys-apps/usbutils/usbutils-0.71.ebuild deleted file mode 100644 index d1819152f08c..000000000000 --- a/sys-apps/usbutils/usbutils-0.71.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.71.ebuild,v 1.1 2005/07/12 03:45:34 vapier 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="dev-libs/libusb" - -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 - - # 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 -} |