Restore removed versions that are still needed.

Package-Manager: portage-2.1.2.3

9 files changed, 386 insertions, 5 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index b5a291822275..d4aca546513d 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2007/04/14 08:04:11 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.83 2007/04/14 14:20:24 dirtyepic Exp $
+
+  14 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/openh323-1.11.7-emptyMakefile, +files/openh323-1.15.2-notrace.diff,
+  +files/openh323-1.15.6-gcc4.diff, +openh323-1.15.3.ebuild,
+  +openh323-1.15.6.ebuild:
+  Restore removed versions that are still needed.
 
   14 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
   -files/openh323-1.11.7-emptyMakefile,
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 18d25907c24d..c2f4ba31f3c8 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,3 +1,15 @@
+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
+SHA256 f60e4b963e5b4a498c79a1c1db1f51eeb6589c061826c891b3c6c552bb96653b files/openh323-1.11.7-emptyMakefile 8
+AUX openh323-1.15.2-notrace.diff 801 RMD160 83d7ee6b7aafc10da9648da62a4495925a71c8ce SHA1 7bd159a4f78b868aae7849a92dbcf46ab114e4f0 SHA256 ed3fa31f18b95c1db7958b500ce9805331d85fb7e2c2763e053d0f0a790d5efa
+MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
+RMD160 83d7ee6b7aafc10da9648da62a4495925a71c8ce files/openh323-1.15.2-notrace.diff 801
+SHA256 ed3fa31f18b95c1db7958b500ce9805331d85fb7e2c2763e053d0f0a790d5efa files/openh323-1.15.2-notrace.diff 801
+AUX openh323-1.15.6-gcc4.diff 1220 RMD160 aba712ee89a03b24a6263a67d7e7d89a6670c0de SHA1 810a3dab6bcb302dc71e3bb51fa87d1770b19786 SHA256 2641f5dc25bd810977f13ad46ae7a1efe6468d849b0f764e3a7da0744c4d01ba
+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
@@ -6,19 +18,35 @@ AUX openh323-1.18.0-install.diff 917 RMD160 18bdb85be13f1ca074f0d4db2394c8962bca
 MD5 0f8527aebd8d3dcfb7197656a4d31579 files/openh323-1.18.0-install.diff 917
 RMD160 18bdb85be13f1ca074f0d4db2394c8962bcaf9be files/openh323-1.18.0-install.diff 917
 SHA256 0216b9cc4ed5082e7897fa806f568e2281c602e8abd0f0a74902e7bc812047e6 files/openh323-1.18.0-install.diff 917
+DIST openh323-1.15.3.tar.gz 3754056 RMD160 280dde066c6170219a578ce723b252757da92f4e SHA1 42c7b55018455af568d70a42989bc5f32220b729 SHA256 2dab649046ca15b589bf48cfa6c6d2f3656b310ac482280f69a74eea397c91ef
+DIST openh323-1.15.6.tar.gz 3739001 RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af SHA1 4dffc58c1b2c10a20f8b9b3623af07248d59db55 SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569
 DIST openh323-v1_18_0-src-tar.gz 3742730 RMD160 1fc2abe36eef780f10f52aa2ebdd1950aa4fcebb SHA1 7d10cc3e35450f7bbde925375a99d66ae34369fa SHA256 26b4c9cf21dc1c92edf1583046670fce6be5b13045ef5d06e11403d36ffff218
