Version bump, new versions work with current pwlib and openh323 versions and removed old ebuilds.

Package-Manager: portage-2.0.51.22-r2

15 files changed, 331 insertions, 256 deletions

diff --git a/net-misc/asterisk-oh323/ChangeLog b/net-misc/asterisk-oh323/ChangeLog
index ba6906ee9312..b7d09a7e8c3a 100644
--- a/net-misc/asterisk-oh323/ChangeLog
+++ b/net-misc/asterisk-oh323/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-misc/asterisk-oh323
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/ChangeLog,v 1.6 2005/07/08 22:43:03 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/ChangeLog,v 1.7 2005/09/20 16:10:59 stkn Exp $
+
+*asterisk-oh323-0.7.3 (20 Sep 2005)
+*asterisk-oh323-0.6.7 (20 Sep 2005)
+
+  20 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/asterisk-oh323-0.5.10-Makefile.patch,
+  -files/asterisk-oh323-0.5.10-asterisk-driver-Makefile.patch,
+  -files/asterisk-oh323-0.6.5-Makefile.patch,
+  +files/asterisk-oh323-0.6.7-Makefile.diff,
+  +files/asterisk-oh323-0.7.3-gentoo.diff, -asterisk-oh323-0.5.10.ebuild,
+  -asterisk-oh323-0.6.5.ebuild, +asterisk-oh323-0.6.7.ebuild,
+  +asterisk-oh323-0.7.3.ebuild:
+  Version bump, new versions work with current pwlib and openh323 versions and
+  removed old ebuilds.
 
 *asterisk-oh323-0.6.6 (09 Jul 2005)
 
diff --git a/net-misc/asterisk-oh323/Manifest b/net-misc/asterisk-oh323/Manifest
index 5d72607b65f5..43523c033346 100644
--- a/net-misc/asterisk-oh323/Manifest
+++ b/net-misc/asterisk-oh323/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 523fc371f7710183b5046783ca64cbba ChangeLog 1628
-MD5 5640cab5679236e722c37c8a3ca42646 asterisk-oh323-0.5.10.ebuild 960
-MD5 b1f61ef934bf7c481663f3550413e82e asterisk-oh323-0.6.5.ebuild 1171
+MD5 475e40c6e7019ffb09cc5dd816d75af5 asterisk-oh323-0.7.3.ebuild 1545
+MD5 6a641b45da8a7775c1311ea0591726a5 asterisk-oh323-0.6.7.ebuild 1476
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 d5a522d63cdebb4bc9daebab10e6b36d ChangeLog 2222
 MD5 3fcfea43a5ef408069ccc48ab4089d51 asterisk-oh323-0.6.6.ebuild 1203
-MD5 5f3da3b300fafed1e2639505fb938afb files/asterisk-oh323-0.5.10-Makefile.patch 1649
-MD5 ffa52289baeedd9c24e1a9eb21ab721f files/asterisk-oh323-0.5.10-asterisk-driver-Makefile.patch 323
-MD5 c14a16ac3b4367dbe209d5895bee0fbe files/asterisk-oh323-0.6.5-Makefile.patch 2527
 MD5 7812b5cd1b960503c8e3bb849bdd316c files/asterisk-oh323-0.6.6-Makefile.patch 5382
-MD5 2a85703c4ed5f0a0f4a163643ba1809c files/digest-asterisk-oh323-0.5.10 72
-MD5 442630149f00b75cebe5b3f876545ba3 files/digest-asterisk-oh323-0.6.5 71
+MD5 144ff815a14eb2951c1febcc6141b6fc files/digest-asterisk-oh323-0.6.7 71
+MD5 55a1973743617df96f4a1298853e19af files/digest-asterisk-oh323-0.7.3 71
+MD5 05d8b63dc6b9772e6e0c7014a4de98e8 files/asterisk-oh323-0.7.3-gentoo.diff 371
 MD5 fa0eebb1d3bd976c64178706c0214330 files/digest-asterisk-oh323-0.6.6 71
-MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0HTGI1lqEGTUzyQRAiMDAKCSykt5+44Sq10rTlZsHNlNn7iQlwCgthrW
-XXihuNMe2G2XHIheV42T5Jo=
-=/6YJ
------END PGP SIGNATURE-----
+MD5 5d6aa1f77e7660782f2f3f290bc1be77 files/asterisk-oh323-0.6.7-Makefile.diff 5925
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild
deleted file mode 100644
index 05e77dece31a..000000000000
--- a/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild,v 1.3 2005/03/10 01:44:19 stkn Exp $
-
-inherit eutils
-
-DESCRIPTION="H.323 Support for the Asterisk soft PBX"
-HOMEPAGE="http://www.inaccessnetworks.com/projects/asterisk-oh323/"
-SRC_URI="http://www.inaccessnetworks.com/projects/asterisk-oh323/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-libs/pwlib-1.5.2-r2
-	>=net-libs/openh323-1.12.2-r2
-	>=net-misc/asterisk-0.7.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-Makefile.patch
-	epatch ${FILESDIR}/${P}-asterisk-driver-Makefile.patch
-}
-
-src_compile() {
-	# NOTRACE=1 is required (atm)
-	# plugin won't work if this isn't set!
-	# emake breaks version detection for pwlib and openh323
-	make NOTRACE=1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild
deleted file mode 100644
index 0b318bd3043c..000000000000
--- a/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild,v 1.3 2005/07/10 01:07:04 swegener Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="debug"
-
-DESCRIPTION="H.323 Support for the Asterisk soft PBX"
-HOMEPAGE="http://www.inaccessnetworks.com/projects/asterisk-oh323/"
-SRC_URI="http://www.inaccessnetworks.com/projects/asterisk-oh323/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-DEPEND="~dev-libs/pwlib-1.6.6
-	~net-libs/openh323-1.13.5
-	>=net-misc/asterisk-1.0.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-Makefile.patch
-
-	# add -fPIC and use our own flags
-	append-flags -fPIC
-
-	sed -i  -e "s:^\(CPPFLAGS=\)\(.*\):\1 ${CXXFLAGS} \2:" \
-		-e "s:^\(CFLAGS=\)\(.*\):\1 ${CFLAGS} \2:" \
-		Makefile
-
-	# disable wraptracing if you dont need it
-	if ! use debug; then
-		sed -i -e "s:^\(WRAPTRACING\).*:\1=0:" Makefile
-	fi
-}
-
-src_compile() {
-	# NOTRACE=1 is set in the Makefile
-	# emake breaks version detection for pwlib and openh323
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.6.7.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.6.7.ebuild
new file mode 100644
index 000000000000..57c99b677bc5
--- /dev/null
+++ b/net-misc/asterisk-oh323/asterisk-oh323-0.6.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.6.7.ebuild,v 1.1 2005/09/20 16:10:59 stkn Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="debug"
+
+DESCRIPTION="H.323 Support for the Asterisk soft PBX"
+HOMEPAGE="http://www.inaccessnetworks.com/projects/asterisk-oh323/"
+SRC_URI="http://www.inaccessnetworks.com/projects/asterisk-oh323/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+DEPEND="=dev-libs/pwlib-1.8*
+	=net-libs/openh323-1.15*
+	<net-misc/asterisk-1.2.0_beta1
+	!>=net-misc/asterisk-1.2.0_beta1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.6.7-Makefile.diff
+
+	# set our own cflags
+	sed -i  -e "s:^\(CPPFLAGS[\t ]\+=\)\(.*\) -Os:\1 ${CXXFLAGS} \2:" \
+		-e "s:^\(CFLAGS[\t ]\+=\)\(.*\):\1 ${CFLAGS} \2:" \
+		rules.mak
+
+	# disable wraptracing if you dont need it
+	use debug \
+		|| sed -i -e "s:^\(WRAPTRACING\).*:\1=0:" Makefile
+
+#	# link statically 
+#	use static \
+#		&& sed -i -e "s:^\(OH323STAT\).*:\1=1:" Makefile
+}
+
+src_compile() {
+	# NOTRACE=1 is set in the Makefile
+	# emake breaks version detection of pwlib and openh323
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc BUGS CONFIGURATION COPYING README TESTS
+
+	# fix permissions
+	if [[ -n "$(egetent group asterisk)" ]]; then
+		chown -R root:asterisk ${D}etc/asterisk
+		chmod -R u=rwX,g=rX,o= ${D}etc/asterisk
+	fi
+}
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.7.3.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.7.3.ebuild
new file mode 100644
index 000000000000..27198b88b4dc
--- /dev/null
+++ b/net-misc/asterisk-oh323/asterisk-oh323-0.7.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.7.3.ebuild,v 1.1 2005/09/20 16:10:59 stkn Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="debug"
+
+DESCRIPTION="H.323 Support for the Asterisk soft PBX"
+HOMEPAGE="http://www.inaccessnetworks.com/projects/asterisk-oh323/"
+SRC_URI="http://www.inaccessnetworks.com/projects/asterisk-oh323/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+DEPEND="=dev-libs/pwlib-1.8*
+	=net-libs/openh323-1.15*
+	>=net-misc/asterisk-1.2.0_beta1
+	!<net-misc/asterisk-1.2.0_beta1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.6.7-Makefile.diff
+	# additional patch for 1.2.X's asterisk.h 
+	epatch ${FILESDIR}/${PN}-0.7.3-gentoo.diff
+
+	# set our own cflags
+	sed -i  -e "s:^\(CPPFLAGS[\t ]\+=\)\(.*\) -Os:\1 ${CXXFLAGS} \2:" \
+		-e "s:^\(CFLAGS[\t ]\+=\)\(.*\):\1 ${CFLAGS} \2:" \
+		rules.mak
+
+	# disable wraptracing if you dont need it
+	use debug \
+		|| sed -i -e "s:^\(WRAPTRACING\).*:\1=0:" Makefile
+
+#	use static \
+#		&& sed -i -e "s:^\(OH323STAT\).*:\1=1:" Makefile
+#
+}
+
+src_compile() {
+	# NOTRACE=1 is set in the Makefile
+	# emake breaks version detection of pwlib and openh323
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc BUGS CONFIGURATION COPYING README TESTS
+
+	# fix permissions
+	if [[ -n "$(egetent group asterisk)" ]]; then
+		chown -R root:asterisk ${D}etc/asterisk
+		chmod -R u=rwX,g=rX,o= ${D}etc/asterisk
+	fi
+}
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.10-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.10-Makefile.patch
deleted file mode 100644
index 7d96dc8ffd56..000000000000
--- a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.10-Makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- Makefile.orig	2004-02-18 22:09:49.000000000 +0100
-+++ Makefile	2004-02-18 22:11:11.000000000 +0100
-@@ -44,13 +44,13 @@
- # Set PWLIBDIR variable to the directory containing the sources of 
- # PWlib library.
- #
--PWLIBDIR=/root/src/oh323/pwlib
-+PWLIBDIR=/usr/share/pwlib
- 
- #
- # Set OPENH323LIBDIR variable to the directory containing the sources of
- # OpenH323 library.
- #
--OPENH323DIR=/root/src/oh323/openh323
-+OPENH323DIR=/usr/share/openh323
- 
- #
- # Set ASTERISKSRCDIR variable to the directory where ASTERISK's source files
-@@ -76,7 +76,7 @@
- # LD_LIBRARY_PATH shell variable, or to the /etc/ld.so.conf
- # file and run "ldconfig".
- #
--OH323WRAPLIBDIR=$(DESTDIR)/usr/local/lib
-+OH323WRAPLIBDIR=$(DESTDIR)/usr/lib
- 
- #
- # Set SSLINCDIR variable to the directory where ssl/crypto
-@@ -158,7 +158,7 @@
- OPENH323USERFLAGS += P_PTHREADS=1
- endif
- OPENH323FLAGS=$(shell make $(OPENH323USERFLAGS) --no-print-directory -s \
--            -C $(OPENH323DIR) \
-+            -C $(OPENH323DIR) -f openh323u.mak \
-             PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) ccflags)
- CPPFLAGS=$(OPENH323FLAGS) -Wall
- ASTERISKINCLUDE=-I$(ASTERISKSRCDIR)/include -I../wrapper
---- Makefile.orig	2004-03-11 20:07:41.000000000 +0100
-+++ Makefile	2004-03-11 20:08:21.000000000 +0100
-@@ -133,10 +133,10 @@
- TOUCH=touch
- AR=ar
- OH323WRAPINCLUDE=-I$(SSLINCDIR) \
--				 -I$(PWLIBDIR)/include/ptlib/unix \
- 				 -I$(PWLIBDIR)/include \
--				 -I$(OPENH323DIR)/include \
--				 -I$(OPENH323DIR)/include/openh323 \
-+				 -I$(PWLIBDIR)/include/ptlib/unix \
-+				 -I/usr/include/openh323 \
-+				 -I/usr/include \
- 				 -I../asterisk-driver
- OPENH323USERFLAGS=
- ifdef   NOVIDEO
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.10-asterisk-driver-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.10-asterisk-driver-Makefile.patch
deleted file mode 100644
index 7f874ed4dab7..000000000000
--- a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.10-asterisk-driver-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- asterisk-driver/Makefile.orig	2003-10-07 14:31:45.000000000 +0200
-+++ asterisk-driver/Makefile	2004-02-05 15:51:25.884616624 +0200
-@@ -29,6 +29,7 @@
- #################################################################################
- 
- TARGET=chan_oh323.so
-+OPENH323DIR=/usr
- 
- ifndef SKIP_SUFFIX
- 	ifeq ($(WRAPSTAT),1)
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.5-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.5-Makefile.patch
deleted file mode 100644
index 0588c14381ed..000000000000
--- a/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.5-Makefile.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- asterisk-oh323-0.6.5/Makefile.orig	2004-11-03 12:52:59.000000000 +0100
-+++ asterisk-oh323-0.6.5/Makefile	2005-03-09 06:26:56.042637240 +0100
-@@ -49,7 +49,7 @@
- # compile asterisk-oh323. Do not use the installed library of your
- # distribution. It won't work.
- #
--PWLIBDIR=/root/src/oh323/pwlib
-+PWLIBDIR=/usr/share/pwlib
- 
- #
- # Set OPENH323LIBDIR variable to the directory containing the sources of
-@@ -59,13 +59,13 @@
- # compile asterisk-oh323. Do not use the installed library of your
- # distribution. It won't work.
- #
--OPENH323DIR=/root/src/oh323/openh323
-+OPENH323DIR=/usr/share/openh323
- 
- #
- # Set ASTERISKINCDIR variable to the directory containing the include files of
- # Asterisk PBX.
- #
--ASTERISKINCDIR=/root/src/asterisk/include
-+ASTERISKINCDIR=/usr/include
- 
- #
- # Set ASTERISKMODDIR variable to the directory where ASTERISK's modules reside.
-@@ -91,7 +91,7 @@
- #
- # Note: This directory is created under $DESTDIR.
- #
--OH323WRAPLIBDIR=/usr/local/lib
-+OH323WRAPLIBDIR=/usr/lib
- 
- #
- # Set SSLINCDIR variable to the directory where ssl/crypto
-@@ -121,7 +121,7 @@
- # With this flag on the channel driver is huge, in size, but Asterisk boots
- # faster!
- #
--OH323STAT=1
-+OH323STAT=0
- 
- #
- # Define options that were used during Asterisk compilation
-@@ -137,7 +137,7 @@
- #NOVIDEO=1
- #NO_SPEEX=1
- #NOAUDIOCODECS=1
--#NOTRACE=1
-+NOTRACE=1
- #NO_IPv6=1
- #P_PTHREADS=1
- 
-@@ -165,13 +165,9 @@
- AR=ar
- STRIP=strip
- STRIPFLAGS=
--OH323WRAPINCLUDE= \
--				 -I$(PWLIBDIR)/include/ptlib/unix \
--				 -I$(PWLIBDIR)/include \
--				 -I$(OPENH323DIR)/include \
--				 -I$(OPENH323DIR)/include/openh323 \
--				 -I../asterisk-driver
--#				 -I$(SSLINCDIR)
-+OH323WRAPINCLUDE=-I$(SSLINCDIR) \
-+		 -I/usr/include/openh323 \
-+		 -I../asterisk-driver
- OPENH323USERFLAGS=
- ifdef	NOVIDEO
- OPENH323USERFLAGS += NOVIDEO=1
-@@ -192,7 +189,7 @@
- OPENH323USERFLAGS += P_PTHREADS=1
- endif
- OPENH323FLAGS=$(shell make $(OPENH323USERFLAGS) --no-print-directory -s \
--		-C $(OPENH323DIR) \
-+		-C $(OPENH323DIR) -f openh323u.mak \
- 		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) ccflags)
- CPPFLAGS=$(OPENH323FLAGS) -Wall -x c++ -Os
- ASTERISKINCLUDE=-I$(ASTERISKINCDIR) -I../wrapper
---- asterisk-oh323-0.6.5/asterisk-driver/Makefile.orig	2004-10-04 13:52:09.000000000 +0200
-+++ asterisk-oh323-0.6.5/asterisk-driver/Makefile	2005-03-09 06:28:39.092971208 +0100
-@@ -31,6 +31,8 @@
- TARGET=chan_oh323.so
- TARGET_OBJ=chan_oh323.o
- 
-+OPENH323DIR=/usr
-+
- ifndef SKIP_SUFFIX
- 	ifeq ($(OH323STAT),1)
- 		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*s.a))
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.7-Makefile.diff b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.7-Makefile.diff
new file mode 100644
index 000000000000..8c36536e468f
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.7-Makefile.diff
@@ -0,0 +1,181 @@
+--- asterisk-oh323-0.6.7/Makefile.orig	2005-09-09 16:35:01.000000000 +0000
++++ asterisk-oh323-0.6.7/Makefile	2005-09-20 15:45:04.000000000 +0000
+@@ -51,7 +51,7 @@
+ # compile asterisk-oh323. Do not use the installed library of your
+ # distribution. It won't work.
+ #
+-PWLIBDIR=/usr/src/pwlib
++PWLIBDIR=/usr/share/pwlib
+ 
+ #
+ # Set OPENH323LIBDIR variable to the directory containing the sources of
+@@ -61,13 +61,13 @@
+ # compile asterisk-oh323. Do not use the installed library of your
+ # distribution. It won't work.
+ #
+-OPENH323DIR=/usr/src/openh323
++OPENH323DIR=/usr/share/openh323
+ 
+ #
+ # Set ASTERISKINCDIR variable to the directory containing the include files of
+ # Asterisk PBX.
+ #
+-ASTERISKINCDIR=/usr/src/asterisk/include
++ASTERISKINCDIR=/usr/include/asterisk
+ 
+ #
+ # Set ASTERISKMODDIR variable to the directory where ASTERISK's modules reside.
+@@ -93,7 +93,7 @@
+ #
+ # Note: This directory is created under $DESTDIR.
+ #
+-OH323WRAPLIBDIR=/usr/local/lib
++OH323WRAPLIBDIR=/usr/lib
+ 
+ #
+ # Set WRAPTRACING to 1 to enable tracing information from the OpenH323Wrap
+@@ -120,7 +120,7 @@
+ # With this flag on the channel driver is huge, in size, but Asterisk boots
+ # faster!
+ #
+-OH323STAT=1
++OH323STAT=0
+ 
+ #
+ # Define options that were used during Asterisk compilation. It is
+@@ -142,7 +142,7 @@
+ #NOVIDEO=1
+ #NO_SPEEX=1
+ #NOAUDIOCODECS=1
+-#NOTRACE=1
++NOTRACE=1
+ NO_IPv6=1
+ #P_PTHREADS=1
+ 
+--- asterisk-oh323-0.6.6/rules.mak.orig	2005-07-08 03:19:20.000000000 +0200
++++ asterisk-oh323-0.6.6/rules.mak	2005-07-08 03:21:34.000000000 +0200
+@@ -50,11 +50,14 @@
+ AR = ar
+ STRIP = strip
+ STRIPFLAGS = 
+-OH323WRAPINCLUDE = \
+-				 -I$(PWLIBDIR)/include \
+-				 -I$(OPENH323DIR)/include \
+-				 -I$(OPENH323DIR)/include/openh323 \
+-				 -I../asterisk-driver
++OH323WRAPINCLUDE=-I$(SSLINCDIR) \
++		 -I/usr/include/openh323 \
++		 -I../asterisk-driver
++
++ifneq ($(ASTERISKINCDIR),/usr/include/asterisk)
+ ASTERISKINCLUDE = -I$(ASTERISKINCDIR) -I../wrapper
++else
++ASTERISKINCLUDE = -I../wrapper
++endif
+ 
+ ifdef	NOTRACE
+ OH323BUILDTYPE = optnotrace
+ ASTERISKINCLUDE = -I$(ASTERISKINCDIR) -I../wrapper
+--- asterisk-oh323-0.6.6/asterisk-driver/Makefile.orig	2005-06-17 12:14:02.000000000 +0200
++++ asterisk-oh323-0.6.6/asterisk-driver/Makefile	2005-07-08 03:27:38.000000000 +0200
+@@ -34,23 +34,23 @@
+ ifndef SKIP_SUFFIX
+ 	ifeq ($(OH323STAT),1)
+ 		ifeq ($(OH323BUILDTYPE),debug) # Static, debug
+-			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*_d_s.a))
++			LIBPTPATH=$(word 1,$(shell ls /usr/lib/libpt*_d_s.a))
+ 		else                           # Static, opt
+-			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*_r_s.a))
++			LIBPTPATH=$(word 1,$(shell ls /usr/lib/libpt*_r_s.a))
+ 		endif
+ 	else
+ 		ifeq ($(OH323BUILDTYPE),debug) # Shared, debug
+-			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*d.so))
++			LIBPTPATH=$(word 1,$(shell ls /usr/lib/libpt*d.so))
+ 		else                           # Shared, opt
+-			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*r.so))
++			LIBPTPATH=$(word 1,$(shell ls /usr/lib/libpt*r.so))
+ 		endif
+ 	endif
+ 	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
+ else
+ 	ifeq ($(OH323STAT),1)
+-		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/$(LIBPT_BASE).a))
++		LIBPTPATH=$(word 1,$(shell ls /usr/lib/$(LIBPT_BASE).a))
+ 	else
+-		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/$(LIBPT_BASE).so))
++		LIBPTPATH=$(word 1,$(shell ls /usr/lib/$(LIBPT_BASE).so))
+ 	endif
+ 	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
+ endif
+@@ -59,12 +59,12 @@
+ ifndef SKIP_SUFFIX
+ 	ifeq ($(OH323STAT),1)
+ 		ifeq ($(OH323BUILDTYPE),debug)   # Static, debug
+-			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*_d_s.a))
++			LIBH323PATH=$(word 1,$(shell ls /usr/lib/libh323*_d_s.a))
+ 		else
+ 			ifeq ($(OH323BUILDTYPE),opt) # Static, opt
+-				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*_r_s.a))
++				LIBH323PATH=$(word 1,$(shell ls /usr/lib/libh323*_r_s.a))
+ 			else                         # Static, opt, no trace
+-				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*_n_s.a))
++				LIBH323PATH=$(word 1,$(shell ls /usr/lib/libh323*_n_s.a))
+ 			endif
+ 		endif
+ 	else
+@@ -72,18 +72,18 @@
+ 			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*d.so))
+ 		else
+ 			ifeq ($(OH323BUILDTYPE),opt) # Shared, opt
+-				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*r.so))
++				LIBH323PATH=$(word 1,$(shell ls /usr/lib/libh323*r.so))
+ 			else                         # Shared, opt, no trace
+-				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*n.so))
++				LIBH323PATH=$(word 1,$(shell ls /usr/lib/libh323*n.so))
+ 			endif
+ 		endif
+ 	endif
+ 	LIBH323NAME=$(subst lib,,$(basename $(notdir $(LIBH323PATH))))
+ else
+ 	ifeq ($(OH323STAT),1)
+-		LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/$(LIBH323_BASE).a))
++		LIBH323PATH=$(word 1,$(shell ls /usr/lib/$(LIBH323_BASE).a))
+ 	else
+-		LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/$(LIBH323_BASE).so))
++		LIBH323PATH=$(word 1,$(shell ls /usr/lib/$(LIBH323_BASE).so))
+ 	endif
+ 	LIBH323NAME=$(subst lib,,$(basename $(notdir $(LIBH323PATH))))
+ endif
+@@ -153,14 +153,12 @@
+ ifeq ($(OH323STAT),1)
+ 	$(CC) -shared -Xlinker -x -g -o $@ $(TARGET_OBJ) \
+ 	-L../wrapper -loh323wrap_s \
+-	-L$(OPENH323DIR)/lib -l$(LIBH323) \
+-	-L$(PWLIBDIR)/lib -l$(LIBPT) \
++	-l$(LIBH323) -l$(LIBPT) \
+ 	-lstdc++ $(EXTLIBS)
+ else
+ 	$(CC) -shared -Xlinker -x -g -o $@ $(TARGET_OBJ) \
+ 	-L../wrapper -loh323wrap \
+-	-L$(OPENH323DIR)/lib -l$(LIBH323) \
+-	-L$(PWLIBDIR)/lib -l$(LIBPT) \
++	-l$(LIBH323) -l$(LIBPT) \
+ 	-lstdc++ $(EXTLIBS)
+ endif
+ 
+--- asterisk-oh323-0.6.7/rules.mak.orig	2005-09-20 15:53:42.000000000 +0000
++++ asterisk-oh323-0.6.7/rules.mak	2005-09-20 15:53:58.000000000 +0000
+@@ -76,9 +76,9 @@
+ CFLAGS += -DUSE_OLD_CAPABILITIES_API=1
+ endif
+ 
+-ifneq	($(PROC),)
+-CFLAGS += -march=$(PROC)
+-endif
++#ifneq	($(PROC),)
++#CFLAGS += -march=$(PROC)
++#endif
+ 
+ ifdef	HAS_OH323MODS
+ CPPFLAGS += -DHAS_OH323MODS
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.7.3-gentoo.diff b/net-misc/asterisk-oh323/files/asterisk-oh323-0.7.3-gentoo.diff
new file mode 100644
index 000000000000..67e28ceea672
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/asterisk-oh323-0.7.3-gentoo.diff
@@ -0,0 +1,11 @@
+--- asterisk-oh323-0.7.3/asterisk-driver/chan_oh323.c.orig	2005-09-20 17:40:37.000000000 +0000
++++ asterisk-oh323-0.7.3/asterisk-driver/chan_oh323.c	2005-09-20 17:42:00.000000000 +0000
+@@ -46,7 +46,7 @@
+ #include <netinet/ip.h>
+ #include <sys/signal.h>
+ 
+-#include "asterisk.h"
++#include "asterisk/asterisk.h"
+ 
+ #include "asterisk/lock.h"
+ #include "asterisk/channel.h"
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.5.10 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.5.10
deleted file mode 100644
index d455198331b4..000000000000
--- a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.5.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd878d8348e804d440588cbe235b091e asterisk-oh323-0.5.10.tar.gz 74857
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.5 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.5
deleted file mode 100644
index 0dcb5ac8f01d..000000000000
--- a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4cf3ff5362bb5db498f2a2dfb8b24087 asterisk-oh323-0.6.5.tar.gz 87112
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.7 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.7
new file mode 100644
index 000000000000..8a2f26a7f909
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.7
@@ -0,0 +1 @@
+MD5 3ba5431b09882cb3254115fd5499d5fa asterisk-oh323-0.6.7.tar.gz 93691
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.7.3 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.7.3
new file mode 100644
index 000000000000..ccc56d0176ab
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.7.3
@@ -0,0 +1 @@
+MD5 66dc098a20ac11f098edbbaed307c085 asterisk-oh323-0.7.3.tar.gz 93440