Revbump for EAPI bump, add prefix keywords

(Portage version: -svn/cvs/Linux i686)

3 files changed, 67 insertions, 5 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 32e685ab632c..03ecf0bfa268 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libusb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.99 2009/12/26 01:22:46 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.100 2010/02/21 03:42:38 abcd Exp $
+
+*libusb-0.1.12-r7 (21 Feb 2010)
+
+  21 Feb 2010; Jonathan Callen <abcd@gentoo.org> +libusb-0.1.12-r7.ebuild,
+  libusb-1.0.6.ebuild:
+  Revbump for EAPI bump, add prefix keywords
 
 *libusb-1.0.6 (26 Dec 2009)
 
diff --git a/dev-libs/libusb/libusb-0.1.12-r7.ebuild b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
new file mode 100644
index 000000000000..a295d710f07b
--- /dev/null
+++ b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 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.1 2010/02/21 03:42:38 abcd 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 ~x86-macos"
+IUSE="debug doc nocxx"
+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 nocxx && 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
+
+	# Ensure that the documentation actually finds the DTD it needs
+	docbookdtd="${EPREFIX}/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_configure() {
+	econf \
+		$(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 nocxx && rm -f "${ED}"/usr/include/usbpp.h
+}
diff --git a/dev-libs/libusb/libusb-1.0.6.ebuild b/dev-libs/libusb/libusb-1.0.6.ebuild
index 46a8c9c3d150..dc4c83d7b404 100644
--- a/dev-libs/libusb/libusb-1.0.6.ebuild
+++ b/dev-libs/libusb/libusb-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-1.0.6.ebuild,v 1.1 2009/12/26 01:22:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-1.0.6.ebuild,v 1.2 2010/02/21 03:42:38 abcd Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://libusb.org/"
 SRC_URI="mirror://sourceforge/libusb/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-doc/doxygen )"