Version bump. Apply fix for gcc-4.6 issue (bug #371043 by klondike).

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

4 files changed, 122 insertions, 7 deletions

diff --git a/dev-embedded/avr-libc/ChangeLog b/dev-embedded/avr-libc/ChangeLog
index 7e81341d068b..7e9d9592c565 100644
--- a/dev-embedded/avr-libc/ChangeLog
+++ b/dev-embedded/avr-libc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/avr-libc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.47 2011/07/20 13:53:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.48 2011/09/03 08:40:14 radhermit Exp $
+
+*avr-libc-1.7.1 (03 Sep 2011)
+
+  03 Sep 2011; Tim Harder <radhermit@gentoo.org> +avr-libc-1.7.1.ebuild,
+  +files/avr-libc-1.7.1-gcc46.patch:
+  Version bump. Apply fix for gcc-4.6 issue (bug #371043 by klondike).
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
index 68431db2c2fc..38553b707807 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -1,24 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX avr-libc-1.7.1-gcc46.patch 979 RMD160 b3810304812c39a73826826989902773acbbae43 SHA1 8d58c50685f3c8ce462c1f15e847eac106ab92f8 SHA256 f5afdc16c242c0d943037b51fe2754b68d4bf094e45c7af4275221374040a4f1
 DIST avr-libc-1.6.2.tar.bz2 1044977 RMD160 789366fcc9f40e2f6b666914e3c51aca3480daa7 SHA1 14dbf6b8b91df0a2dd30bfeef6d1d9150e7cd1e5 SHA256 b70112efb9e66def5789ea9cfaad8d050a6af284b2f503fc81b479cec15cbbd7
 DIST avr-libc-1.6.4.tar.bz2 1137818 RMD160 2efe8818fa82b56205f9171ce10d56107fe98104 SHA1 02de79dd778f83e777ad0f69cf1d3a2e7bbea7c6 SHA256 965fbe12bc882836c419f8c5c7b8261b04c7bbb463ad9fd0899c8165eed5477c
 DIST avr-libc-1.6.8.tar.bz2 1345899 RMD160 afbcbecdd32b554c51d709fcfd5aeb35e4f25e9f SHA1 7536f36f20fc2768976c9b97c1e35b54300911d7 SHA256 9c35ff8569703786a9b919e9a6e3a703e9977223853691b17d8333242a9bc12b
 DIST avr-libc-1.7.0.tar.bz2 1409160 RMD160 6be7e8cc7e05c84dc5bb706d466f603941ec0dce SHA1 38d1d52174a6afaf6f5cddbc29af49b586cfde2f SHA256 27499f59e7e2d8c1dedfabdd0a9ec9aa243ba3a2e72eee0fa21375e054938e9f
+DIST avr-libc-1.7.1.tar.bz2 1417545 RMD160 5eb77da24c267d5d11d3e6d8477029b7614307dc SHA1 8ac3f03229101c427aa90f8293ddabde6c3a6f87 SHA256 c6fe3f0fc0e7b1703e173ff265de1a7cac9fffdc9b249047a53f1e741c233aac
 DIST avr-libc-manpages-1.6.2.tar.bz2 133249 RMD160 a12ad79c92197d3aff90ea031089b2940d9d6742 SHA1 540b6c4a7debab55ff55fc328c704922d7d8c575 SHA256 1c2ab29c62e308ebbb906691d0197f4b3f45fb03439c6ed674babb171104943f
 DIST avr-libc-manpages-1.7.0.tar.bz2 143540 RMD160 b4967e82d487b877102d47261ab6e152776bc1b0 SHA1 82d31efb4f34dd4a1bd829ff1916853b5664ccf7 SHA256 d97ec03a075b331b957ffe968e7236cf79260ae22195036e644b1ba5279d7fcf
+DIST avr-libc-manpages-1.7.1.tar.bz2 143831 RMD160 aac3baba863545306521a6fca25068bced93a7b5 SHA1 ccdbcfc2b4a8026385b57bfcf9b72d2f30f3f5a9 SHA256 13a17b8e7522045a88a49b972f8861e8350ba0403cf692087f86525f401fe404
 DIST avr-libc-user-manual-1.6.2.tar.bz2 511408 RMD160 d3f900c2458416f5bfc1540afda58766c99a2e78 SHA1 7d5c72ea30246bd8091d3219605e1a4482684de1 SHA256 cc02a2a1a69870add0a69178e06f6ee1c972f139d39826aefbc0ed46febde4ee
 DIST avr-libc-user-manual-1.7.0.tar.bz2 690477 RMD160 94a48af15b6d30d89d3524b8b8f95d19e98d33a2 SHA1 49e05f806a78019f1eb47525f0c3a1ded0be9595 SHA256 85bc2d7f4fcacfc727a5c026705b7d7545fb8886e1333e18a3c358571344145f
+DIST avr-libc-user-manual-1.7.1.tar.bz2 692262 RMD160 da00b70c62fed1f2d711c1b6a3b2f37e4e895fdc SHA1 7058caaf4726f7a37353779684b0369fc42203ef SHA256 25a47084f312b553f12e19d401dc63e26d36ce1821bfd38d168908f6f04a008a
 EBUILD avr-libc-1.6.2.ebuild 1839 RMD160 9f56f7b89a1859d84bdbb9ab31c457dce4f35aba SHA1 37fe3c5c2cfb705cdcfb072eef1ba14c4de4b401 SHA256 7bf3e9ac1ba2753fc1510904520b224b57723bc97476dcd98b7bc073464e8336
 EBUILD avr-libc-1.6.4.ebuild 1844 RMD160 815d0c2a4bf15530bfb4a6525bef79a0acad0a0a SHA1 cb1392790b2f3d245aea361eee0c02cb1d0ce910 SHA256 b2e92f1b37145a40d3380af61e51816ec1c21fdd7ba7d87599842d9a1467a271
 EBUILD avr-libc-1.6.8.ebuild 1817 RMD160 777841d323b0be348208a9f080533830fdb2fb81 SHA1 ba66faacf1bebdbc474668c268bfc69747c59d36 SHA256 4b5ca13fbb53fc71fa8c3c47b7a225bf09fb498ed4ebccfbdabb1cc2392f6aed
 EBUILD avr-libc-1.7.0.ebuild 1890 RMD160 427da7502f99492b3552896f13baccdbf550cea9 SHA1 a430db679ded40d5e38735e1fe0f53a5b97e6f0c SHA256 a1b731945d9754c5025f0ebc949193355f86ff88a8f2d0c14ceb2312052758dd
-MISC ChangeLog 6369 RMD160 d7a119ccd828fdb28f32f93fa85bb0071ea9f270 SHA1 789677c9c899779d18e70db523c5e59c0178e03f SHA256 d458e4a40c59c8093147e7b07ea4e2556a83af40c2a1dfb8c95119b5a7743d45
+EBUILD avr-libc-1.7.1.ebuild 2026 RMD160 f99818f5ad4f2c1ffe02b29bd6e3e64c8b4f2d88 SHA1 c512df52c997ae77685d9f427402f7c56bc246f6 SHA256 82fe2c5ab1ce355e22c17da412374179e388c89988e7a98cf6c2730072a8cd07
+MISC ChangeLog 6586 RMD160 3b02a644cfc6cefb4d317848bdd1173008974da4 SHA1 bb5644f12b1bedab6ef069b3f8e6e7ed77f52c7c SHA256 15d76e40ee54a48360eb07a18f2ce06e2e7aa5bb9ba09960ae26f67d1c680261
 MISC metadata.xml 385 RMD160 0c24e70852cc0b70e46fe75ffa8d81f5f78879af SHA1 1f58d3e4a423a89189d083f47ec0e4a4c25c5c43 SHA256 977a90ffee40687ab331c98ea7fc3beba198883caf5c98f910f135e4bc79318c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4m3cUACgkQCaWpQKGI+9T5tQCdEzs9NEQ1LjMdJGBTWIPjUkom
-ivoAn074JTaLZqyarjyhGjQKpb0MiK/h
-=Q1Qj
+iQEcBAEBCgAGBQJOYef4AAoJEEqz6FtPBkyjqI0H/RnBOhvgh/YeLNJAl9wXuPYl
+EVbe+NZbHbkagnx69MSwZmClscoaFczZLC1VLocWm7e7VUSr6bhWXjiyueYU3WYv
+2npO4kB0GWYVgLXkdm+QmQvTBhzGkaUDUpRHpekTG1xrUqls+UZdUDX1KZ0acYQo
+yVPqwoBK9hPbLr4w9z2uNnL05NNxStW2IB3b7KNOdNulTc1FYcw0xaMR8ABr2Cz9
+d4x1CskG9IBdQksQLVBvENSQ2g0WNhpnKYbZyTlx4yzgD2M/95H4mXBzD1/wZGuf
+j365n9B/n4/Wa8exEw44bB/jX6gfhqCt8HALVpq/Zq+i66/qHX3XgzCOguIXOV4=
+=ZDBf
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/avr-libc/avr-libc-1.7.1.ebuild b/dev-embedded/avr-libc/avr-libc-1.7.1.ebuild
new file mode 100644
index 000000000000..6e1f89b45e02
--- /dev/null
+++ b/dev-embedded/avr-libc/avr-libc-1.7.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 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.7.1.ebuild,v 1.1 2011/09/03 08:40:14 radhermit Exp $
+
+CHOST="avr"
+CTARGET="avr"
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="C library for Atmel AVR microcontrollers"
+HOMEPAGE="http://www.nongnu.org/avr-libc/"
+SRC_URI="http://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
+	http://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
+	doc? ( http://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc crosscompile_opts_headers-only"
+
+DEPEND=">=sys-devel/crossdev-0.9.1"
+[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
+	&& RDEPEND="!dev-embedded/avr-libc" \
+	|| RDEPEND=""
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_setup() {
+	# check for avr-gcc, bug #134738
+	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_prepare() {
+	#Fix avr-libc bug #32988 causing and ICE with gcc-4.6.0
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+
+	# work around broken gcc versions PR45261
+	local mcu
+	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
+		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
+			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
+		fi
+	done
+
+	# Install docs in correct directory
+	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
+
+	strip-flags
+	strip-unsupported-flags
+}
+
+src_install() {
+	default
+
+	# man pages can not go into standard locations
+	# as they would then overwrite libc man pages
+	insinto /usr/share/doc/${PF}/man/man3
+	doins "${WORKDIR}"/man/man3/*
+	prepman /usr/share/doc/${PF}
+
+	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
+}
diff --git a/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch b/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch
new file mode 100644
index 000000000000..1f0922196c36
--- /dev/null
+++ b/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch
@@ -0,0 +1,25 @@
+--- avr-libc-1.7.1.orig/include/avr/pgmspace.h
++++ avr-libc-1.7.1/include/avr/pgmspace.h
+@@ -252,7 +252,7 @@
+ # define PSTR(s) ((const PROGMEM char *)(s))
+ #else  /* !DOXYGEN */
+ /* The real thing. */
+-# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];}))
++# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+ #endif /* DOXYGEN */
+ 
+ #define __LPM_classic__(addr)   \
+--- avr-libc-1.7.1.orig/libc/stdlib/dtostre.c
++++ avr-libc-1.7.1/libc/stdlib/dtostre.c
+@@ -37,9 +37,9 @@
+ char *
+ dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
+ {
+-    __attribute__((progmem)) static char str_nan[2][4] =
++    __attribute__((progmem)) static const char str_nan[2][4] =
+ 	{"nan", "NAN"};
+-    __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
++    __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] =
+ 	{"inf", "INF"};
+     char *d;		/* dst	*/
+     char *s;		/* src	*/