Fixed compilation with <gcc-4.7 (bug #498776)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 40 insertions, 16 deletions

diff --git a/x11-themes/qtcurve/ChangeLog b/x11-themes/qtcurve/ChangeLog
index bc100988f86c..b4575b3b4d7f 100644
--- a/x11-themes/qtcurve/ChangeLog
+++ b/x11-themes/qtcurve/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/qtcurve
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.85 2014/02/02 17:25:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/ChangeLog,v 1.86 2014/02/04 14:10:09 polynomial-c Exp $
+
+  04 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> qtcurve-1.8.17-r1.ebuild,
+  qtcurve-1.8.18.ebuild:
+  Fixed compilation with <gcc-4.7 (bug #498776).
 
   02 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> qtcurve-1.8.17-r1.ebuild:
   Stable on amd64 and x86, wrt bug #498660
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 35055fa6847e..aae793d16575 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -5,20 +5,27 @@ AUX qtcurve_kwin_automagic_fix.patch 1556 SHA256 f1023b308bb44c19f5d60847f3e8187
 DIST QtCurve-KDE4-1.8.14.tar.bz2 383313 SHA256 ff2f4731a0fd3c0a246a4c9099ac8a117bba463fd7cc00490acb6525ea463404 SHA512 5f5c6449d56c03a901bbec9ce44433b1919139183be75df5fec9d35a73f2c31d8b845185f542a2f9c75e4eaea251d8f07e0ddf05fef4fd1cbf32cbaf827621d9 WHIRLPOOL 68ff3eaee0b5e4ef42e7588428e9c036307ec1cf80cb443a37442baae2f8c4e6f107558c0c1617eb72e738a4f0803a4ac1e93e9e888b76411e30559118c8ae5b
 DIST qtcurve-1.8.17-old_config_file.patch 1000 SHA256 fc744d2bc69b8e9008408df0b83d358c4036ea944aaf4ad46ff02905e0d8c87d SHA512 53de2692ba3a231d5a209f518291da035ac72ddb421073dfcdebacaef130f5249a1af7d05992a26be640641f50194f12ab5f710ea9651e749b839657411f4426 WHIRLPOOL 8afa96f0f32481387622e60ff538cd382f7c1f18d6ec8d9bfdbe600edf8060c18129206a8d792174b8844d0aea60b66a72e2caea196d2c47e3af139b0b146365
 DIST qtcurve-1.8.17.tar.gz 961958 SHA256 d673925f4f24ed7caf1aa722d2c9daeb4b3a383753b332b563153a9a288dafc7 SHA512 c8b760737fb6b4958ec3618b54f5277eac12dfab31f892b68cb74daae279afe721d14592c5dbb8fc376bad7b99d4d637be6a58f6fd296b61ab199d39768787b2 WHIRLPOOL a82ab899bb0ac2efbc3e76de7554f831f8d66a3c8eeee702a1f91e8deb7028f51b1ad2871d7708ea3a102aefdef0bd4b1b92237d3b12d87c473a414fec16affa
+DIST qtcurve-1.8.18-dont_use_c++11.patch 1096 SHA256 09a9c42bd045dc9161881fdfe62b854d8577fc57e00a245ae03fb00a384cb82f SHA512 3228e4e5babd6a309fca02c4a103500acd913f40364e9dffd8238aa05377f4d31c3b2ba2c84427804de909712a2dd9b391e9f84206fca5146dbadc0d96183cf7 WHIRLPOOL 23f4e2d568e6a2331e2f34f8c3061c1f4171ef0b39e74a56da44c7d761626eefc2a5ff0fa39d4983d8c99742f753ec26dcc2287320aa8d43d5cab9a0d13f2245
 DIST qtcurve-1.8.18.tar.gz 991195 SHA256 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6 SHA512 0ba7927db11d1f2d7bad08fa923d3f0f2167d89fdf0d09bf0b677ffd4f2cc547c22890c87b8f18495e73f8ce21ffbd40899792a512dd9e2a481b81a52abd84eb WHIRLPOOL d3c7dc0c08b42deafdd5fcd513dcb2d9ea9c52ade8090d6cc022315ac80b1ea196a8a763d9c96096ee645f45bc329b837f23987bf7229c718d2a5811a35c68d1
 EBUILD qtcurve-1.8.14.ebuild 1206 SHA256 1bb9e86e90ba4d5b41586e977abe6fe77ce7f86c395440eda832de332b88a643 SHA512 081abf894e812479e9afb2834ff8eee05abda59ed6039c69650234b94d4534ddd7b301918a1e2151c5550f2044354e9f6925eb47d3e821df816539fd9a45ccee WHIRLPOOL 9736335e33369ac47a8b0c38be12cc69d51b34696d409aefd107af1f6a067e3f9b2748e00a7d02b1293c4cb55aafecb68af4f0f40d9ad8407d6dbc26ccca8515
-EBUILD qtcurve-1.8.17-r1.ebuild 1903 SHA256 8a008816c47dc2ddd1b94f8af2eaaa3d978c604ad9b959df7e5da60c476e211d SHA512 67b64905949f7c3285f145bba156fd539a3719ee3580ba15fb4857b1f31302ab33ce83fc3faa81cd547e6636713348744e8722e556c7a0df91fa352f6a184293 WHIRLPOOL dff5b5e461d840951d9a5a4e7fefd2c033b420b461b3e351ad325062528c48d5859e530b18e8789c3033f2a0de72e5eed240b67100de4becde7ca15252dfd757
-EBUILD qtcurve-1.8.18.ebuild 1740 SHA256 bf54dc20450fda7d6add9eca480d3a6ff630ec15bec0decd48e5cca024c72d09 SHA512 90609a55532226cab4930b86c5d3f65a2f9f092ac6aec779657e5e4417728c9fa3d176d8091bcc2e0e8f57ec7eddf45b1e812584261bc9ba2e623ed9748cee57 WHIRLPOOL e1803c6c890fef85f8ea895f6c19c8edc24bbac0382af3013f556eff33c98e126ae02224e38f855ffaef7db8e1a14d80699a2974af231c643aae916fc8d4baf6
-MISC ChangeLog 1810 SHA256 d082e6fecbf3987240981a2df68a23726922980749761aa222ec1c035d9650fd SHA512 20e71f4fc72a7897a99bc2544ad4d9eafad42c72b0fe2ccb93e96f07e2ac295ef7138b8ce0091300ea6fa973f8085e77f3334add15d287598df8105d7915a236 WHIRLPOOL a094feeb7463afc466c6db40980bc7ba9915e83812b0b4a7679fb9a6125bfcafa61cfda317eae954fcea67a266d1a069d3e9fb7ae584ff521b63072a06e70ef5
+EBUILD qtcurve-1.8.17-r1.ebuild 1997 SHA256 ade5b93187fb10e8db27a7a39b483b1e2b6f24f8e1ff008cd7c73e05f5a9901a SHA512 605802a0197cbf420af19d7d559602b6f08e3778e26b54476855922ff4d10763be2ec0d108d2d9d4b7b572a8c3e8e6af55dc28d20cc62fa5f22ee497ebcc006b WHIRLPOOL 0071d8053399adaac29a6116e8a8785b1ed7c760dd556718896e63a845d8396cfe55017c629fac10c25b579aaa7bc547d01430c39d39ce3dc15111d46836f7ac
+EBUILD qtcurve-1.8.18.ebuild 2010 SHA256 59b5befe6402dcadd01c2965abdb0c80d866db9e253c7f57820cb700d60d25cf SHA512 5e5b354edaa8e6f4400cb53b24724bdc1f0a8e859f308f73ad2b0f4d6faa97c01d084b6215412df30e9278e8b2a30191df6c7056aa38b6480b18b0683654e528 WHIRLPOOL 348b6845cf3bfab8dd19b15fd33b4b058b40f6afce07139f45c648c95c2fa68f9fe7f6c3595f8e301c9dfc24b439a7727200f8adb21e5f7367125b41719322b1
+MISC ChangeLog 1969 SHA256 80fbfc2b5bf76c69abca5098442e65d0a5026cfb3831e16d3f017fe568e48f34 SHA512 609e8c4f2a196960b30c472543f6e52b691441d06120f56df7a4a01af6b287a9f211e76c91f56bbe6b06a39d112e5f2024a1b2599d1426d72eb91cce7d6262a6 WHIRLPOOL 394004642b2cdfae9b5419c834a8deadfac494005e1bdc87b24bfe233165b11b94b9969450dfdad4906850309551241c9180efab11a36f51ba3e09cb57f7d51e
 MISC metadata.xml 464 SHA256 c42f1a02728c330d5eface146f5bb2fcf4b8396f408aa58b80e4067b56a9c1a8 SHA512 327d4c6e7e5bccebb80dc4d5edbd5ad8727f1ba07aae83df71e539c8e115df59726b7004cef57af5b5107bed97e02c4d63fdad21054511ede8ff3e472636fedd WHIRLPOOL f257a43ddb399a1509a509cb537b7b651e18521d11f14e8ef93c22cde69628cd9fcd38c85ba7f8584aa22a263a0addc38127872760f90f294476f7c5c8851a0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS7n+aAAoJECo/aRed9267PmkH/0Z4cKvwmY+lZxsGSLfZbiGg
-Z8eAh0e7AuPfyoyjsphH9RCBBLeIR+1qh4L+/RxFn1ZSkWO2WpwIEXgSpBkl+F40
-9LHBpFnsgl7JddYoCC0ltgAWSIDa7lysxvhsVfsR1+txF1UULVCIPMzAQzI8bjrj
-0r8Xg4e1K/8+5P2/mhJx6UldJMAM4s7SYUvHvBXlThPaLMurs8k6EoCnp4NI0nhJ
-GbKrawgLjdUwWQVORZUioYoomFt8WONSnwq5TBzRpNfEEJhrylJSCjeVteeIeJeY
-BrcILfow9Km2g3jjAdjoIotFN0X/c9S+DMcpPH2dkx6bn44vdsQ4q3r+53aDMgI=
-=UAD7
+iQIcBAEBCAAGBQJS8PTCAAoJEPiazRVxLXTFd+gP/1zD4fd4Ow7URwxu8wELkle8
+N/psF2h679XTGymaA3WqsMY6Tnxfmi96Uc9Aopne6WCuQ/2/Dpom08LQMedPFfMv
+PA7i+dc+899dXQejwGOxGdsJ0Ve0EY0YuIznhRO6/ZLejy/09iJVSOFv5Qypxm1+
+afhe/0yw0OtMtB9Bkg6UAkswl2qcjAAYwigiHaxcFdEzDUzA4zYtGOZow42txUYz
+JHz21ovs2rDReb30c0jdUCfPlzdnQQ4SerPMiHzXTgjlji0k9ottu87YU2W21uvL
+yr+Ir3LdutC7DZbTSU5ZSInlNUsq7hPj6ycVxD7m8L4qbLMaslHSTRkYxzvb7ixu
+x/mm0XUCC/rv216VSzdBRJ7zq0RCPRNm7UcfFpIuoY9/lqRpf0nPdk4a0b7pPiQY
+3j27LNhmcXoc4aE4LOucbb9I43UY8V8L+oaf+LyrSQy4gGPqw5FFw7MYTAsraHju
+jsY1gqlcCBpJJOaW6Eh+8MFS+Gc0AzM7Oecf6d8IzL9dwL2bd7j3W1DNoOZmxNl7
++TH2h/LMWi5dzBiQJ7Cp3lsvkk2SWxCnG6WoOT1Ea5KzUb+hm7XO+BaMTyl3trhO
+EjNaJXS47hFRQtkWHnWl8bZix7ytBbxCwCJpzj1tr6jMiIvd46YNHF/KUCUkIY7k
+UdpTk35kfKDCMxD5HZHz
+=4UKQ
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
index b880890494b1..f7f3459d4688 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v 1.6 2014/02/02 17:25:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v 1.7 2014/02/04 14:10:09 polynomial-c Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
+inherit kde4-base
 
 DESCRIPTION="A set of widget styles for Qt and GTK2"
 HOMEPAGE="https://github.com/QtCurve/qtcurve"
@@ -53,6 +53,11 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 PATCHES=( "${DISTDIR}/${P}-old_config_file.patch" )
 
 pkg_setup() {
+	# bug #498776
+	if ! version_is_at_least 4.7 $(gcc-version) ; then
+		append-cxxflags -Doverride=
+	fi
+
 	use kde && kde4-base_pkg_setup
 }
 
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18.ebuild
index ae58f47812f1..8e1d42792c31 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.18.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild,v 1.1 2014/01/27 13:50:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.18.ebuild,v 1.2 2014/02/04 14:10:09 polynomial-c Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
+inherit kde4-base
 
 DESCRIPTION="A set of widget styles for Qt and GTK2"
 HOMEPAGE="https://github.com/QtCurve/qtcurve"
@@ -14,7 +14,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz  -> ${P}.tar.gz"
+	SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz  -> ${P}.tar.gz
+		https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch"
 	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
@@ -51,7 +52,14 @@ S="${WORKDIR}/${P/_/}"
 
 DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
+PATCHES=( "${DISTDIR}/${P}-dont_use_c++11.patch" )
+
 pkg_setup() {
+	# bug #498776
+	if ! version_is_at_least 4.7 $(gcc-version) ; then
+		append-cxxflags -Doverride=
+	fi
+
 	use kde && kde4-base_pkg_setup
 }