Fix building with gcc 4.8, wrt bug #464280. Thanks to Patrick Lauer for discovering this issue and David Abbott for providing patch

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 43 insertions, 24 deletions

diff --git a/app-editors/xmlcopyeditor/ChangeLog b/app-editors/xmlcopyeditor/ChangeLog
index 82afad44c2c0..215f490da4ca 100644
--- a/app-editors/xmlcopyeditor/ChangeLog
+++ b/app-editors/xmlcopyeditor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/xmlcopyeditor
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.25 2012/12/03 19:55:30 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.26 2013/04/05 09:27:25 pinkbyte Exp $
+
+  05 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> xmlcopyeditor-1.2.0.6.ebuild,
+  +files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch, xmlcopyeditor-1.2.0.9.ebuild:
+  Fix building with gcc 4.8, wrt bug #464280. Thanks to Patrick Lauer for
+  discovering this issue and David Abbott for providing patch
 
 *xmlcopyeditor-1.2.0.9 (03 Dec 2012)
 
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 78131cef7bdd..f94536eb9a98 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xmlcopyeditor-1.2.0.6-gcc-4.8.patch 436 SHA256 64fe3c29734a5c4c4f2e1f8215988ba053311419a6fd53ccb5e7e0336b57e8d8 SHA512 eb7ff5d7c98633f1973bae3b087a0b97edaeae9e3a717b18f6665b22e460859c3363ecf79ca9540e44ee9e0e24d89852e5c240e766d04e681eec711a10764fe0 WHIRLPOOL 1d89125ffd7cff6b14ee24b8cfad373a0f85521df537b133d60f8c26ea80e032905ffb1dc8192dd3a531764a1e5e9e31f3eef76b1399b641b8e981a8b3fc5780
 DIST GuideXML-templates.tar.gz 884 SHA256 3ede041b74a64a3f262455728486a616ffb496fa0d6f3c50610387d9de0d742e SHA512 1a303c8f0664d950b89430f940fc27b8cc4f3b76d076437e62edbc736c50bce5794a7178a2c99712a29db4de7e9e8b03c0f598ab702e4289cb77625d5a63ab30 WHIRLPOOL 6094faa76f1b731537e5d254cdd33a98830c22ad4fb99817fd8332b59a03451bf9e3c14ef2fc71c32ed2c74bf1c1ca132210aaf3b2bdeb4342f2a0fc24505f6f
 DIST xmlcopyeditor-1.2.0.6-2.tar.gz 1526457 SHA256 9a4ba41d67604d303b1728877768f9e3ef85d56e6f580b0eeef840e12b84f02c SHA512 9833a520ed835ea1bb285ace9deca3e309a5b31fd923582f79302cd1b81e5caf1de39296efe6eda33d329b2c40aabb10bcd7b476e61d8b3ea6e5aac43b361b72 WHIRLPOOL 9e79075e4a0b325a08b9784a5bcdfdd414390d161440a47394bf63ed5944e700fef4c61e6e29c508ec7bfee802f527a5b393824d48ac82bd55527231ba341916
 DIST xmlcopyeditor-1.2.0.9.tar.gz 1815995 SHA256 850df750f3561320f6ab1b612e00cd2b9ecc2bed49ab1dcc261af78d0a28b7f7 SHA512 a375476fe1140a2089e7322c9d219ae3440a3b971947ced440f71c72e99b3b3998419bf34303df3e6093378336b2d69652c4e7dc93880ff40d8c3fac48103eaa WHIRLPOOL 75bbd422c7618650d183eac45f24871a80bf8cffcaa9f3d320d7fcb0a282cabf1f14b9f825e893373b85d99bd6c5f58db882a91eb427c9775822ce417f5d5278
