BUG #56951 fixed, amd64 and ~amd64

5 files changed, 30 insertions, 7 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index a755f249e737..f071ccfc76f9 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.45 2004/06/24 23:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.46 2004/08/13 22:32:00 kugelfang Exp $
+
+  14 Aug 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/openh323-1.13.2-gcc34.diff, openh323-1.13.2-r1.ebuild,
+  openh323-1.13.5.ebuild:
+  Fixed BUG #56951. Marked 1.13.2-r1 amd64 and 1.13.5 ~amd64.
 
   10 Jun 2004; Aron Griffis <agriffis@gentoo.org> openh323-1.11.7.ebuild,
   openh323-1.12.0-r1.ebuild, openh323-1.12.2-r1.ebuild,
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 3d3bedfa593e..94a14ebb381d 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,13 +1,13 @@
-MD5 ee1f9470981e0ca7b7b19d07677efa66 ChangeLog 7735
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
 MD5 bc1d3d9e9dfe4dea1ee2195db7e2cd04 openh323-1.11.7.ebuild 1826
 MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
 MD5 ac4ea2adff91762288ef0246d7446f48 openh323-1.12.2-r1.ebuild 3106
 MD5 1245c9d4d766cc03c5a6eaba1911731f openh323-1.12.2-r2.ebuild 3723
-MD5 383decc43d1093e0ad84b4c11e1ccc63 openh323-1.13.2-r1.ebuild 3948
+MD5 861af42198beea9e8b7d6ec97137cdba openh323-1.13.2-r1.ebuild 4029
 MD5 6b667e9692c156dd6808f23916047619 openh323-1.13.2.ebuild 3705
-MD5 98c76ccaa32663a881e46b3611bbfd2b openh323-1.13.5.ebuild 3955
+MD5 6e4f09cf5be8497ba7a9205310a08157 openh323-1.13.5.ebuild 4050
 MD5 12403060d8b2aab0cf2256cb868512fc openh323-1.9.10-r1.ebuild 1103
+MD5 aeca490ba3edc84eb8be245fbac975ff ChangeLog 7941
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
 MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
@@ -24,3 +24,4 @@ MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
 MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
 MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
+MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
diff --git a/net-libs/openh323/files/openh323-1.13.2-gcc34.diff b/net-libs/openh323/files/openh323-1.13.2-gcc34.diff
new file mode 100644
index 000000000000..1a28190fd20d
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.13.2-gcc34.diff
@@ -0,0 +1,11 @@
+--- 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/openh323-1.13.2-r1.ebuild b/net-libs/openh323/openh323-1.13.2-r1.ebuild
index 652c3348c4ab..18510153c693 100644
--- a/net-libs/openh323/openh323-1.13.2-r1.ebuild
+++ b/net-libs/openh323/openh323-1.13.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.11 2004/08/11 21:21:53 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.12 2004/08/13 22:32:00 kugelfang Exp $
 
 inherit eutils flag-o-matic
 
@@ -54,6 +54,9 @@ src_unpack() {
 
 	# 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
 }
 
 src_compile() {
diff --git a/net-libs/openh323/openh323-1.13.5.ebuild b/net-libs/openh323/openh323-1.13.5.ebuild
index 86a6c792109d..cd58997ad1fb 100644
--- a/net-libs/openh323/openh323-1.13.5.ebuild
+++ b/net-libs/openh323/openh323-1.13.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.5.ebuild,v 1.5 2004/06/24 23:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.5.ebuild,v 1.6 2004/08/13 22:32:00 kugelfang Exp $
 
 IUSE="ssl"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/openh323/${MY_P}-src.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.6.6
@@ -59,6 +59,9 @@ src_unpack() {
 
 	# fix include order (bug #32522)
 	epatch ${FILESDIR}/openh323-${PV}-include-order.diff
+
+	# fix to compile on gcc-3.4 (bug #56951)
+	epatch ${FILESDIR}/${PN}-1.13.2-gcc34.diff
 }
 
 src_compile() {