Shameless copy of avr-gcc check from later versions to fix bug #204377.

Package-Manager: portage-2.1.4_rc14

3 files changed, 31 insertions, 22 deletions

diff --git a/dev-embedded/avr-libc/ChangeLog b/dev-embedded/avr-libc/ChangeLog
index 490ed7147d44..b54b5eeb3a36 100644
--- a/dev-embedded/avr-libc/ChangeLog
+++ b/dev-embedded/avr-libc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-embedded/avr-libc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.40 2007/08/29 17:19:56 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.41 2008/01/05 09:32:23 calchan Exp $
+
+  05 Jan 2008; Denis Dupeyron <calchan@gentoo.org> avr-libc-1.2.6.ebuild:
+  Shameless copy of avr-gcc check from later versions to fix bug #204377.
 
   29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing gustavoz from metadata due to his retirement (see #36010 for
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
index fe2dae92f3ef..4af776659af0 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX avr-libc-macros.patch 497 RMD160 cfc9bf78d9be8eab185bfd7b5c9ba07c249cd413 SHA1 285037aad0992779ef70af1a43a59386541a4fd7 SHA256 1ae9193b138b372527c1e79079407657b7b6f0d5d27f3a9569b29c9b9e676fe2
 MD5 a171e49ae4824538fe554c27b30d5fd0 files/avr-libc-macros.patch 497
 RMD160 cfc9bf78d9be8eab185bfd7b5c9ba07c249cd413 files/avr-libc-macros.patch 497
@@ -17,10 +14,10 @@ DIST avr-libc-user-manual-1.2.6.tar.bz2 112574 RMD160 a6e6945570255b3048022270e1
 DIST avr-libc-user-manual-1.4.4.tar.bz2 493931 RMD160 79c3ba52f75b5fc117ee9dab29025bef862b7c29 SHA1 1eadfca772371a577a890f95306531676af2fdaf SHA256 1d87eb5564db9bb4ac35561be6961f3ef03281e17554879f7f1ecee37b2b3a32
 DIST avr-libc-user-manual-1.4.5.tar.bz2 499278 RMD160 e208d10d465c42645c64a8d4eff0f8d35a0159d6 SHA1 e8fdb1ad20ac16ee2295059675d6a99c52ab9f7c SHA256 3d9b5c90746a4cab81b00e2573300bd393cd03de5279f26aa34eff600cd9f518
 DIST avr-libc-user-manual-1.4.6.tar.bz2 565095 RMD160 7f36bcf1f9f01e4486920f6ba39cbbd957b8a7ac SHA1 7d7031e8225d2a279ad038aced941a6464b1b63f SHA256 ac59179df6d7f12587858fe91429e07215d59144162cd3d2e6d3334d0d3b425f
-EBUILD avr-libc-1.2.6.ebuild 1586 RMD160 dd47b1b6e81f1b70313a2c80eb68f3a87ee3dd4f SHA1 3c9915a421d4a6cf3203319bc6f2a269f3be3129 SHA256 7aa74c184ee51203540cf7c8e2f37c116c41bc25fadcaa0d8831ac1fb75227b0
-MD5 4c08aa0b206f3dcd692548064da23b6a avr-libc-1.2.6.ebuild 1586
-RMD160 dd47b1b6e81f1b70313a2c80eb68f3a87ee3dd4f avr-libc-1.2.6.ebuild 1586
-SHA256 7aa74c184ee51203540cf7c8e2f37c116c41bc25fadcaa0d8831ac1fb75227b0 avr-libc-1.2.6.ebuild 1586
+EBUILD avr-libc-1.2.6.ebuild 1921 RMD160 41bdd95f5e4f3e02e8873e0b2ddbfd79c393a951 SHA1 fa78089ef464b6cd85a55cfd6b97fdb930231d2b SHA256 dedef2148a1cb8076efd2319e0dbeee374157807a52a40911d166c6cbb7192fa
+MD5 aacaa393716e1849694e895a71eba360 avr-libc-1.2.6.ebuild 1921
+RMD160 41bdd95f5e4f3e02e8873e0b2ddbfd79c393a951 avr-libc-1.2.6.ebuild 1921
+SHA256 dedef2148a1cb8076efd2319e0dbeee374157807a52a40911d166c6cbb7192fa avr-libc-1.2.6.ebuild 1921
 EBUILD avr-libc-1.4.4.ebuild 1778 RMD160 aefb9a97a85ec3263db52ce46ef20f4578832e60 SHA1 3c9148a3d563c1b0d772fd78f2091067329c49f2 SHA256 763379b5086964ca94d3ffb6b68b6085e673ecfa7ff42987bf9842e6123532da
 MD5 e8b940ed8155e299f9e2c9c6a90d1b96 avr-libc-1.4.4.ebuild 1778
 RMD160 aefb9a97a85ec3263db52ce46ef20f4578832e60 avr-libc-1.4.4.ebuild 1778
@@ -33,10 +30,10 @@ EBUILD avr-libc-1.4.6.ebuild 1782 RMD160 e249de7b2409ce8466352bd195772174a320fba
 MD5 3c11509e9804d245470f0a12e4fa6089 avr-libc-1.4.6.ebuild 1782
 RMD160 e249de7b2409ce8466352bd195772174a320fba2 avr-libc-1.4.6.ebuild 1782
 SHA256 043dfb10d465e58a540f5d74003ca38d923a22e4f06305424dd4de2ff2029616 avr-libc-1.4.6.ebuild 1782
-MISC ChangeLog 5279 RMD160 9d28103ed9680ad276d0585eab382a20028d1a35 SHA1 b116708b0bd9c128091aa290a5f2fe9e68bc7871 SHA256 bb570264b620c43ec6ef08845bf78e75eaa7a21333e18f70c6f955101238c3bb
-MD5 27062225a1cd4c850a84be9d657c015f ChangeLog 5279
-RMD160 9d28103ed9680ad276d0585eab382a20028d1a35 ChangeLog 5279
-SHA256 bb570264b620c43ec6ef08845bf78e75eaa7a21333e18f70c6f955101238c3bb ChangeLog 5279
+MISC ChangeLog 5429 RMD160 100ccc39de10bd6cdbe6b45c7508e85ece4a60ee SHA1 87de6da5d04d4722c44d528823e6ef2388d0b5ae SHA256 0883190a77f0815337f0123c243b5e6674d98b94154e9c9305e16da4f3c88ad8
+MD5 77bb0b7353063e7563027eb588222d3e ChangeLog 5429
+RMD160 100ccc39de10bd6cdbe6b45c7508e85ece4a60ee ChangeLog 5429
+SHA256 0883190a77f0815337f0123c243b5e6674d98b94154e9c9305e16da4f3c88ad8 ChangeLog 5429
 MISC metadata.xml 482 RMD160 c53fed9a10b4df96430e648daa79a21c3d222456 SHA1 729896808dfeabdfe232cd887fedf3dc3bfd6d60 SHA256 ed0bc041670efcdfbc9329f9304db9a00410c9b65e84a5a88a394ff46c007f2f
 MD5 18e8e087c048c5c3ed642bad15fb7579 metadata.xml 482
 RMD160 c53fed9a10b4df96430e648daa79a21c3d222456 metadata.xml 482
@@ -53,10 +50,3 @@ SHA256 fe8139918bdcc54f78d07620b8e7c76874970ddcfc1838de3069eeb55c96625c files/di
 MD5 ff009aebec9ac158e05694fdedf5fd56 files/digest-avr-libc-1.4.6 804
 RMD160 9b02780d106b07946516a450c3282c14d9396f7e files/digest-avr-libc-1.4.6 804
 SHA256 bf08fd0555e027574bf120ceaf0f84a640f9da56f4cba81e11150d89dc9c6f4d files/digest-avr-libc-1.4.6 804
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG1arDyuNVb5qfaOYRAsFLAJ9aG0+xnpuBj2jGbieSGGagzLuROwCgzKl8
-YvgvK4836jfGEol+SQi9/Is=
-=fSr7
------END PGP SIGNATURE-----
diff --git a/dev-embedded/avr-libc/avr-libc-1.2.6.ebuild b/dev-embedded/avr-libc/avr-libc-1.2.6.ebuild
index 3634a08b6ca1..cf2ea9424f83 100644
--- a/dev-embedded/avr-libc/avr-libc-1.2.6.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/avr-libc-1.2.6.ebuild,v 1.6 2006/10/11 22:13:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/avr-libc-1.2.6.ebuild,v 1.7 2008/01/05 09:32:23 calchan Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,6 +20,22 @@ DEPEND=">=sys-devel/crossdev-0.9.1"
 	&& RDEPEND="!dev-embedded/avr-libc" \
 	|| RDEPEND=""
 
+pkg_setup() {
+	# check for avr-gcc, bug #134738 and bug #204377
+	ebegin "Checking for avr-gcc"
+	if type -p avr-gcc > /dev/null ; then
+		eend 0
+	else
+		eend 1
+
+		eerror
+		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
+		eerror "  $ crossdev -t avr"
+		eerror
+		die "AVR toolchain not found"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}