Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 83 insertions, 24 deletions

diff --git a/dev-embedded/libftdi/ChangeLog b/dev-embedded/libftdi/ChangeLog
index 245ee48cd110..5c2401b64c0c 100644
--- a/dev-embedded/libftdi/ChangeLog
+++ b/dev-embedded/libftdi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/libftdi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/ChangeLog,v 1.51 2010/06/22 23:10:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/ChangeLog,v 1.52 2010/06/29 23:32:22 vapier Exp $
+
+*libftdi-0.18 (29 Jun 2010)
+
+  29 Jun 2010; Mike Frysinger <vapier@gentoo.org> +libftdi-0.18.ebuild,
+  libftdi-9999.ebuild, libftdi-9999.1.0.ebuild:
+  Version bump.
 
 *libftdi-9999.1.0 (22 Jun 2010)
 *libftdi-9999 (22 Jun 2010)
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 26193e015da0..04e926dbff59 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libftdi-0.16.tar.gz 426500 RMD160 7ab0cab64cd43239c5a2ed22d85c4e931b3b1625 SHA1 03e453ea0b74e41ffe5bf0476c1997a4faa072c3 SHA256 62f7f09e1a09db28a0801df2279ff0d4030d4c39f1bcfa448077d67f37a322d8
 DIST libftdi-0.17.tar.gz 435901 RMD160 cca442415a0ee380e9efcdbd60aa48b1cfdecede SHA1 e2ab367f20df8f38fa9754070ad0bea5aa0f6f7a SHA256 d5c0275125ab68a431375083c9544899e578b8f98b83de1254386d0209feabf0
-EBUILD libftdi-0.16.ebuild 1073 RMD160 96cc3f90fa1352ec1db91f2ef52681635cbdcc3c SHA1 961ce0308ab0b7b13a242feae6fa2e1a506477d6 SHA256 4adba8fa3eb4aaef0357c55e06c3122c4b7b3563bb5325bebfd2f31f4d1d9455
+DIST libftdi-0.18.tar.gz 398380 RMD160 0e8a9a2135a82bb4435678e91a952bf0757ce72d SHA1 52401db0e7cb90a5d83f82c2859a4f8d44e52579 SHA256 5b6f3c3ee51c6aa24d3b87135e01762cf68821d1c3599d87d349fea4ede74c62
 EBUILD libftdi-0.17.ebuild 1294 RMD160 a0aac518e67adde29dd582b644f880c72d127877 SHA1 4505bd7ce86396164bb630c9f4177e12c28025e6 SHA256 6153e07439128c3bcf3933eedb8e29877658d0ef3d233eed6a83d31113b35646
