remove old to fix bug 145783

Package-Manager: portage-2.1.2.3

20 files changed, 19 insertions, 962 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 7dfe7c21b229..b5a291822275 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.81 2007/03/02 17:06:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.82 2007/04/14 08:04:11 genstef Exp $
+
+  14 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/openh323-1.11.7-emptyMakefile,
+  -files/openh323-1.12.0-include-order.diff,
+  -files/openh323-1.12.2-ffmpeg.diff,
+  -files/openh323-1.12.2-include-order.diff,
+  -files/openh323-1.13.2-ffmpeg.diff, -files/openh323-1.13.2-gcc34.diff,
+  -files/openh323-1.13.2-include-order.diff,
+  -files/openh323-1.13.2-ixjuser.diff, -files/openh323-1.13.5-ffmpeg.diff,
+  -files/openh323-1.13.5-include-order.diff,
+  -files/openh323-1.15.2-notrace.diff, -files/openh323-1.15.6-gcc4.diff,
+  -openh323-1.13.2-r2.ebuild, -openh323-1.15.3.ebuild,
+  -openh323-1.15.6.ebuild:
+  remove old to fix bug 145783
 
   02 Mar 2007; Alexis Ballier <aballier@gentoo.org>
   +files/openh323-1.18.0-compilerh.patch, openh323-1.18.0.ebuild:
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index ea145a1af077..18d25907c24d 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,54 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX openh323-1.11.7-emptyMakefile 8 RMD160 2a4f6bc2a3cfeec78edca0f9e548f081617b696f SHA1 6b048ad6f51daed87ef968fce97c291ab026edc7 SHA256 f60e4b963e5b4a498c79a1c1db1f51eeb6589c061826c891b3c6c552bb96653b
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
 AUX openh323-1.18.0-compilerh.patch 325 RMD160 d069bff830da8aa6a6557beb697087b94e4177c9 SHA1 f8b966c79ff597f4c339e4d89a20559d3e5f1e69 SHA256 d04fe879d25f2b9d6541d3adacc980ebd5ef037b75fbb6759d6810bf3acded1b
 MD5 47dd326f4e5be0e3bb0bc11e72e6988a files/openh323-1.18.0-compilerh.patch 325
 RMD160 d069bff830da8aa6a6557beb697087b94e4177c9 files/openh323-1.18.0-compilerh.patch 325
@@ -57,50 +6,19 @@ AUX openh323-1.18.0-install.diff 917 RMD160 18bdb85be13f1ca074f0d4db2394c8962bca
 MD5 0f8527aebd8d3dcfb7197656a4d31579 files/openh323-1.18.0-install.diff 917
 RMD160 18bdb85be13f1ca074f0d4db2394c8962bcaf9be files/openh323-1.18.0-install.diff 917
 SHA256 0216b9cc4ed5082e7897fa806f568e2281c602e8abd0f0a74902e7bc812047e6 files/openh323-1.18.0-install.diff 917
-DIST openh323-1.13.2.tar.gz 2197100 RMD160 61fc4960d745234bb190f3eedf7625e8821f5880 SHA1 d0bb9b44e0efc87072e783f084e5d94d139695fa SHA256 caf29b5632831bdd2634ea265ee38e7c67bb866e9f479755f8d311fd0fe6bd7d
-DIST openh323-1.15.3.tar.gz 3754056 RMD160 280dde066c6170219a578ce723b252757da92f4e SHA1 42c7b55018455af568d70a42989bc5f32220b729 SHA256 2dab649046ca15b589bf48cfa6c6d2f3656b310ac482280f69a74eea397c91ef
-DIST openh323-1.15.6.tar.gz 3739001 RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af SHA1 4dffc58c1b2c10a20f8b9b3623af07248d59db55 SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569
 DIST openh323-v1_18_0-src-tar.gz 3742730 RMD160 1fc2abe36eef780f10f52aa2ebdd1950aa4fcebb SHA1 7d10cc3e35450f7bbde925375a99d66ae34369fa SHA256 26b4c9cf21dc1c92edf1583046670fce6be5b13045ef5d06e11403d36ffff218
