Depend on libusb:0 for older versions #410279 by Godfath3r. Update URI to mirror://nongnu/.

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

9 files changed, 87 insertions, 71 deletions

diff --git a/dev-embedded/avrdude/ChangeLog b/dev-embedded/avrdude/ChangeLog
index 075af7d26726..b1b7259fec97 100644
--- a/dev-embedded/avrdude/ChangeLog
+++ b/dev-embedded/avrdude/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/avrdude
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.47 2011/09/21 04:29:31 radhermit Exp $
+# 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 $
+
+  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,
+  avrdude-5.10.ebuild, avrdude-5.11.ebuild, avrdude-5.11.1.ebuild:
+  Depend on libusb:0 for older versions #410279 by Godfath3r. Update URI to
+  mirror://nongnu/.
 
 *avrdude-5.11.1 (21 Sep 2011)
 
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index 7373feb329c5..f3fcf491f3fe 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX avrdude-5.10-jtagmkII-debugWire.patch 684 RMD160 3f240926fe81dfcced0ef9729b63b48834e4bc96 SHA1 6a645a801729a3d2620ff6804d9d9e2e255f9068 SHA256 41ec2f15817917925e07da715672331426c36142de8f8ff8a3e2680f39c3f65d
 AUX avrdude-5.8-dragon-segfault.patch 543 RMD160 14bedadae5a52214d41565874d8bd394f9e73a8d SHA1 06d0bbf34371bc1077cbea54dabe431098b22dfa SHA256 66c2a29f55eb1b897b4e48c3b3c6b0511502dda07322c8b4006d9d56f5618e19
@@ -19,23 +19,29 @@ DIST avrdude-doc-5.5.pdf 199919 RMD160 425226e8629e4e5c20987bc389f087d669e6f8a4
 DIST avrdude-doc-5.5.tar.gz 26256 RMD160 6c5b298eaffceb78f3eb6d68ff9a70d37e6bc096 SHA1 a06a06852cdcf1ebe67efcd2584953f1bbe8d62b SHA256 26d7883172eb8c55604a7561270aa2ac7ec4760d8dfbb44087eaede35688ac5c
 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 1391 RMD160 ddb74536a6af3c924bd74f44f34c81522b2a0541 SHA1 81b53c2e0415ac5de7d8b84dca998b625dad11ff SHA256 bf83d7d4ef6af0208ebeb6c9217b02ceba1cf46469008535a9f5a4c288e027d7
-EBUILD avrdude-5.11.1.ebuild 1152 RMD160 dd88c561df57df38c8852c2124fd02914c6b5fdd SHA1 22789892eb8af415f59d5d6491ae4f74991ce318 SHA256 4f390131bb3997dfad3d83415953889c99aa65b10886e855f0ab3e4bf7b47693
-EBUILD avrdude-5.11.ebuild 1150 RMD160 2c8aa8b443673419e39277375b880729e99bca82 SHA1 9e6495441948dabc64f3ee55a95a3494218a03c5 SHA256 52d54f3b4ae8ed4ba5d76459b7770068a88bd53325aee6660e67db628142f54d
-EBUILD avrdude-5.4.ebuild 1081 RMD160 5450d48a5b407d2444a732db088eb26b8f780000 SHA1 1b315bc5399a5777e89a0a4882dee0f1114f8b8f SHA256 3b0124fadb7629dc7ff09cd565f4cab43201b97fcc3d7e283ec64a8446b45c45
-EBUILD avrdude-5.5.ebuild 1617 RMD160 4a23a6e1ee1b3409598a4fbd45b9fcf66ba4e43a SHA1 6f156da39e83371a1e0f3fd2b553b0e48ceef21c SHA256 c0e1ca7c5d03eed9bf8b9d995e9276e383fa191877cca8c646bc2b26f6fe348d
-EBUILD avrdude-5.8-r1.ebuild 1396 RMD160 9d6af90d5c050db11c3c060abb89ffd8dcd3623d SHA1 50de55cee620422aabe2a27fcf8f93224d39eeaf SHA256 eb0dd4db3ec0761791fc918b0523c3dbf5940165d6f8525869a202bfa5477b4f
-EBUILD avrdude-5.8.ebuild 1325 RMD160 c3ed2ab8a673a532478f984e7e9fb91afaf19b3a SHA1 429da10bc222a7845d1dc2af70248210cc3e8923 SHA256 eae2adf7a30b41fcb352c66ef46b5a81b39fdad6e9f5fdb92f8ee40c27461b28
-MISC ChangeLog 6100 RMD160 1ef85536293c12ca7bc4206e8a5db40f9818dde3 SHA1 8e291c2d3b99c0c0d4baa97902dc7057985bad52 SHA256 f29381897356ae149632c3232c32f83ea69cae67a602c7480f7bcddeed62c364
+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.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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOeWgwAAoJEEqz6FtPBkyjCYUH/3JkLNiv8M/QO2HQCLPbN+JS
-jIexgrn/SShZ2LmWLWJ6XZva+XgUMPHcLio9CeSMlrJadVSLDdhihvVUjwguZFhg
-k1sd/v7/PjHRnXM53IfaUXiSH6mZBmAL+vKndUK3j40vK7s1dPvXXLYte7nhWraZ
-Y9Ws64tI6oGdOqQUPNk2zolPuSYU30hB68reWxNjBFm6AZXh6jFuI8zLRgPxitrZ
-jmp8D1TMop3hxyl49leUbrizQ1+V1xOpbgwizzB5jx0v/slkiE8vkxTYdubzg+id
-qNU7Y4Xx8EJwg7XXBhOBzKKc/PMVOED0EFSIM427IGNJFOdA4IgBQo+UAbmjh60=
-=htIP
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/avrdude/avrdude-5.10.ebuild b/dev-embedded/avrdude/avrdude-5.10.ebuild
index 1762551d29e6..bd3c6b5320a5 100644
--- a/dev-embedded/avrdude/avrdude-5.10.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.10.ebuild,v 1.1 2010/11/17 23:13:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.10.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
 
 EAPI=2
 
