Bug #273752: ANSI compat patch from Debian, rediffed.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 259 insertions, 2 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 5830ec221f9f..06859e43e076 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.96 2009/11/11 07:31:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.97 2009/11/11 08:02:02 robbat2 Exp $
+
+*libusb-0.1.12-r6 (11 Nov 2009)
+
+  11 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +libusb-0.1.12-r6.ebuild, +files/libusb-0.1-ansi.patch:
+  Bug #273752: ANSI compat patch from Debian, rediffed.
 
 *libusb-1.0.4 (11 Nov 2009)
 
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 3a26c3262dcb..8bf10f3444e4 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,4 +1,5 @@
 AUX 0.1.12-fbsd.patch 2477 RMD160 aa92a57100c98cf1ef900d1f27685a33a9c3fc91 SHA1 75dbab5891a5753463661806e89263f13e8653b3 SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d
+AUX libusb-0.1-ansi.patch 4599 RMD160 9aa540748c939f43da218982a7a7067c33834b9f SHA1 d383ffde3baeaa78a2c148dee69777cf5c61102c SHA256 237920768d4bd84189159e488b0c5c1ecb0e4abea82b1a316b16dacb1016698b
 AUX libusb-0.1.12-no-infinite-bulk.patch 807 RMD160 bba6194bb6cc9c0008791684c325c599ea6a2415 SHA1 92b97b247baa0e548f1909addf69bb159534a991 SHA256 141b8a6f6e4cef3b9e08377cb1d79cb9398f2437894d368d0eca8f1c07848db7
 AUX libusb-0.1.12-nocpp.patch 572 RMD160 cdceb6a5550a6371401046fb26a9ccc67e4a3d5d SHA1 c55022ae4965b469949329cd6839707790a44ec4 SHA256 6a9833ea9238b9df0f6a359c3d84f829bdf83e26dedb31ce9d614f9c6cda3ab0
 DIST libusb-0.1.11.tar.gz 377187 RMD160 326af5a58143a9bab9e5f3190fd3c70f19c8d061 SHA1 59e043bb92f8eb17a1172d01e365b0e042654356 SHA256 8d73f0d7074fc43e1003068668cbabf120ed8148db7b3d4ee54b25fd645923e4
@@ -13,10 +14,11 @@ EBUILD libusb-0.1.12-r2.ebuild 1881 RMD160 62ff5c881696ebf8b89a16cb5d9c24fdd8e75
 EBUILD libusb-0.1.12-r3.ebuild 1970 RMD160 2ab25a414b7e358ebc95815ff4236de0e5a00ce7 SHA1 28b65540cf709c4923ae4b111c67a92f437df5b3 SHA256 3310d4f54db61cc0712b21371df053abaa297ccdd7b0bef2b478fe8052fb508a
 EBUILD libusb-0.1.12-r4.ebuild 2027 RMD160 fbb29cf384cef4fa1fa5f0af40104e135648e497 SHA1 0f3b9ad19075ae227eb2b0d1ab384b5b8a579dc8 SHA256 2a4d39c39f0822b7ad8c066d67327605329ee907d8e65ac34297d03538b8a7ea
 EBUILD libusb-0.1.12-r5.ebuild 1669 RMD160 2c5edee2593448fd142f9b66612ed6f5c1bcca54 SHA1 15ce66a61ee94b21427973584f468568e83a8800 SHA256 a74a92cf8693a436a75b2e6c13aa6edc963d3b96223c371251a2733fe2a0d225
+EBUILD libusb-0.1.12-r6.ebuild 1734 RMD160 2f05b1bf971d25f55d031ae06c7d3f9d051d6825 SHA1 bb0e5f4ac45f35a8e977a244baff41f85b216aa0 SHA256 ea0343cda0b4ce9887485c89602624c87e329bffb597ed65881f84268c0c5a96
 EBUILD libusb-0.1.12.ebuild 1520 RMD160 030987f169060a9da28bc7035b4ac49583d5ca8b SHA1 11f595a9e758126b76c5aede2bd42838f44387cb SHA256 2dcc747c097af0a33e9ebe117fd440c00544f6de83709da32e21ee9decf4bbbf
 EBUILD libusb-1.0.1.ebuild 964 RMD160 6917db038ecfb38c561777e5b83aa164990a9b26 SHA1 297ac20c7652dd06886e456f46a8158dd6987e91 SHA256 464f307faaf05c7184ee02c0f1fa4e560640d5b1dc9e1f9f1e116721771ecb13
 EBUILD libusb-1.0.2.ebuild 963 RMD160 7a41e910e2e3c29ef2783fb40eef1b28b27ce091 SHA1 76c4a7deaa2d287b21fea7477b3ae9dacb72072a SHA256 34ebc8892c0225724c3fbbd56238bf10c0274fc0419c54b700b41b855e530451
 EBUILD libusb-1.0.3.ebuild 951 RMD160 cbfbd0a21f5c1b32173154b72acd18e130fb7029 SHA1 ddc0f37186cbb50db0d0255462daf7a486d2daa6 SHA256 d644faeb635ebb5e0eae669324560640b46693d144809cd0adbae0837bd5c216
 EBUILD libusb-1.0.4.ebuild 951 RMD160 de3acfe3a6863273ae5aa3269307a39795c51574 SHA1 dcfb28e5a209235af1102fba873d563f28df8c97 SHA256 1255fffb76cf5ab73144805854a88e3a840c1509902248588957d7311a5bdd07