-EBUILD libftdi-9999.1.0.ebuild 1400 RMD160 a6f8e68d76fc0957cc38ecafc23489b7d30fa5e9 SHA1 577a4e3fe739fe71327c275640b27411b35328eb SHA256 1ab5485cbc99b4a07303524621ff90e1aa8c5964847525a249dcc626df30d0d1
-EBUILD libftdi-9999.ebuild 1392 RMD160 3dfabf091cea42decf3a3481eb416ecee0b6a04c SHA1 8950d04d8dc106503e12c05398a1d0daa02020a1 SHA256 858c8baa615fdd809b8d4c194b56a80e6d8182d2fa92f153645f9884adc034ab
-MISC ChangeLog 5744 RMD160 14cfa140da08ba9953f0dad32dd3d37cd779d0d9 SHA1 bffbc7c45fe0480234e2d3424efe91a01f868ba7 SHA256 6a8bb273cdd2f6fdd98395dc236e832994689dd1ce18bcab1f6527cc3f3fb423
+EBUILD libftdi-0.18.ebuild 1223 RMD160 48d0159437977c1b47024bd63ff8cb2fb655deb3 SHA1 28c6447c849614bbf78376943456e39e73510b02 SHA256 1443ab260a5b8358bcf56bb4a7680e977b917169c1b094ab74ec28809c79faf4
+EBUILD libftdi-9999.1.0.ebuild 1281 RMD160 bbbd6ec247e18d2f6a2cf54644827e27bc31b464 SHA1 9bf9acc74650c0044628c512bb4a9224ed697ff4 SHA256 bf9a574d157c179c6d41d9e6c1c289ace3c2375a1150e9ad442253a280b3b02f
+EBUILD libftdi-9999.ebuild 1223 RMD160 e60b1fe0ce552aebf385b104569081af313d1752 SHA1 09c276049cdae792f05458cc279a3e54d424985b SHA256 222c29751987c92b2a6cbcf94779c53d49e3fb4c760321fe38f81c1d14104116
+MISC ChangeLog 5910 RMD160 f173cb1dae45074f353b1e978f4a2cd3fd84b27e SHA1 ec4183059a57dbb6b43de13581a3c1f6a44a0c45 SHA256 6abfb3f11e65d4cb3ed63b5056dd7b5f38ad4065576d3e0dd35fefd4280c503a
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwhQtUACgkQTwhj9JtAlp5b6wD+IehPUQ+O4DUy3PKntKK+u2zi
-qGJWcchDVhEz9y0YABYBALq3d5tCC3tFbxokVL9XRrnfyjSbqo0+/aqvW29gxMd/
-=V/OA
+iF4EAREIAAYFAkwqglwACgkQTwhj9JtAlp78LQD+OFAw03AjGtWnMd1qg6QFYlsv
+MLkOgR2FwOTvLvTQaEAA/Rh+o2QyNmOeXcpQsjiWA00ZLhnig4dGGLgTcMwG1Zfu
+=Pbu/
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/libftdi/libftdi-0.18.ebuild b/dev-embedded/libftdi/libftdi-0.18.ebuild
new file mode 100644
index 000000000000..2d73b7303e3a
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-0.18.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-0.18.ebuild,v 1.1 2010/06/29 23:32:22 vapier Exp $
+
+EAPI="2"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="git://developer.intra2net.com/libftdi"
+	inherit git autotools
+else
+	SRC_URI="http://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="cxx doc examples python"
+
+RDEPEND="virtual/libusb:0
+	cxx? ( dev-libs/boost )
+	python? ( dev-lang/python )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		mkdir -p m4
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable cxx libftdipp) \
+		$(use_with doc docs) \
+		$(use_with examples) \
+		$(use_enable python python-binding)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+
+	if use doc ; then
+		doman doc/man/man3/*
+		dohtml doc/html/*
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/dev-embedded/libftdi/libftdi-9999.1.0.ebuild b/dev-embedded/libftdi/libftdi-9999.1.0.ebuild
index 61a703a42c04..ec1ebbb7f1c0 100644
--- a/dev-embedded/libftdi/libftdi-9999.1.0.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.1.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.1.0.ebuild,v 1.1 2010/06/22 23:10:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.1.0.ebuild,v 1.2 2010/06/29 23:32:22 vapier Exp $
 
 EAPI="2"
 
 if [[ ${PV} == 9999* ]] ; then
+	EGIT_PROJECT="libftdi-1.0"
 	EGIT_REPO_URI="git://developer.intra2net.com/libftdi-1.0"
 	inherit git autotools
 else
@@ -19,7 +20,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 IUSE="cxx doc examples python"
 
-RDEPEND="virtual/libusb:0
+RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
 	python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
@@ -27,23 +28,22 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
+		mkdir -p m4
 		eautoreconf
 	fi
-
-	# don't bother building examples as we dont want the binaries
-	# installed and the Makefile has broken install targets
-	sed -i '/^SUBDIRS =/s:examples::' Makefile.in
 }
 
 src_configure() {
-	use doc || export ac_cv_path_DOXYGEN=true
 	econf \
+		--with-async-mode \
 		$(use_enable cxx libftdipp) \
+		$(use_with doc docs) \
+		$(use_with examples) \
 		$(use_enable python python-binding)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog README
 
 	if use doc ; then
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 638c085e7ad7..95eb9ad60206 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.1 2010/06/22 23:10:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.2 2010/06/29 23:32:22 vapier Exp $
 
 EAPI="2"
 
@@ -27,23 +27,21 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
+		mkdir -p m4
 		eautoreconf
 	fi
-
-	# don't bother building examples as we dont want the binaries
-	# installed and the Makefile has broken install targets
-	sed -i '/^SUBDIRS =/s:examples::' Makefile.in
 }
 
 src_configure() {
-	use doc || export ac_cv_path_DOXYGEN=true
 	econf \
 		$(use_enable cxx libftdipp) \
+		$(use_with doc docs) \
+		$(use_with examples) \
 		$(use_enable python python-binding)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog README
 
 	if use doc ; then