Add patch to fix compilation with gcc-4.1 by Åsmund Grammeltvedt <grammel@online.no>; bug #129447

Package-Manager: portage-2.1_pre9-r5

5 files changed, 160 insertions, 24 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 589363b04500..f4ab14ca3bbc 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/openh323
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.70 2005/09/16 01:37:39 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.71 2006/05/01 18:06:15 halcy0n Exp $
+
+  01 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/openh323-1.15.6-gcc4.diff, openh323-1.15.6.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Åsmund Grammeltvedt
+  <grammel@online.no>; bug #129447
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> openh323-1.15.3.ebuild:
   Mark 1.15.3 stable on alpha
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 486cc2ba7ab3..444144a13d5c 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,27 +1,122 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX openh323-1.11.7-emptyMakefile 8 RMD160 2a4f6bc2a3cfeec78edca0f9e548f081617b696f SHA1 6b048ad6f51daed87ef968fce97c291ab026edc7 SHA256 f60e4b963e5b4a498c79a1c1db1f51eeb6589c061826c891b3c6c552bb96653b size 8
+MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+RMD160 2a4f6bc2a3cfeec78edca0f9e548f081617b696f files/openh323-1.11.7-emptyMakefile 8
+SHA256 f60e4b963e5b4a498c79a1c1db1f51eeb6589c061826c891b3c6c552bb96653b files/openh323-1.11.7-emptyMakefile 8
+AUX openh323-1.12.0-include-order.diff 1326 RMD160 d8bae0e28497d7018a9298188ff5e8ed9dc1c5ce SHA1 54701baf83331fee63eaa6db3dccd9c1a6613beb SHA256 0bdcfcf3692206c22a33ec6a224204400adadf26d4c628553f6a634ae5822a11 size 1326
+MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
+RMD160 d8bae0e28497d7018a9298188ff5e8ed9dc1c5ce files/openh323-1.12.0-include-order.diff 1326
+SHA256 0bdcfcf3692206c22a33ec6a224204400adadf26d4c628553f6a634ae5822a11 files/openh323-1.12.0-include-order.diff 1326
+AUX openh323-1.12.2-ffmpeg.diff 1899 RMD160 008f4202479a7dbd6da58ef6e6a322a7345ebfb4 SHA1 0dae08ceb683376a05e7a3d7753e61c95024cdec SHA256 340365bfd1d7abfef78fda4d9f2a1f52019572466b22c22f4724b515d8d7d246 size 1899
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
+RMD160 008f4202479a7dbd6da58ef6e6a322a7345ebfb4 files/openh323-1.12.2-ffmpeg.diff 1899
+SHA256 340365bfd1d7abfef78fda4d9f2a1f52019572466b22c22f4724b515d8d7d246 files/openh323-1.12.2-ffmpeg.diff 1899
+AUX openh323-1.12.2-include-order.diff 1361 RMD160 0f7f46e74078efc0eeb08194e6c0f30433a001ff SHA1 aab6b23ecaba20f5f03a3122435d80ccc1c99d0a SHA256 efc1f8352a366f24c8c0eaa611a6cdb68dfd0db22a8ae517088daf1502d93d8b size 1361
+MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+RMD160 0f7f46e74078efc0eeb08194e6c0f30433a001ff files/openh323-1.12.2-include-order.diff 1361
+SHA256 efc1f8352a366f24c8c0eaa611a6cdb68dfd0db22a8ae517088daf1502d93d8b files/openh323-1.12.2-include-order.diff 1361
+AUX openh323-1.13.2-ffmpeg.diff 1899 RMD160 008f4202479a7dbd6da58ef6e6a322a7345ebfb4 SHA1 0dae08ceb683376a05e7a3d7753e61c95024cdec SHA256 340365bfd1d7abfef78fda4d9f2a1f52019572466b22c22f4724b515d8d7d246 size 1899
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
+RMD160 008f4202479a7dbd6da58ef6e6a322a7345ebfb4 files/openh323-1.13.2-ffmpeg.diff 1899
+SHA256 340365bfd1d7abfef78fda4d9f2a1f52019572466b22c22f4724b515d8d7d246 files/openh323-1.13.2-ffmpeg.diff 1899
+AUX openh323-1.13.2-gcc34.diff 291 RMD160 b5c72eb344ff37d9b6c36fd74c69423d1bd6bcf6 SHA1 3584533b88fb0960e5e4a1928b2a3f4f797deb33 SHA256 16b81dec619e4c4243919779d1501bc4e7661b6139ff516c7e4b04604c3f0085 size 291
+MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
+RMD160 b5c72eb344ff37d9b6c36fd74c69423d1bd6bcf6 files/openh323-1.13.2-gcc34.diff 291
+SHA256 16b81dec619e4c4243919779d1501bc4e7661b6139ff516c7e4b04604c3f0085 files/openh323-1.13.2-gcc34.diff 291
+AUX openh323-1.13.2-include-order.diff 1027 RMD160 7c9107cbebf94dd40a7e7ad8e5a477097e64ac21 SHA1 31beca15256329c0170603ad5974274bad439c79 SHA256 ef7b73a231021486febc6ba5f797317a8e5fc17b063c7094e17e5f42f805bab9 size 1027
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
+RMD160 7c9107cbebf94dd40a7e7ad8e5a477097e64ac21 files/openh323-1.13.2-include-order.diff 1027
+SHA256 ef7b73a231021486febc6ba5f797317a8e5fc17b063c7094e17e5f42f805bab9 files/openh323-1.13.2-include-order.diff 1027
+AUX openh323-1.13.2-ixjuser.diff 285 RMD160 08f1a50a63fac46f2a3e1d945759a62893b87ce1 SHA1 12f5450878c8da697a538b07f6218ce2337bc505 SHA256 667176b69f5e4c0faf374a066a19fb993730612da2c0ecd92ce7890ca20a3beb size 285
+MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
+RMD160 08f1a50a63fac46f2a3e1d945759a62893b87ce1 files/openh323-1.13.2-ixjuser.diff 285
+SHA256 667176b69f5e4c0faf374a066a19fb993730612da2c0ecd92ce7890ca20a3beb files/openh323-1.13.2-ixjuser.diff 285
+AUX openh323-1.13.5-ffmpeg.diff 1899 RMD160 008f4202479a7dbd6da58ef6e6a322a7345ebfb4 SHA1 0dae08ceb683376a05e7a3d7753e61c95024cdec SHA256 340365bfd1d7abfef78fda4d9f2a1f52019572466b22c22f4724b515d8d7d246 size 1899
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
+RMD160 008f4202479a7dbd6da58ef6e6a322a7345ebfb4 files/openh323-1.13.5-ffmpeg.diff 1899
+SHA256 340365bfd1d7abfef78fda4d9f2a1f52019572466b22c22f4724b515d8d7d246 files/openh323-1.13.5-ffmpeg.diff 1899
+AUX openh323-1.13.5-include-order.diff 1027 RMD160 7c9107cbebf94dd40a7e7ad8e5a477097e64ac21 SHA1 31beca15256329c0170603ad5974274bad439c79 SHA256 ef7b73a231021486febc6ba5f797317a8e5fc17b063c7094e17e5f42f805bab9 size 1027
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
+RMD160 7c9107cbebf94dd40a7e7ad8e5a477097e64ac21 files/openh323-1.13.5-include-order.diff 1027
+SHA256 ef7b73a231021486febc6ba5f797317a8e5fc17b063c7094e17e5f42f805bab9 files/openh323-1.13.5-include-order.diff 1027
+AUX openh323-1.15.2-notrace.diff 801 RMD160 83d7ee6b7aafc10da9648da62a4495925a71c8ce SHA1 7bd159a4f78b868aae7849a92dbcf46ab114e4f0 SHA256 ed3fa31f18b95c1db7958b500ce9805331d85fb7e2c2763e053d0f0a790d5efa size 801
+MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
+RMD160 83d7ee6b7aafc10da9648da62a4495925a71c8ce files/openh323-1.15.2-notrace.diff 801
+SHA256 ed3fa31f18b95c1db7958b500ce9805331d85fb7e2c2763e053d0f0a790d5efa files/openh323-1.15.2-notrace.diff 801
+AUX openh323-1.15.6-gcc4.diff 1220 RMD160 aba712ee89a03b24a6263a67d7e7d89a6670c0de SHA1 810a3dab6bcb302dc71e3bb51fa87d1770b19786 SHA256 2641f5dc25bd810977f13ad46ae7a1efe6468d849b0f764e3a7da0744c4d01ba size 1220
+MD5 cebf369b8262892d46ba56684cf15467 files/openh323-1.15.6-gcc4.diff 1220
+RMD160 aba712ee89a03b24a6263a67d7e7d89a6670c0de files/openh323-1.15.6-gcc4.diff 1220
+SHA256 2641f5dc25bd810977f13ad46ae7a1efe6468d849b0f764e3a7da0744c4d01ba files/openh323-1.15.6-gcc4.diff 1220
+DIST openh323-1.13.2.tar.gz 2197100 size 2197100
+DIST openh323-1.15.3.tar.gz 3754056 size 3754056
+DIST openh323-1.15.6.tar.gz 3739001 RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569 size 3739001
+DIST openh323-v1_13_5-src.tar.gz 2216406 size 2216406
+DIST openh323-v1_15_2-src-tar.gz 3735815 size 3735815
+DIST openh323_1.12.0.tar.gz 2325128 size 2325128
+DIST openh323_1.12.2.tar.gz 2343354 size 2343354
+EBUILD openh323-1.12.0-r1.ebuild 2820 RMD160 9a63d237355cc308b07d77b7d30307c2a9c6a3f2 SHA1 0d1c11a977793218c8a31463189176d57b431774 SHA256 14ff8faae3447a06bb9b97f8673d49af90a8fc20794642b63019db735947a088 size 2820
+MD5 0fe7f7f9988fabaa2763e35d351fd409 openh323-1.12.0-r1.ebuild 2820
+RMD160 9a63d237355cc308b07d77b7d30307c2a9c6a3f2 openh323-1.12.0-r1.ebuild 2820
+SHA256 14ff8faae3447a06bb9b97f8673d49af90a8fc20794642b63019db735947a088 openh323-1.12.0-r1.ebuild 2820
+EBUILD openh323-1.12.2-r2.ebuild 3720 RMD160 9d4353b9310a8f9476eab4c998cfb7b26730f65b SHA1 2982ef8110b7165d9b0524b1cf2ce673cf87bbf2 SHA256 3e3c11fd8df20c3bc5ffed2745e69b8685de6afe90d522b2381664d1018e3ac0 size 3720
 MD5 9c59d13d7b06bc4d44c71723173b32c9 openh323-1.12.2-r2.ebuild 3720
-MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
+RMD160 9d4353b9310a8f9476eab4c998cfb7b26730f65b openh323-1.12.2-r2.ebuild 3720
+SHA256 3e3c11fd8df20c3bc5ffed2745e69b8685de6afe90d522b2381664d1018e3ac0 openh323-1.12.2-r2.ebuild 3720
+EBUILD openh323-1.13.2-r2.ebuild 4163 RMD160 ed3b1ed282a3424d94744ad2b3aa0b9304127375 SHA1 e6753490b3d072772535fa435de8a59b088d3e8b SHA256 3888f37efbd1d6409ff3a799cce60c1680db22f59f5976b28ae12c67839eb64e size 4163
 MD5 a94ddb1d91decd0a0787734fc1e27c9d openh323-1.13.2-r2.ebuild 4163
-MD5 4ae7db9510034e77e8fdf76deda14ae7 ChangeLog 11395
-MD5 0fe7f7f9988fabaa2763e35d351fd409 openh323-1.12.0-r1.ebuild 2820
+RMD160 ed3b1ed282a3424d94744ad2b3aa0b9304127375 openh323-1.13.2-r2.ebuild 4163
+SHA256 3888f37efbd1d6409ff3a799cce60c1680db22f59f5976b28ae12c67839eb64e openh323-1.13.2-r2.ebuild 4163
+EBUILD openh323-1.13.5-r1.ebuild 4188 RMD160 f5e4fe8ab8959df2bd3d6ce899684dcc0d2623ce SHA1 4daf10f74cb3a5f38685a0bee0e056208d19b9bb SHA256 dc21b6a3451d446d072bd54c953dd17e0bd8cccb554b509375b445ebd3b54502 size 4188
+MD5 29aa9329620d18452705fa542c6ebfba openh323-1.13.5-r1.ebuild 4188
+RMD160 f5e4fe8ab8959df2bd3d6ce899684dcc0d2623ce openh323-1.13.5-r1.ebuild 4188
+SHA256 dc21b6a3451d446d072bd54c953dd17e0bd8cccb554b509375b445ebd3b54502 openh323-1.13.5-r1.ebuild 4188
+EBUILD openh323-1.15.2-r1.ebuild 4100 RMD160 0028e400987e5aab1a22d8a024a40f041c0cb189 SHA1 67e277441190b0be999b2975b7317f02702af658 SHA256 af6ebd686da202fc56cb4ac1ab28cfcb8599fb2fa7bc33ed6623e51907c2575b size 4100
 MD5 c37dead260b91dfc038ead49e10e2b7e openh323-1.15.2-r1.ebuild 4100
