new version

5 files changed, 177 insertions, 19 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index ec4f6642786d..d72cde48ce04 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2004/11/30 22:30:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.53 2004/12/28 03:40:17 stkn Exp $
+
+*openh323-1.15.2 (28 Dec 2004)
+
+  28 Dec 2004; Stefan Knoblich <stkn@gentoo.org>
+  +files/openh323-1.15.2-notrace.diff, +openh323-1.15.2.ebuild:
+  new version, hard-masked for now (needs testing)
 
   30 Nov 2004; <stkn@gentoo.org> +files/openh323-1.13.2-ixjuser.diff,
   openh323-1.13.2-r1.ebuild:
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 16aaaed72435..6fb5b21c5a9c 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,28 +1,31 @@
+MD5 03ffce610d4d5c1bad37d71290ce3a7b openh323-1.12.2-r2.ebuild 3723
+MD5 a849ad67e89640b6553a759c07a60c69 openh323-1.13.5.ebuild 4062
+MD5 a2d7e2c4e27da19ecf4dd9ef303a184f openh323-1.15.2.ebuild 3393
+MD5 12403060d8b2aab0cf2256cb868512fc openh323-1.9.10-r1.ebuild 1103
+MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
-MD5 600a575272d12d74811951f6ccd93f55 ChangeLog 8799
 MD5 bc1d3d9e9dfe4dea1ee2195db7e2cd04 openh323-1.11.7.ebuild 1826
-MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
-MD5 12403060d8b2aab0cf2256cb868512fc openh323-1.9.10-r1.ebuild 1103
-MD5 a849ad67e89640b6553a759c07a60c69 openh323-1.13.5.ebuild 4062
-MD5 af3a69233933d2f0e342bbee7f6b5a59 openh323-1.13.2-r1.ebuild 4098
-MD5 03ffce610d4d5c1bad37d71290ce3a7b openh323-1.12.2-r2.ebuild 3723
+MD5 f5e8875a0fa5f3684cb0dd4a90a6b871 ChangeLog 8996
 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 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
+MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
+MD5 c86108b98d6cb08de9e4cfcaca436e24 files/digest-openh323-1.15.2 73
+MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
 MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
+MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
+MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5 73
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
-MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
-MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
-MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
 MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r1 68
+MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
+MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
 MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
-MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
-MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
+MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
-MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
-MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5 73
-MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
diff --git a/net-libs/openh323/files/digest-openh323-1.15.2 b/net-libs/openh323/files/digest-openh323-1.15.2
new file mode 100644
index 000000000000..3483c1c512fd
--- /dev/null
+++ b/net-libs/openh323/files/digest-openh323-1.15.2
@@ -0,0 +1 @@
+MD5 53086e76eb4e2ff2a3b77f1d4e9acaa8 openh323-v1_15_2-src.tar.gz 3735815
diff --git a/net-libs/openh323/files/openh323-1.15.2-notrace.diff b/net-libs/openh323/files/openh323-1.15.2-notrace.diff
new file mode 100644
index 000000000000..762f9f768b13
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.15.2-notrace.diff
@@ -0,0 +1,19 @@
+--- 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/openh323-1.15.2.ebuild b/net-libs/openh323/openh323-1.15.2.ebuild
new file mode 100644
index 000000000000..c6381dc8f7b2
--- /dev/null
+++ b/net-libs/openh323/openh323-1.15.2.ebuild
@@ -0,0 +1,129 @@
+# 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.15.2.ebuild,v 1.1 2004/12/28 03:40:17 stkn Exp $
+
+IUSE="ssl novideo noaudio debug"
+
+inherit eutils flag-o-matic
+
+MY_P="${PN}-v${PV//./_}"
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://dev.gentoo.org/~stkn/openh323/${MY_P}-src.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="-*"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-libs/pwlib-1.8.0
+	>=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
+
+	export PWLIBDIR=/usr/share/pwlib
+	export PTLIB_CONFIG=/usr/bin/ptlib-config
+	export OPENH323DIR=${S}
+
+	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser"
+
+	# 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 -j1 ${makeopts} opt apps || 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=${D}/usr ${makeopts} install || die "install failed"
+	dobin ${S}/samples/simple/obj_${OPENH323_ARCH}/simph323
+
+	###
+	# Compatibility "hacks" (openh323-config anyone?)
+	#
+
+	# 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/lib/libopenh323.so
+	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/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/lib/libh323_${ALT_ARCH}.so.${pv} symlink"
+		dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libh323_${ALT_ARCH}.so.${pv}
+	done
+	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/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/lib:" \
+		/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
+}