Fix building with gcc-4.7 wrt #421871 by Danny Robson <danny@nerdcruft.net>. Thanks to Rion <rion4ik@gmail.com> for suggestion regarding fix

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

4 files changed, 43 insertions, 20 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index f20ef7101141..8d3e62139a5a 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/nsis
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.38 2012/12/16 16:35:10 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.39 2013/03/03 12:10:25 xarthisius Exp $
+
+  03 Mar 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/nsis-2.46-gcc47.patch, nsis-2.46.ebuild:
+  Fix building with gcc-4.7 wrt #421871 by Danny Robson <danny@nerdcruft.net>.
+  Thanks to Rion <rion4ik@gmail.com> for suggestion regarding fix
 
   16 Dec 2012; Ulrich Müller <ulm@gentoo.org> nsis-2.46.ebuild:
   Fix LICENSE, see COPYING file, bug 445656.
@@ -165,4 +170,3 @@
   +files/nsis-2.21-config.patch, +metadata.xml, +nsis-2.21.ebuild:
   Initial import from Sunrise, thanks to Cédric Krier <cedk@gentoo.org>
   (#136035).
-
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 289d3543d030..065e3f66a69b 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nsis-2.46-gcc47.patch 357 SHA256 1655c47013e49a5811440ecadb32004b1fddca109f3ce3c50aa78a4e22124e48 SHA512 a560c0318928eb246d42193318b7302e655913f13f8f3ed280e25278259e4b9ddefb84a7017b5496077ef37d7ab6c75c23944a4ccf4a72efaf6b3a0e23bd4e33 WHIRLPOOL 1c48e0630ad68016feac6e654cfc002319d88288f1b457b91e6e5b2c281068f80f115f3a8fa56daa49197bb6de81a05a502e9dd3ab19ac3486538aecbfdfde09
 DIST nsis-2.46-src.tar.bz2 1499014 SHA256 f5f9e5e22505e44b25aea14fe17871c1ed324c1f3cc7a753ef591f76c9e8a1ae SHA512 8716cf6dc086d8b9eb3c707b3a65790bf2e2b41116243d86243514ec6b2db7c508dedef027863bbd6650b21ca5f94ef7dd6706fe14ddc151c4548ecb15858ee6 WHIRLPOOL d716a7b78b20517dff420f57ff820a5aac4654d77a3a0760ee7512aff12d9abbb8be20da888968b151571363ddc1b8c3b02cc7e51784c95ab5169b8a1ab424e3
-EBUILD nsis-2.46.ebuild 2835 SHA256 55f5b571ea11730e9d961709b7fe8b02d34e2924305cee9ad14511d1a804a636 SHA512 feb4b8e0c15c26678f37e11d2c703cefc264a9bf9ab4182270c9123acefa902b4c6ff9e2442fd0866d0139d8445030a83de602190a7c3000628ae006310c0f14 WHIRLPOOL e0e162654d09759423684d2b39a86660da2276ad2874aa80915d5ed10e609a0e02acc76cef1b8f563c18734fee9c03c437db60fea0de66ca4a605ff8198b8edd
-MISC ChangeLog 5243 SHA256 47084507f3d460ff8650303061a7216d025901982a477c3d81c9aed65014da95 SHA512 304a456b3a2759b429eefdf839caaa77942df1acbf6b5d7b55155b01e8c34ac3546429fe878eb52306a2227888710a1b1bc095d47724b4ab09e4505a844919f8 WHIRLPOOL feba1b874a2969aa30fa1c5fb623134408b6b3e5f0365c7c62df463b86862634c76f1393782fe6748c2b423b30bcc1f0e06a7a4cf662a3d4f74340f8b4ae0b5a
+EBUILD nsis-2.46.ebuild 2897 SHA256 c875eccaa126d266df2c769baf8162f871d73dbdd075b12f6f424472fc6bbf18 SHA512 1571feffba54e28c9fe0babb400bf0ecf5db233ed830b0ea7251732ff4393eac3b8fe174ee8029316661e1dfff5f10edddf2a22c238505e056746e7f45543f97 WHIRLPOOL 0f88d059c1f698948238d4ed59974ec960e54273cab6fcc70ecf8b2cb9bc007ad82de3c53c10af13b5adc5dc390bc584621c6a97768421562f5f71dc9a0acc36
+MISC ChangeLog 5499 SHA256 2c2a57ebf5104e4d6876f5abbb2ae34e98596d75473fbd4fb1c89cb77770d098 SHA512 03495fd8c6f8427b0fe05f2958eedd482f78bf1d059a3c18fb158fb3daeacaada32ef6780e9f3d99380b52fbc7d370a1c8dbca579b25030949c2d81175b498aa WHIRLPOOL 6ac59e9bc47da3776377cfd6f1b8e7efedf2c1724806b7d8d05b050b21d49517db216f78c72582f58187202073e4caaa2815419140e14c1aa39f93491fe311fb
 MISC metadata.xml 901 SHA256 e997096c641a2fe4d573b5375b578d625a11352e5cb6d79fbfaf79c02038c4c3 SHA512 2f9e330b1b8dd9b0076b9d0fbd636ff0c416f059cc785d1bddfa60c09272bd92b87cf5a9a70964a32c279f2217a50f60eb88b9b9e465905b22a1cf6778b3b86f WHIRLPOOL b102ae254db63d91c0279594bf74a1878bfd585c7a4f483658804857217ad8398473b512ff1d41419f6b912fcba921f3ce479efe9fb6ea4517d155020bc3117c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQzfiyAAoJEDxpGckxwJCB9Z0P/jf7fd3njTP72yGd06cqv2K6
-VoDnVLAtfSs6QsjbXI94He5OPvcve0DW5hjc3w6bUigAkqPMpqt+uoE4i3+5GrGT
-E9+3A0ZdJ+kQBJlRcmt2O0kbsEZIr41B9zqf8+lXLMER/J5Vr+iW2b9XieXbFiTS
-gkpnlhe7YIzWisQCKBZcL378TPhEsQah5fEGtaC3ZEaWIBO+Swy2YAHQOqlYR88w
-VPTwwlGXoYL5VUMfw7bDqAvJw8RjgrL0+MPHV2Xyw934NDtsGvl7fZoXX2uoX6mG
-QFNJNsB3eM0OW2YfM1F8Kf8V7WThbMypyvQyQRV+fx4LO552V5i2ws5lK7MauNAw
-zYmoBdrR5GnIB0CFRuW6rzx2Ou3fvkTkpc2/jh2Q68ztQgfiBFIUvrvjOa+as/wK
-T2Cs9VQIgK1xyxD3+ISpfj6D618MlcY0ewzX1LC7keeMFPSHEsn+FPZczfOovOmu
-z0/mDuCVhCoktfcHtfUSVj2y445/frsw8lt00Icv2kQu+HeVcy8qYvKYZfoYjxBO
-UoX+sAVLjNPANzYKmkLXyFw3lG9PtEDBB7Md/emS9xtDugsMB7LpQctdloV8qozd
-20UsUz18Dq0/iz55qEDa9Bo7gyEJGMOuoxRbJMGjX0ukwFClcZvm6phzhGLXRnSq
-7eaGm7w/2L1J4vCAYsL1
-=BI53
+iQIcBAEBCAAGBQJRMz22AAoJEF0huFKJUZL5UxcQAJJwe4U1KjSf1Miorkkuzqwm
+JOlhaRRQiQU6xEBgqB8fha04v01KM0uzKsCVOaK8GqrXXc/lbWWBhFvie7WZxSWw
+dGUEsPshLrrSyy5R2p2HX1euokknamrrXY6IrGHFgG8HjU8mSLmjKLuJfSJYXpCY
+b7UW61/8kltK6YfFv8ifkwDFOkuccOoQP4nxMqumc/LzkYHRCNIgr8/dq2HoNBpV
+ZxbrVm6nfg4VHfuHJqXcWERmyN6i7sX8uLTKCkM6u5HtBLaGxywDW2kBna3VXwtu
+r0qk9JW5arcRRlfnMRjB9q4SgL1zKB1fRIq/WA57RY4tO0QSMq/oXVrpK/QKYeN0
+m3Q0pg1f63lm4CBEhShdKhxiwAY+0ytuy0MpEJDuiBiN5134vpgIWKHQyzNKhROa
+euGGjyzluXIEAyYI6dBHePtWboR8oukv2PfJvEBBwwUS6h6rCOMo2FSmlcBHV3W5
+KEn5TNj7p7qwQvQpYuIiJ691j5oMQEjMTRYfhsl9A/oIaOekcX/RJv7M6vkTlqBJ
+SSD5T4/+6dTWEKdRbUZCuCz3nh2hV/HCsQmQ1tGQN27Ihdv4Z+3DT9Dq9Ipy/CyD
+Ant1P/xAjlXpNM0c+mq39obfHBlQkYGXd+G9NCKVqa7Qgcg82phBqhH1fDuG38yY
+BMxQNGNkV+xlr9Dr/Z6d
+=2M/4
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/files/nsis-2.46-gcc47.patch b/dev-util/nsis/files/nsis-2.46-gcc47.patch
new file mode 100644
index 000000000000..e64a8b6ba43f
--- /dev/null
+++ b/dev-util/nsis/files/nsis-2.46-gcc47.patch
@@ -0,0 +1,15 @@
+Fix building with gcc-4.7
+
+https://bugs.gentoo.org/show_bug.cgi?id=421871
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/Source/util.h
++++ b/Source/util.h
+@@ -18,6 +18,7 @@
+ #define _UTIL_H_
+ 
+ #include <string> // for std::string
++#include <unistd.h>
+ 
+ #include "boost/scoped_ptr.hpp" // for boost::scoped_ptr
+ #include "ResourceEditor.h"
diff --git a/dev-util/nsis/nsis-2.46.ebuild b/dev-util/nsis/nsis-2.46.ebuild
index aa3fae85b7de..29bb061af6c7 100644
--- a/dev-util/nsis/nsis-2.46.ebuild
+++ b/dev-util/nsis/nsis-2.46.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.3 2012/12/16 16:35:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.4 2013/03/03 12:10:25 xarthisius Exp $
 
 EAPI="2"
 mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-}}mingw32)
 
+inherit eutils
+
 DESCRIPTION="Nullsoft Scriptable Install System"
 HOMEPAGE="http://nsis.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
@@ -46,6 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 	# a dirty but effective way of killing generated docs
 	use doc || echo > Docs/src/SConscript
 }