5 files changed, 16 insertions, 40 deletions
diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 1ca2c1bde0dd..d851be8e8335 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2006/02/06 21:53:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.41 2006/02/06 22:52:13 liquidx Exp $
+
+  06 Feb 2006; Alastair Tse <liquidx@gentoo.org> -libusb-0.1.7-r1.ebuild,
+  libusb-0.1.10a.ebuild, libusb-0.1.11.ebuild:
+  Stripping -Werror to prevent problems with strict CFLAGS
 
 *libusb-0.1.11 (06 Feb 2006)
 
diff --git a/dev-libs/libusb/files/digest-libusb-0.1.7-r1 b/dev-libs/libusb/files/digest-libusb-0.1.7-r1
deleted file mode 100644
index 3d7222c9ee07..000000000000
--- a/dev-libs/libusb/files/digest-libusb-0.1.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c7abee86d8715bccb43428a500d2170 libusb-0.1.7.tar.gz 193075
diff --git a/dev-libs/libusb/libusb-0.1.10a.ebuild b/dev-libs/libusb/libusb-0.1.10a.ebuild
index de8da733c575..2dab98d6d301 100644
--- a/dev-libs/libusb/libusb-0.1.10a.ebuild
+++ b/dev-libs/libusb/libusb-0.1.10a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.10a.ebuild,v 1.15 2005/12/29 09:22:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.10a.ebuild,v 1.16 2006/02/06 22:52:13 liquidx Exp $
 
 inherit eutils libtool autotools
 
@@ -24,6 +24,7 @@ src_unpack(){
 	cd ${S}
 
 	epatch ${FILESDIR}/${PV}-fbsd.patch
+	sed -i -e 's:-Werror::' Makefile.am
 	eautoreconf
 	elibtoolize
 }
diff --git a/dev-libs/libusb/libusb-0.1.11.ebuild b/dev-libs/libusb/libusb-0.1.11.ebuild
index 1d20ee2f4510..86707c58b1b1 100644
--- a/dev-libs/libusb/libusb-0.1.11.ebuild
+++ b/dev-libs/libusb/libusb-0.1.11.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.1 2006/02/06 21:53:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.11.ebuild,v 1.2 2006/02/06 22:52:13 liquidx Exp $
 
 inherit eutils libtool autotools
 
@@ -19,7 +19,14 @@ DEPEND="sys-devel/libtool
 	doc? ( app-text/openjade
 		~app-text/docbook-sgml-dtd-4.2 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:-Werror::' Makefile.am
+}
+
 src_compile() {
+	elibtoolize
 	econf \
 		$(use_enable debug debug all) \
 		$(use_enable doc build-docs) \
diff --git a/dev-libs/libusb/libusb-0.1.7-r1.ebuild b/dev-libs/libusb/libusb-0.1.7-r1.ebuild
deleted file mode 100644
index 37bab8be3611..000000000000
--- a/dev-libs/libusb/libusb-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.7-r1.ebuild,v 1.8 2004/10/18 16:49:28 usata Exp $
-
-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="x86 sparc ppc alpha amd64 ia64"
-IUSE="debug doc"
-
-DEPEND="virtual/libc
-	doc? ( app-text/openjade ~app-text/docbook-sgml-dtd-3.1 )"
-
-src_compile() {
-	local myconf
-	use doc \
-		&& myconf="--enable-build-docs" \
-		|| myconf="--disable-build-docs"
-	use debug \
-		&& myconf="${myconf} --enable-debug=all" \
-		|| myconf="${myconf} --disable-debug"
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS NEWS README || die
-	if use doc; then
-		dohtml doc/html/*.html || die
-	fi
-}