Restore removed versions that are still needed.

(Portage version: 2.1.2.3)

8 files changed, 354 insertions, 1 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/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
+}