-EBUILD xmlcopyeditor-1.2.0.6.ebuild 1463 SHA256 f8fa9885d6660aed0a662f81b85ad87067d1db9f73d74e0032957a7b125997db SHA512 fae2ea5da8960c2dd0cf0fd5192bdd6f9c3b2e3d963118878e5d4e672a6ab441a84d29f7b5fe69a7797d42782225cd59bc4943c34daa14712ed7098baeb17a55 WHIRLPOOL fdf672f72c1354608903bc91de30f1592279419ed51ce229d63d24b95b67afaed4c195a88c353ca50994d202196519e27b09a5402de87879bf166f30c8e9cc01
-EBUILD xmlcopyeditor-1.2.0.9.ebuild 1454 SHA256 c66422c9843cfb5e936a2a2dfb7d1e40bed98d7fb4bca561ebc652d4d0e66213 SHA512 80faa20092f5ddbeba56bd9c950d511583af7f36b0ec21b4cab708476356308d94f0422bac07dfd2bd5c3ffe05a7dd2e8c2dac2036a4c307145da3eb43c52b48 WHIRLPOOL da1977d74c624182065e3d93592152e23d53387159b311afa00a83e80a1936f75eb336c721e45385c11b19835b7c92a65c55be0ea497e0c8e13c70b3d9fd63de
-MISC ChangeLog 5086 SHA256 db5cd722a144096451460e6f0826fba5c448abd898cffe694922355de9fe1919 SHA512 b6cdf8d790c8bf38e3d7796c394358d2ddee19f230896ba5fbb6a5bea9d4235b97c22390e8c4c06b8b8421cdd149bc6e6ae903fbb8826048e10aa8ade1c2c867 WHIRLPOOL 6ecba6de63f08044152304f231dd987e0dc582d7599e48b1a2717e549fae8dd147abe59c297c3ba051e092817d27124de6dfb5e72b59937a356e517ab7f5af5f
+EBUILD xmlcopyeditor-1.2.0.6.ebuild 1527 SHA256 ae831de231ed7b58112569a0dc6bf6470b45152e0a8e0e2fc52903295c3ac443 SHA512 cf19c711bbc9ec190fb1f4fcbb86bc62487bb4de1c76ccb704c7cfe9ae53837ef24b45f1aa8aad3d7e81bc43c4e1eaf5d11afe334d0699d1a544430e460ad83b WHIRLPOOL c7a4e286167c833ae6709263e40f2aefa1bdb328c5cb3962a424f36c73c10a8268ff2f5736f6d0dc72b667625b792cc4f2cd64ec2caa509745ae2f3ce1947cd2
+EBUILD xmlcopyeditor-1.2.0.9.ebuild 1527 SHA256 bab26b5fab18ee9e24eedeedad5a0de1fe889174914fc7d5a202398cec4b19fa SHA512 712b7ba65600adbfd9fe649cea40423fb8b06e38373ac160d3f4eeff00fae1e040a2ef032fe582b1c531e94eb88762ec2e97e41eecdf8ecd6d0c041a39e0ec69 WHIRLPOOL 5b53fb49359f49013374c07c37f7ca7b9caab7185f4c48d1623c2c42389bf68cf637a421dc756832b3af4e6387a935aefaf7651339dfa2cefdd875236dae1a59
+MISC ChangeLog 5379 SHA256 eab82898858312af68f9ad79163be9b734af1944c7c37bfe7005c4d6a534ea5c SHA512 a6ac156bd285f32139af61f4f1dcab4fd1f0e227c4b6be7421330d4ca05df3c57617ef34d1314572728094ee700b8014e147c2dc6c5f827b0eb4818c33e88518 WHIRLPOOL 684f58b6cbb296af260603ed72997b5de9003c8b9a5e531cab65d055cea2b94bae97a70ada31bc1d016eedef730ae94fb66a0f547017166c87a090ac3a3f4bb8
 MISC metadata.xml 445 SHA256 d980d410811811f848e3afe5de8b4e06cd3997d66a42dad90046a46776774ab8 SHA512 281d19673680a616f2c0eba5f84f62c49004648d5308a0edb9fdc7dfcda4dc37f559fcb980764866ce4e2c783c7db9dc36d0d58398854be3ffea7b3a08976af9 WHIRLPOOL 141fcff8b42a24487202ff745613130090c7b8a2abb88dddb50712846a482bb61579383c3bdef58f9cc99d46edc6a8fa0067cab9e9d7849e267a2da9198a34fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQvQOzAAoJEPqDWhW0r/LC5Z4QAIWfuBFrXjp1jQmDgicpVh1A
