some changes, see ChangeLog for details, marked ~x86

11 files changed, 47 insertions, 35 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index ced949259520..ba9139d6ed60 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.55 2004/12/29 03:46:38 stkn Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.56 2005/01/08 20:15:47 stkn Exp $
+
+  08 Jan 2005; Stefan Knoblich <stkn@gentoo.org> openh323-1.15.2.ebuild:
+  removed sample application (simph323, anyone needs that?), parallel building
+  works, libs are now installed as libh323*.so.${PV} (imho more
+  sane than libh323*.so), testing fun on x86 begins
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 0e85502fcc0c..a305e8b8bc18 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,14 +1,14 @@
-MD5 03ffce610d4d5c1bad37d71290ce3a7b openh323-1.12.2-r2.ebuild 3723
-MD5 a849ad67e89640b6553a759c07a60c69 openh323-1.13.5.ebuild 4062
-MD5 98267a6d9140b3d60cbb992c67a3560e openh323-1.15.2.ebuild 3595
-MD5 12403060d8b2aab0cf2256cb868512fc openh323-1.9.10-r1.ebuild 1103
-MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
+MD5 9c59d13d7b06bc4d44c71723173b32c9 openh323-1.12.2-r2.ebuild 3720
+MD5 596594d4622b8512ca45dd8e4a879d51 openh323-1.13.5.ebuild 4060
+MD5 d8adb83dc452a129ff585cf3fc1f7f11 openh323-1.15.2.ebuild 3847
+MD5 0fc92f812d82b55f0070957e64f12182 openh323-1.9.10-r1.ebuild 1099
+MD5 3aeadd649563d6df48e8f2d24eb9f2ed openh323-1.12.0-r1.ebuild 2818
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
-MD5 bc1d3d9e9dfe4dea1ee2195db7e2cd04 openh323-1.11.7.ebuild 1826
-MD5 3bf614f03ac28b3bec486ee7f23b6c6d ChangeLog 9286
-MD5 2b323f821a82d94ecaaad482405ac025 openh323-1.13.2.ebuild 3705
-MD5 af3a69233933d2f0e342bbee7f6b5a59 openh323-1.13.2-r1.ebuild 4098
-MD5 ac4ea2adff91762288ef0246d7446f48 openh323-1.12.2-r1.ebuild 3106
+MD5 a167b86038f89f15ce2609935c31678c openh323-1.11.7.ebuild 1822
+MD5 39165b79fa071af365b5ec5e4b172f45 ChangeLog 9555
+MD5 4a8ed9e0975b6974ff38d251fa023e08 openh323-1.13.2.ebuild 3702
+MD5 822d1f8b8e3353d2035fd6ea153f0f71 openh323-1.13.2-r1.ebuild 4098
+MD5 52d02159dd3a9eb5727220aa9c8fb417 openh323-1.12.2-r1.ebuild 3102
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
 MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2 73
diff --git a/net-libs/openh323/openh323-1.11.7.ebuild b/net-libs/openh323/openh323-1.11.7.ebuild
index 325e60dca4ba..17c866f2db86 100644
--- a/net-libs/openh323/openh323-1.11.7.ebuild
+++ b/net-libs/openh323/openh323-1.11.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.11.7.ebuild,v 1.10 2004/06/24 23:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.11.7.ebuild,v 1.11 2005/01/08 20:15:47 stkn Exp $
 
 IUSE="ssl"
 
diff --git a/net-libs/openh323/openh323-1.12.0-r1.ebuild b/net-libs/openh323/openh323-1.12.0-r1.ebuild
index b5ff2be6c798..f616669f7ed7 100644
--- a/net-libs/openh323/openh323-1.12.0-r1.ebuild
+++ b/net-libs/openh323/openh323-1.12.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.12.0-r1.ebuild,v 1.9 2004/06/24 23:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.10 2005/01/08 20:15:47 stkn Exp $
 
 inherit eutils
 
diff --git a/net-libs/openh323/openh323-1.12.2-r1.ebuild b/net-libs/openh323/openh323-1.12.2-r1.ebuild
index 595d098de189..03182140656f 100644
--- a/net-libs/openh323/openh323-1.12.2-r1.ebuild
+++ b/net-libs/openh323/openh323-1.12.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.12.2-r1.ebuild,v 1.4 2004/06/24 23:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r1.ebuild,v 1.5 2005/01/08 20:15:47 stkn Exp $
 
 IUSE="ssl"
 