+EBUILD openh323-1.15.3.ebuild 3980 RMD160 0b3abe872567f27bda94248edd83c08b16bc811a SHA1 eaf7dc3d02404af0c8656e7906403418d688c083 SHA256 f4e60bd68438755765809c6bfca0620b57d86d5734be2e9f8e824aa39bcf957a
+MD5 c077e91f9fc08108e7d47dfcf0eef967 openh323-1.15.3.ebuild 3980
+RMD160 0b3abe872567f27bda94248edd83c08b16bc811a openh323-1.15.3.ebuild 3980
+SHA256 f4e60bd68438755765809c6bfca0620b57d86d5734be2e9f8e824aa39bcf957a openh323-1.15.3.ebuild 3980
+EBUILD openh323-1.15.6.ebuild 4100 RMD160 76c3370c9d6c95d1f40ed563b3756d2827b72149 SHA1 b64c166ec0e1e6f9f8811ea79a86ea6ffee6562b SHA256 fe40817e01926ff87456fd378252980535f8a2a2fe58921f0946807e8bc3918b
+MD5 281bdcd3c98f7bb1881689d62f893df8 openh323-1.15.6.ebuild 4100
+RMD160 76c3370c9d6c95d1f40ed563b3756d2827b72149 openh323-1.15.6.ebuild 4100
+SHA256 fe40817e01926ff87456fd378252980535f8a2a2fe58921f0946807e8bc3918b openh323-1.15.6.ebuild 4100
 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 13544 RMD160 d2f787b77902df80ab479a50cb4f38e595e8b742 SHA1 772112a7b3dd5dacca5f1ebc33ef03f625ce91f5 SHA256 3fec6c7f0d51c1010cb219a33eb9eb1f97de9cefb79abdccf6cf98f6e241f042
-MD5 5b80d0c578ff270d4981b12e8f08e42e ChangeLog 13544
-RMD160 d2f787b77902df80ab479a50cb4f38e595e8b742 ChangeLog 13544
-SHA256 3fec6c7f0d51c1010cb219a33eb9eb1f97de9cefb79abdccf6cf98f6e241f042 ChangeLog 13544
+MISC ChangeLog 13810 RMD160 a91e27a0419cfa775fb76345dc14b55d2232cfba SHA1 ac1a1fc9166e74e78c40c09c1437fd78b1980759 SHA256 b1c6ef29bdf97346d30af6f32575971a47229e4ed1b5ceb1a8802703d91428c5
+MD5 296e1e010467308aca6cca3657d2019c ChangeLog 13810
+RMD160 a91e27a0419cfa775fb76345dc14b55d2232cfba ChangeLog 13810
+SHA256 b1c6ef29bdf97346d30af6f32575971a47229e4ed1b5ceb1a8802703d91428c5 ChangeLog 13810
 MISC metadata.xml 267 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 SHA1 c3b283892982fe0444300256e9d7648126c65704 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 metadata.xml 267
 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e metadata.xml 267
+MD5 973eeb57f63719fd2735dbe6a449185f files/digest-openh323-1.15.3 250
+RMD160 c4c3ec80ba2d561b74a2e58d200e1e477d9b722b files/digest-openh323-1.15.3 250
+SHA256 d5b362b71dfa609973ac5c97783979672112567a4711f57d8f6f0796647374a6 files/digest-openh323-1.15.3 250
+MD5 1a07fbf6574ed01c5a065cf4f962f24f files/digest-openh323-1.15.6 250
+RMD160 7d35047b3bced683abbb3174a2de1ce59ae729ad files/digest-openh323-1.15.6 250
+SHA256 cb05f4b3767b1e1fd089f45a667b3a50fb9ff6fa325ef8cb6b0a57112016e2b8 files/digest-openh323-1.15.6 250
 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