-KwgGtcsnLXMmIIc0GK9qBSaW+eepWzgISBqpsF4eAl+Ozg0Us6psbQ/ngmU1oACO
-0797gJmEPMCQxLo8dTRGGmQJOsbd2AVE8ipt4FJ4CYqj9htWd5Gcu6iWA/VWrpfK
-PrFBME+ZiGh2CVjfg4sQNg1Ptg0LQFn7Mddem150prc25kKFs22bDVi+Kfk5wMZq
-3ygKN1XXUd7B+KpblXEdnBaWYFpvkyee9sFDrPNsSzmLTe+dZADvbtwT3aMBPt9l
-VKHtgVgtpqgkDk5fcwZIOALpY+ieMscViKVR1td4beCNPFxDPEf3WaAzAledyzrt
-mmUIdlOE9SlrsKHsFBpdBiO3WZT0txLlNNxEWucSGkS+zCvm6A4p4hm1TNAQ3qx0
-7Y8a/gs/qvoKOsfOilDRn7j5Li2mwNZoPhcequDt7p+8ul7Lq0NQPEm+EXCo2XD2
-hc/hfBD/pS7kWDHpxCVxLSqxtol1rDcKim0A5UEiDD7OR08gaE70lngIqfysyURy
-uUAJGy41MvKox/0y9HvuIG2x0MAvIhbhmNlP1KnhSKDQ33Sunzp8L11jsZgPkJUs
-qjWbruvPdyASSLDO9o8vgXZluj1XO5cY4CkJNrpgPUH+ghPCFmdgSL/kpi72YfYw
-R/mL7kxupNuRARxrtBhn
-=/FKs
+iQEcBAEBCAAGBQJRXpj0AAoJECo/aRed9267GcoH/1OaPqgYGYR/PZ2Dl0HdqxFc
+Kn32s1ZnyJHQ5Ih2WATFO7Bm9XRMVwYZ4qfY0UsEVzRRzitX8CLdal6EVJBda8KL
+iqbe1nShwBxsUOHRHP011gO9t8hEtMwJWNHUDXACaZ2DvwNYzzuOUqz7Mczf2Bqq
+UudwopEkR+fSqXdSJ+FLY3G4qPQmCy3AGJGyq2+g0b464UnfYOwoaDFseRD3Cz7y
+Cu7aRkZv/ij/HXRBPXu9gOrleegbC3/LqTG07J2w0oLeAJ+eY+C9TfK390eZvrZu
+ADrAsWaqul2rCaOhyOIUPwAN+gnpKBdv0SaYkzOzxiUpNiMjokdUHhyIcBD/NqE=
+=YJxv
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch
new file mode 100644
index 000000000000..4367cee1fa0a
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch
@@ -0,0 +1,13 @@
+--- a/xmlcopyeditor-1.2.0.9/src/housestyle.h	2012-10-07 09:19:52.000000000 -0400
++++ b/xmlcopyeditor-1.2.0.9/src/housestyle.h	2013-04-03 10:27:46.784455182 -0400
+@@ -68,8 +68,9 @@
+ 		           filterDirectory,

+ 		           filterFile,

+ 		           pathSeparator,

+-		           error,

++		           error

+ #ifdef __WXMSW__

++                   ,

+                    aspellDataPath,

+                    aspellDictPath

+ #endif

diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild
index 1588ff082ff8..41f64eef8079 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild
@@ -1,13 +1,13 @@
-# 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/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild,v 1.6 2012/11/27 10:13:16 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild,v 1.7 2013/04/05 09:27:26 pinkbyte Exp $
 
 EAPI="4"
 
 WX_GTK_VER="2.8"
 MY_P=${P}-2
 
-inherit autotools wxwidgets
+inherit autotools eutils wxwidgets
 
 DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
 HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
@@ -40,6 +40,9 @@ src_prepare() {
 	sed -i  -e 's/ -Wall -g -fexceptions//g' \
 		-e '/CXXFLAGS/s/CPPFLAGS/CXXFLAGS/' \
 		configure.in || die 'sed on configure.in failed'
+	# bug #464280
+	epatch "${FILESDIR}/${P}-gcc-4.8.patch"
+
 	eautoreconf
 }
 
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild
index 6c6e3ea9d731..3dd53d3611c1 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild
@@ -1,12 +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/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild,v 1.1 2012/12/03 19:55:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild,v 1.2 2013/04/05 09:27:26 pinkbyte Exp $
 
 EAPI="4"
 
 WX_GTK_VER="2.8"
 
-inherit autotools wxwidgets
+inherit autotools eutils wxwidgets
 
 DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
 HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
@@ -38,6 +38,9 @@ src_prepare() {
 	sed -i  -e 's/ -Wall -g -fexceptions//g' \
 		-e '/CXXFLAGS/s/CPPFLAGS/CXXFLAGS/' \
 		configure.in || die 'sed on configure.in failed'
+	# bug #464280
+	epatch "${FILESDIR}/${PN}-1.2.0.6-gcc-4.8.patch"
+
 	eautoreconf
 }