+RMD160 0028e400987e5aab1a22d8a024a40f041c0cb189 openh323-1.15.2-r1.ebuild 4100
+SHA256 af6ebd686da202fc56cb4ac1ab28cfcb8599fb2fa7bc33ed6623e51907c2575b openh323-1.15.2-r1.ebuild 4100
+EBUILD openh323-1.15.3.ebuild 3973 RMD160 b6e8b0ff8e4fe02e51007affb749a3fde6701985 SHA1 1cc53014490fb09b79d375294cc4fa688d71244e SHA256 9be33bcfc23f92ce8d013d58f9d4035097292ff05662f18aea02d927318cd284 size 3973
 MD5 57b84b4fcd17dda0ae3a0dab79c99366 openh323-1.15.3.ebuild 3973
-MD5 032ccbd847b10acf333607d4b3471924 openh323-1.15.6.ebuild 4043
-MD5 29aa9329620d18452705fa542c6ebfba openh323-1.13.5-r1.ebuild 4188
-MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2-r1 73
+RMD160 b6e8b0ff8e4fe02e51007affb749a3fde6701985 openh323-1.15.3.ebuild 3973
+SHA256 9be33bcfc23f92ce8d013d58f9d4035097292ff05662f18aea02d927318cd284 openh323-1.15.3.ebuild 3973
+EBUILD openh323-1.15.6.ebuild 4085 RMD160 2c9f15264f76bd3fb8f117f6d3cd6767ea43b668 SHA1 f5756c21d4c1b1162339633d9a45ff4bcb2dd73c SHA256 f305f848426c93653e607ad5be1fbe94a34e748f678d49965f96fe3275bed291 size 4085
+MD5 ec1f55631ff0c3e30bbb4abb484d08cc openh323-1.15.6.ebuild 4085
+RMD160 2c9f15264f76bd3fb8f117f6d3cd6767ea43b668 openh323-1.15.6.ebuild 4085
+SHA256 f305f848426c93653e607ad5be1fbe94a34e748f678d49965f96fe3275bed291 openh323-1.15.6.ebuild 4085
+MISC ChangeLog 11606 RMD160 3b1b0c6b79b420bf898ba32d403f47be51e73f16 SHA1 e8fce8acc04b79b6364f80de97944e80ee9383ca SHA256 86d471d470f24975ad5544d437b47bdc9ffeeb61ee196a21520e24cd23bab709 size 11606
+MD5 ffb1321288650d6d1dc8bd33a4f74560 ChangeLog 11606
+RMD160 3b1b0c6b79b420bf898ba32d403f47be51e73f16 ChangeLog 11606
+SHA256 86d471d470f24975ad5544d437b47bdc9ffeeb61ee196a21520e24cd23bab709 ChangeLog 11606
+MISC metadata.xml 267 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 SHA1 c3b283892982fe0444300256e9d7648126c65704 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e size 267
+MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
+RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 metadata.xml 267
+SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e metadata.xml 267
 MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