diff --git a/net-libs/openh323/files/digest-openh323-1.15.3 b/net-libs/openh323/files/digest-openh323-1.15.3
new file mode 100644
index 000000000000..0aa701387840
--- /dev/null
+++ b/net-libs/openh323/files/digest-openh323-1.15.3
@@ -0,0 +1,3 @@
+MD5 f9d25921281843fd2304da494b2e04e2 openh323-1.15.3.tar.gz 3754056
+RMD160 280dde066c6170219a578ce723b252757da92f4e openh323-1.15.3.tar.gz 3754056
+SHA256 2dab649046ca15b589bf48cfa6c6d2f3656b310ac482280f69a74eea397c91ef openh323-1.15.3.tar.gz 3754056
diff --git a/net-libs/openh323/files/digest-openh323-1.15.6 b/net-libs/openh323/files/digest-openh323-1.15.6
new file mode 100644
index 000000000000..c8854dc1c0b3
--- /dev/null
+++ b/net-libs/openh323/files/digest-openh323-1.15.6
@@ -0,0 +1,3 @@
+MD5 6c49f41c4cec39172000586a26b98c48 openh323-1.15.6.tar.gz 3739001
+RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af openh323-1.15.6.tar.gz 3739001
+SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569 openh323-1.15.6.tar.gz 3739001
diff --git a/net-libs/openh323/files/openh323-1.11.7-emptyMakefile b/net-libs/openh323/files/openh323-1.11.7-emptyMakefile
new file mode 100644
index 000000000000..d720acc09d37
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.11.7-emptyMakefile
@@ -0,0 +1,2 @@
+opt:
+	:
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/files/openh323-1.15.6-gcc4.diff b/net-libs/openh323/files/openh323-1.15.6-gcc4.diff
new file mode 100644
index 000000000000..277c250ec52b
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.15.6-gcc4.diff
@@ -0,0 +1,33 @@
+--- openh323-1.15.6/include/ixjlid.h	2004-08-22 06:21:06.000000000 +0200
++++ openh323-1.15.6-gcc4/include/ixjlid.h	2006-04-11 20:48:51.000000000 +0200
+@@ -836,7 +836,7 @@
+     };
+ 
+     static void SignalHandler(int sig);
+-    ExceptionInfo * OpalIxJDevice::GetException();
++    ExceptionInfo * GetException();
+     int GetOSHandle() { return os_handle; }
+ 
+   protected:
+--- openh323-1.15.6/src/vic/p64.cxx	2003-03-14 08:25:55.000000000 +0100
++++ openh323-1.15.6-gcc4/src/vic/p64.cxx	2006-04-11 20:49:41.000000000 +0200
+@@ -1125,7 +1125,7 @@
+ 	 * If input buffer not aligned, prime bit-buffer
+ 	 * with 8 bits; otherwise, prime it with a 16.
+ 	 */
+-	if ((int)bp & 1) {
++	if ((long)bp & 1) {
+ 		bs_ = (u_short*)(bp + 1);
+ 		bb_ = *bp;
+ 		nbb_ = 8 - sbit;
+--- openh323-1.15.6/plugins/audio/Speex/speexcodec.cxx	2006-04-11 21:32:34.000000000 +0200
++++ openh323-1.15.6-gcc4/plugins/audio/Speex/speexcodec.cxx	2006-04-11 20:48:51.000000000 +0200
+@@ -112,7 +112,7 @@
+ 
+ static void * create_encoder(const struct PluginCodec_Definition * codec)
+ {
+-  int mode = (int)(codec->userData);
++  int mode = (long)(codec->userData);
+ 
+   struct PluginSpeexContext * context = new PluginSpeexContext;
+   context->bits = new SpeexBits;
diff --git a/net-libs/openh323/openh323-1.15.3.ebuild b/net-libs/openh323/openh323-1.15.3.ebuild
new file mode 100644
index 000000000000..b8aa7381405e
--- /dev/null
+++ b/net-libs/openh323/openh323-1.15.3.ebuild
@@ -0,0 +1,139 @@
+# 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.15.3.ebuild,v 1.6 2007/04/14 14:20:24 dirtyepic Exp $
+
+inherit eutils flag-o-matic multilib
+
+MY_P="${PN}-v${PV//./_}"
+
+DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+IUSE="ssl novideo noaudio debug"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-libs/pwlib-1.8.4
+	>=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
+
+	# remove -fstack-protector, may cause problems (bug #75259)
+	filter-flags -fstack-protector
+
+	export PWLIBDIR=/usr/share/pwlib
+	export PTLIB_CONFIG=/usr/bin/ptlib-config
+	export OPENH323DIR=${S}
+
+	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
+	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 ${makeopts} opt || 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=/usr DESTDIR=${D} \
+		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
+		${makeopts} install || die "install failed"
+
+	# workaround: don't install libh323*.so and libh323.so.${PV}
+	if [[ -f ${D}/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so ]]; then
+		# libh323*.so is a file... replace it w/ a symlink
+		rm -f ${D}/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so
+
+		dosym  /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} \
+			/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so
+	fi
+
+	###
+	# Compatibility "hacks"
+	#
+
+	# 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/$(get_libdir)/libopenh323.so
+	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/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/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv} symlink"
+		dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv}
+	done
+	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/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/$(get_libdir):" \
+		/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
+}
diff --git a/net-libs/openh323/openh323-1.15.6.ebuild b/net-libs/openh323/openh323-1.15.6.ebuild
new file mode 100644
index 000000000000..92cbb54b6237
--- /dev/null
+++ b/net-libs/openh323/openh323-1.15.6.ebuild
@@ -0,0 +1,148 @@
+# 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.15.6.ebuild,v 1.5 2007/04/14 14:20:24 dirtyepic Exp $
+
+inherit eutils flag-o-matic multilib
+
+MY_P="${PN}-v${PV//./_}"
+
+DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+IUSE="ssl novideo noaudio debug"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	~dev-libs/pwlib-1.8.7
+	>=media-video/ffmpeg-0.4.7
+	ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Makefile is currently broken with NOTRACE=1, fix that
+	epatch "${FILESDIR}"/${PN}-1.15.2-notrace.diff
+	epatch "${FILESDIR}"/${P}-gcc4.diff
+}
+
+src_compile() {
+	local makeopts
+	local myconf
+
+	# remove -fstack-protector, may cause problems (bug #75259)
+	filter-flags -fstack-protector
+
+	export PWLIBDIR=/usr/share/pwlib
+	export PTLIB_CONFIG=/usr/bin/ptlib-config
+	export OPENH323DIR=${S}
+
+	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
+	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 ${makeopts} opt || die "make failed"
+}
+
+src_install() {
+	local OPENH323_ARCH ALT_ARCH OPENH323_SUFFIX
+	local makeopts libdir
+
+	# 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
+
+	# use ptlib-config to get the right values here (for hppa, amd64 ...)
+	OPENH323_ARCH="$(ptlib-config --ostype)_$(ptlib-config --machtype)_${OPENH323_SUFFIX}"
+
+	# 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=/usr DESTDIR=${D} \
+		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
+		${makeopts} install || die "install failed"
+
+	libdir=$(get_libdir)
+
+	# fix openh323's bogus symlinks
+	for pv in ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
+		rm -f ${D}/usr/${libdir}/libh323_${OPENH323_ARCH}.so.${pv}
+
+		dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+			/usr/${libdir}/libh323_${OPENH323_ARCH}.so.${pv}
+	done
+	rm -f ${D}/usr/${libdir}/libh323_${OPENH323_ARCH}.so
+	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+		/usr/${libdir}/libh323_${OPENH323_ARCH}.so
+
+	# create backwards compatibility with _r versioned libraries
+	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
+		# compat symlink
+		dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+			/usr/${libdir}/libh323_${ALT_ARCH}.so.${pv}
+	done
+	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+		/usr/${libdir}/libh323_${ALT_ARCH}.so
+
+	###
+	# Compatibility "hacks"
+	#
+
+	# mod to keep gnugk happy (still needed?)
+	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
+
+	# should try to get rid of this one
+	rm -f ${D}/usr/${libdir}/libopenh323.so
+	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} /usr/${libdir}/libopenh323.so
+
+	# these should point to the right directories,
+	# openh323.org apps and others need this
+	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/${libdir}:" \
+		/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
+}