added freebsd patches (#128937) and possible solution to doc generation bug (#66172)

Package-Manager: portage-2.1_pre9

5 files changed, 201 insertions, 16 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index c9f051cd9839..d1e75cb4d298 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.43 2006/04/04 09:26:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.44 2006/04/24 21:29:30 liquidx Exp $
+
+*libusb-0.1.12 (24 Apr 2006)
+
+  24 Apr 2006; Alastair Tse <liquidx@gentoo.org> +files/0.1.12-fbsd.patch,
+  +libusb-0.1.12.ebuild:
+  added freebsd patches (#128937) and possible solution to doc generation bug
+  (#66172)
 
   04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libusb-0.1.11.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index aeba5bcd2060..9c4d5b84bd25 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,40 +1,66 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d26dfc2be5b4faad2a5b06eff43a5091 ChangeLog 5227
-RMD160 4e33c6146d85921df70aa82ccd77bb93bba4a054 ChangeLog 5227
-SHA256 31f67c66b0ebf7b489f83df7b4611ca64a7f0657222144c46a8ba79ffb616f79 ChangeLog 5227
+AUX 0.1.10a-fbsd.patch 734 RMD160 b706b7037681eba98afcbb84d40cacc0e79622ed SHA1 2f548adba56ae84366e17af4ea03396862b3e65e SHA256 d876430aba91cb3ccca65c1930002edcf4339ed3fcc60512ec23609a58f5f62f size 734
 MD5 c819378823e7b8610d4e164757dc25be files/0.1.10a-fbsd.patch 734
 RMD160 b706b7037681eba98afcbb84d40cacc0e79622ed files/0.1.10a-fbsd.patch 734
 SHA256 d876430aba91cb3ccca65c1930002edcf4339ed3fcc60512ec23609a58f5f62f files/0.1.10a-fbsd.patch 734
-MD5 9b71253641038ba3d13b833a85cdcf76 files/digest-libusb-0.1.10a 66
-RMD160 58465edbd5947786189019543e39c9779b19363a files/digest-libusb-0.1.10a 66
-SHA256 377aa1c27cb695584c4aa60b4c7ea98f04a95ecd46090330d7e18349ffb4551f files/digest-libusb-0.1.10a 66
-MD5 6003190228fa769e74354643143f899d files/digest-libusb-0.1.11 65
-RMD160 cebcf021562adda77531a4a185868e11a700916b files/digest-libusb-0.1.11 65
-SHA256 3bbd74d64c3718a0d1659938abd82c94a964b21c255f25bf795086a2fa12c140 files/digest-libusb-0.1.11 65
-MD5 edf695ba0c7ee442c501401384faaa94 files/digest-libusb-0.1.8 64
-RMD160 720dfc6a66bef730b9abaf97a3a56b708393843e files/digest-libusb-0.1.8 64
-SHA256 66ec90a76bb591c77fa26cf9d50890533a292d2cd94da9db4f19439f8fd34bab files/digest-libusb-0.1.8 64
+AUX 0.1.12-fbsd.patch 2477 RMD160 aa92a57100c98cf1ef900d1f27685a33a9c3fc91 SHA1 75dbab5891a5753463661806e89263f13e8653b3 SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d size 2477
+MD5 044ce8477a76fd09db1de6e709e86c67 files/0.1.12-fbsd.patch 2477
+RMD160 aa92a57100c98cf1ef900d1f27685a33a9c3fc91 files/0.1.12-fbsd.patch 2477
+SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d files/0.1.12-fbsd.patch 2477
+AUX libusb-0.1.8-amd64-fPIC.patch 268 RMD160 d13bbcf69825c69c1a24c908dfde997fdd199b7a SHA1 f8c3fda830d4717384bda6155162d297144df9da SHA256 8653d8d8bc745833939754179235ded50d61b3f11b7a5c7acb0d5510dc9a96e9 size 268
 MD5 13b0f271f94755b89f904270daa0659d files/libusb-0.1.8-amd64-fPIC.patch 268
 RMD160 d13bbcf69825c69c1a24c908dfde997fdd199b7a files/libusb-0.1.8-amd64-fPIC.patch 268
 SHA256 8653d8d8bc745833939754179235ded50d61b3f11b7a5c7acb0d5510dc9a96e9 files/libusb-0.1.8-amd64-fPIC.patch 268
+DIST libusb-0.1.10a.tar.gz 375144 size 375144
+DIST libusb-0.1.11.tar.gz 377187 size 377187
+DIST libusb-0.1.12.tar.gz 389343 RMD160 63848df717e00fff67ab30ba86a85466370d4e8e SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44 size 389343
+DIST libusb-0.1.8.tar.gz 321295 size 321295
+EBUILD libusb-0.1.10a.ebuild 1077 RMD160 be882b71e39a5929bbb2ea2f8c3fdb10b489dec9 SHA1 87f27f991a0eb3f9cb61e5e1cc03a90e50247a95 SHA256 45d8addf9b06123da19c90f33208d781c3728ab2ee65ddd8908c3e9c703d8b45 size 1077
 MD5 ad47150634a6c134a0bd217e1d790cc0 libusb-0.1.10a.ebuild 1077
 RMD160 be882b71e39a5929bbb2ea2f8c3fdb10b489dec9 libusb-0.1.10a.ebuild 1077
 SHA256 45d8addf9b06123da19c90f33208d781c3728ab2ee65ddd8908c3e9c703d8b45 libusb-0.1.10a.ebuild 1077
+EBUILD libusb-0.1.11.ebuild 1051 RMD160 a6ef7ebe81a9f914a2b1b5d395a49f2999677ad0 SHA1 a19e0dfe14e387b8d294e63984da46609b02d208 SHA256 774128940a918cd69ddbb3afcf661bee75d045a4195d426807eb91fa271821e2 size 1051
 MD5 ebb35fd5374707c39b24be8f990593aa libusb-0.1.11.ebuild 1051
 RMD160 a6ef7ebe81a9f914a2b1b5d395a49f2999677ad0 libusb-0.1.11.ebuild 1051
 SHA256 774128940a918cd69ddbb3afcf661bee75d045a4195d426807eb91fa271821e2 libusb-0.1.11.ebuild 1051
+EBUILD libusb-0.1.12.ebuild 1175 RMD160 678380912d7d70f8a1de3cd8ef78d3df47f938f1 SHA1 cd91468178e0c6aa4c284174431b275a108983b6 SHA256 99515cc4d584b87880731771f909230bc694fe5463840e9a9e8f3d1c0ec11d2f size 1175
+MD5 cf6c36055194093856cb3c5bfe42a71e libusb-0.1.12.ebuild 1175
+RMD160 678380912d7d70f8a1de3cd8ef78d3df47f938f1 libusb-0.1.12.ebuild 1175
+SHA256 99515cc4d584b87880731771f909230bc694fe5463840e9a9e8f3d1c0ec11d2f libusb-0.1.12.ebuild 1175
+EBUILD libusb-0.1.8.ebuild 1361 RMD160 f1a7f2a5e9cca2e2fd74c413653a586bb8e355c9 SHA1 675d449c407f7f47bdbcc7e92332fb69e1119df9 SHA256 cbd6e6b11e9fa98ef55e45e59e1a2d4266a560478b71fcb06bfbcf020651497c size 1361
 MD5 ecc4ed6c771b98aea70ec6f3955f569f libusb-0.1.8.ebuild 1361
 RMD160 f1a7f2a5e9cca2e2fd74c413653a586bb8e355c9 libusb-0.1.8.ebuild 1361
 SHA256 cbd6e6b11e9fa98ef55e45e59e1a2d4266a560478b71fcb06bfbcf020651497c libusb-0.1.8.ebuild 1361
+MISC ChangeLog 5445 RMD160 8d7725b0d5b1ec46a84641fcf6a3f50cdb073679 SHA1 74874cd49af387d9ad78b546db3f0afeb0c95de7 SHA256 59ed95db79b8237b71636c1f455eb0e671fcbe38e149348447529112d0de2e0f size 5445
+MD5 429771717e6f4bf48593e54fe49d4044 ChangeLog 5445
+RMD160 8d7725b0d5b1ec46a84641fcf6a3f50cdb073679 ChangeLog 5445
+SHA256 59ed95db79b8237b71636c1f455eb0e671fcbe38e149348447529112d0de2e0f ChangeLog 5445
+MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 size 219
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 metadata.xml 219
+MD5 9b71253641038ba3d13b833a85cdcf76 files/digest-libusb-0.1.10a 66
+RMD160 58465edbd5947786189019543e39c9779b19363a files/digest-libusb-0.1.10a 66
+SHA256 377aa1c27cb695584c4aa60b4c7ea98f04a95ecd46090330d7e18349ffb4551f files/digest-libusb-0.1.10a 66
+size 66 files/digest-libusb-0.1.10a 66
+MD5 6003190228fa769e74354643143f899d files/digest-libusb-0.1.11 65
+RMD160 cebcf021562adda77531a4a185868e11a700916b files/digest-libusb-0.1.11 65
+SHA256 3bbd74d64c3718a0d1659938abd82c94a964b21c255f25bf795086a2fa12c140 files/digest-libusb-0.1.11 65
+size 65 files/digest-libusb-0.1.11 65
+MD5 69d1715954fdf5d05e4de63304bc524d files/digest-libusb-0.1.12 241
+RMD160 a4173f9c426aaf2c3045976cfa54c0042c66404d files/digest-libusb-0.1.12 241
+SHA256 e3f7389ad6c898008f7394c8f3bec01d538e3b96f6db87c90109804e962a8fc7 files/digest-libusb-0.1.12 241
+size 241 files/digest-libusb-0.1.12 241
+MD5 edf695ba0c7ee442c501401384faaa94 files/digest-libusb-0.1.8 64
+RMD160 720dfc6a66bef730b9abaf97a3a56b708393843e files/digest-libusb-0.1.8 64
+SHA256 66ec90a76bb591c77fa26cf9d50890533a292d2cd94da9db4f19439f8fd34bab files/digest-libusb-0.1.8 64
+size 64 files/digest-libusb-0.1.8 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEMjvYAiZjviIA2XgRAmsnAJ0WZkn9XY0mqczgu8dv4cg1LfqlSQCgyFek
-AISdeJEtI7LiovCow4asMOU=
-=Kvrx
+iD8DBQFETUN09ZFPrqoILX8RAggEAKC1n9o65LwBeECE0+5cExS5BJRDxQCg4z1F
+FzlG1GLdmy7YxHkAh/DWA7g=
+=MP2J
 -----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
new file mode 100644
index 000000000000..57fd2ee4cd26
--- /dev/null
+++ b/dev-libs/libusb/files/0.1.12-fbsd.patch
@@ -0,0 +1,97 @@
+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/digest-libusb-0.1.12 b/dev-libs/libusb/files/digest-libusb-0.1.12
new file mode 100644
index 000000000000..7b884d146b0f
--- /dev/null
+++ b/dev-libs/libusb/files/digest-libusb-0.1.12
@@ -0,0 +1,3 @@
+MD5 caf182cbc7565dac0fd72155919672e6 libusb-0.1.12.tar.gz 389343
+RMD160 63848df717e00fff67ab30ba86a85466370d4e8e libusb-0.1.12.tar.gz 389343
+SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44 libusb-0.1.12.tar.gz 389343
diff --git a/dev-libs/libusb/libusb-0.1.12.ebuild b/dev-libs/libusb/libusb-0.1.12.ebuild
new file mode 100644
index 000000000000..69f9b0f03094
--- /dev/null
+++ b/dev-libs/libusb/libusb-0.1.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/04/24 21:29:30 liquidx Exp $
+
+inherit eutils libtool autotools
+
+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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc"
+
+RDEPEND=""
+
+DEPEND="doc? ( app-text/openjade
+		app-text/docbook-dsssl-stylesheets
+		~app-text/docbook-sgml-dtd-4.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:-Werror::' Makefile.am
+
+	epatch "${FILESDIR}/${PV}-fbsd.patch"
+
+	eautoreconf
+
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug debug all) \
+		$(use_enable doc build-docs) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS NEWS README || die "dodoc failed"
+	if use doc; then
+		dohtml doc/html/*.html || die "dohtml failed"
+	fi
+}
+
+src_test() {
+	return
+}