Make sure the docdir is unique across cross-compilers #414075 by Soeren Hoeckner.

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

3 files changed, 24 insertions, 18 deletions

diff --git a/dev-embedded/avr-libc/ChangeLog b/dev-embedded/avr-libc/ChangeLog
index 47f2f8d77b57..17a5bf5ad07c 100644
--- a/dev-embedded/avr-libc/ChangeLog
+++ b/dev-embedded/avr-libc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/avr-libc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.52 2012/04/13 18:03:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.53 2012/05/03 02:22:39 vapier Exp $
+
+  03 May 2012; Mike Frysinger <vapier@gentoo.org> avr-libc-1.8.0.ebuild:
+  Make sure the docdir is unique across cross-compilers #414075 by Soeren
+  Hoeckner.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> avr-libc-1.7.0.ebuild,
   avr-libc-1.7.1.ebuild, avr-libc-1.8.0.ebuild:
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
index 5cd51df5b37a..bc375c58c8a9 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -21,23 +21,23 @@ EBUILD avr-libc-1.6.4.ebuild 1844 RMD160 815d0c2a4bf15530bfb4a6525bef79a0acad0a0
 EBUILD avr-libc-1.6.8.ebuild 1817 RMD160 777841d323b0be348208a9f080533830fdb2fb81 SHA1 ba66faacf1bebdbc474668c268bfc69747c59d36 SHA256 4b5ca13fbb53fc71fa8c3c47b7a225bf09fb498ed4ebccfbdabb1cc2392f6aed
 EBUILD avr-libc-1.7.0.ebuild 1887 RMD160 f70c95156a87e2d70cc52e9aee73d5124d9aba59 SHA1 e30e993af2b043bbd34d321afb71378c3e9dc219 SHA256 37b59a71d459195a9c5a2d71e75cccdb18e5ced155c0a23db755c3d48bd509c5
 EBUILD avr-libc-1.7.1.ebuild 2020 RMD160 45bfde9b3f4b291a3a62bc76743eac7a352ae171 SHA1 835b8a7926e798a6ad994763043f6cb96dd594c3 SHA256 0deb85d2fbe2b5a81ec85d5b228a2ddc8cb6793f2f4fe2b5d977b15cb5d33b53
-EBUILD avr-libc-1.8.0.ebuild 1912 RMD160 0ff8b80ca52afbf0193cd60b780c4101af9eee50 SHA1 82be2edf540388073a3d54771259e41e8859b8fb SHA256 5b044237e288f7d9de81443136f032bcb3c811a393c1f9fb2727148de8330699
-MISC ChangeLog 7062 RMD160 477c47a03d670eba1f38605a18bffd5201c8e12a SHA1 279b59a966eb4a235199632a8fee18979698710f SHA256 6f33dfe749edadd53a9eca561189f918857b453678263f28776082c2c9c7332a
+EBUILD avr-libc-1.8.0.ebuild 2000 RMD160 083da711d6500c3d56dcb0db6fcd318a75f45b76 SHA1 d4c1de46fffb8df0c7a59326ba5e22d835a74aa1 SHA256 691fa2836104734b574cc66b76dd80f4794a1ef410b9e7e65aa27a4165d54152
+MISC ChangeLog 7225 RMD160 10a98004031fdcd0648e1f4a5fb36f0262216177 SHA1 7bbc5fa03f9df17e91b532a94d603629c8c15258 SHA256 ac864009c6a4a07ea8e3f983c810ffb0de841a4b5ff08ba572ad47cc2a17e38e
 MISC metadata.xml 385 RMD160 0c24e70852cc0b70e46fe75ffa8d81f5f78879af SHA1 1f58d3e4a423a89189d083f47ec0e4a4c25c5c43 SHA256 977a90ffee40687ab331c98ea7fc3beba198883caf5c98f910f135e4bc79318c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiGswAAoJEDxpGckxwJCBZSMQAIvndwMx1DsuVE3o14XyZ2kK