+RMD160 4b58e9a8e195f199598db362d138ea0a6575eaae files/digest-openh323-1.12.0-r1 68
+SHA256 60613fa99d8d312faa1aa64f6d0f32c70623c6b986c0fe32d0019e615ac965f4 files/digest-openh323-1.12.0-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
+RMD160 2ed9a0dc819a12201830e7ff4bc4a84fbb8ccd76 files/digest-openh323-1.12.2-r2 68
+SHA256 8796cead33ccb8f920ce49e943179c46cec1cbb3a9a1181f5b3df26cd3729766 files/digest-openh323-1.12.2-r2 68
 MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r2 68
-MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
-MD5 cfdd76561ff2f0a2582f953e56fa4623 files/digest-openh323-1.15.3 68
-MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
-MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
-MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
-MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
-MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
+RMD160 bf1598e2879281496a8fd179b975c974704ce1d5 files/digest-openh323-1.13.2-r2 68
+SHA256 d2508ba08fe04d229ea58c1fccf869791e3a2c153811746f45d5d00f4d03c0ca files/digest-openh323-1.13.2-r2 68
 MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5-r1 73
-MD5 f5617f451bc51bdc25f39d40f32dd7a4 files/digest-openh323-1.15.6 68
+RMD160 164a5feedeca92b6c32f78ecaa8238e91e3b98d8 files/digest-openh323-1.13.5-r1 73
+SHA256 7b7160e7af2cb904f0ef4548be4be145d6170fb682dbae3c3b612629f6c77165 files/digest-openh323-1.13.5-r1 73
+MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2-r1 73
+RMD160 022ec53d637493cab4ca78395138c7d9a20ff9a8 files/digest-openh323-1.15.2-r1 73
+SHA256 7a1cf05e30827e885b16be923e43e309ba3431db67dc54e0c3db94692eca1116 files/digest-openh323-1.15.2-r1 73
+MD5 cfdd76561ff2f0a2582f953e56fa4623 files/digest-openh323-1.15.3 68
+RMD160 288de1b17bc9973a85468cf7ff4e087190c632ef files/digest-openh323-1.15.3 68
+SHA256 1f149ecd80402902293cdc8bda1c3cd851b98ddc3e70fca4b72b7af77037419a files/digest-openh323-1.15.3 68
+MD5 1a07fbf6574ed01c5a065cf4f962f24f files/digest-openh323-1.15.6 250
+RMD160 7d35047b3bced683abbb3174a2de1ce59ae729ad files/digest-openh323-1.15.6 250
+SHA256 cb05f4b3767b1e1fd089f45a667b3a50fb9ff6fa325ef8cb6b0a57112016e2b8 files/digest-openh323-1.15.6 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEVk4gCRZPokWLroQRAlHCAJ47KpL0Q44/98rTOyvEZolGDfQBPACgvtbA
+VxadR4Ur2q1NU1yGmNe8JrM=
+=eOkd
+-----END PGP SIGNATURE-----
diff --git a/net-libs/openh323/files/digest-openh323-1.15.6 b/net-libs/openh323/files/digest-openh323-1.15.6
index c8340dc764fd..c8854dc1c0b3 100644
--- a/net-libs/openh323/files/digest-openh323-1.15.6
+++ b/net-libs/openh323/files/digest-openh323-1.15.6
@@ -1 +1,3 @@
 MD5 6c49f41c4cec39172000586a26b98c48 openh323-1.15.6.tar.gz 3739001
+RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af openh323-1.15.6.tar.gz 3739001
+SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569 openh323-1.15.6.tar.gz 3739001
diff --git a/net-libs/openh323/files/openh323-1.15.6-gcc4.diff b/net-libs/openh323/files/openh323-1.15.6-gcc4.diff
new file mode 100644
index 000000000000..277c250ec52b
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.15.6-gcc4.diff
@@ -0,0 +1,33 @@
+--- openh323-1.15.6/include/ixjlid.h	2004-08-22 06:21:06.000000000 +0200
++++ openh323-1.15.6-gcc4/include/ixjlid.h	2006-04-11 20:48:51.000000000 +0200
+@@ -836,7 +836,7 @@
+     };
+ 
+     static void SignalHandler(int sig);
+-    ExceptionInfo * OpalIxJDevice::GetException();
++    ExceptionInfo * GetException();
+     int GetOSHandle() { return os_handle; }
+ 
+   protected:
+--- openh323-1.15.6/src/vic/p64.cxx	2003-03-14 08:25:55.000000000 +0100
++++ openh323-1.15.6-gcc4/src/vic/p64.cxx	2006-04-11 20:49:41.000000000 +0200
+@@ -1125,7 +1125,7 @@
+ 	 * If input buffer not aligned, prime bit-buffer
+ 	 * with 8 bits; otherwise, prime it with a 16.
+ 	 */
+-	if ((int)bp & 1) {
++	if ((long)bp & 1) {
+ 		bs_ = (u_short*)(bp + 1);
+ 		bb_ = *bp;
+ 		nbb_ = 8 - sbit;
+--- openh323-1.15.6/plugins/audio/Speex/speexcodec.cxx	2006-04-11 21:32:34.000000000 +0200
++++ openh323-1.15.6-gcc4/plugins/audio/Speex/speexcodec.cxx	2006-04-11 20:48:51.000000000 +0200
+@@ -112,7 +112,7 @@
+ 
+ static void * create_encoder(const struct PluginCodec_Definition * codec)
+ {
+-  int mode = (int)(codec->userData);
++  int mode = (long)(codec->userData);
+ 
+   struct PluginSpeexContext * context = new PluginSpeexContext;
+   context->bits = new SpeexBits;
diff --git a/net-libs/openh323/openh323-1.15.6.ebuild b/net-libs/openh323/openh323-1.15.6.ebuild
index 1bad03656c50..662821701bc2 100644
--- a/net-libs/openh323/openh323-1.15.6.ebuild
+++ b/net-libs/openh323/openh323-1.15.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.6.ebuild,v 1.1 2005/09/12 20:06:58 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.6.ebuild,v 1.2 2006/05/01 18:06:17 halcy0n Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -28,7 +28,8 @@ src_unpack() {
 
 	cd ${S}
 	# Makefile is currently broken with NOTRACE=1, fix that
-	epatch ${FILESDIR}/${PN}-1.15.2-notrace.diff
+	epatch "${FILESDIR}"/${PN}-1.15.2-notrace.diff
+	epatch "${FILESDIR}"/${P}-gcc4.diff
 }
 
 src_compile() {