Fix missing #includes for gcc-47 (bug 425690). Thanks Diego. Also add slot deps to qt-*:4

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

4 files changed, 34 insertions, 16 deletions

diff --git a/media-radio/svxlink/ChangeLog b/media-radio/svxlink/ChangeLog
index 05f34477ea75..93c697ae1738 100644
--- a/media-radio/svxlink/ChangeLog
+++ b/media-radio/svxlink/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/svxlink
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.20 2012/06/09 00:30:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.21 2012/07/31 18:00:25 tomjbe Exp $
+
+  31 Jul 2012; Thomas Beierlein <tomjbe@gentoo.org> svxlink-11.11.1.ebuild,
+  +files/svxlink-11.11.1-gcc-47.patch:
+  Fix missing #includes for gcc-47 (bug 425690). Thanks Diego. Also add slot
+  deps to qt-*:4
 
   09 Jun 2012; Zac Medico <zmedico@gentoo.org> svxlink-11.11.1.ebuild:
   inherit user for enewgroup and enewuser
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index f0e54967348b..9b16aa00169f 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX remotetrx.init 900 RMD160 1f7563d63428e49d6780051a981e77a4ebfac69e SHA1 580cd6d147d57d01d758ff7f4b29905c0fe338f0 SHA256 ed941fc921339c534eb15385873688ee73a07cd93260036be607b21c93206c0c
-AUX remotetrx.rc 578 RMD160 d2013e38d9a249aa556e4ec5452db70afc6cfc66 SHA1 0b268d04b22e155bc07387a3dd1fb62685000c67 SHA256 90176eb6d1bc0f95f504e90a5bba375c5d4513f57fb322284d4da9462ac0b201
-AUX svxlink.init 894 RMD160 71e6ebfe023de360eb767eab0797084cca1d008d SHA1 c969b90e2282521cf23a9ea1da98b197b1b1e7cd SHA256 8ccc01f43e46de81f6ee067605d0ce1f9e5ac04405b718df297e40b580cdb3ad
-AUX svxlink.rc 568 RMD160 470efa0808527bf12bb487cc37364baed427d51c SHA1 8285fdc122be8a5b0c2771c89fe32800ddaea2c4 SHA256 d9faf2c39ee13f382ea5be3af8c6cedf67a69bbaeff601220a91437fa52daafa
-DIST svxlink-11.11.1.tar.gz 838749 RMD160 2f1f862da6aff6e15c2b4ed5c603ca79a6a76056 SHA1 7b28282d65252295ddbb3e1a3e507a16b833568a SHA256 6de1041203bbd4634c182daef37370186daa2107b04bb84829fe274b8dc7f133
-EBUILD svxlink-11.11.1.ebuild 1382 RMD160 72945286038586fb483a3b396ebbe2aae93972c0 SHA1 3175ca37a2271f663c1fb9cd7797be725f28f49b SHA256 4c3b2e1193a18fba35f92db696143d55423eac707c80a183c2f1eb6eab57734b
-MISC ChangeLog 3804 RMD160 8642c481e166369676ef21748782fbbce874858e SHA1 195cffec5f1be0c51e6ed7b8a4f776c7d9226ce4 SHA256 925937f694b8a89f6e67de4ad213eb34c1e2fa641a0823a25a662e4d75115ad3
-MISC metadata.xml 650 RMD160 48aa2bebc69352e3cdd84ce39bc80cf8af3bc141 SHA1 ad55d971b783e8326b69d88c9a33e02e69310fbb SHA256 15fd5f97398bba8537021442521002863aaa2e147d7a97ad45de45e0c9ed8bde
+AUX remotetrx.init 900 SHA256 ed941fc921339c534eb15385873688ee73a07cd93260036be607b21c93206c0c SHA512 641091326dab89e555dd4f992cd238ae7014cf3087bc50b9499f1df4196f103a805cf981d4d44b78c597fc013009ce150c75caf77c9ff89d382c439b4a6a3d29 WHIRLPOOL af705fbcfec1b66a5940c18c0ca78da88e05a1c266daf1f1da11020365274392454f1c48d7e373b3b345471e57baa8b0d3b00d763d63030ba0762bcb9e7f11f9
+AUX remotetrx.rc 578 SHA256 90176eb6d1bc0f95f504e90a5bba375c5d4513f57fb322284d4da9462ac0b201 SHA512 759adaa668f5f0315dd9d710d3ed738b4a0e042a7d12541862c2a311073d25573195336416b3940aaa89443242ce34abf7994c902603cd2640d08291037f465f WHIRLPOOL b4d3c8d5f1912b6aa1fe9e8bb7ad4c665803fe33828c357c2dbe0f783193a019f65e94aa79bc0de6eb887df8e30ecb8b4d4842356ad1cc674f4f3507a874b4a4
+AUX svxlink-11.11.1-gcc-47.patch 359 SHA256 517bc4b8774e7479b753a2f76be42be2e0d8bc90e29f1e2395298d4feb2b4bd0 SHA512 81834b2dcd0023b7e3938e9559e58010e99ff60c7f0d4210a2deb6d07330acc091a00ef4907b542f7baf9fd25576108bc58d4b493542c65ad0dcc3e9057a864b WHIRLPOOL 6934437f32d94515a3f502ebb3f4afb9855f525b6e1c877218c74adbcf1c8b2773336a4b396bfded4cda7ceb1615749d12b30c201dd71f006167d36969712333
+AUX svxlink.init 894 SHA256 8ccc01f43e46de81f6ee067605d0ce1f9e5ac04405b718df297e40b580cdb3ad SHA512 75b7d64f805f1813e7c77314cd5fe7e643ac58408abe5eba645fa185ba4d328bd593623b2d864818aed2f10c2c397e07bfec22fb46e91467dbe1f486c2651b1b WHIRLPOOL 592bc9e0abf320c8571e563839b786989993c0294cb7dc94c7e5073c8f0a0e9daa46330119d340d1757358285d5157ccb57626b6994f1bf0a7457e12a03d8e5d
+AUX svxlink.rc 568 SHA256 d9faf2c39ee13f382ea5be3af8c6cedf67a69bbaeff601220a91437fa52daafa SHA512 96e95116c031e3e5f21d1239362736c093c3e5c32adcb4eef1fa667c89a08d62cdb82640a246cf11b9fddc62544f98a660f626e91c67dd7a0d608904b8ddf6dd WHIRLPOOL b3d18d8d8c7f87ea52b8825c8b6e85903fb7a49847dc92cbb3b973d2f5c0869611ac25c9c61cb39eb20ca0983a3952ac39a7c77ef945dfb3a97765755f0dbca2
+DIST svxlink-11.11.1.tar.gz 838749 SHA256 6de1041203bbd4634c182daef37370186daa2107b04bb84829fe274b8dc7f133 SHA512 6b859801717800439bfd77b3a2a765e6555cbb50af4f19a1ac1ec021377772e0ee24a82799db09511e052084af95de51f6ed8128dc4e784bf946408715899719 WHIRLPOOL cb91de4e1e8c7f119f6dadb48dfc588afddaef55bd8b8e73ca045719621fbb6559acc78b76a40bf5a14ec696687c2f1cd936b3b491b3dc4bdf37130fbdc4c05a
+EBUILD svxlink-11.11.1.ebuild 1450 SHA256 04f51dd1512a4d372dbf1440a6d81959cac50e494ff0c278f95e1ad715472df5 SHA512 a06d2ccf87de495db7453a22cecf11aba83ec4fce8dbcaaadae3fcaf2495a76e3861c39edbd32766e89f015cd1d987c0595c670d6fdd9200240631012a08e1a8 WHIRLPOOL 1bf6f6b38784a967dcca8fa961524037ea7bf0176156ca7606cdedb73180e6ddd4f275fd0b3cdcc69064644092d0248ce433cdb2bd166c44166f74dd52e8f006
+MISC ChangeLog 4013 SHA256 a9c2aadd29c5299c22646c5bcdb39084c475ca6a650406d491a24378c30a6d4f SHA512 0649569bc6476f2b44ccd2f0f30637b4ae971fc829d779eeb5be59a143dfaab22baebd35dd430203c4d62bdc1cad280f6fb15bcfc9531b5395e023f9d26f27c1 WHIRLPOOL 5a915307d36b57d48af67c186ddef485bf1e70952d76741ae14ea6f9164c07f8d5fea39f1b968f0a4817b6c1738fa52c9afdcd0ede3a8ba632d17528b545d316
+MISC metadata.xml 650 SHA256 15fd5f97398bba8537021442521002863aaa2e147d7a97ad45de45e0c9ed8bde SHA512 5cc939dd7ba2c75e518f82ffc9eeb041fddfc87ccf533833418018592fc7a31f084aab215b7e0882060269768bdccd8f41e27129c35f96a712d58c3d1ecaf4c8 WHIRLPOOL f3f7192e9550dffb4d4ddb6c89e2102faee486024a66a93df931489c031a17f42e319567bce1b4dfbef1c05908360be51888067a39a9112207e15b12af918569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/SmUIACgkQ/ejvha5XGaNoiACgkSWdoQsvfa+PHI9S66s4EHHa
-VIwAoMlLcA5t07Lq4KKwBKvhtweBJw4Y
-=ZM+r
+iEYEAREIAAYFAlAYHUUACgkQQe4uqXYgU9V0gQCghD0QvGg/nVnAWr3MszHUA/Ok
+ytMAn1dHyYwqmY5DToFt21RlBZz1qJJX
+=bta4
 -----END PGP SIGNATURE-----
