summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-12 04:57:53 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-12 04:57:53 +0000
commitad29148c7603c96ec8bfbc20a1a1356df06ad5f0 (patch)
tree8748eb408ea998c9a4220da9b7ade2e1511b9ed2 /dev-util/mingw-runtime
parentAdd fix for building with gcc-4.6 #419627 by Maciej Szmigiero. (diff)
downloadhistorical-ad29148c7603c96ec8bfbc20a1a1356df06ad5f0.tar.gz
historical-ad29148c7603c96ec8bfbc20a1a1356df06ad5f0.tar.bz2
historical-ad29148c7603c96ec8bfbc20a1a1356df06ad5f0.zip
Make sure we install docs into unique cross-compiler dir to avoid collisions.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'dev-util/mingw-runtime')
-rw-r--r--dev-util/mingw-runtime/ChangeLog5
-rw-r--r--dev-util/mingw-runtime/Manifest30
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-3.20.ebuild3
3 files changed, 21 insertions, 17 deletions
diff --git a/dev-util/mingw-runtime/ChangeLog b/dev-util/mingw-runtime/ChangeLog
index a329ebb1057d..d4a531a7cb84 100644
--- a/dev-util/mingw-runtime/ChangeLog
+++ b/dev-util/mingw-runtime/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/mingw-runtime
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.25 2012/08/12 04:50:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.26 2012/08/12 04:57:53 vapier Exp $
+
+ 12 Aug 2012; Mike Frysinger <vapier@gentoo.org> mingw-runtime-3.20.ebuild:
+ Make sure we install docs into unique cross-compiler dir to avoid collisions.
12 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+files/mingw-runtime-3.18-gcc-4.6.patch, mingw-runtime-3.18.ebuild:
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
index 6f153a8304a9..b7477701cd68 100644
--- a/dev-util/mingw-runtime/Manifest
+++ b/dev-util/mingw-runtime/Manifest
@@ -9,23 +9,23 @@ DIST mingwrt-3.18-mingw32-src.tar.gz 391939 SHA256 de4979fd6eedeb21d2d506fe4880a
DIST mingwrt-3.20-mingw32-src.tar.gz 393946 SHA256 f1869483318ed1df5e15e49b8315173e90c1caa2968c4956b7657854c36bfe0a SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c WHIRLPOOL c66a805cdd4500f142e0d38cd3add06046608addba67e1c0167d96dc4838eacd938c6d38c5d423ab7dd6344070445df5105eeac9bbe3529ca528d02c3f31bad3
EBUILD mingw-runtime-3.16.ebuild 2163 SHA256 52d0172e074ec0c236bbdf2e49bd6ad7d4eadf4b2dab3ae6e71f182245bf2200 SHA512 b4888945150e17e461e4371d92d29251a63325ead9aa011c1256ff120f1176a3d213ef720dc420b2eed728d7709b5ee8cdf3dccc575fb623524337dfb60beb0b WHIRLPOOL be023ad4fcd53024fd02d428ea831e3c01da569644e286a6374f4516e1320ac7749e098ca2dc1a69b450c3500d5decf23ec1b37d12a6abe42a016792acf0e39f
EBUILD mingw-runtime-3.18.ebuild 1908 SHA256 8060b3c07f016989f90f46e318bce81f8291eaf2b87bd1825cf193fd4f294282 SHA512 7f26862cbcbcbbe4a002203369c646e9f76c1723bebdc24b5cec2f5e51c33e5c65d50798ca644dc9d62452a8fe78c3c430d580d96913920cef687905592775fa WHIRLPOOL 99e791cc42716f4d8829f10a151fadf5f929b0c71f400ac0016c4f1026fc6932f3d9697ba20286bd12381bca6f6e2191525623f0e9b23bd513a96b62a9bf1465
-EBUILD mingw-runtime-3.20.ebuild 1919 SHA256 bae082838d020ee9af83d62defebbb53c87e9f83211764aa5698ad51455523b7 SHA512 1380aabc65089197689754facc3227d3d3f24ded86c369496c3867fcafc44d4c471cf9a3aa6d18537dda225c2fbe55c7834c6704e30b4d25b6be00d12a84fad5 WHIRLPOOL 83f2740947f2e4c1ae42c36e2805231a7f6f2119b826ddef858b64d9da89ecd79c643bce5cd06d9368ee4ad6504a9f9a39ed0a6609cb5ec812bd58e863e0fe1e
-MISC ChangeLog 3962 SHA256 2d24d5d5f87a88c7931705a7e26445208a94d4058b266be421c601ba6ec100b9 SHA512 020148c78f862b425163694e3fda781333aa867ab090cd28cb08fcd6b4a4508207bc2acd25d06e80d51552556b9f3cccfb4518a394ca5e41221d18970cc3cca8 WHIRLPOOL 236089a31f9062b7988ecf4cf893cf98f6bfc3724213b96dec16efb231aebbd12b716a3f8cc64d706142ba57cb4e4ebdcaed9a6fa21da70e31fa687d6b96690d
+EBUILD mingw-runtime-3.20.ebuild 1987 SHA256 02fbfd47950d754b28bb82618a474c379af25ebb91fa2e4256285be6d8dbefc6 SHA512 6eac8bc9b6614aa4377df1fda9c2172bcdc3c0ef8f9a995c3b9fd362163952f40888ee9ce3a240599c39e26de3e6bce3de1ad0af2b1975b773d6c8344c7d0ad5 WHIRLPOOL 787f46effebf0090586b1947097346551550375a1d51bfbe4c8bf27a985d7a0b3918e378b2f6c68fcf04d4a39735dd164423d36eaf6aa73377c24f4d1fde4bf8
+MISC ChangeLog 4120 SHA256 d899989fb23331166fbe84ae781886d2da9cfabcd179623fd57ae0ae62259ba6 SHA512 0524e06db0019b1f25a2204584ec9f10f1637ed8278416359b13c70d88004fa2cb2771601195c26219f15f30ad7f3fb66cddcfb2a31faee069d17d57f01b4aed WHIRLPOOL 701a415976ebc3b47108297adf12d92825b2ebc009522f0ae199e24862a247f1397f9c183bc2b9ed83b038c719ed75f12118886c3b1dfeebc6e25183465bae00
MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQJzYQAAoJELEHsLL7fEFW0ekP/0EbeZ5SdkxCPszP/Wo8lG/0
-5F02E1fRaFRwGNjcjOwmJOunCapgT+RbkTVT8Ejn6GWYc1hMPFe6Gw49Mo6R9W6A
-CSYW4Wdgno9+Py88vEwmo9m9CZcItxAZvl1UFv20dif0GMYa9Xbi//AZ8dxCgi+F
-uR0WqgzKcZl2saPzDB51JWSdZ1OzEK2hNoMSuhHPnGai1axVQjFZalnbe+e+AvHC
-vl9jt/a1/0F6OR/fN7QjOQeT3gyYy1pq5En/vgWE6iG1d96XH4frAIHaleSLOvUG
-Jx/Yyeljho4FtDiOpCn5wPg8RO1C7EFcwBnA0/jjw5tj2RhRySO8HInPpJME4jR7
-Ib55mGysLAp4MyHhR+qaGFkJwjYEhDTQrWIR5H6lUmBGrmjz7cLp3/HY+qYKZItl
-JFKUM6lmzDFsE9jfDXzS1NTcWXElrRJiceq/WbtFghiAC0n/2TdTbW4x5ceYJ186
-42dEmOlXmfvHr3b9OgDrRw1bqhscUcrDP/wju/7NyyK87DP6qWXGoPcjUIRkMr3Q
-5tmk2kkkrJlfaMMoAuEPloW7JTxNLD7wz47kLHKGWnptKc0IroLhhKqqLKqzG4i+
-IUbP3p2Os0HCPe893sO8hJ6keH01HL6G4ROtzZEkBDtVqQxmsLy/YvuedV/CQwpY
-+lKpXB7UbKWhkOZoflw/
-=H+U9
+iQIcBAEBCAAGBQJQJzfYAAoJELEHsLL7fEFWRbwP/jZA4VWdLp90bcSWky+Fh178
+ZjWCNCPweY9R+QuyN+jo68Gb7fnv22BhWnV0lLB7lwJsT8InPN2pwbCjiZG6lSih
+9RTc/mCizBMuXt+1enN2Hkeo9DA4lb2AGltuP0CNkfHPI6DBEaUvA0Tis6rclK/C
+6TZNkJAhval/GH6JOaUhKUNUC9YgMHSwysUsIkZHyLXOZEP2WmkKTftf6NAHQ2Ay
+WjmgbDBbLHvrHPxeHy02uYpmMFeSeUBj2ajWhN93Qh15ZW+K4z/yb1/euz0NkeHW
+mykrkrD8LKFzjyk8vAEyQM0qmIpM9Z3+dPtx710lnByX+NnjIi1fgqsZ+mWG5eNe
+pg+z7FfGQj0bxDL1z8vXbl1zWGpiPf6bE93svA65YdqMJxZ0dyJ88S3O3ujOfQ47
+3U/jxj15eshOvsIBNMUk8usIrKoO5bHQCpNB1InPwniXMFG2GQbpfraPgeKcRU4r
+1xaZvm4EdvXWRFBv4Eukr+G/xAD7gSyw7uYrbT2vK3z+wAxpwRbNp4W88XVF5t9B
+Fpu3T7MEoosrFh12g1AH49VNXi79MxSUV6HNF3UghO9WrBOl9zyVHiR/un3k4vwf
+o87xS9C2mBZThmxGiWeOchQeCZlBeKnYy9PAgGUseGIOF1g+Aadj7mZxuMpg2xH8
+wjANoj9r7CtpA8JDSAwu
+=tOFN
-----END PGP SIGNATURE-----
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
index bffc787abac8..960fefef7bd2 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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-util/mingw-runtime/mingw-runtime-3.20.ebuild,v 1.3 2012/08/12 04:49:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild,v 1.4 2012/08/12 04:57:53 vapier Exp $
EAPI="4"
@@ -70,6 +70,7 @@ src_install() {
emake install DESTDIR="${insdir}" || die
env -uRESTRICT CHOST=${CTARGET} prepallstrip
rm -rf "${insdir}"/usr/doc
+ docinto ${CTARGET} # Avoid collisions with other cross-compilers.
dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
fi
is_crosscompile && dosym usr /usr/${CTARGET}/mingw