openh323-1.12.2-r2 stable on x86, fixed #43981, includes fix for amd64

4 files changed, 42 insertions, 24 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 9dd8f3ac70c6..7e3258863d2c 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.36 2004/03/30 18:52:45 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.37 2004/03/30 22:29:46 stkn Exp $
+
+  30 Mar 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.2-r2.ebuild,
+  openh323-1.13.2-r1.ebuild:
+  openh323-1.12.2-r2 marked stable on x86, added fix for #43981.
+  Both ebuilds should work on amd64 now (symlinks are created correctly)
 
   30 Mar 2004; Sven Blumenstein <bazik@gentoo.org> openh323-1.12.2-r2.ebuild:
   Stable on sparc.
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 165f859dcfe9..203fd1f4313b 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,22 +1,22 @@
-MD5 118dc6363105e93f2d8f256d0278a180 openh323-1.12.2-r1.ebuild 3119
-MD5 54e3e22ba5b272002ac28fdbe07c82ab openh323-1.13.2.ebuild 3721
-MD5 e0b59bdeb247309aa20dcc6232324989 openh323-1.13.2-r1.ebuild 3873
-MD5 1640790319d97a0b9934321fb497e6e1 openh323-1.9.10-r1.ebuild 1116
-MD5 238f71369acba3912e3d958ec6b6f702 openh323-1.12.0-r1.ebuild 2834
-MD5 6189d0cddb3caef14e831710e7e59d45 openh323-1.11.7.ebuild 1838
-MD5 dd6c7a8497871ff152f36b97d6197254 openh323-1.12.2-r2.ebuild 3540
-MD5 60ce3fcf5ad04a9c7d5f5cd573570051 ChangeLog 6411
+MD5 0705f0067956b42389dae4bc6024cf8a ChangeLog 6653
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
-MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
-MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 43ccf0e901b82bf96ac9588d0bd31b8f openh323-1.11.7.ebuild 1837
+MD5 1b8eec9d35b38f8131fa688c290bbf82 openh323-1.12.0-r1.ebuild 2833
+MD5 8530580ad74cd19f57adab52a2278b85 openh323-1.12.2-r1.ebuild 3118
+MD5 6b4f96872a08d397e2f1ea8c25612f80 openh323-1.12.2-r2.ebuild 3739
+MD5 3dca051f8c9b0a6b16b23183eecdc51b openh323-1.13.2-r1.ebuild 3981
+MD5 4327fd2c77e122b73694dc6e13ce1fbc openh323-1.13.2.ebuild 3720
+MD5 09fd919349a020267a74fd17bc9266df openh323-1.9.10-r1.ebuild 1115
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
-MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
-MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
 MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
 MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r1 68
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
 MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
+MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
+MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
diff --git a/net-libs/openh323/openh323-1.12.2-r2.ebuild b/net-libs/openh323/openh323-1.12.2-r2.ebuild
index a0736e4c0d63..5bd25c2ca605 100644
--- a/net-libs/openh323/openh323-1.12.2-r2.ebuild
+++ b/net-libs/openh323/openh323-1.12.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r2.ebuild,v 1.5 2004/03/30 18:52:45 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r2.ebuild,v 1.6 2004/03/30 22:29:46 stkn Exp $
 
 inherit eutils
 
@@ -13,10 +13,10 @@ SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ppc sparc"
+KEYWORDS="x86 ppc sparc ~alpha"
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-libs/pwlib-1.5.2
+	>=dev-libs/pwlib-1.5.2-r3
 	>=media-video/ffmpeg-0.4.7
 	ssl? ( dev-libs/openssl )"
 
@@ -39,7 +39,7 @@ pkg_setup() {
 	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 "If you are experiencing problems emerging openh323 with gcc-3.3.x"
 		ewarn "please try using CFLAGS=\"-O1\" when emergeing"
 		ewarn "we are currently investigating this problem..."
 		ewarn ""
@@ -67,7 +67,8 @@ src_compile() {
 	export OPENH323DIR=${S}
 
 	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser NOTRACE=1"
+	# setting LDFLAGS prevents openh323 from using the wrong libs
+	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib NOTRACE=1"
 
 	if [ "`use ssl`" ]; then
 		export OPENSSLFLAG=1
@@ -83,7 +84,13 @@ src_install() {
 	local OPENH323_ARCH ALT_ARCH
 	# make NOTRACE=1 opt ==> linux_$ARCH_n
 	# make opt           ==> linux_$ARCH_r
-	OPENH323_ARCH="linux_${ARCH}_n"
+
+	# amd64 needs special treatment
+	if [ ${ARCH} = "amd64" ]; then
+		OPENH323_ARCH="linux_x86_64_n"
+	else
+		OPENH323_ARCH="linux_${ARCH}_n"
+	fi
 
 	dodir /usr/bin /usr/lib/ /usr/share
 	make PREFIX=${D}/usr install || die "install failed"
diff --git a/net-libs/openh323/openh323-1.13.2-r1.ebuild b/net-libs/openh323/openh323-1.13.2-r1.ebuild
index ce9d4b6244e1..b3020e401c19 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 Technologies, Inc.
 # 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.4 2004/03/30 14:44:23 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.5 2004/03/30 22:29:46 stkn Exp $
 
 IUSE="ssl"
 
@@ -88,7 +88,13 @@ src_install() {
 	local OPENH323_ARCH ALT_ARCH
 	# make NOTRACE=1 opt ==> linux_$ARCH_n
 	# make opt           ==> linux_$ARCH_r
-	OPENH323_ARCH="linux_${ARCH}_n"
+
+	# amd64 needs special treatment
+	if [ ${ARCH} = "amd64" ]; then
+		OPENH323_ARCH="linux_x86_64_n"
+	else
+		OPENH323_ARCH="linux_${ARCH}_n"
+	fi
 
 	dodir /usr/bin /usr/lib/ /usr/share
 	make PREFIX=${D}/usr install || die "install failed"