Revbump for EAPI bump, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 80 insertions, 7 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/Manifest b/dev-libs/libusb/Manifest
index 427cf5b84018..d09ea6fb1d52 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.1.12-fbsd.patch 2477 RMD160 aa92a57100c98cf1ef900d1f27685a33a9c3fc91 SHA1 75dbab5891a5753463661806e89263f13e8653b3 SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d
 AUX libusb-0.1-ansi.patch 4599 RMD160 9aa540748c939f43da218982a7a7067c33834b9f SHA1 d383ffde3baeaa78a2c148dee69777cf5c61102c SHA256 237920768d4bd84189159e488b0c5c1ecb0e4abea82b1a316b16dacb1016698b
 AUX libusb-0.1.12-no-infinite-bulk.patch 807 RMD160 bba6194bb6cc9c0008791684c325c599ea6a2415 SHA1 92b97b247baa0e548f1909addf69bb159534a991 SHA256 141b8a6f6e4cef3b9e08377cb1d79cb9398f2437894d368d0eca8f1c07848db7
@@ -17,12 +20,20 @@ EBUILD libusb-0.1.12-r3.ebuild 1970 RMD160 2ab25a414b7e358ebc95815ff4236de0e5a00
 EBUILD libusb-0.1.12-r4.ebuild 2027 RMD160 fbb29cf384cef4fa1fa5f0af40104e135648e497 SHA1 0f3b9ad19075ae227eb2b0d1ab384b5b8a579dc8 SHA256 2a4d39c39f0822b7ad8c066d67327605329ee907d8e65ac34297d03538b8a7ea
 EBUILD libusb-0.1.12-r5.ebuild 1669 RMD160 2c5edee2593448fd142f9b66612ed6f5c1bcca54 SHA1 15ce66a61ee94b21427973584f468568e83a8800 SHA256 a74a92cf8693a436a75b2e6c13aa6edc963d3b96223c371251a2733fe2a0d225
 EBUILD libusb-0.1.12-r6.ebuild 1734 RMD160 2f05b1bf971d25f55d031ae06c7d3f9d051d6825 SHA1 bb0e5f4ac45f35a8e977a244baff41f85b216aa0 SHA256 ea0343cda0b4ce9887485c89602624c87e329bffb597ed65881f84268c0c5a96
+EBUILD libusb-0.1.12-r7.ebuild 1733 RMD160 b5f8c936a5eb534c9b3c07912e5f7126e6bd133a SHA1 22cde69408a90f32d8e7801939b7e0ebdea7bdda SHA256 68369af5a7ae317895860747bfd2366a5bdbb1bb66b3b98cf4c1e849762010df
 EBUILD libusb-0.1.12.ebuild 1520 RMD160 030987f169060a9da28bc7035b4ac49583d5ca8b SHA1 11f595a9e758126b76c5aede2bd42838f44387cb SHA256 2dcc747c097af0a33e9ebe117fd440c00544f6de83709da32e21ee9decf4bbbf
 EBUILD libusb-1.0.1.ebuild 964 RMD160 6917db038ecfb38c561777e5b83aa164990a9b26 SHA1 297ac20c7652dd06886e456f46a8158dd6987e91 SHA256 464f307faaf05c7184ee02c0f1fa4e560640d5b1dc9e1f9f1e116721771ecb13
 EBUILD libusb-1.0.2.ebuild 963 RMD160 7a41e910e2e3c29ef2783fb40eef1b28b27ce091 SHA1 76c4a7deaa2d287b21fea7477b3ae9dacb72072a SHA256 34ebc8892c0225724c3fbbd56238bf10c0274fc0419c54b700b41b855e530451
 EBUILD libusb-1.0.3.ebuild 951 RMD160 cbfbd0a21f5c1b32173154b72acd18e130fb7029 SHA1 ddc0f37186cbb50db0d0255462daf7a486d2daa6 SHA256 d644faeb635ebb5e0eae669324560640b46693d144809cd0adbae0837bd5c216
 EBUILD libusb-1.0.4.ebuild 951 RMD160 de3acfe3a6863273ae5aa3269307a39795c51574 SHA1 dcfb28e5a209235af1102fba873d563f28df8c97 SHA256 1255fffb76cf5ab73144805854a88e3a840c1509902248588957d7311a5bdd07
 EBUILD libusb-1.0.5.ebuild 951 RMD160 05d9b7273106974b027ebdb5e14ae215b3e11e6a SHA1 8a64a521f8a1391515193686e52020bf08fecd0b SHA256 2d402084f14d87d35e2a63523251498edd620078a30f52707e8e409fb6fc155d
-EBUILD libusb-1.0.6.ebuild 951 RMD160 6deb344f216b9ca42cbdc724520de71c542e20bd SHA1 ec196520a56b979fc3a84fcd1768ce6405ed5d4e SHA256 43f2750b4dbbc3639981e8629572bcafa3611a0002e0c2bc17b4a2dcee6b73e4
-MISC ChangeLog 12805 RMD160 d863d0882bb1d8e993e7d8bf3df077dbbdf84c0f SHA1 22304c46bd2c5f245d0aa3a233c3646dc3b6b2ff SHA256 356d87db6e25339bf8f26224139949b00b19ea7e7fc391063d1b9cdcc961b9f4
+EBUILD libusb-1.0.6.ebuild 994 RMD160 22db4ab40195cbaff873d587f0c10ebd9fac9184 SHA1 3d625cba05a407541beb3b6bd127a4cff1c811d9 SHA256 688a9a8520afcc512df471b617e3b5c37240ff28b4ab20cfb7c7d6781f14b5bb
+MISC ChangeLog 12980 RMD160 f342b393f8aef027567ac5b5d3056ae45ca3217a SHA1 4e4bd63a9cac7ed7fd3c7a541273dce652745265 SHA256 5bac334061c168bf133d6ad1f39b15e4aab2a8f7933b2e5449645e133f6b2a29
 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuAq7cACgkQOypDUo0oQOqe/QCgqgL4fCyLCxa1iprEWumVek7j
+m84AnjHyxtIjWwo/nv3e+YepqvbqiE0P
+=zygo
+-----END PGP SIGNATURE-----
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 )"