-6+OOlK24Sr0eYY61uagUxMcFyVUUWpWGx9XoOpo0G2K3iX6VwqSQngsSQ/V6IvXy
-dhgXUGD5lICCVVK4jg80w24AZubHth+o+w9GTVR4UTmRsTD6NcwOcKIGWSoL8THn
-Hr0ZvgrStkxm4b7oT6be3dQRzwXutopXfn2HIb+kNGQxpguJiUjV9tf9IagncZ1f
-OuHt6BVAukujI1jAT6fejpCL0WDe4bKkY1KrS1EujilzBIK2JHuh0oLoAaC7JMBF
-R5P5nRi+MV+BLDOXR1kjlo3R2/GJ4BIr+zCD1YTHrU1+GfuJB2Ln5sWjZ344zVz7
-sxnGljmDiIc2Wk3Et0jSm53MXm8N0KnJdje/dHgHtmzfW/tKlIRXiyKatEglI+Jg
-3gPZL87DwKx6vSiPLUXEtbBOCN6OaievwoOtXr/59sg0AuZlqvoOY8fzYL2lGZZQ
-mq4drO+q6Ua5blsgFm3V/HpfyiCsTaHpiNXgSay4SYf/z3sO869Af7+B+igqRIXk
-IzyVscl7ccf/dqz21/1Q2cYXGtKFhdr4gi6htS87OMoJrzzC3yIIx6BKie8eyFRG
-0Y3HxK1Jj1CKo5ltffUgT29dYGDgtrtT4nrBXKbtlfFehBKMlQ5bHKvg6uJR1YK/
-zz1N/JY5J7amAcNYpVkp
-=IZko
+iQIcBAEBAgAGBQJPoewkAAoJELEHsLL7fEFWOX0P/AoTyPXPGo/vGyx0tQ9Zf8Xl
+TYCcjlCzQP2/nMgXA63NqUgSE/LGEFcy66d5ViW08d1viR6m7HifcEu3577LwTRm
+Pc6q+ls7oHBYgegocEYaFV6kpzpx0n6SLqlWtu5hTwA1BaMf/OwtW1uUSt4alAqX
+z00mALm3jtSpnOYVNUf4l/MHoGQt/hc4ig3ijMeaBcKOh4ymgyrYZg7OfkJ2UBbF
+FDIwIIIPfTH01tgf/gL0j7+65N2IT/vfG7uJ2lG82zrUMZH+9eBtUBNoB3BVrLCG
+N4r3XgBuU29BcbO7u/4/r0rrjMDWAurZd+mXufDeuirXbndEg2D8kHPml+Ggtv/Y
+nbR9uS9bvlbvqFP1esqf3tHgpU2XREmQMTM7O0CMK1rJsj5b0piwPmed75pijG8B
+XU7QMxEH6Y8yeCHihyFEEyLWNi6v3tAuFzya2+8ZlY+nrP88cUH5E89NVQVP04k+
+slwKSxJvm7W/zg/GNYgIYV1OVDt5KYEeDCFptnwRBe9DWVaOTlnwf0gZuVc1+2lp
+fMGWW1kF9KFL/NiwRHiDnyhtrkm1VXwQcZ2Efbpaex3ANM39TJwvW3DcHPpcJ3sD
+2tr3GAXJqmdWgCEKY7dn67uLY9g6FZhRf7f4XZWhllW+bwoNPTtOFu3FEJ4BsbQ4
+VYi8Bleeyqkyzyvnl9OB
+=G0lZ
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild b/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild
index 406af70e9a5a..e6e3f81132a1 100644
--- a/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild
+++ b/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.0.ebuild,v 1.3 2012/04/13 18:03:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild,v 1.4 2012/05/03 02:22:39 vapier Exp $
 
 EAPI="4"
 
@@ -66,7 +66,9 @@ src_install() {
 	# 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}/*
+
+	# Make sure diff cross-compilers don't collide #414075
+	mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
 }