Do not include compiler.h, bug #168791

Package-Manager: portage-2.1.2-r13

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index f248c5c770b71f695fff751428f2e641054a3076..7dfe7c21b229f966d518d3f1c264bd43586d9138 100644 (file)
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,10 @@
 # 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.80 2007/02/22 01:37:04 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.81 2007/03/02 17:06:49 aballier Exp $
+
+  02 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/openh323-1.18.0-compilerh.patch, openh323-1.18.0.ebuild:
+  Do not include compiler.h, bug #168791
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.

diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 635a256e628c5ced369e2099a6f7537800c040ac..ea145a1af0776c2f7d412e80ca0ff591650c9018 100644 (file)
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -46,6 +49,10 @@ AUX openh323-1.15.6-gcc4.diff 1220 RMD160 aba712ee89a03b24a6263a67d7e7d89a6670c0
 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
+SHA256 d04fe879d25f2b9d6541d3adacc980ebd5ef037b75fbb6759d6810bf3acded1b files/openh323-1.18.0-compilerh.patch 325
 AUX openh323-1.18.0-install.diff 917 RMD160 18bdb85be13f1ca074f0d4db2394c8962bcaf9be SHA1 fd9a1eecd6491af179931194af071d0f8af55f7e SHA256 0216b9cc4ed5082e7897fa806f568e2281c602e8abd0f0a74902e7bc812047e6
 MD5 0f8527aebd8d3dcfb7197656a4d31579 files/openh323-1.18.0-install.diff 917
 RMD160 18bdb85be13f1ca074f0d4db2394c8962bcaf9be files/openh323-1.18.0-install.diff 917
@@ -66,14 +73,14 @@ EBUILD openh323-1.15.6.ebuild 4092 RMD160 1fa0d390f7a855bf2b2dcdea3a861b3b7a39e5
 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 2356 RMD160 78614397935cb7c7d50867cb89c30111c09f2d56 SHA1 b7d14b789a436b5fb57cf0837a16f746ef88f34e SHA256 df6b9f03769f3a409eae29c3a0000f96a822ee227ec02784862a9b82dd6312a2
-MD5 118179dda283d826bd2bc9ba051bd8ab openh323-1.18.0.ebuild 2356
-RMD160 78614397935cb7c7d50867cb89c30111c09f2d56 openh323-1.18.0.ebuild 2356
-SHA256 df6b9f03769f3a409eae29c3a0000f96a822ee227ec02784862a9b82dd6312a2 openh323-1.18.0.ebuild 2356
-MISC ChangeLog 12736 RMD160 4bdd6cccc966d4ec9e981bcf92121c86c842cdd6 SHA1 0aa9ca754d54aab10af7cb91360ff9ad2b28b653 SHA256 c021d38b2876f96b5c625cee4060e9e8eacaa4f57d3ab57c8dba5910bffb1aff
-MD5 faf30eb13bb31c63ad6d705e8b1504da ChangeLog 12736
-RMD160 4bdd6cccc966d4ec9e981bcf92121c86c842cdd6 ChangeLog 12736
-SHA256 c021d38b2876f96b5c625cee4060e9e8eacaa4f57d3ab57c8dba5910bffb1aff ChangeLog 12736
+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 metadata.xml 267 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 SHA1 c3b283892982fe0444300256e9d7648126c65704 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 metadata.xml 267
@@ -90,3 +97,10 @@ SHA256 cb05f4b3767b1e1fd089f45a667b3a50fb9ff6fa325ef8cb6b0a57112016e2b8 files/di
 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/openh323-1.18.0-compilerh.patch b/net-libs/openh323/files/openh323-1.18.0-compilerh.patch
new file mode 100644 (file)
index 0000000..2327420
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.18.0-compilerh.patch
@@ -0,0 +1,12 @@
+Index: openh323_v1_18_0/include/ixjlid.h
+===================================================================
+--- openh323_v1_18_0.orig/include/ixjlid.h
++++ openh323_v1_18_0/include/ixjlid.h
+@@ -274,7 +274,6 @@
+ 
+ #ifdef P_LINUX
+ #include <linux/telephony.h>
+-#include <linux/compiler.h>
+ #include <linux/ixjuser.h>
+ #endif
+ 

diff --git a/net-libs/openh323/openh323-1.18.0.ebuild b/net-libs/openh323/openh323-1.18.0.ebuild
index ff9d5cbf52de5ec749962852a90647a3ba3a006b..73a4527796f2f39241b6c35910eb0d0a532fd433 100644 (file)
--- a/net-libs/openh323/openh323-1.18.0.ebuild
+++ b/net-libs/openh323/openh323-1.18.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.18.0.ebuild,v 1.7 2006/10/24 03:33:36 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.18.0.ebuild,v 1.8 2007/03/02 17:06:49 aballier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -32,6 +32,8 @@ src_unpack() {
        cd ${S}
        # Makefile does not work correctly, fix
        epatch ${FILESDIR}/${PN}-1.18.0-install.diff
+       # Do not include compiler.h, bug #168791
+       epatch "${FILESDIR}/${P}-compilerh.patch"
 }
 
 src_compile() {