-MISC ChangeLog 12337 RMD160 cf3972f4e8fbd21c45028ddb41c89ea19a76aaf5 SHA1 88a373dfb06f3145c8b1124822a32ace50518f05 SHA256 c00d74fe06087467d9098da0075c2b9ee7804a88a5fe01f76f09d0aae297a956
+MISC ChangeLog 12538 RMD160 70e6559abb74a2507d776d1afa4243747a9df82e SHA1 ea3cd884a4d6bbaa8a000e06c7b388298dd01e24 SHA256 3b53be1dd09b5f6ab367f0f5a709399872eca7bad3f0f3b55e8b62c23e3c1fb4
 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2
diff --git a/dev-libs/libusb/files/libusb-0.1-ansi.patch b/dev-libs/libusb/files/libusb-0.1-ansi.patch
new file mode 100644
index 000000000000..9db4b4d9f628
--- /dev/null
+++ b/dev-libs/libusb/files/libusb-0.1-ansi.patch
@@ -0,0 +1,191 @@
+diff -Nuar --exclude '*.rej' --exclude '*.orig' libusb-0.1.12.orig/usb.h.in libusb-0.1.12/usb.h.in
+--- libusb-0.1.12.orig/usb.h.in	2009-11-11 07:57:27.335948692 +0000
++++ libusb-0.1.12/usb.h.in	2009-11-11 08:00:11.391786398 +0000
+@@ -13,8 +13,10 @@
+ 
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <limits.h>
+ 
++#include <sys/param.h>
+ #include <dirent.h>
+ 
+ #if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__)
+@@ -70,27 +72,27 @@
+ 
+ /* All standard descriptors have these 2 fields in common */
+ struct usb_descriptor_header {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
+ };
+ 
+ /* String descriptor */
+ struct usb_string_descriptor {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
+-	u_int16_t wData[1];
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
++	uint16_t wData[1];
+ };
+ 
+ #if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__)
+ /* HID descriptor */
+ struct usb_hid_descriptor {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
+-	u_int16_t bcdHID;
+-	u_int8_t  bCountryCode;
+-	u_int8_t  bNumDescriptors;
+-	/* u_int8_t  bReportDescriptorType; */
+-	/* u_int16_t wDescriptorLength; */
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
++	uint16_t bcdHID;
++	uint8_t  bCountryCode;
++	uint8_t  bNumDescriptors;
++	/* uint8_t  bReportDescriptorType; */
++	/* uint16_t wDescriptorLength; */
+ 	/* ... */
+ };
+ #endif
+@@ -98,14 +100,14 @@
+ /* Endpoint descriptor */
+ #define USB_MAXENDPOINTS	32
+ struct usb_endpoint_descriptor {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
+-	u_int8_t  bEndpointAddress;
+-	u_int8_t  bmAttributes;
+-	u_int16_t wMaxPacketSize;
+-	u_int8_t  bInterval;
+-	u_int8_t  bRefresh;
+-	u_int8_t  bSynchAddress;
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
++	uint8_t  bEndpointAddress;
++	uint8_t  bmAttributes;
++	uint16_t wMaxPacketSize;
++	uint8_t  bInterval;
++	uint8_t  bRefresh;
++	uint8_t  bSynchAddress;
+ 
+ 	unsigned char *extra;	/* Extra descriptors */
+ 	int extralen;
+@@ -123,15 +125,15 @@
+ /* Interface descriptor */
+ #define USB_MAXINTERFACES	32
+ struct usb_interface_descriptor {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
+-	u_int8_t  bInterfaceNumber;
+-	u_int8_t  bAlternateSetting;
+-	u_int8_t  bNumEndpoints;
+-	u_int8_t  bInterfaceClass;
+-	u_int8_t  bInterfaceSubClass;
+-	u_int8_t  bInterfaceProtocol;
+-	u_int8_t  iInterface;
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
++	uint8_t  bInterfaceNumber;
++	uint8_t  bAlternateSetting;
++	uint8_t  bNumEndpoints;
++	uint8_t  bInterfaceClass;
++	uint8_t  bInterfaceSubClass;
++	uint8_t  bInterfaceProtocol;
++	uint8_t  iInterface;
+ 
+ 	struct usb_endpoint_descriptor *endpoint;
+ 
+@@ -149,14 +151,14 @@
+ /* Configuration descriptor information.. */
+ #define USB_MAXCONFIG		8
+ struct usb_config_descriptor {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
+-	u_int16_t wTotalLength;
+-	u_int8_t  bNumInterfaces;
+-	u_int8_t  bConfigurationValue;
+-	u_int8_t  iConfiguration;
+-	u_int8_t  bmAttributes;
+-	u_int8_t  MaxPower;
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
++	uint16_t wTotalLength;
++	uint8_t  bNumInterfaces;
++	uint8_t  bConfigurationValue;
++	uint8_t  iConfiguration;
++	uint8_t  bmAttributes;
++	uint8_t  MaxPower;
+ 
+ 	struct usb_interface *interface;
+ 
+@@ -166,28 +168,28 @@
+ 
+ /* Device descriptor */
+ struct usb_device_descriptor {
+-	u_int8_t  bLength;
+-	u_int8_t  bDescriptorType;
+-	u_int16_t bcdUSB;
+-	u_int8_t  bDeviceClass;
+-	u_int8_t  bDeviceSubClass;
+-	u_int8_t  bDeviceProtocol;
+-	u_int8_t  bMaxPacketSize0;
+-	u_int16_t idVendor;
+-	u_int16_t idProduct;
+-	u_int16_t bcdDevice;
+-	u_int8_t  iManufacturer;
+-	u_int8_t  iProduct;
+-	u_int8_t  iSerialNumber;
+-	u_int8_t  bNumConfigurations;
++	uint8_t  bLength;
++	uint8_t  bDescriptorType;
++	uint16_t bcdUSB;
++	uint8_t  bDeviceClass;
++	uint8_t  bDeviceSubClass;
++	uint8_t  bDeviceProtocol;
++	uint8_t  bMaxPacketSize0;
++	uint16_t idVendor;
++	uint16_t idProduct;
++	uint16_t bcdDevice;
++	uint8_t  iManufacturer;
++	uint8_t  iProduct;
++	uint8_t  iSerialNumber;
++	uint8_t  bNumConfigurations;
+ };
+ 
+ struct usb_ctrl_setup {
+-	u_int8_t  bRequestType;
+-	u_int8_t  bRequest;
+-	u_int16_t wValue;
+-	u_int16_t wIndex;
+-	u_int16_t wLength;
++	uint8_t  bRequestType;
++	uint8_t  bRequest;
++	uint16_t wValue;
++	uint16_t wIndex;
++	uint16_t wLength;
+ };
+ 
+ /*
+@@ -258,7 +260,7 @@
+ 
+   void *dev;		/* Darwin support */
+ 
+-  u_int8_t devnum;
++  uint8_t devnum;
+ 
+   unsigned char num_children;
+   struct usb_device **children;
+@@ -270,7 +272,7 @@
+   char dirname[PATH_MAX + 1];
+ 
+   struct usb_device *devices;
+-  u_int32_t location;
++  uint32_t location;
+ 
+   struct usb_device *root_dev;
+ };
diff --git a/dev-libs/libusb/libusb-0.1.12-r6.ebuild b/dev-libs/libusb/libusb-0.1.12-r6.ebuild
new file mode 100644
index 000000000000..36fc2c410a30
--- /dev/null
+++ b/dev-libs/libusb/libusb-0.1.12-r6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r6.ebuild,v 1.1 2009/11/11 08:02:02 robbat2 Exp $
+
+inherit eutils libtool autotools toolchain-funcs
+
+DESCRIPTION="Userspace access to USB devices"
+HOMEPAGE="http://libusb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc nocxx"
+RESTRICT="test"
+
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
+	app-text/docbook-dsssl-stylesheets
+	app-text/docbook-sgml-utils
+	~app-text/docbook-sgml-dtd-4.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:-Werror::' Makefile.am
+	sed -i 's:AC_LANG_CPLUSPLUS:AC_PROG_CXX:' configure.in #213800
+	epatch "${FILESDIR}"/${PV}-fbsd.patch
+	use nocxx && epatch "${FILESDIR}"/${PN}-0.1.12-nocpp.patch
+	epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch
+	epatch "${FILESDIR}"/${PN}-0.1-ansi.patch # 273752
+	eautoreconf
+	elibtoolize
+
+	# Ensure that the documentation actually finds the DTD it needs
+	docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd"
+	sysid='"-//OASIS//DTD DocBook V4.2//EN"'
+	sed -r -i -e \
+		"s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \
+		"${S}"/doc/manual.sgml
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug debug all) \
+		$(use_enable doc build-docs)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS NEWS README
+	use doc && dohtml doc/html/*.html
+
+	gen_usr_ldscript -a usb
+	use nocxx && rm -f "${D}"/usr/include/usbpp.h
+}