diff --git a/media-radio/svxlink/files/svxlink-11.11.1-gcc-47.patch b/media-radio/svxlink/files/svxlink-11.11.1-gcc-47.patch
new file mode 100644
index 000000000000..b13985ace9c7
--- /dev/null
+++ b/media-radio/svxlink/files/svxlink-11.11.1-gcc-47.patch
@@ -0,0 +1,10 @@
+--- async/cpp/AsyncCppDnsLookupWorker.cpp.old	2012-07-31 17:45:31.000000000 +0000
++++ async/cpp/AsyncCppDnsLookupWorker.cpp	2012-07-31 17:45:24.000000000 +0000
+@@ -38,6 +38,7 @@
+  *
+  ****************************************************************************/
+ 
++#include <unistd.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/media-radio/svxlink/svxlink-11.11.1.ebuild b/media-radio/svxlink/svxlink-11.11.1.ebuild
index 74d0477c8f8f..fe7dc267b007 100644
--- a/media-radio/svxlink/svxlink-11.11.1.ebuild
+++ b/media-radio/svxlink/svxlink-11.11.1.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/media-radio/svxlink/svxlink-11.11.1.ebuild,v 1.3 2012/06/09 00:30:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-11.11.1.ebuild,v 1.4 2012/07/31 18:00:25 tomjbe Exp $
 
 EAPI=4
 inherit eutils multilib qt4-r2 user
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/tcl
-	x11-libs/qt-core
-	x11-libs/qt-gui
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	media-libs/alsa-lib
 	media-sound/gsm
 	dev-libs/libgcrypt
@@ -38,6 +38,8 @@ src_prepare() {
 	sed -i -e "s:/etc/udev:/lib/udev:" svxlink/scripts/Makefile.default || die
 	# fix underlinking
 	sed -i -e "s:lgsm:lgsm -lspeex:" qtel/Makefile.default || die
+	# fix gcc-4.7 bug #425690
+	epatch "${FILESDIR}/$P-gcc-47.patch"
 }
 
 src_install() {