@@ -8,18 +8,18 @@ inherit eutils
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
-	doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
-		   ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	doc? (
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
-
 IUSE="doc"
 
-RDEPEND="virtual/libusb"
+RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-embedded/avrdude/avrdude-5.11.1.ebuild b/dev-embedded/avrdude/avrdude-5.11.1.ebuild
index bfe86d802c18..996a3178a01e 100644
--- a/dev-embedded/avrdude/avrdude-5.11.1.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.11.1.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/09/21 04:29:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.1.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
 
 EAPI=4
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
-	doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
-		   ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	doc? (
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
-RDEPEND="virtual/libusb"
+RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog* NEWS README"
@@ -27,8 +28,8 @@ src_prepare() {
 }
 
 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.
+	# The automake target for these files does not use tempfiles or create
+	# these atomically, confusing a parallel build. So we force them first.
 	emake lexer.c config_gram.c config_gram.h
 	emake
 }
diff --git a/dev-embedded/avrdude/avrdude-5.11.ebuild b/dev-embedded/avrdude/avrdude-5.11.ebuild
index 073d434146a9..e538ef8a4f44 100644
--- a/dev-embedded/avrdude/avrdude-5.11.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.11.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.ebuild,v 1.1 2011/09/02 08:15:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
 
 EAPI=4
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
-	doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
-		   ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	doc? (
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +28,8 @@ src_prepare() {
 }
 
 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.
+	# The automake target for these files does not use tempfiles or create
+	# these atomically, confusing a parallel build. So we force them first.
 	emake lexer.c config_gram.c config_gram.h
 	emake
 }
diff --git a/dev-embedded/avrdude/avrdude-5.4.ebuild b/dev-embedded/avrdude/avrdude-5.4.ebuild
index 1efde6ffc71c..34e17bd826f5 100644
--- a/dev-embedded/avrdude/avrdude-5.4.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.4.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.4.ebuild,v 1.6 2008/05/13 08:35:05 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.7 2012/04/03 03:12:04 vapier Exp $
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI="http://savannah.nongnu.org/download/avrdude/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 x86"
-
 IUSE="doc"
+
 RDEPEND="sys-libs/readline
 		sys-libs/ncurses
-		dev-libs/libusb"
+		<dev-libs/libusb-1"
 DEPEND="doc? ( app-text/texi2html
 			   virtual/latex-base
 			   sys-apps/texinfo )
diff --git a/dev-embedded/avrdude/avrdude-5.5.ebuild b/dev-embedded/avrdude/avrdude-5.5.ebuild
index af6fc0bcbfe8..5a90697aace9 100644
--- a/dev-embedded/avrdude/avrdude-5.5.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.5.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5.ebuild,v 1.5 2010/02/28 19:56:30 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.6 2012/04/03 03:12:04 vapier Exp $
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
-	!doc? ( http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.tar.gz
-		http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.pdf )"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	!doc? (
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="arm amd64 ~ppc ~ppc64 x86"
-
 IUSE="doc"
-RDEPEND="dev-libs/libusb"
+
+RDEPEND="<dev-libs/libusb-1"
 DEPEND="${RDEPEND}
 	doc? ( app-text/texi2html
 		virtual/latex-base
diff --git a/dev-embedded/avrdude/avrdude-5.8-r1.ebuild b/dev-embedded/avrdude/avrdude-5.8-r1.ebuild
index b712b09d85f5..1947f1a606f8 100644
--- a/dev-embedded/avrdude/avrdude-5.8-r1.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.8-r1.ebuild,v 1.1 2010/11/17 22:59:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8-r1.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
 
 EAPI=2
 
@@ -8,18 +8,18 @@ inherit eutils
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
-	doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
-		   ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	doc? (
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
-
 IUSE="doc"
 
-RDEPEND="virtual/libusb"
+RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-embedded/avrdude/avrdude-5.8.ebuild b/dev-embedded/avrdude/avrdude-5.8.ebuild
index 7e7bd1dec231..b03f7c461b28 100644
--- a/dev-embedded/avrdude/avrdude-5.8.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.8.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.8.ebuild,v 1.1 2009/12/27 23:18:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
 
 EAPI=2
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
-SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
-	doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
-		   ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	doc? (
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
-
 IUSE="doc"
 
-RDEPEND="virtual/libusb"
+RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {