Update gcc47 patch. Bug #430006

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 30 insertions, 21 deletions

diff --git a/media-video/xvideoservicethief/ChangeLog b/media-video/xvideoservicethief/ChangeLog
index 7c501ce5c115..d9d20c85ad86 100644
--- a/media-video/xvideoservicethief/ChangeLog
+++ b/media-video/xvideoservicethief/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/xvideoservicethief
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.32 2012/07/18 18:28:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.33 2012/08/05 19:00:38 hwoarang Exp $
+
+  05 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  files/xvideoservicethief-2.4.1-gcc47.patch,
+  xvideoservicethief-2.4.1-r2.ebuild:
+  Update gcc47 patch. Bug #430006
 
   18 Jul 2012; Markos Chandras <hwoarang@gentoo.org>
   +files/xvideoservicethief-2.4.1-gcc47.patch,
diff --git a/media-video/xvideoservicethief/Manifest b/media-video/xvideoservicethief/Manifest
index 7c5d8cd2d583..822cb10b273e 100644
--- a/media-video/xvideoservicethief/Manifest
+++ b/media-video/xvideoservicethief/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xvideoservicethief-2.4.1-gcc47.patch 578 SHA256 4ca82dac29c418b683dcd960d0b7fe5cced9729cbd33fe7e793094ec042bd7f2 SHA512 c87a9251d245db19ac8f0d77dff26aa2d72aaad58a16aa534663ae3b8dd642f1ca8b9f6e4148440d842e051d19db8acba86377e7476f7a071476ec3e8dc7e0b2 WHIRLPOOL f8fc56e97cb9823efaf7ebdb339e397724a28294094d8848b5286217692e313b013d869785a86b0a5c667005ff9ebf4d82419c00c6a9af45e8e163e8fb703a67
+AUX xvideoservicethief-2.4.1-gcc47.patch 654 SHA256 3853a9302beeb6c73a978e11855c615c5ef787214dcb3f0615a2bfc759b7b55d SHA512 f1e9b97261bb47c9cf67b38d14d376677c395549baf14379cb21194fbea7996075a6b9bdbdb90640c583198514844c30d196d5fac5d4c5579f0013681077ef9e WHIRLPOOL 8f2df7ae3ec2006fa9b3eb66a45adb4718ebb5f42fc78403b2ca64ad24b0f178d48446dcff00a04c5a5f3cf34e90d81ce2d0b1eaa8df79e5ffd79d175acffe04
 AUX xvideoservicethief-2.4.1-youtube-api.patch 8567 SHA256 bdbdd01b30148ebf13e029b888ceca66006e17996c358bb524b1194fe0753a8c SHA512 a16a5b8ec9c9b10304e1bc2325949f33cdbc5a93c1f6759425ee942c28dd56b330b88f4b5afbd8d174df072855d89a7b784d7a2cccc4b4dccedd4f0c3e46bb20 WHIRLPOOL dc5b1f31aeb5a50cad23626ed05158e162c7c11c2e45708ae18de9d1ca1ffc1c62e8b8fcae78f3fc47e8c261878027e0772d209396c866a53dfdc1f5a6156ccc
 DIST xVST_2_4_1_src.zip 3817619 SHA256 cbd1f24156bdb6e3527b5b4d6823441881462442b9aeeb36098abcf16fbe7a29 SHA512 d0f23c3ac652326d3dd53ef66ba7db0c09ba28f8f7ad0bee864cab057b87d4b171f6076675abe443f738d7c715ec79d507e8d08fd595db3208fc4f9c5548eb2c WHIRLPOOL c19d6fac3a781435de6d4615a02ec00d21069387051ac0bdfda09d668ab70141a115ea1633d7290c3789f2353ddcf308f4372391a20a7689f94dc11df26561d8
 EBUILD xvideoservicethief-2.4.1-r2.ebuild 2486 SHA256 14731e67c4c0434cfa4d9c11782fedb64ea0ab25f8b62993c8ca7257566ced8b SHA512 28b28baa575224feec269c1fbcaa5c3e541f6baea173a3785042e714d17f594bfd708cb6b1c5cffa00b3c3357d43f47862fa8ea52831c1d42135624fa35abc46 WHIRLPOOL bc44461cfbeada37feaacc700006bab8e5b1d730ffbd6298e29d8fd360f243d28044775c8ed5a24fdd67750e583ee00416b9189de53b181bfd6b844fcbbf5ec3
-MISC ChangeLog 5164 SHA256 853bd7c6cd4b6b25d31a593008b05c2474ac95c95888bcaca37717a087c7a1bc SHA512 b5873694951e2d67e36172e44a0836fe6f85a7887c7ee3e04455dc5df0121c51cdacd9b38418d46ae9954aae81379999909a72ef72fbab1accaebc5d7f163c17 WHIRLPOOL 8304c472b4318fcdb32e8c2329fe3cd1df04300485604cfbd079178dbc31ed18deb3d2fae740ea4dc381410dfc26f8bd6103fe84d355713048da6dad1c907342
+MISC ChangeLog 5336 SHA256 a86df5da62ad876b393b0c58d496bf629331379623584e262e8a8af3b60bdf78 SHA512 e11c936a73d0538e76f8d3063f512f4c70abfba2ad6a1aa09ce5365812046d173bbdccb400708be1b1e640359c595f79fcc3fcd8eb7e254ded6c84d932c68e7c WHIRLPOOL 5b2c6e24357e0709f4593809191a2f9459787c8442337d06167f268103eda90dbe475e10924f658530207ab9b6b2a21ef631c733bac3ae26f0654e4333e1f1df
 MISC metadata.xml 277 SHA256 088b359fa836214a4429a6f7e7d7e3c82234a0c2e84da475c8b92f7f566f39cb SHA512 48bc6043448b71311ad3d87831aa4cc283c6cbe9f460cebb42675360d280c6ed3400b6d1ddbbd3ff363d18907d81278d4800ffd74ca000378863ad76a775c8ac WHIRLPOOL 8d3e8168a08eb4b821fed71eb5c361c4cbb46ed59474892f5bcaa1afaa239816fda570f6c689afd49570fbedb716350c1405d328cc8364e7594f710ed076beaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQBwBIAAoJEPqDWhW0r/LCUkgP/jymxWQxRIMXsHt9Q23mnGq/
-VV1BMCQZnjGWe0R15KoC7cB8aT5zfhKGdY47E3WzF7An0YWclBjoy5z8DAQnEr4A
-MmhEb79sddwHfWsW4R7WcXbG7nkT6wU/AZCLwsTHMMajpuintyDBapSSka6z0cD5
-NhVliJlySkm07gfUTSI29mbPni5rpAn9U1LSQoQIvdMetsgBkSAgNcBAD3BB0Hln
-8kh3bBGKQcypK9RWuXXgY/vFV1X4IdTmdI3pZObAoZW8i1vYs5CTAqeptfaJ+6tK
-21abO5dkQ6rr+F4hJKZa5COxCoiHg3FqmLjWIU5oOYgfUs8r78TApmAT+EhYmkEC
-Jcwm2x2fHgD0f4iwJGAcstrolJm5fUUKtsy7gYZvJqENe+lmnQCl8JkJfeRD8wwz
-j56o6yxvr8oyKFCmFvxzMPG6eMcVj2ZOSp9plB8qw0B+xPp3Kxo7p+az7WEhRlWM
-+cAp983UEO2b2alMfcDFIq8S9XNc2mVhg3XxArwd0MUiRL9lgPqSQ3god3UhVBmf
-p3bXnmGMZTU+iAdHnlB2zvlQkqiYKy7ZQZcBJR2T/Rj8/Pk/tRhdz1sMgWJee/zy
-xaSkKamtIAtEaPS7uRoJTQ9EiEqB2A/bjlXxav+0b3Smqdzj0AXN/x625PTnE6B8
-uhifciLslQUEt8eSLCgW
-=CEUN
+iQIcBAEBCAAGBQJQHsLaAAoJEPqDWhW0r/LCGKcQALABg1UQpiUE5+Q+csq0udAO
+AzlMNZ55fxVKWs6CA2q+ltFwvyBIZ/3VUtv7ROkopviPPRnLZungCrIoA1vyPfiA
+KpWuAvSOY4V/tIQMZ/C/R3Rc1cIy600HA0oW/LlwYELOnOimmBPg4ZtYJaCR+beA
+65QzV2rqUjRbfjrqWJQGwFvu3RqRsCpBfk7QvG3pDet+0JWPqwa0mfisfirCgeZj
+QV1RjlN829BvWQGhCYa4iIQxCZrQ72XuELWcTRmq+xvhaO6qgSVBWDWEEoi1mank
+EABa4pNrG/d8pn5gZLGLUq9hAqUW08vg4DjzhiSU55PqFPFZgNbka+TvgGNIPInI
+wd59ZW6lVx76UaRiCTC5PW/qlxzHD/tTBWO7vXJZRQreU1ltoZDgq+Bma6D2K8s1
+zCYfG47WI1XPWfiTsOb1yLCtZZzx4P+4NX4+JdN8TVznIiHQNkOaVinioUvDPCB8
+UM+rh8DYjbzMa1IiOcxWmyvRNy/idZQjziRJNcGjtXSf9K4ZcY1gah3VV05s6mVl
+EUANBInRHD54R9TybDIknN4PIpEaMGA/8UXIxflJZhZFYYvD6YLjiNU6z3aE+F2f
+NRy6sS5lDJKx0rzMA32A+UUj/kAIxmYMi80oqh+rRcpACBT8ZuZiQ+XREXFR+4+K
+YAGAbrSBrCpYD1LxX6k7
+=1BRd
 -----END PGP SIGNATURE-----
diff --git a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch
index 535912d97ccf..90ea8a88ba82 100644
--- a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch
+++ b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch
@@ -1,12 +1,16 @@
-https://bugs.gentoo.org/show_bug.cgi?id=427066
---- src/qtsingleapplication/src/qtlocalpeer.cpp.bak	2009-10-11 20:43:46.000000000 -0700
-+++ src/qtsingleapplication/src/qtlocalpeer.cpp	2012-07-18 01:43:28.210656553 -0700
-@@ -100,7 +100,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent
+Index: work/src/qtsingleapplication/src/qtlocalpeer.cpp
+===================================================================
+--- work.orig/src/qtsingleapplication/src/qtlocalpeer.cpp
++++ work/src/qtsingleapplication/src/qtlocalpeer.cpp
+@@ -100,7 +100,11 @@ QtLocalPeer::QtLocalPeer(QObject* parent
          socketName += QLatin1Char('-') + QString::number(sessionId, 16);

      }

  #else

--    socketName += QLatin1Char('-') + QString::number(::getuid(), 16);

++#if __GNUC__ >= 4 && __GNUC_MINOR__ <=6

+     socketName += QLatin1Char('-') + QString::number(::getuid(), 16);

++#else

 +    socketName += QLatin1Char('-') + QString::number(QtLP_Private::getuid(), 16);

++#endif

  #endif

  

      server = new QLocalServer(this);