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

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

4 files changed, 35 insertions, 14 deletions

diff --git a/dev-util/w32api/ChangeLog b/dev-util/w32api/ChangeLog
index 32142540246a..1d6b01f91768 100644
--- a/dev-util/w32api/ChangeLog
+++ b/dev-util/w32api/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/w32api
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/ChangeLog,v 1.16 2011/12/10 20:49:23 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/ChangeLog,v 1.17 2012/05/03 02:33:59 vapier Exp $
+
+  03 May 2012; Mike Frysinger <vapier@gentoo.org> w32api-3.14.ebuild,
+  w32api-3.17.2.ebuild:
+  Make sure the docdir is unique across cross-compilers #414075 by Soeren
+  Hoeckner.
 
   10 Dec 2011; Mike Frysinger <vapier@gentoo.org> w32api-3.17.2.ebuild:
   Stabilize for amd64/x86.
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
index b0ebdac100d4..5fa60b4f74cb 100644
--- a/dev-util/w32api/Manifest
+++ b/dev-util/w32api/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST w32api-3.14-mingw32-src.tar.gz 1220398 RMD160 5c3f8d16824a217e0e62e9c6f00ed427113eed2b SHA1 851d2df6b213c11a30e96c05665f91d68dfb3ce9 SHA256 415cbe17225f851fe45f31e4cfe6e8f85eaa5588eb4457a2ee57d34614ea0a89
 DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 RMD160 e4c702dd0e69c4a1097e94c35fa1253994404623 SHA1 7fd9192d0efea46e69eb81d277e4ecf7c6bbd1ff SHA256 8b23391c9cc7f6884c9f6a3c6ad32fbe6530992ca54660d2f2adcef80db53027
-EBUILD w32api-3.14.ebuild 1426 RMD160 8bf374b57e6b0ed0d1a27f77598ba35a2f462f91 SHA1 6b9935c4e529bca8b78eceea434d02f92773eded SHA256 f185993cbc53d84da0597054afdd9525d0a1e649ee5c8deda265ebfb96e27861
-EBUILD w32api-3.17.2.ebuild 1543 RMD160 288f9bb6a664b3beef9ec4991e9ae507836e2f5b SHA1 ef3e4a14374cdd3c02dfbe36fc6f5f01e79d4136 SHA256 0131d1d6da97becb697af369d1abcc6a2e73abe56661ccf4989400709fa0ad7a
-MISC ChangeLog 2198 RMD160 927ae7e7c5688ae8a6b9fcbceccae29bfdc6ce47 SHA1 e6064cce59c7412806e5b0ac040a3f2510612081 SHA256 892ed08812eae04771154af74b99fd9d30be39e76b7f37173118c6fe05ad0a05
+EBUILD w32api-3.14.ebuild 1543 RMD160 14c5be5d4846cc5a9bd0a074f57cf86c2815f273 SHA1 7c77761ad9a26138232d0de43239191e90ea6595 SHA256 ef7014e63ab0e508368f3f58383040662c408185c4c53f570924688811a4c472
+EBUILD w32api-3.17.2.ebuild 1660 RMD160 f8e8ff72278bf17e13c995f029cc59ad33631e9e SHA1 4dae957765144da517a645036eac845e7beb2c38 SHA256 8314c1bd2887ebe809308a44cdbbb57d93f468b8056a9de38d33f317f5f15772
+MISC ChangeLog 2379 RMD160 ba4678e3ce776a57a5121684d3574a05f701851c SHA1 78816fbb7b9855cfbccf204d0290ed8d2c8bea39 SHA256 71d04a751e4a6390c675bfddd32fd6f774c801a52e9fea59db8c2cae1ec6e634
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk7jxdkACgkQaC/OocHi7JZ+PQD9GBbUoZnHa6Mpnctp+48k39KM
-miADqzDgH6AcSKdqgdkA/0aoiT/bmj6nkpY69o3CNtfwLWhkCyLL50eBHbZdiekg
-=3aBj
+iQIcBAEBAgAGBQJPoe7QAAoJELEHsLL7fEFWXZ0QAJTmYgAAfjpYqEgPrSIuMifP
+EuDnDpNhhcz+VIESPvyX0SCUrq/ueQXP8GcEaEmMrapsyAw96mrsjsEpffoEAbOk
+Nmp+k71B1X/VKEzSZ05hLJB/jk4nYN9qAGE4aNIxOeOAqsmD+C05hd1rry5F8trG
+imZvHZgxg5zBPGoQj50mjuaFhWzblGCgo+v6LJEHyTvXYhReWJEULVWQf4pfdqSG
+uOBTqkBLlgwPgO7gjvJusj17mKM63hFkxdG+PP9GguCU65WbjvW5qyDZJdyR1uu5
+G6tnQbiSDSKbslnyxvYGyAOAqxCk3t82GuxKZ9bBTXLqxojwRGOLdEZBnhXx1Cph
+iv13GXZrSfxQfvESGH1mcOJo2D3vm9pJG5P+820weigPrFVdZkcnIm18krMzml3R
+ysaaz+5ExpFynHrDCnkjAVRT058uXsaYr44bY9Eg+f9/FiT9OmlatqX0QovzDATH
+AACpV9q2rgmm1Bln+TxzHjTGSiYf1WdeFFqrU29zOAReiRKiunsP4Xc2LqAOqPlB
+Db7p90WkGdNzxQ+1nD6pP+1S21DrPtr/lEY5GP28sTD8C8yEFiPZRvsbMIv5dZgP
+TamPjFqpLB5ugUeLG1yT9AlupdUZLJs6DhKPj1EbnT+UFaPYHKCrCugl7IbgEU0l
+zbquZ7y6oT8stpr01SQm
+=Fm7n
 -----END PGP SIGNATURE-----
diff --git a/dev-util/w32api/w32api-3.14.ebuild b/dev-util/w32api/w32api-3.14.ebuild
index ab64c6964508..ebe267abfe24 100644
--- a/dev-util/w32api/w32api-3.14.ebuild
+++ b/dev-util/w32api/w32api-3.14.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-util/w32api/w32api-3.14.ebuild,v 1.2 2010/09/22 22:20:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/w32api-3.14.ebuild,v 1.3 2012/05/03 02:33:54 vapier Exp $
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -55,5 +55,8 @@ src_install() {
 		emake install DESTDIR="${D}" || die
 		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
+
+		# Make sure diff cross-compilers don't collide #414075
+		mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
 	fi
 }
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
index 62634e0c56d3..2c27a864bc5e 100644
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ b/dev-util/w32api/w32api-3.17.2.ebuild
@@ -1,6 +1,6 @@
-# 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-util/w32api/w32api-3.17.2.ebuild,v 1.3 2011/12/10 20:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/w32api-3.17.2.ebuild,v 1.4 2012/05/03 02:33:54 vapier Exp $
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -57,5 +57,8 @@ src_install() {
 		emake install DESTDIR="${D}" || die
 		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
+
+		# Make sure diff cross-compilers don't collide #414075
+		mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
 	fi
 }