Add USE flags to control ftdi/ncurses/readline deps.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 41 insertions, 22 deletions

diff --git a/dev-embedded/avrdude/ChangeLog b/dev-embedded/avrdude/ChangeLog
index b1b7259fec97..017cf94c565b 100644
--- a/dev-embedded/avrdude/ChangeLog
+++ b/dev-embedded/avrdude/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/avrdude
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.48 2012/04/03 03:12:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.49 2012/04/30 02:51:27 vapier Exp $
+
+  30 Apr 2012; Mike Frysinger <vapier@gentoo.org> avrdude-5.11.1.ebuild,
+  metadata.xml:
+  Add USE flags to control ftdi/ncurses/readline deps.
 
   03 Apr 2012; Mike Frysinger <vapier@gentoo.org> avrdude-5.4.ebuild,
   avrdude-5.5.ebuild, avrdude-5.8.ebuild, avrdude-5.8-r1.ebuild,
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index f3fcf491f3fe..62d8da5ae3cb 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -20,28 +20,28 @@ DIST avrdude-doc-5.5.tar.gz 26256 RMD160 6c5b298eaffceb78f3eb6d68ff9a70d37e6bc09
 DIST avrdude-doc-5.8.pdf 214889 RMD160 25447cf70e2ad4743ceffc195832044cc65f0c6a SHA1 7db074bb392a81adc24e9c60372532b16e94224c SHA256 da08527e1c3ed3baab772dfb3dd2a075af9916c5471c4584dec1fd5642aed355
 DIST avrdude-doc-5.8.tar.gz 30219 RMD160 6f8199af786d1e4d0f2ed8ee6ed18e4153592b61 SHA1 c1cd604ddb34ac252bc42741cd63638902a6bd01 SHA256 5246f55cdb1c0e056fe6f8fdc0c6004bcd4430178d3fabec886a656881a7bdb3
 EBUILD avrdude-5.10.ebuild 1356 RMD160 07236bd583900c9cd2efd05bd3b500a62683e6d4 SHA1 613ad11443d270818d340231cfd079a440430bd6 SHA256 f5c5057c0ce2dbca5c0b024808ff09e4403eeb7a0ee15dde30ce84381d43ccb6
-EBUILD avrdude-5.11.1.ebuild 1112 RMD160 dd269874887f69a1229a82c089212e920d2b1ac3 SHA1 053a6f80c5f5ce29fb1af7c5c77d06d7b3bcb0bb SHA256 1a5f6599ef25d15096bdac4f323497a7d97a28963f131e7eb0ae70dc3312b089
+EBUILD avrdude-5.11.1.ebuild 1436 RMD160 f6444593dc72158104db231d05bd4fb22e19365d SHA1 94106acb15318c08722d0324d8660d7c59ca7a05 SHA256 3fbbc4f3d8a5dcc85714a890538ac037be533418fc5269815530cb2315bbbccd
 EBUILD avrdude-5.11.ebuild 1108 RMD160 7c7994255d87c1ef6adafc25ed81ae594669dc0d SHA1 af7ac799001248a89ca9abe6ead0373c63e0b22e SHA256 733d7b1953b90897f37a8a3e095b3e1e3de02664876c5dce505ac4a650881422
 EBUILD avrdude-5.4.ebuild 1061 RMD160 dd07b2be5d05d534d530e0e95212121874cc95fd SHA1 f469975c79644dffe96434fb824a8985d2258c6b SHA256 90bbbdfbfd74e63d27944ae2cd9ca165f3d40e178be0f7480939ad517a35fe15
 EBUILD avrdude-5.5.ebuild 1564 RMD160 09ba43ca044d9d7c833217b3053c87df85c2b42a SHA1 5d594a4b8ebf91016a89c3abff04289b941ad573 SHA256 c2b97f59f47c238ac403a301d0cffbaaa66d8d76ffa4f1693c5ba9b77989d405
 EBUILD avrdude-5.8-r1.ebuild 1361 RMD160 acf05b2455ce8612db10ac3d4725298440f3af8b SHA1 ab9f0d5b811c40c597028ea66d7bba7ec4f05b2d SHA256 d2f04ba83cdbfcaec67f5b767f6c28fa78926fc1e61677e223272092b2599812
 EBUILD avrdude-5.8.ebuild 1286 RMD160 2c9b84ab6802eaa96bd0c1c509f578933711adfb SHA1 bd2d936b174ffe5ef5a7a55302ec15e91e0a48cf SHA256 965c7223ad1979c4cb0d6f2b7c9c08996863007d7dbd8276fde7bb453f47f1a1
