Version bump and removed old version.

Package-Manager: portage-2.0.51.19

9 files changed, 224 insertions, 93 deletions

diff --git a/net-misc/asterisk-oh323/ChangeLog b/net-misc/asterisk-oh323/ChangeLog
index 0193f36a7455..ba6906ee9312 100644
--- a/net-misc/asterisk-oh323/ChangeLog
+++ b/net-misc/asterisk-oh323/ChangeLog
@@ -1,6 +1,15 @@
 # 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.5 2005/05/10 12:49:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/ChangeLog,v 1.6 2005/07/08 22:43:03 stkn Exp $
+
+*asterisk-oh323-0.6.6 (09 Jul 2005)
+
+  09 Jul 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/asterisk-oh323-0.5.9-Makefile.patch,
+  -files/asterisk-oh323-0.5.9-asterisk-driver-Makefile.patch,
+  +files/asterisk-oh323-0.6.6-Makefile.patch, -asterisk-oh323-0.5.9.ebuild,
+  +asterisk-oh323-0.6.6.ebuild:
+  Version bump and removed old version.
 
   10 May 2005; David Holm <dholm@gentoo.org> asterisk-oh323-0.6.5.ebuild:
   Added to ~ppc.
diff --git a/net-misc/asterisk-oh323/Manifest b/net-misc/asterisk-oh323/Manifest
index 4e2a57792781..0ad07958c76e 100644
--- a/net-misc/asterisk-oh323/Manifest
+++ b/net-misc/asterisk-oh323/Manifest
@@ -1,13 +1,12 @@
-MD5 da017eed376cf8f4482a998bb511b21b ChangeLog 1286
 MD5 5640cab5679236e722c37c8a3ca42646 asterisk-oh323-0.5.10.ebuild 960
-MD5 f0da89ac74560117aed85298acd9cfaf asterisk-oh323-0.5.9.ebuild 941
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 523fc371f7710183b5046783ca64cbba ChangeLog 1628
+MD5 83d72e56434c221f823462d365a26c58 asterisk-oh323-0.6.6.ebuild 1220
 MD5 33c3853e2cc2ff006f2cd04c93c98b53 asterisk-oh323-0.6.5.ebuild 1189
-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 d81ba6256f0eadf0479f37fae7451836 files/asterisk-oh323-0.5.9-Makefile.patch 1163
-MD5 ffa52289baeedd9c24e1a9eb21ab721f files/asterisk-oh323-0.5.9-asterisk-driver-Makefile.patch 323
 MD5 2a85703c4ed5f0a0f4a163643ba1809c files/digest-asterisk-oh323-0.5.10 72
-MD5 4313406e25f5b3bc750c792e1448ce04 files/digest-asterisk-oh323-0.5.9 71
-MD5 c14a16ac3b4367dbe209d5895bee0fbe files/asterisk-oh323-0.6.5-Makefile.patch 2527
 MD5 442630149f00b75cebe5b3f876545ba3 files/digest-asterisk-oh323-0.6.5 71
+MD5 c14a16ac3b4367dbe209d5895bee0fbe files/asterisk-oh323-0.6.5-Makefile.patch 2527
+MD5 5f3da3b300fafed1e2639505fb938afb files/asterisk-oh323-0.5.10-Makefile.patch 1649
+MD5 fa0eebb1d3bd976c64178706c0214330 files/digest-asterisk-oh323-0.6.6 71
+MD5 7812b5cd1b960503c8e3bb849bdd316c files/asterisk-oh323-0.6.6-Makefile.patch 5382
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild
deleted file mode 100644
index be6bf1eac790..000000000000
--- a/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild
+++ /dev/null
@@ -1,38 +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.9.ebuild,v 1.4 2005/03/10 01:44:19 stkn Exp $
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="H.323 Channel plugin 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=dev-libs/pwlib-1.5.2-r2
-	>=net-libs/openh323-1.12.2-r2
-	>=net-misc/asterisk-0.5.0
-	!>=net-libs/openh323-1.13.0"
-
-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!
-	make NOTRACE=1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.6.6.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.6.6.ebuild
new file mode 100644
index 000000000000..3c136ce8e404
--- /dev/null
+++ b/net-misc/asterisk-oh323/asterisk-oh323-0.6.6.ebuild
@@ -0,0 +1,48 @@
+# 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.6.ebuild,v 1.1 2005/07/08 22:43:03 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="~x86 ~ppc"
+DEPEND="~dev-libs/pwlib-1.6.6
+	~net-libs/openh323-1.13.5
+	>=net-misc/asterisk-1.0.0"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-Makefile.patch
+
+	# 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
+	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 of pwlib and openh323
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc BUGS CONFIGURATION COPYING README TESTS
+}
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.9-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.9-Makefile.patch
deleted file mode 100644
index 715d397fc542..000000000000
--- a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.9-Makefile.patch
+++ /dev/null
@@ -1,36 +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
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.9-asterisk-driver-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.9-asterisk-driver-Makefile.patch
deleted file mode 100644
index 7f874ed4dab7..000000000000
--- a/net-misc/asterisk-oh323/files/asterisk-oh323-0.5.9-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.6-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.6-Makefile.patch
new file mode 100644
index 000000000000..0ba228f767c5
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.6-Makefile.patch
@@ -0,0 +1,159 @@
+--- asterisk-oh323-0.6.6/Makefile.orig	2005-06-17 12:14:01.000000000 +0200
++++ asterisk-oh323-0.6.6/Makefile	2005-07-08 03:20:13.000000000 +0200
+@@ -51,7 +51,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
+@@ -61,13 +61,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.
+@@ -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,9 @@
+ 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
+ ASTERISKINCLUDE = -I$(ASTERISKINCDIR) -I../wrapper
+ 
+ ifdef	NOTRACE
+--- 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
+ 
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.5.9 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.5.9
deleted file mode 100644
index 344bcc759a42..000000000000
--- a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.5.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bcd262211f0db31181d44fdd286c6ae1 asterisk-oh323-0.5.9.tar.gz 72463
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.6 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.6
new file mode 100644
index 000000000000..989066a26692
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.6
@@ -0,0 +1 @@
+MD5 5766d733cd9dab27bfdfced008d4750f asterisk-oh323-0.6.6.tar.gz 89554