- snag cross compile fix from buildroot

(Portage version: 2.1.4.4)

3 files changed, 90 insertions, 1 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/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
+}