-EBUILD openh323-1.13.2-r2.ebuild 4163 RMD160 ed3b1ed282a3424d94744ad2b3aa0b9304127375 SHA1 e6753490b3d072772535fa435de8a59b088d3e8b SHA256 3888f37efbd1d6409ff3a799cce60c1680db22f59f5976b28ae12c67839eb64e
-MD5 a94ddb1d91decd0a0787734fc1e27c9d openh323-1.13.2-r2.ebuild 4163
-RMD160 ed3b1ed282a3424d94744ad2b3aa0b9304127375 openh323-1.13.2-r2.ebuild 4163
-SHA256 3888f37efbd1d6409ff3a799cce60c1680db22f59f5976b28ae12c67839eb64e openh323-1.13.2-r2.ebuild 4163
-EBUILD openh323-1.15.3.ebuild 3973 RMD160 b6e8b0ff8e4fe02e51007affb749a3fde6701985 SHA1 1cc53014490fb09b79d375294cc4fa688d71244e SHA256 9be33bcfc23f92ce8d013d58f9d4035097292ff05662f18aea02d927318cd284
-MD5 57b84b4fcd17dda0ae3a0dab79c99366 openh323-1.15.3.ebuild 3973
-RMD160 b6e8b0ff8e4fe02e51007affb749a3fde6701985 openh323-1.15.3.ebuild 3973
-SHA256 9be33bcfc23f92ce8d013d58f9d4035097292ff05662f18aea02d927318cd284 openh323-1.15.3.ebuild 3973
-EBUILD openh323-1.15.6.ebuild 4092 RMD160 1fa0d390f7a855bf2b2dcdea3a861b3b7a39e515 SHA1 379dae7b8baeb6927045729070f3f23b225139bb SHA256 b8fc5f11048193bec3e0d5710407c6b8dcdc712d750f6b6dac042eca28a9475e
-MD5 72fa5aa4bac95c9b66af1d2522cdf912 openh323-1.15.6.ebuild 4092
-RMD160 1fa0d390f7a855bf2b2dcdea3a861b3b7a39e515 openh323-1.15.6.ebuild 4092
-SHA256 b8fc5f11048193bec3e0d5710407c6b8dcdc712d750f6b6dac042eca28a9475e openh323-1.15.6.ebuild 4092
 EBUILD openh323-1.18.0.ebuild 2445 RMD160 c21a744f2899c94b4185026928267bbd8b58c987 SHA1 572b0da11835224fde18f7b494b43d1e51a0efa5 SHA256 4fd80c0cb55e4eac72d964159a33cdaece2f47e7e936b5c116e58ec8b8613458
 MD5 6ae77043373838d326848ebee101ee7e openh323-1.18.0.ebuild 2445
 RMD160 c21a744f2899c94b4185026928267bbd8b58c987 openh323-1.18.0.ebuild 2445
 SHA256 4fd80c0cb55e4eac72d964159a33cdaece2f47e7e936b5c116e58ec8b8613458 openh323-1.18.0.ebuild 2445
-MISC ChangeLog 12899 RMD160 db5a83d54e203b7e3bf9403689c0dfc56c3c60fc SHA1 0f160a7091e2111f241fbdb1a37fcecb27101f77 SHA256 3d71a0935d811e8092c11b1ef4ce1ebc06eec85684385f5d66554c1043c2cbc7
-MD5 92549f280e6f91740a2228153d32f3fa ChangeLog 12899
-RMD160 db5a83d54e203b7e3bf9403689c0dfc56c3c60fc ChangeLog 12899
-SHA256 3d71a0935d811e8092c11b1ef4ce1ebc06eec85684385f5d66554c1043c2cbc7 ChangeLog 12899
+MISC ChangeLog 13544 RMD160 d2f787b77902df80ab479a50cb4f38e595e8b742 SHA1 772112a7b3dd5dacca5f1ebc33ef03f625ce91f5 SHA256 3fec6c7f0d51c1010cb219a33eb9eb1f97de9cefb79abdccf6cf98f6e241f042
+MD5 5b80d0c578ff270d4981b12e8f08e42e ChangeLog 13544
+RMD160 d2f787b77902df80ab479a50cb4f38e595e8b742 ChangeLog 13544
+SHA256 3fec6c7f0d51c1010cb219a33eb9eb1f97de9cefb79abdccf6cf98f6e241f042 ChangeLog 13544
 MISC metadata.xml 267 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 SHA1 c3b283892982fe0444300256e9d7648126c65704 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 metadata.xml 267
 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e metadata.xml 267
-MD5 4b66daa5488a92e9260e52f0457bb934 files/digest-openh323-1.13.2-r2 250
-RMD160 e2b30ec8fe210a963b199b9f575e20db88c2c591 files/digest-openh323-1.13.2-r2 250
-SHA256 7697da6c0ff370d1d7c9a5762e6f4b2f085d3d67a3bd9501a56e768a146337f5 files/digest-openh323-1.13.2-r2 250
-MD5 973eeb57f63719fd2735dbe6a449185f files/digest-openh323-1.15.3 250
-RMD160 c4c3ec80ba2d561b74a2e58d200e1e477d9b722b files/digest-openh323-1.15.3 250
-SHA256 d5b362b71dfa609973ac5c97783979672112567a4711f57d8f6f0796647374a6 files/digest-openh323-1.15.3 250
-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
 MD5 63b2393d22a1e26f3003d570496540fa files/digest-openh323-1.18.0 265
 RMD160 427f5b004f0a78f1524ccdbbd589be62a5a19f0e files/digest-openh323-1.18.0 265
 SHA256 f76ca3ed0ed5c46964718a964deb24662317596807b397bbdd68ee393dc0ed28 files/digest-openh323-1.18.0 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF6FmyvFcC4BYPU0oRAmqOAJ9tASpO0TCc4JKmfL4BmZ/8DQLG1wCdF3Bj
