summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-01 12:27:39 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-01 12:27:39 +0000
commitac3c90d1df5a5e6fc778fb4bb3139664d4a6cd7c (patch)
tree9e06baef21ab8f5440c82aebf37dc460d983adc3
parentoops, missing inherit for last commit (diff)
downloadhistorical-ac3c90d1df5a5e6fc778fb4bb3139664d4a6cd7c.tar.gz
historical-ac3c90d1df5a5e6fc778fb4bb3139664d4a6cd7c.tar.bz2
historical-ac3c90d1df5a5e6fc778fb4bb3139664d4a6cd7c.zip
old
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
-rw-r--r--dev-libs/libusb/Manifest22
-rw-r--r--dev-libs/libusb/files/0.1.12-fbsd.patch97
-rw-r--r--dev-libs/libusb/files/libusb-0.1-ansi.patch191
-rw-r--r--dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch24
-rw-r--r--dev-libs/libusb/files/libusb-0.1.12-nocpp.patch20
-rw-r--r--dev-libs/libusb/libusb-0.1.12-r7.ebuild52
6 files changed, 8 insertions, 398 deletions
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 9d2e0b41f890..359181ab43b2 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,25 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 0.1.12-fbsd.patch 2477 SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d SHA512 81e3f5ddabaceac1325dfb6ff2425edc5c15dcf75538c43ca1a5f1caa10ea98c14c2a5436647924db6e4e1afab0e6083ffd493138533e992cde3e314e22587a3 WHIRLPOOL cc64f0ca9233432191b0fea1c0196fa4b84e8c6c907734068c242854254871cc47046d56ad34e41a6ec0a33ba1fe39998f5ea290bd57448534734130cd7aa73d
-AUX libusb-0.1-ansi.patch 4599 SHA256 237920768d4bd84189159e488b0c5c1ecb0e4abea82b1a316b16dacb1016698b SHA512 c8eb8c6e8df12dbf85c17afffa32dcf6f325ead6c9b645c0b3bd9c40437aa267a1b0f953ebc9abcb65fa14d0c35bebddf7fd583cde144eff2d10ebc5d98a0d3b WHIRLPOOL 1d040eb7242851711ce10af3031980692642719a6417048b1a9d6ad591fbcd7997052ad9541982e51396642d9b80e6b3fbad162e349555f1a4be431b03bf0516
-AUX libusb-0.1.12-no-infinite-bulk.patch 807 SHA256 141b8a6f6e4cef3b9e08377cb1d79cb9398f2437894d368d0eca8f1c07848db7 SHA512 fa61a9a46bf571b6ddcaa94fafbd9fd243940cfd580c1802ef4a59cd01a05f8f6b1c9d11d5c72e99dc350ef658962777e539f12cba98ac6fd4d8a4d9614b5597 WHIRLPOOL 23b8dd36f66c66b5cff380616492796434d5bbe7947a43b8d37285a727166733fa2f9965f85f2ff79880e1b88dab7b16ce64d31ce58c5fd1e7c6b0ceea0192d9
-AUX libusb-0.1.12-nocpp.patch 572 SHA256 6a9833ea9238b9df0f6a359c3d84f829bdf83e26dedb31ce9d614f9c6cda3ab0 SHA512 cbbc8554e3dc951e1c19ce11ce837339189653f2c4661b66495bbf43740d8614fba3bc40e699dc9ce49cfe9bfc544001fa12bdca8033bf9d986f2fe6da64de45 WHIRLPOOL b6b4e4865180e56ab90e961924cc664499fba8d48df7fc1c0b2267347fed3bfeff22712666d6966edec5a90ada8f219686990ecd7f92abc1c4723e9f621482f2
-DIST libusb-0.1.12.tar.gz 389343 SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44 SHA512 08c10e899f93b5f8567d1a1e1ed87dd5631ad0a1463975404709c1d165e545e340afb474a66788efcfdd8193542e2a2eb9cf133f55cbbf76441244191d0bb825 WHIRLPOOL 1991590fd971229d4cb809ff3cd1844243edffd0500a710019836683f291b7187756409c137c8a5bbdc908f90ff5a06c4a1923a77ee04c56988fcb5d68433245
DIST libusb-1.0.9.tar.bz2 421971 SHA256 e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b SHA512 5eba3e9df2c1db71d685becebebf5b1310ee87e442f97a2553a430fd11655a2d9ce50e4ec2ffd62fe322286b0d6bc9e142ce552effc2466ee50424deba035ee5 WHIRLPOOL 9886cb6660d4530fe199441a8b5b76cb8a00012d69a13a40276bf3b880561eeb31301c186828b6fd08b687e038fac640475ba280473053e252cf23f15ca38372
-EBUILD libusb-0.1.12-r7.ebuild 1548 SHA256 f975cad9ca00c12f99ebe773295c4b591eb2f0dbb4cdb57d88e0497cd596b798 SHA512 00826472c4dfc8318ba36d0738fb0c3b278637ccce2580b2917ba31f283ed3b4803c764eb3e242990d805fd9e2d6f047d2012142c8c9030dd8e1dc75a0782d55 WHIRLPOOL bf0031f3f526c8c7aa35717baba892bcece34af0c80ec499871d595e2a7493b0fa135ffb5f792e42afa5f22c2fcccde8cb6cb6a95995afaf0b81550309f5b679
EBUILD libusb-1.0.9-r1.ebuild 1070 SHA256 7380a11d1598cf24e7f97520982a93d87c9b68b9597a9054ab972921927945f3 SHA512 e44f356a65973c7ee7c18bce4b9fdc9887e717eedc9f2050ac0bd823fb3fb939ca6117186032aa1458ff0b3da0ed3680e8ff1e126d11b37127e5ed3026953544 WHIRLPOOL e082cf6f9ef0f9f3f0a68d73f1b261ed2d8c338e10ddb9c800b65eed6e582f60949e6137ad83818415d11b25d173a241a15acae90a5f01acb5a961896890e33c
EBUILD libusb-1.0.9.ebuild 1000 SHA256 7d016e63df50d581e270756222955f081cfedd5cc968256028897f7b09a56424 SHA512 2d86b3696800aaa0bee43c77d4548d72a4cf005db418acb3e73dfd6acbdaff7ae00d6a6b9ce193336476b2cc0ceb1ff7ddd443f6ab0aef5ea427c143361dd043 WHIRLPOOL 97ec162cfcd567f0b2511a9cec9147ad784f0fa39403e585e6b59dc75ac874708659ba3b66e56b461cdd2edb34be9980997612225f0325e0b0c91bfdcb0dda89
-MISC ChangeLog 19047 SHA256 9042f1ce375a7368005243f8912d077a7d2939fe4615c1f4c3fca61545786080 SHA512 3ea0ea84ac7167ee8ceefcadac7959f6c04c116cabdd83b3bbd7e5fce7950d88e4a0664a469198eb88e7583c67aff8989cf033865676530209acb948af251845 WHIRLPOOL 640106762c327af11600e660e4121cdb9c4618363d7fb87a1cfbeda9dd7b35d67830514d9651c5804c5ae85b45c7838e3f3d8ae1ae5e512a17e7313d8d1309f0
+MISC ChangeLog 19273 SHA256 7d42454835a2bde2b6add91ebca4f5aca9e754340fe85074a943efde4f6f40a1 SHA512 a180e583586c97540089c31266e318537a44741b9fe00291df4819b91e53ef826aefd47b43886212ce158efd2cdb131032f7db8225f2eddc5499eaf5b14f5820 WHIRLPOOL cf3ab5a0c4c763210fc57c7b6a09ddb11fe4e9b8be5091cd7660c5a6b1de1e26c16a54aca36285dfc189c520bdd57633f77efeca205f179d2593c65fa45e7d01
MISC metadata.xml 285 SHA256 8f3e4e1f792ef6a6f383ae0aac1627db7f536ff880da423bca1113cea6d06773 SHA512 10fc61b3654c9aee6e9ba9702cf6630928921d2670248b9e1356d417b205dabc959e3672eda071f5fa734b3a001992cecd514a920b6e37376db943266683e75d WHIRLPOOL e26de64dba56ea85587b9e7348a1be056f78a2e2f9f91ffb5faef242b7ced82496b40fe672b18c33491f40a124161ca47af0e80219ebe39a8b24e86557c36db1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJR+lOGAAoJEEdUh39IaPFNHe0H+gOT9V6XmCcQP4IL5pJNMxex
-yoBG+oiCKP7oaQ0x9SVBTbLbiMzpuGsQVJQlHaFUS6TXfcegWDXFRNG2Lfbjyw0A
-st7y21RiCHwYsIe7JJ1q/go1aU5UxUQUd0TguQUOPSk6IH++5JELbS0SU+X4X7wC
-213LrN3QgLDs2AJpYMX6fxJDUetAeC18OcX0nE+PBdeVPs2u5wN2YIHL/+aWgw5+
-+YkI/7qpfrjREnk3Q40ZDLDKEEWGa1FInYWECt3kCCrCTfDecJqOBky1ABCwkJRY
-fMFKWyWSDNOqCGJOAK1DdcIEichnWZsl6fFB8hy0Cn6jnJfnLEsmjp/8FTkov5c=
-=e8l0
+iQEcBAEBCAAGBQJR+lPgAAoJEEdUh39IaPFNZroH/0pVSZ9z8DYzUcOnHGNIudeg
+6aCGKll2FK9s37MGxqc5D6NyM7B8xndtBkmHE+xqyx2uXDHxSCUT+KTwZQCnTTKK
+vCLH6FvNuPvpnWo7P8xkDH9zi8cQFKir25Dc5BrCTXfykojRRHYAVeRGBGE+zTi9
+LLrHRzhUFno3WUIAJIoJ6LmnkqZWiFabwFtNQ6RoFiN5cPNfbsJXqB0x+MhoHQ8M
+qv9MOVmX9p83McNNzby7yXPCgefL+9VoAQWCWPWzdAS3uHPa4ipJLu7nDO/8Gtb+
+nqCJXgB/l6YZ9dxyyVsRCR9pcax+LUSVRy1DcrMgD08pMU56bQ1ddMEwJsXOutw=
+=xhwm
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libusb/files/0.1.12-fbsd.patch b/dev-libs/libusb/files/0.1.12-fbsd.patch
deleted file mode 100644
index 57fd2ee4cd26..000000000000
--- a/dev-libs/libusb/files/0.1.12-fbsd.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Index: libusb-0.1.12/configure.in
-===================================================================
---- libusb-0.1.12.orig/configure.in
-+++ libusb-0.1.12/configure.in
-@@ -90,6 +90,8 @@ LINUX_API=0
- DARWIN_API=0
- BSD_API=0
-
-+DEFINE_USB_HID_DESCRIPTOR=1
-+
- AC_MSG_CHECKING(for what USB OS support)
- case $host in
- *-linux*)
-@@ -101,13 +103,40 @@ case $host in
- AC_MSG_RESULT(Linux)
- OSLIBS=""
- ;;
-- *-freebsd*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*)
-+ *-freebsd*)
-+ AC_DEFINE(BSD_API, 1)
-+ AC_DEFINE(LINUX_API, 0)
-+ AC_DEFINE(DARWIN_API, 0)
-+ BSD_API=1
-+ os_support=bsd
-+ AC_MSG_RESULT(FreeBSD)
-+ OSLIBS=""
-+ AC_CHECK_HEADERS([dev/usb/usbhid.h])
-+ if test "x$ac_cv_header_dev_usb_hisbhid_h" = "xyes"; then
-+ AC_MSG_CHECKING([for usb_hid_descriptor])
-+ have_usb_hid_descriptor=no
-+ AC_TRY_COMPILE([
-+ #include <sys/types.h>
-+ #include <dev/usb/usb.h>
-+ #include <dev/usb/usbhid.h>
-+ ], [
-+ struct usb_hid_descriptor descr;
-+ ], [
-+ have_usb_hid_descriptor=yes
-+ ])
-+ AC_MSG_RESULT([$have_usb_hid_descriptor])
-+ if test "x$have_usb_hid_descriptor" = "xyes"; then
-+ DEFINE_USB_HID_DESCRIPTOR=0
-+ fi
-+ fi
-+ ;;
-+ *-dragonfly*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*)
- AC_DEFINE(BSD_API, 1)
- AC_DEFINE(LINUX_API, 0)
- AC_DEFINE(DARWIN_API, 0)
- BSD_API=1
- os_support=bsd
-- AC_MSG_RESULT(FreeBSD, OpenBSD and/or NetBSD)
-+ AC_MSG_RESULT(DragonFly, OpenBSD and/or NetBSD)
- OSLIBS=""
- ;;
- *-darwin*)
-@@ -128,6 +157,7 @@ esac
- AC_SUBST(DARWIN_API)
- AC_SUBST(LINUX_API)
- AC_SUBST(BSD_API)
-+AC_SUBST(DEFINE_USB_HID_DESCRIPTOR)
-
- AM_CONDITIONAL(LINUX_API, test "$os_support" = "linux")
- AM_CONDITIONAL(BSD_API, test "$os_support" = "bsd")
-Index: libusb-0.1.12/usb.h.in
-===================================================================
---- libusb-0.1.12.orig/usb.h.in
-+++ libusb-0.1.12/usb.h.in
-@@ -17,6 +17,12 @@
-
- #include <dirent.h>
-
-+#if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <dev/usb/usb.h>
-+#include <dev/usb/usbhid.h>
-+#endif
-+
- /*
- * USB spec information
- *
-@@ -75,6 +81,7 @@ struct usb_string_descriptor {
- u_int16_t wData[1];
- };
-
-+#if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__)
- /* HID descriptor */
- struct usb_hid_descriptor {
- u_int8_t bLength;
-@@ -86,6 +93,7 @@ struct usb_hid_descriptor {
- /* u_int16_t wDescriptorLength; */
- /* ... */
- };
-+#endif
-
- /* Endpoint descriptor */
- #define USB_MAXENDPOINTS 32
diff --git a/dev-libs/libusb/files/libusb-0.1-ansi.patch b/dev-libs/libusb/files/libusb-0.1-ansi.patch
deleted file mode 100644
index 9db4b4d9f628..000000000000
--- a/dev-libs/libusb/files/libusb-0.1-ansi.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-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/files/libusb-0.1.12-no-infinite-bulk.patch b/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch
deleted file mode 100644
index 563397d2fea3..000000000000
--- a/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch-from: http://bugs.gentoo.org/show_bug.cgi?id=225879
-Gentoo-Bug: 225879
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Prevents an infinite loop if device is removed during usb_bulk_read or
-usb_bulk_write.
-
-diff -Naur libusb-0.1.12/linux.c libusb-0.1.12-new/linux.c
---- libusb-0.1.12/linux.c 2006-03-04 04:52:46.000000000 +0200
-+++ libusb-0.1.12-new/linux.c 2008-06-11 14:22:20.000000000 +0300
-@@ -220,6 +220,13 @@
- waiting = 1;
- context = NULL;
- while (!urb.usercontext && ((ret = ioctl(dev->fd, IOCTL_USB_REAPURBNDELAY, &context)) == -1) && waiting) {
-+ if (ret == -1)
-+ {
-+ if (errno == ENODEV)
-+ {
-+ return -ENODEV;
-+ }
-+ }
- tv.tv_sec = 0;
- tv.tv_usec = 1000; // 1 msec
- select(dev->fd + 1, NULL, &writefds, NULL, &tv); //sub second wait
diff --git a/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch b/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch
deleted file mode 100644
index de1a8c7db6fd..000000000000
--- a/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libusb-0.1.12/Makefile.am 2006-03-04 13:52:46.000000000 +1100
-+++ libusb-0.1.12/Makefile.am.new 2007-11-08 16:25:38.000000000 +1100
-@@ -4,7 +4,7 @@
- # gnu strictness chokes on README being autogenerated
- AUTOMAKE_OPTIONS = 1.4 foreign
-
--SUBDIRS = . tests doc
-+SUBDIRS = . doc
-
- AM_CFLAGS = -Werror
-
-@@ -19,7 +19,7 @@
- apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb.pc.in
- EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c
-
--lib_LTLIBRARIES = libusb.la libusbpp.la
-+lib_LTLIBRARIES = libusb.la
-
- pkgconfig_DATA = libusb.pc
-
diff --git a/dev-libs/libusb/libusb-0.1.12-r7.ebuild b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
deleted file mode 100644
index cb4f06fc35b4..000000000000
--- a/dev-libs/libusb/libusb-0.1.12-r7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 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-r7.ebuild,v 1.12 2012/01/09 06:53:36 ssuominen Exp $
-
-EAPI="3"
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc +cxx static-libs"
-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_prepare() {
- 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 cxx || 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
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable debug debug all) \
- $(use_enable doc build-docs)
-}
-
-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 cxx || rm -f "${ED}"/usr/include/usbpp.h
-
- rm -f "${ED}"/usr/lib*/libusb*.la
-}