diff --git a/net-libs/openh323/openh323-1.12.2-r2.ebuild b/net-libs/openh323/openh323-1.12.2-r2.ebuild
index dd5b3d5454b0..b9c038f89e7f 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 Foundation
+# 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.12.2-r2.ebuild,v 1.11 2004/09/06 19:46:59 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r2.ebuild,v 1.12 2005/01/08 20:15:47 stkn Exp $
 
 inherit eutils
 
diff --git a/net-libs/openh323/openh323-1.13.2-r1.ebuild b/net-libs/openh323/openh323-1.13.2-r1.ebuild
index 53060d174f75..21ec4633b9a9 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
+# 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-r1.ebuild,v 1.16 2004/11/30 22:30:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.17 2005/01/08 20:15:47 stkn Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-libs/openh323/openh323-1.13.2.ebuild b/net-libs/openh323/openh323-1.13.2.ebuild
index d053155a024c..f3ae989bc969 100644
--- a/net-libs/openh323/openh323-1.13.2.ebuild
+++ b/net-libs/openh323/openh323-1.13.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.5 2004/09/06 19:46:59 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2.ebuild,v 1.6 2005/01/08 20:15:47 stkn Exp $
 
 IUSE="ssl"
 
diff --git a/net-libs/openh323/openh323-1.13.5.ebuild b/net-libs/openh323/openh323-1.13.5.ebuild
index 09a613992b72..41f1b572f870 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
+# 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.5.ebuild,v 1.10 2004/11/09 10:36:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.5.ebuild,v 1.11 2005/01/08 20:15:47 stkn Exp $
 
 IUSE="ssl"
 
diff --git a/net-libs/openh323/openh323-1.15.2.ebuild b/net-libs/openh323/openh323-1.15.2.ebuild
index 4bbc7ef457ef..84b63e3ab1d4 100644
--- a/net-libs/openh323/openh323-1.15.2.ebuild
+++ b/net-libs/openh323/openh323-1.15.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.ebuild,v 1.2 2004/12/29 03:46:38 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.2.ebuild,v 1.3 2005/01/08 20:15:47 stkn Exp $
 
 IUSE="ssl novideo noaudio debug"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src-tar.gz"
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="-*"
+KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.8.3
@@ -40,7 +40,7 @@ src_compile() {
 	export PTLIB_CONFIG=/usr/bin/ptlib-config
 	export OPENH323DIR=${S}
 
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser"
+	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
@@ -61,7 +61,7 @@ src_compile() {
 		&& myconf="${myconf} --disable-audio"
 
 	econf ${myconf} || die "configure failed"
-	emake -j1 ${makeopts} opt apps || die "make failed"
+	emake ${makeopts} opt || die "make failed"
 }
 
 src_install() {
@@ -97,10 +97,17 @@ src_install() {
 		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
 		${makeopts} install || die "install failed"
 
-	dobin ${S}/samples/simple/obj_${OPENH323_ARCH}/simph323
+	# workaround: don't install libh323*.so and libh323.so.${PV}
+	if [[ -f ${D}/usr/lib/libh323_${OPENH323_ARCH}.so ]]; then
+		# libh323*.so is a file... replace it w/ a symlink
+		rm -f ${D}/usr/lib/libh323_${OPENH323_ARCH}.so
+
+		dosym  /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} \
+			/usr/lib/libh323_${OPENH323_ARCH}.so
+	fi
 
 	###
-	# Compatibility "hacks" (openh323-config anyone?)
+	# Compatibility "hacks"
 	#
 
 	# mod to keep gnugk happy
diff --git a/net-libs/openh323/openh323-1.9.10-r1.ebuild b/net-libs/openh323/openh323-1.9.10-r1.ebuild
index 3d18b9066462..44cfe506d8a6 100644
--- a/net-libs/openh323/openh323-1.9.10-r1.ebuild
+++ b/net-libs/openh323/openh323-1.9.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.9.10-r1.ebuild,v 1.13 2004/06/24 23:16:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.9.10-r1.ebuild,v 1.14 2005/01/08 20:15:47 stkn Exp $
 
 IUSE="ssl"