- snag cross compile fix from buildroot

Package-Manager: portage-2.1.4.4

4 files changed, 93 insertions, 12 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 762f5bcb519e..69acebf0acc0 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.78 2008/04/20 11:34:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.79 2008/05/11 02:28:05 solar Exp $
+
+*libusb-0.1.12-r2 (11 May 2008)
+
+  11 May 2008; <solar@gentoo.org> +files/libusb-0.1.12-nocpp.patch,
+  +libusb-0.1.12-r2.ebuild:
+  - snag cross compile fix from buildroot
 
   20 Apr 2008; Mike Frysinger <vapier@gentoo.org> libusb-0.1.12-r1.ebuild:
   Fixup autotools #213800 by Alessandro Guido.
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index dbf6d16fde57..f92cb44f13e5 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.1.12-fbsd.patch 2477 RMD160 aa92a57100c98cf1ef900d1f27685a33a9c3fc91 SHA1 75dbab5891a5753463661806e89263f13e8653b3 SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d
+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
 DIST libusb-0.1.12.tar.gz 389343 RMD160 63848df717e00fff67ab30ba86a85466370d4e8e SHA1 599a5168590f66bc6f1f9a299579fd8500614807 SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
 EBUILD libusb-0.1.11.ebuild 1057 RMD160 422a10490c31d9448983f0c517223175f69f2a39 SHA1 08d1f4928505a70b44c1abb197f0d11aff825ee1 SHA256 b4b1d113c64159ead308fe07c2eefd399c737a1433082aafdf39f34498e61074
 EBUILD libusb-0.1.12-r1.ebuild 1785 RMD160 b9c6c17a3e419437b54ff83fa22f98701836202b SHA1 09333cbea1aabd7728a6522473b55ce235aa1842 SHA256 e94ebdab3175dc192296c83258ce1ee1cae57a624b37447a35d04218d3a9fdb0
+EBUILD libusb-0.1.12-r2.ebuild 1844 RMD160 2a74195021a8afbabc431329cc42ce5822f6d6fd SHA1 1e071a0ea3079325b4fb0efddfbd8c270b9607c8 SHA256 f6330908600b012827e3d5ee939e37cbe0bff480f287e7b426d92f983e105d86
 EBUILD libusb-0.1.12.ebuild 1479 RMD160 2f7eab3f81707b1ec795bd5ef52d930e3b9ddaef SHA1 d75b22c0bbbdaae4af7650ce746a37fc0e5f927f SHA256 628c8e0c045ff8df28b90c5182bda251e28a49c858de4d8ca77f4d383809f734
-MISC ChangeLog 9514 RMD160 4f472363f5d9ec97a240b75fbc69d7f207529b34 SHA1 16919041b02eb42b86094aa9b4f11612e41889fa SHA256 a0de9c2389299526f0fb8e202354a1393b7cadc43e1d8c1d933a702c8a2af0f5
+MISC ChangeLog 9685 RMD160 435d33c88a3d48c390be4c7febe795a7c1216b46 SHA1 a9578b81e7358d0e9e54c9e7ada118072ddf005c SHA256 ec10865e0f209a290e9009d1cbe43dbd35d1a7eda66e8551c2c6c4c0556c5b51
 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFICypej9hvisErhMIRAskvAKCKZLfwaBdnxBsHKNm9M3LjC1bUoACgp+pZ
-4rEQlXtPSubYqKVBIHJa6Ew=
-=D//G
------END PGP SIGNATURE-----
diff --git a/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch b/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch
new file mode 100644
index 000000000000..de1a8c7db6fd
--- /dev/null
+++ b/dev-libs/libusb/files/libusb-0.1.12-nocpp.patch
@@ -0,0 +1,20 @@
+--- 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-r2.ebuild b/dev-libs/libusb/libusb-0.1.12-r2.ebuild
new file mode 100644
index 000000000000..c4ed950aea08
--- /dev/null
+++ b/dev-libs/libusb/libusb-0.1.12-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/05/11 02:28:05 solar Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+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"
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="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
+	epatch "${FILESDIR}"/libusb-0.1.12-nocpp.patch
+	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) \
+		--libdir /usr/$(get_libdir) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	dodir /$(get_libdir)
+	mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir) \
+		|| die "Failed to put dynamic libs in /$(get_libdir)"
+	gen_usr_ldscript libusb.so
+	gen_usr_ldscript libusbpp.so
+	dodoc AUTHORS NEWS README || die "dodoc failed"
+	if use doc ; then
+		dohtml doc/html/*.html || die "dohtml failed"
+	fi
+}