-d3XMx1V67hkvb7hnKAn6mPU=
-=UX4h
------END PGP SIGNATURE-----
diff --git a/net-libs/openh323/files/digest-openh323-1.13.2-r2 b/net-libs/openh323/files/digest-openh323-1.13.2-r2
deleted file mode 100644
index afd2a03cc5b9..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.13.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b63e0ae7555facdbeab5be8b407d09b6 openh323-1.13.2.tar.gz 2197100
-RMD160 61fc4960d745234bb190f3eedf7625e8821f5880 openh323-1.13.2.tar.gz 2197100
-SHA256 caf29b5632831bdd2634ea265ee38e7c67bb866e9f479755f8d311fd0fe6bd7d openh323-1.13.2.tar.gz 2197100
diff --git a/net-libs/openh323/files/digest-openh323-1.15.3 b/net-libs/openh323/files/digest-openh323-1.15.3
deleted file mode 100644
index 0aa701387840..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.15.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f9d25921281843fd2304da494b2e04e2 openh323-1.15.3.tar.gz 3754056
-RMD160 280dde066c6170219a578ce723b252757da92f4e openh323-1.15.3.tar.gz 3754056
-SHA256 2dab649046ca15b589bf48cfa6c6d2f3656b310ac482280f69a74eea397c91ef openh323-1.15.3.tar.gz 3754056
diff --git a/net-libs/openh323/files/digest-openh323-1.15.6 b/net-libs/openh323/files/digest-openh323-1.15.6
deleted file mode 100644
index c8854dc1c0b3..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.15.6
+++ /dev/null
@@ -1,3 +0,0 @@
-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.11.7-emptyMakefile b/net-libs/openh323/files/openh323-1.11.7-emptyMakefile
deleted file mode 100644
index d720acc09d37..000000000000
--- a/net-libs/openh323/files/openh323-1.11.7-emptyMakefile
+++ /dev/null
@@ -1,2 +0,0 @@
-opt:
-	:
diff --git a/net-libs/openh323/files/openh323-1.12.0-include-order.diff b/net-libs/openh323/files/openh323-1.12.0-include-order.diff
deleted file mode 100644
index a95c046a9aa3..000000000000
--- a/net-libs/openh323/files/openh323-1.12.0-include-order.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- openh323u.mak.in.orig	2003-11-03 04:12:31.000000000 +0100
-+++ openh323u.mak.in	2003-11-03 04:16:07.000000000 +0100
-@@ -121,11 +121,26 @@
- #
- 
- PWLIBDIR	= @PWLIBDIR@
--STDCCFLAGS	+= @STDCCFLAGS@
- LDFLAGS		+= @LDFLAGS@
- ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
- H323_AVCODEC	= @H323_AVCODEC@
- 
-+#
-+# stkn@gentoo.org
-+# moved stuff around, this should fix problems with include order
-+# blame me if this breaks things...
-+#
-+OH323_SRCDIR = $(OPENH323DIR)/src
-+ifdef PREFIX
-+OH323_INCDIR = $(PREFIX)/include/openh323
-+else
-+OH323_INCDIR = $(OPENH323DIR)/include
-+endif
-+OH323_LIBDIR = $(OPENH323DIR)/lib
-+
-+STDCCFLAGS   += -I$(OH323_INCDIR) @STDCCFLAGS@
-+
-+
- ifdef LIBRARY_MAKEFILE
- include $(PWLIBDIR)/make/unix.mak
- else
-@@ -140,16 +155,6 @@
- 
- #OH323_SUPPRESS_H235	= 1
- 
--
--OH323_SRCDIR = $(OPENH323DIR)/src
--ifdef PREFIX
--OH323_INCDIR = $(PREFIX)/include/openh323
--else
--OH323_INCDIR = $(OPENH323DIR)/include
--endif
--OH323_LIBDIR = $(OPENH323DIR)/lib
--
--
- ifdef NOTRACE
- STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
- OH323_SUFFIX = n
-@@ -168,15 +173,12 @@
- endif
- 
- 
--
- OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
- OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
- 
- LDFLAGS	    += -L$(OH323_LIBDIR)
- LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
- 
--STDCCFLAGS  += -I$(OH323_INCDIR)
--
- 
- ifneq ($(OS),Nucleus)
- 
diff --git a/net-libs/openh323/files/openh323-1.12.2-ffmpeg.diff b/net-libs/openh323/files/openh323-1.12.2-ffmpeg.diff
deleted file mode 100644
index e93db8302b7a..000000000000
--- a/net-libs/openh323/files/openh323-1.12.2-ffmpeg.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	2003-11-05 01:44:44.000000000 +0100
-+++ configure	2003-11-05 01:57:55.000000000 +0100
-@@ -3384,15 +3384,16 @@
- echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_open" >&6
- if test $ac_cv_lib_avcodec_avcodec_open = yes; then
-   H323_AVCODEC=1
-+  AVCODECINCLUDEDIR="/usr/include"
- else
-   H323_AVCODEC=
- fi
- 
- fi
- 
--if test "${H323_AVCODEC:-unset}" != "unset" ; then
--  echo "$as_me:$LINENO: checking for /usr/local/include/ffmpeg/avcodec.h" >&5
--echo $ECHO_N "checking for /usr/local/include/ffmpeg/avcodec.h... $ECHO_C" >&6
-+if test "${H323_AVCODEC:-unset}" = "unset" ; then
-+  echo "$as_me:$LINENO: checking for /usr/include/ffmpeg/avcodec.h" >&5
-+echo $ECHO_N "checking for /usr/include/ffmpeg/avcodec.h... $ECHO_C" >&6
- if test "${ac_cv_file__usr_local_include_ffmpeg_avcodec_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3400,7 +3401,7 @@
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
--if test -r "/usr/local/include/ffmpeg/avcodec.h"; then
-+if test -r "/usr/include/ffmpeg/avcodec.h"; then
-   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=yes
- else
-   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=no
-@@ -3410,6 +3411,7 @@
- echo "${ECHO_T}$ac_cv_file__usr_local_include_ffmpeg_avcodec_h" >&6
- if test $ac_cv_file__usr_local_include_ffmpeg_avcodec_h = yes; then
-   H323_AVCODEC=1
-+  AVCODECINCLUDEDIR="/usr/include/ffmpeg"
- fi
- 
- fi
-@@ -3422,9 +3424,10 @@
- #define H323_AVCODEC 1
- _ACEOF
- 
--  AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
--  AVCODECLIBDIR=/usr/local/lib
-+  AVCODECLIBDIR=/usr/lib
-   STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-+  LDFLAGS="$LDFLAGS -L${AVCODECLIBDIR}"
-+  ENDLDLIBS="-lavcodec $ENDLDLIBS"
- 
-   echo  "                      H263 codec on FFmpeg library  enabled"
- fi
diff --git a/net-libs/openh323/files/openh323-1.12.2-include-order.diff b/net-libs/openh323/files/openh323-1.12.2-include-order.diff
deleted file mode 100644
index 9317fd2a8217..000000000000
--- a/net-libs/openh323/files/openh323-1.12.2-include-order.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- openh323u.mak.in.orig	2003-11-03 19:05:49.000000000 +0100
-+++ openh323u.mak.in	2003-11-03 19:07:11.000000000 +0100
-@@ -127,12 +127,26 @@
- #
- 
- PWLIBDIR	= @PWLIBDIR@
--STDCCFLAGS	+= @STDCCFLAGS@
- LDFLAGS		+= @LDFLAGS@
- ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
- H323_AVCODEC	= @H323_AVCODEC@
- H323_VICH263	= @H323_VICH263@      
- 
-+#
-+# stkn@gentoo.org
-+# moved stuff around, this should fix problems with include order
-+# blame me if this breaks things...
-+#
-+OH323_SRCDIR = $(OPENH323DIR)/src
-+ifdef PREFIX
-+OH323_INCDIR = $(PREFIX)/include/openh323
-+else
-+OH323_INCDIR = $(OPENH323DIR)/include
-+endif
-+OH323_LIBDIR = $(OPENH323DIR)/lib
-+
-+STDCCFLAGS   += -I$(OH323_INCDIR) @STDCCFLAGS@
-+
- ifdef LIBRARY_MAKEFILE
- include $(PWLIBDIR)/make/unix.mak
- else
-@@ -147,16 +161,6 @@
- 
- #OH323_SUPPRESS_H235	= 1
- 
--
--OH323_SRCDIR = $(OPENH323DIR)/src
--ifdef PREFIX
--OH323_INCDIR = $(PREFIX)/include/openh323
--else
--OH323_INCDIR = $(OPENH323DIR)/include
--endif
--OH323_LIBDIR = $(OPENH323DIR)/lib
--
--
- ifdef NOTRACE
- STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
- OH323_SUFFIX = n
-@@ -175,15 +179,12 @@
- endif
- 
- 
--
- OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
- OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
- 
- LDFLAGS	    += -L$(OH323_LIBDIR)
- LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
- 
--STDCCFLAGS  += -I$(OH323_INCDIR)
--
- 
- ifneq ($(OS),Nucleus)
- 
diff --git a/net-libs/openh323/files/openh323-1.13.2-ffmpeg.diff b/net-libs/openh323/files/openh323-1.13.2-ffmpeg.diff
deleted file mode 100644
index e93db8302b7a..000000000000
--- a/net-libs/openh323/files/openh323-1.13.2-ffmpeg.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	2003-11-05 01:44:44.000000000 +0100
-+++ configure	2003-11-05 01:57:55.000000000 +0100
-@@ -3384,15 +3384,16 @@
- echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_open" >&6
- if test $ac_cv_lib_avcodec_avcodec_open = yes; then
-   H323_AVCODEC=1
-+  AVCODECINCLUDEDIR="/usr/include"
- else
-   H323_AVCODEC=
- fi
- 
- fi
- 
--if test "${H323_AVCODEC:-unset}" != "unset" ; then
--  echo "$as_me:$LINENO: checking for /usr/local/include/ffmpeg/avcodec.h" >&5
--echo $ECHO_N "checking for /usr/local/include/ffmpeg/avcodec.h... $ECHO_C" >&6
-+if test "${H323_AVCODEC:-unset}" = "unset" ; then
-+  echo "$as_me:$LINENO: checking for /usr/include/ffmpeg/avcodec.h" >&5
-+echo $ECHO_N "checking for /usr/include/ffmpeg/avcodec.h... $ECHO_C" >&6
- if test "${ac_cv_file__usr_local_include_ffmpeg_avcodec_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3400,7 +3401,7 @@
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
--if test -r "/usr/local/include/ffmpeg/avcodec.h"; then
-+if test -r "/usr/include/ffmpeg/avcodec.h"; then
-   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=yes
- else
-   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=no
-@@ -3410,6 +3411,7 @@
- echo "${ECHO_T}$ac_cv_file__usr_local_include_ffmpeg_avcodec_h" >&6
- if test $ac_cv_file__usr_local_include_ffmpeg_avcodec_h = yes; then
-   H323_AVCODEC=1
-+  AVCODECINCLUDEDIR="/usr/include/ffmpeg"
- fi
- 
- fi
-@@ -3422,9 +3424,10 @@
- #define H323_AVCODEC 1
- _ACEOF
- 
--  AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
--  AVCODECLIBDIR=/usr/local/lib
-+  AVCODECLIBDIR=/usr/lib
-   STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-+  LDFLAGS="$LDFLAGS -L${AVCODECLIBDIR}"
-+  ENDLDLIBS="-lavcodec $ENDLDLIBS"
- 
-   echo  "                      H263 codec on FFmpeg library  enabled"
- fi
diff --git a/net-libs/openh323/files/openh323-1.13.2-gcc34.diff b/net-libs/openh323/files/openh323-1.13.2-gcc34.diff
deleted file mode 100644
index 1a28190fd20d..000000000000
--- a/net-libs/openh323/files/openh323-1.13.2-gcc34.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/gkserver.h.old	2004-08-13 16:22:58.136150976 +0200
-+++ include/gkserver.h	2004-08-13 16:23:04.049252048 +0200
-@@ -427,7 +427,7 @@
-     H225_RegistrationConfirm & rcf;
-     H225_RegistrationReject  & rrj;
- 
--  protected:
-+//  protected:
-     virtual Response OnHandlePDU();
- };
- 
diff --git a/net-libs/openh323/files/openh323-1.13.2-include-order.diff b/net-libs/openh323/files/openh323-1.13.2-include-order.diff
deleted file mode 100644
index 8ca6b7c3337c..000000000000
--- a/net-libs/openh323/files/openh323-1.13.2-include-order.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- openh323u.mak.in.orig	2004-03-05 21:21:37.804902816 +0100
-+++ openh323u.mak.in	2004-03-05 21:25:43.476555048 +0100
-@@ -139,7 +139,6 @@
- 
- PWLIBDIR	= @PWLIBDIR@
- OPENH323DIR	= @OPENH323DIR@
--STDCCFLAGS	+= @STDCCFLAGS@
- LDFLAGS		+= @LDFLAGS@
- ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
- 
-@@ -160,6 +159,13 @@
- 
- #OH323_SUPPRESS_H235	= 1
- 
-+#
-+# stkn@gentoo.org
-+# oops i did it again :)
-+# moved STDCCFLAGS a little bit around
-+# this fixes include order problems
-+# (use build dir includes before system includes...)
-+#
- OH323_SRCDIR = $(OPENH323DIR)/src
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
-@@ -168,6 +174,8 @@
- endif
- OH323_LIBDIR = $(OPENH323DIR)/lib
- 
-+STDCCFLAGS	+= -I$(OH323_INCDIR) @STDCCFLAGS@
-+
- ifdef NOTRACE
- STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
- OH323_SUFFIX = n
-@@ -191,8 +199,6 @@
- LDFLAGS	    += -L$(OH323_LIBDIR)
- LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
- 
--STDCCFLAGS  += -I$(OH323_INCDIR)
--
- #ifndef NO_SPEEX
- ifeq ($(H323_SYSTEM_SPEEX),1)
- ENDLDLIBS    := -lspeex $(ENDLDLIBS) 
diff --git a/net-libs/openh323/files/openh323-1.13.2-ixjuser.diff b/net-libs/openh323/files/openh323-1.13.2-ixjuser.diff
deleted file mode 100644
index 9b26aa5ef6b2..000000000000
--- a/net-libs/openh323/files/openh323-1.13.2-ixjuser.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/ixjlid.h.orig	2004-01-31 13:13:22.000000000 +0000
-+++ include/ixjlid.h	2004-11-29 18:29:07.870950912 +0000
-@@ -257,6 +257,7 @@
- #ifdef HAS_IXJ
- #ifdef P_LINUX
- #include <linux/telephony.h>
-+#include <linux/compiler.h>
- #include <linux/ixjuser.h>
- #endif
- #ifdef P_FREEBSD
-
diff --git a/net-libs/openh323/files/openh323-1.13.5-ffmpeg.diff b/net-libs/openh323/files/openh323-1.13.5-ffmpeg.diff
deleted file mode 100644
index e93db8302b7a..000000000000
--- a/net-libs/openh323/files/openh323-1.13.5-ffmpeg.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	2003-11-05 01:44:44.000000000 +0100
-+++ configure	2003-11-05 01:57:55.000000000 +0100
-@@ -3384,15 +3384,16 @@
- echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_open" >&6
- if test $ac_cv_lib_avcodec_avcodec_open = yes; then
-   H323_AVCODEC=1
-+  AVCODECINCLUDEDIR="/usr/include"
- else
-   H323_AVCODEC=
- fi
- 
- fi
- 
--if test "${H323_AVCODEC:-unset}" != "unset" ; then
--  echo "$as_me:$LINENO: checking for /usr/local/include/ffmpeg/avcodec.h" >&5
--echo $ECHO_N "checking for /usr/local/include/ffmpeg/avcodec.h... $ECHO_C" >&6
-+if test "${H323_AVCODEC:-unset}" = "unset" ; then
-+  echo "$as_me:$LINENO: checking for /usr/include/ffmpeg/avcodec.h" >&5
-+echo $ECHO_N "checking for /usr/include/ffmpeg/avcodec.h... $ECHO_C" >&6
- if test "${ac_cv_file__usr_local_include_ffmpeg_avcodec_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3400,7 +3401,7 @@
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
--if test -r "/usr/local/include/ffmpeg/avcodec.h"; then
-+if test -r "/usr/include/ffmpeg/avcodec.h"; then
-   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=yes
- else
-   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=no
-@@ -3410,6 +3411,7 @@
- echo "${ECHO_T}$ac_cv_file__usr_local_include_ffmpeg_avcodec_h" >&6
- if test $ac_cv_file__usr_local_include_ffmpeg_avcodec_h = yes; then
-   H323_AVCODEC=1
-+  AVCODECINCLUDEDIR="/usr/include/ffmpeg"
- fi
- 
- fi
-@@ -3422,9 +3424,10 @@
- #define H323_AVCODEC 1
- _ACEOF
- 
--  AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
--  AVCODECLIBDIR=/usr/local/lib
-+  AVCODECLIBDIR=/usr/lib
-   STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-+  LDFLAGS="$LDFLAGS -L${AVCODECLIBDIR}"
-+  ENDLDLIBS="-lavcodec $ENDLDLIBS"
- 
-   echo  "                      H263 codec on FFmpeg library  enabled"
- fi
diff --git a/net-libs/openh323/files/openh323-1.13.5-include-order.diff b/net-libs/openh323/files/openh323-1.13.5-include-order.diff
deleted file mode 100644
index 8ca6b7c3337c..000000000000
--- a/net-libs/openh323/files/openh323-1.13.5-include-order.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- openh323u.mak.in.orig	2004-03-05 21:21:37.804902816 +0100
-+++ openh323u.mak.in	2004-03-05 21:25:43.476555048 +0100
-@@ -139,7 +139,6 @@
- 
- PWLIBDIR	= @PWLIBDIR@
- OPENH323DIR	= @OPENH323DIR@
--STDCCFLAGS	+= @STDCCFLAGS@
- LDFLAGS		+= @LDFLAGS@
- ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
- 
-@@ -160,6 +159,13 @@
- 
- #OH323_SUPPRESS_H235	= 1
- 
-+#
-+# stkn@gentoo.org
-+# oops i did it again :)
-+# moved STDCCFLAGS a little bit around
-+# this fixes include order problems
-+# (use build dir includes before system includes...)
-+#
- OH323_SRCDIR = $(OPENH323DIR)/src
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
-@@ -168,6 +174,8 @@
- endif
- OH323_LIBDIR = $(OPENH323DIR)/lib
- 
-+STDCCFLAGS	+= -I$(OH323_INCDIR) @STDCCFLAGS@
-+
- ifdef NOTRACE
- STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
- OH323_SUFFIX = n
-@@ -191,8 +199,6 @@
- LDFLAGS	    += -L$(OH323_LIBDIR)
- LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
- 
--STDCCFLAGS  += -I$(OH323_INCDIR)
--
- #ifndef NO_SPEEX
- ifeq ($(H323_SYSTEM_SPEEX),1)
- ENDLDLIBS    := -lspeex $(ENDLDLIBS) 
diff --git a/net-libs/openh323/files/openh323-1.15.2-notrace.diff b/net-libs/openh323/files/openh323-1.15.2-notrace.diff
deleted file mode 100644
index 762f9f768b13..000000000000
--- a/net-libs/openh323/files/openh323-1.15.2-notrace.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- openh323/Makefile.in	2004-08-22 06:21:45.000000000 +0200
-+++ openh323/Makefile.in.orig	2004-11-27 21:22:44.431975832 +0100
-@@ -328,12 +328,12 @@
- 
- install:
- 	mkdir -p $(DESTDIR)$(LIBDIR)
--	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
--	$(INSTALL) -m 444 lib/*_r.so $(DESTDIR)$(LIBDIR)
--	(for fn in lib/*_r.so.* ; do \
-+	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_$(OH323_SUFFIX).so*
-+	$(INSTALL) -m 444 lib/*_$(OH323_SUFFIX).so $(DESTDIR)$(LIBDIR)
-+	(for fn in lib/*_$(OH323_SUFFIX).so.* ; do \
- 		cd $(DESTDIR)$(LIBDIR) ; \
- 		rm -f `basename $$fn` ; \
--		ln -s libh323_*_r.so `basename $$fn` ; \
-+		ln -s libh323_*_$(OH323_SUFFIX).so `basename $$fn` ; \
- 	done)
- 	$(INSTALL) -m 444 lib/$(OH323_FILE) $(DESTDIR)$(LIBDIR)
- 	( cd $(DESTDIR)$(LIBDIR); rm libopenh323.so ; ln -s $(OH323_FILE) libopenh323.so)
diff --git a/net-libs/openh323/files/openh323-1.15.6-gcc4.diff b/net-libs/openh323/files/openh323-1.15.6-gcc4.diff
deleted file mode 100644
index 277c250ec52b..000000000000
--- a/net-libs/openh323/files/openh323-1.15.6-gcc4.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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.13.2-r2.ebuild b/net-libs/openh323/openh323-1.13.2-r2.ebuild
deleted file mode 100644
index f128bd9685be..000000000000
--- a/net-libs/openh323/openh323-1.13.2-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r2.ebuild,v 1.2 2005/08/06 19:00:49 kloeri Exp $
-
-inherit eutils flag-o-matic multilib
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="ssl"
-
-DEPEND=">=sys-apps/sed-4
-	~dev-libs/pwlib-1.6.3
-	>=media-video/ffmpeg-0.4.7
-	ssl? ( dev-libs/openssl )"
-
-pkg_setup() {
-	# to prevent merge problems with broken makefiles from old
-	# pwlib versions, we double-check here.
-
-	if [ "` fgrep '\$(OPENSSLDIR)/include' /usr/share/pwlib/make/unix.mak`" ]
-	then
-		# patch unix.mak so it doesn't require annoying
-		# unmerge/merge cycle to upgrade
-		einfo "Fixing broken pwlib makefile."
-		cd /usr/share/pwlib/make
-		sed -i \
-		-e "s:-DP_SSL -I\$(OPENSSLDIR)/include -I\$(OPENSSLDIR)/crypto:-DP_SSL:" \
-		-e "s:^LDFLAGS.*\+= -L\$(OPENSSLDIR)/$(get_libdir) -L\$(OPENSSLDIR):LDFLAGS +=:" \
-		unix.mak
-	fi
-
-	if has_version ">=sys-devel/gcc-3.3.2"; then
-		ewarn "If you are experiencing problems emerging openh323 with gcc-3.3.2"
-		ewarn "please try using CFLAGS=\"-O1\" when emerging"
-		ewarn "we are currently investigating this problem..."
-		ewarn ""
-		ewarn "<sleeping 10 seconds...>"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# fix and enable ffmpeg/h263 support (bug #32754)
-	epatch ${FILESDIR}/openh323-${PV}-ffmpeg.diff
-
-	# fix include order (bug #32522)
-	epatch ${FILESDIR}/openh323-${PV}-include-order.diff
-
-	# fix to compile on gcc-3.4 (bug #56951)
-	epatch ${FILESDIR}/${P}-gcc34.diff
-
-	# fix for 2.6 headers (bug #72448)
-	epatch ${FILESDIR}/${P}-ixjuser.diff
-
-	# fix a typo
-	sed -i -e "s:\$(DESDIR):\$(DESTDIR):" \
-		Makefile.in
-}
-
-src_compile() {
-	local makeopts
-
-	export PWLIBDIR=/usr/share/pwlib
-	export PTLIB_CONFIG=/usr/bin/ptlib-config
-	export OPENH323DIR=${S}
-
-	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib NOTRACE=1"
-
-	if use ssl; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-
-	append-flags -fPIC
-
-	# use shipped speex version
-	econf \
-		--enable-localspeex || die
-
-	emake -j1 ${makeopts} opt || die "make failed"
-}
-
-src_install() {
-	local OPENH323_ARCH ALT_ARCH
-	# make NOTRACE=1 opt ==> linux_$ARCH_n
-	# make opt           ==> linux_$ARCH_r
-
-	# amd64 needs special treatment
-	if [ ${ARCH} = "amd64" ]; then
-		OPENH323_ARCH="linux_x86_64_n"
-	else
-		OPENH323_ARCH="linux_${ARCH}_n"
-	fi
-
-	make PREFIX=/usr DESTDIR=${D} install || die "install failed"
-	dobin ${S}/samples/simple/obj_${OPENH323_ARCH}/simph323
-
-	# mod to keep gnugk happy
-	insinto /usr/share/openh323/src
-	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
-
-	# install version.h into $OPENH323DIR
-	insinto /usr/share/openh323
-	doins version.h
-
-	rm ${D}/usr/$(get_libdir)/libopenh323.so
-	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libopenh323.so
-
-	# for backwards compatibility with _r versioned libraries
-	# (this might not work...)
-	ALT_ARCH=${OPENH323_ARCH/_n/_r}
-	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
-		einfo "creating /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv} symlink"
-		dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv}
-	done
-	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so
-
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
-		/usr/share/openh323/openh323u.mak
-	dosed "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		/usr/share/openh323/openh323u.mak
-	# this is hardcoded now? nice...
-	dosed "s:^\(OPENH323DIR[ \t]\+=\) ${S}:\1 /usr/share/openh323:" \
-		/usr/share/openh323/openh323u.mak
-}
diff --git a/net-libs/openh323/openh323-1.15.3.ebuild b/net-libs/openh323/openh323-1.15.3.ebuild
deleted file mode 100644
index 799635c6125a..000000000000
--- a/net-libs/openh323/openh323-1.15.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.3.ebuild,v 1.4 2005/09/16 01:37:39 agriffis Exp $
-
-inherit eutils flag-o-matic multilib
-
-MY_P="${PN}-v${PV//./_}"
-
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
-
-IUSE="ssl novideo noaudio debug"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-libs/pwlib-1.8.4
-	>=media-video/ffmpeg-0.4.7
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Makefile is currently broken with NOTRACE=1, fix that
-	epatch ${FILESDIR}/${PN}-1.15.2-notrace.diff
-}
-
-src_compile() {
-	local makeopts
-	local myconf
-
-	# remove -fstack-protector, may cause problems (bug #75259)
-	filter-flags -fstack-protector
-
-	export PWLIBDIR=/usr/share/pwlib
-	export PTLIB_CONFIG=/usr/bin/ptlib-config
-	export OPENH323DIR=${S}
-
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib"
-
-	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
-	# compile with PTRACING if the user wants to debug stuff
-	if ! use debug; then
-		makeopts="${makeopts} NOTRACE=1"
-	fi
-
-	if use ssl; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-
-	use novideo \
-		&& myconf="${myconf} --disable-video"
-
-	use noaudio \
-		&& myconf="${myconf} --disable-audio"
-
-	econf ${myconf} || die "configure failed"
-	emake ${makeopts} opt || die "make failed"
-}
-
-src_install() {
-	local OPENH323_ARCH ALT_ARCH OPENH323_SUFFIX
-	local makeopts
-	# make NOTRACE=1 opt ==> linux_$ARCH_n
-	# make opt           ==> linux_$ARCH_r
-	if ! use debug; then
-		OPENH323_SUFFIX="n"
-		makeopts="NOTRACE=1"
-	else
-		OPENH323_SUFFIX="r"
-	fi
-
-	# amd64 needs special treatment
-	if use amd64; then
-		OPENH323_ARCH="linux_x86_64_${OPENH323_SUFFIX}"
-	else
-		OPENH323_ARCH="linux_${ARCH}_${OPENH323_SUFFIX}"
-	fi
-
-	# set ALT_ARCH
-	if use debug; then
-		ALT_ARCH=${OPENH323_ARCH/_r/_n}
-	else
-		ALT_ARCH=${OPENH323_ARCH/_n/_r}
-	fi
-
-	###
-	# Install stuff
-	#
-	make PREFIX=/usr DESTDIR=${D} \
-		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
-		${makeopts} install || die "install failed"
-
-	# workaround: don't install libh323*.so and libh323.so.${PV}
-	if [[ -f ${D}/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so ]]; then
-		# libh323*.so is a file... replace it w/ a symlink
-		rm -f ${D}/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so
-
-		dosym  /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} \
-			/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so
-	fi
-
-	###
-	# Compatibility "hacks"
-	#
-
-	# mod to keep gnugk happy
-	insinto /usr/share/openh323/src
-	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
-
-	# install version.h into $OPENH323DIR
-	insinto /usr/share/openh323
-	doins version.h
-
-	rm ${D}/usr/$(get_libdir)/libopenh323.so
-	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libopenh323.so
-
-	# for backwards compatibility with _r versioned libraries
-	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
-		einfo "creating /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv} symlink"
-		dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv}
-	done
-	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so
-
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
-		/usr/share/openh323/openh323u.mak
-	dosed "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		/usr/share/openh323/openh323u.mak
-	# this is hardcoded now?
-	dosed "s:^\(OPENH323DIR[ \t]\+=\) ${S}:\1 /usr/share/openh323:" \
-		/usr/share/openh323/openh323u.mak
-}
diff --git a/net-libs/openh323/openh323-1.15.6.ebuild b/net-libs/openh323/openh323-1.15.6.ebuild
deleted file mode 100644
index e755a47c6e37..000000000000
--- a/net-libs/openh323/openh323-1.15.6.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.3 2006/07/12 09:05:30 corsair Exp $
-
-inherit eutils flag-o-matic multilib
-
-MY_P="${PN}-v${PV//./_}"
-
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
-
-IUSE="ssl novideo noaudio debug"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	~dev-libs/pwlib-1.8.7
-	>=media-video/ffmpeg-0.4.7
-	ssl? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Makefile is currently broken with NOTRACE=1, fix that
-	epatch "${FILESDIR}"/${PN}-1.15.2-notrace.diff
-	epatch "${FILESDIR}"/${P}-gcc4.diff
-}
-
-src_compile() {
-	local makeopts
-	local myconf
-
-	# remove -fstack-protector, may cause problems (bug #75259)
-	filter-flags -fstack-protector
-
-	export PWLIBDIR=/usr/share/pwlib
-	export PTLIB_CONFIG=/usr/bin/ptlib-config
-	export OPENH323DIR=${S}
-
-	makeopts="ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib"
-
-	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
-	# compile with PTRACING if the user wants to debug stuff
-	if ! use debug; then
-		makeopts="${makeopts} NOTRACE=1"
-	fi
-
-	if use ssl; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-
-	use novideo \
-		&& myconf="${myconf} --disable-video"
-
-	use noaudio \
-		&& myconf="${myconf} --disable-audio"
-
-	econf ${myconf} || die "configure failed"
-	emake ${makeopts} opt || die "make failed"
-}
-
-src_install() {
-	local OPENH323_ARCH ALT_ARCH OPENH323_SUFFIX
-	local makeopts libdir
-
-	# make NOTRACE=1 opt ==> linux_$ARCH_n
-	# make opt           ==> linux_$ARCH_r
-	if ! use debug; then
-		OPENH323_SUFFIX="n"
-		makeopts="NOTRACE=1"
-	else
-		OPENH323_SUFFIX="r"
-	fi
-
-	# use ptlib-config to get the right values here (for hppa, amd64 ...)
-	OPENH323_ARCH="$(ptlib-config --ostype)_$(ptlib-config --machtype)_${OPENH323_SUFFIX}"
-
-	# set ALT_ARCH
-	if use debug; then
-		ALT_ARCH=${OPENH323_ARCH/_r/_n}
-	else
-		ALT_ARCH=${OPENH323_ARCH/_n/_r}
-	fi
-
-	###
-	# Install stuff
-	#
-	make PREFIX=/usr DESTDIR=${D} \
-		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
-		${makeopts} install || die "install failed"
-
-	libdir=$(get_libdir)
-
-	# fix openh323's bogus symlinks
-	for pv in ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
-		rm -f ${D}/usr/${libdir}/libh323_${OPENH323_ARCH}.so.${pv}
-
-		dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
-			/usr/${libdir}/libh323_${OPENH323_ARCH}.so.${pv}
-	done
-	rm -f ${D}/usr/${libdir}/libh323_${OPENH323_ARCH}.so
-	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
-		/usr/${libdir}/libh323_${OPENH323_ARCH}.so
-
-	# create backwards compatibility with _r versioned libraries
-	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
-		# compat symlink
-		dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
-			/usr/${libdir}/libh323_${ALT_ARCH}.so.${pv}
-	done
-	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
-		/usr/${libdir}/libh323_${ALT_ARCH}.so
-
-	###
-	# Compatibility "hacks"
-	#
-
-	# mod to keep gnugk happy (still needed?)
-	insinto /usr/share/openh323/src
-	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
-
-	# install version.h into $OPENH323DIR
-	insinto /usr/share/openh323
-	doins version.h
-
-	# should try to get rid of this one
-	rm -f ${D}/usr/${libdir}/libopenh323.so
-	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} /usr/${libdir}/libopenh323.so
-
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/${libdir}:" \
-		/usr/share/openh323/openh323u.mak
-	dosed "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		/usr/share/openh323/openh323u.mak
-
-	# this is hardcoded now?
-	dosed "s:^\(OPENH323DIR[ \t]\+=\) ${S}:\1 /usr/share/openh323:" \
-		/usr/share/openh323/openh323u.mak
-}