-MISC ChangeLog 6396 RMD160 15ccd4fe18929e171e343affbf5a8a4a96ccf724 SHA1 1da2295153e38839740bfa0c77edcb8e5736ab76 SHA256 c83e40bdf661a0b9ac8cf56a517c1b4f44407f6bb8f4e7aeee64e1ebc3bdd142
-MISC metadata.xml 166 RMD160 3e9fb3b44ba8d9588c6b707be1adebc449a86c35 SHA1 16f4180775df6383c024b55f3db25ace7a18252a SHA256 b2dcf7711258209967bdcb64a889d1fb11ba9889d08501369a8cad102d5cefce
+MISC ChangeLog 6541 RMD160 d7f3d6525e75380b891d102dce4807c1390e7640 SHA1 b78de3d3d7e1d705506a9edebb1eda213dee5b06 SHA256 7ff7d08bc15aef07588fc1de83233358236005d929c17f8907222e8de8b2ed58
+MISC metadata.xml 275 RMD160 5b5d385d1f08cf5ea3a0fd5333d96afda1295cab SHA1 f3284ea17073203ce2ab705457eea52fb7d7439a SHA256 91057bf8ca0ae82be5f25c0aade58e74f5c4cb8db73654ccaa8beddeb3a753fa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPemqYAAoJELEHsLL7fEFWgIAQAJ8sgxAgPJbuilldW0o8Xx2l
-9Zg8RVJE4xEqwLk2zeGGIkXty1bFYyVUuU1gTMkzOJ+ecDhrmhR7q6A1HleQ/Xct
-BerildfhPM9OYLkpfZCJQThBUoPnFqAfza35R2QrlzmfdB6HRfvWNgsjlIcD7CGe
-B2ok2GgeHwAfgJVRUV3LZjNiEsPqVzkdhNyizRAIQTUaLspueQJHB8q4+Uky+i3B
-RSlVBoC56/TXK89xcRGzDxmZj6uQLnA3fhxTSKqWG9eerTWRPvjP57fegm+FA4oI
-l/vaqsIFihNWiu/Byte0LCDPI48pLy1zUghZFDZvmFx63wuqeea4GCeLOaE2Q/0E
-wCOd7j6FwB6sW+hMdj2ik5Kd0ECbIzHq/SHnUpYauoYYs49dssdllLmqEdOyPRM4
-EeHr0HAmpmEasrOK3/ICehnaO5h2LAMjriIbfM1iAZ/5dv4qbgCx4ZtEU1mGgIQg
-eGeIDIb6SlAodd/tS/X1Fi/YvfE9CRbrP7jFo0ZxqCEC0E0838h/FCVLv2NUTL6h
-z4Ao5EZhbJ8FppQsbGEw9oh6qz1ITlaWXpkkx7gzjQle1oXwa6eBR9g0ge4hAiYw
-cao/Bwz1qTOwY45GzvzHQTA+TqWC4Trs1Xaext6MMmSGPufEPSaqjsfr5m62v23F
-7QWluYvlHkKFK4gNQ4t4
-=1WEY
+iQIcBAEBAgAGBQJPnf5PAAoJELEHsLL7fEFWSacQAIX0TKsFyF81fPzDzYRhln8P
+8BOZQkol3bfm1NV39R6YNfVwcTm7gPDTd1+s9RnAPhgf/iVcZGijfEyoVgsdAUo0
+zUX2KwMbx55E7xoztL8mSFliInuTm5VQzNVg7TVpV6uSMzALo8gwVwabnU6EAk+F
+lvI3vmZiuknSqXEz/oA2Ewj4UscQu2ZL+Ad/T57zw+BH+lli3Mr575U/naAjgsau
+zeRzSf9Pco2DMeGoad7/G3SX5w9pQTGX6eiqVV5CN4j6aaYTjWB14qfIdcJffPmx
+I0yO3fNOxBSw3svMis8JMFyBUkpfebbROaTiKiCx2dU+MpLopRM9ei0SrmlWz+95
+bxZb5j5qpiPTRJUFwa4MnlgT0x7SzYd30YoszAXgKCx7j/GGLKqYxhPHsbhCsSu9
+bn4VjFfZDeOkLb3ZQ/6ZIVtlFO7ELmlGawtyYQZYVJqZmH3gpZwCsZj1fzGBPFqY
+htp6l2juK7TzdIDjCuhtm+XTDxRN0QxdCvc/uIS1hcVg9BgBH+nwS6XVG+y/LJSd
+iz+/o7oCcOQs0iMI/tdPVGlqiZ/tcGyZ4glVZntUU5gWr9dJQpEQxwReC0VQ+i/e
+HKifUmVedT4vlk1FHVOoy8TLgyFize9hKcc78V1Zz0bhovU4y63D9EskaMijEpqc
+DMiEHR6NyC5EsSk+LRow
+=ytjE
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/avrdude/avrdude-5.11.1.ebuild b/dev-embedded/avrdude/avrdude-5.11.1.ebuild
index 996a3178a01e..2c4a59fa65a8 100644
--- a/dev-embedded/avrdude/avrdude-5.11.1.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.11.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.1.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.1.ebuild,v 1.3 2012/04/30 02:51:27 vapier Exp $
 
-EAPI=4
+EAPI="4"
+
+inherit eutils
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
@@ -15,9 +17,12 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
+IUSE="doc ftdi ncurses readline"
 
-RDEPEND="virtual/libusb:0"
+RDEPEND="virtual/libusb:0
+	ftdi? ( dev-embedded/libftdi )
+	ncurses? ( sys-libs/ncurses )
+	readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog* NEWS README"
@@ -27,6 +32,13 @@ src_prepare() {
 	rm -f lexer.c config_gram.c config_gram.h
 }
 
+src_configure() {
+	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
+	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
+	export ac_cv_lib_readline_readline=$(usex readline)
+	default
+}
+
 src_compile() {
 	# The automake target for these files does not use tempfiles or create
 	# these atomically, confusing a parallel build. So we force them first.
diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
index a217d236ec3d..1962441214e1 100644
--- a/dev-embedded/avrdude/metadata.xml
+++ b/dev-embedded/avrdude/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>dev-embedded</herd>
+<use>
+ <flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
+</use>
 </pkgmetadata>