Version bump and include ANSI compat patch from Debian per bug #273752.

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

4 files changed, 238 insertions, 2 deletions

diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog
index eb0398d453b7..44c472c4308b 100644
--- a/dev-libs/libusb-compat/ChangeLog
+++ b/dev-libs/libusb-compat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libusb-compat
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.3 2009/05/15 10:11:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.4 2009/11/11 07:55:59 robbat2 Exp $
+
+*libusb-compat-0.1.3 (11 Nov 2009)
+
+  11 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +libusb-compat-0.1.3.ebuild, +files/libusb-0.1-ansi.patch:
+  Version bump and include ANSI compat patch from Debian per bug #273752.
 
   15 May 2009; Robin H. Johnson <robbat2@gentoo.org>
   libusb-compat-0.1.0.ebuild:
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 8ee3a5f1553a..4376570c2695 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,4 +1,7 @@
+AUX libusb-0.1-ansi.patch 4461 RMD160 27caf4d2ce5e4ef7c3268434b6c5ba35d18e2a20 SHA1 96bec47b1299ee62f488a62d2c4020bcba6e90ea SHA256 c54c0d3866ac9842d6a04618267d97186268305966441a3e104af507db0f9a51
 DIST libusb-compat-0.1.0.tar.bz2 249362 RMD160 de6954f8fbae4850dabcc2b4faec710d568abd95 SHA1 7bf7f79053fafd851b76e132ae2f0cf49dee5508 SHA256 69ad5d62946885a60368381a3354b8fd19597bc6fc9ee25b4598977771429b8d
+DIST libusb-compat-0.1.3.tar.bz2 251218 RMD160 d00e00b9f9733efc43eb4e44b84298540e896691 SHA1 d5710d5bc4b67c5344e779475b76168c7ccc5e69 SHA256 a590a03b6188030ee1ca1a0af55685fcde005ca807b963970f839be776031d94
 EBUILD libusb-compat-0.1.0.ebuild 900 RMD160 2d738901342ebd117e6736b972e2e9da1585cd68 SHA1 a87de26ec1475f9b4d750acf5d807d63d1f4d5f8 SHA256 11acf7fed4eb83ad2f101f3a7099cd750c382f772c5dd4aafc2af36500262988
-MISC ChangeLog 786 RMD160 7d9a29d2d409c84b85641d7dbf507c303070407b SHA1 e6d75d600308b28cbacadde49fc0faaa96048f16 SHA256 30f22a14194410752773666dca99bcf36bc594e19cde9c7c9e36ba7c45602914
+EBUILD libusb-compat-0.1.3.ebuild 978 RMD160 aeaffc6d342f816c86738fe621aef532900ee519 SHA1 1080c2e0311c8d8a4be759ab674da4d871fd07f2 SHA256 e6c35493b7cfe07fc97177f7b3d8a4700d3dc72aa47a4bfe69766477a72d9886
+MISC ChangeLog 1011 RMD160 a90571932920321ea59464b96ca7c1420b888cd3 SHA1 2fee386c6c7658ee817715abead431640835cb2f SHA256 4b9efae4b4236e077b9aa1499fe4eeabf755e3cedd42d28ce58cc10d2c853258
 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
new file mode 100644
index 000000000000..ba3436f6d7b4
--- /dev/null
+++ b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
@@ -0,0 +1,190 @@
+diff --git a/libusb/usb.h b/libusb/usb.h
+index b7af749..c9726ed 100644
+--- a/libusb/usb.h
++++ b/libusb/usb.h
+@@ -27,8 +27,10 @@
+ 
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <limits.h>
+ 
++#include <sys/param.h>
+ #include <dirent.h>
+ 
+ /*
+@@ -78,40 +80,40 @@
+ 
+ /* 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];
+ };
+ 
+ /* 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; */
+ 	/* ... */
+ };
+ 
+ /* 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;
+@@ -129,15 +131,15 @@ struct usb_endpoint_descriptor {
+ /* 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;
+ 
+@@ -155,14 +157,14 @@ struct usb_interface {
+ /* 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;
+ 
+@@ -172,28 +174,28 @@ struct usb_config_descriptor {
+ 
+ /* 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;
+ };
+ 
+ /*
+@@ -254,7 +256,7 @@ struct usb_device {
+ 
+   void *dev;		/* Darwin support */
+ 
+-  u_int8_t devnum;
++  uint8_t devnum;
+ 
+   unsigned char num_children;
+   struct usb_device **children;
+@@ -266,7 +268,7 @@ struct usb_bus {
+   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-compat/libusb-compat-0.1.3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.3.ebuild
new file mode 100644
index 000000000000..b762708bc3a7
--- /dev/null
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.3.ebuild,v 1.1 2009/11/11 07:55:59 robbat2 Exp $
+
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
+HOMEPAGE="http://libusb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libusb/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+RDEPEND="dev-libs/libusb:1
+		!dev-libs/libusb:0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/libusb-0.1-ansi.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug debug-log)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*.c
+}