new version, copyright header updates

11 files changed, 181 insertions, 20 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 544addc5c94e..695687745364 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.36 2004/02/09 01:20:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.37 2004/03/09 00:48:59 stkn Exp $
+
+*pwlib-1.6.3 (09 Mar 2004)
+
+  09 Mar 2004; Stefan Knoblich <stkn@gentoo.org> pwlib-1.3.11-r1.ebuild,
+  pwlib-1.4.11.ebuild, pwlib-1.5.0.ebuild, pwlib-1.5.2-r1.ebuild,
+  pwlib-1.5.2-r2.ebuild, pwlib-1.5.2.ebuild, pwlib-1.6.3.ebuild,
+  files/pwlib-1.6.3-install.diff:
+  new version, plugin configuration contributed by Edward Middleton
+  <edwardmiddleton@k3.dion.ne.jp>. Copyright header updates
 
 *pwlib-1.5.0-r1 (08 Feb 2004)
 
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index ec368e1ee62b..35a1fc9020c4 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,12 +1,13 @@
-MD5 cef57361037afa9108a16358eada0283 ChangeLog 6042
+MD5 96734a0a08d776b8b561b23b528b8ef7 ChangeLog 6434
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
-MD5 cf67ce380e520dbf4e74b4375b91f836 pwlib-1.3.11-r1.ebuild 1833
-MD5 831c830fc0d487862adc7c2f120dac16 pwlib-1.4.11.ebuild 2176
-MD5 cbb68eeacb356c629066c5946cf5583a pwlib-1.5.0.ebuild 2320
-MD5 066519e5f88902c4031851d8fb67fb17 pwlib-1.5.2.ebuild 2608
-MD5 5b2dc26c8157358ca5fb2a395a30bf27 pwlib-1.5.2-r1.ebuild 2769
-MD5 447b41f5fec0c72d9b88ce40c60f55c8 pwlib-1.5.2-r2.ebuild 2963
+MD5 29f48b472720520ac71097df39d9b62c pwlib-1.3.11-r1.ebuild 1830
+MD5 09bb1ba73d9c8a3fb027e9db73ae53c3 pwlib-1.4.11.ebuild 2172
+MD5 c8da706d4a9f277b7e7d7ce31e06b169 pwlib-1.5.0.ebuild 2316
+MD5 9fff057a9b69b5bc5eae882c3d95b50d pwlib-1.5.2.ebuild 2604
+MD5 3560f4dfcc2f3ec3c4ece621e407aed0 pwlib-1.5.2-r1.ebuild 2768
+MD5 fe04ae0e2b2d8b3b5c25962f236026a6 pwlib-1.5.2-r2.ebuild 2963
 MD5 fbbfbcada209826765af251cdc821afa pwlib-1.5.0-r1.ebuild 2402
+MD5 21d3a19246ab2df85a41780543e8c4be pwlib-1.6.3.ebuild 3831
 MD5 0c5d290a2ad15d1e8b2ae85365a83bd6 files/digest-pwlib-1.3.11-r1 64
 MD5 c1a54c4c742e40812c02bea08e570604 files/digest-pwlib-1.4.11 64
 MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
@@ -16,3 +17,5 @@ MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r1 64
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r2 64
 MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
 MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
+MD5 ccc2464b497c583103d4607c1b8827a2 files/pwlib-1.6.3-install.diff 518
+MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3 64
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.6.3 b/dev-libs/pwlib/files/digest-pwlib-1.6.3
new file mode 100644
index 000000000000..863433eb2e70
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.6.3
@@ -0,0 +1 @@
+MD5 c190324ded05c349cf50b0d37fe0c8a1 pwlib-1.6.3.tar.gz 1158037
diff --git a/dev-libs/pwlib/files/pwlib-1.6.3-install.diff b/dev-libs/pwlib/files/pwlib-1.6.3-install.diff
new file mode 100644
index 000000000000..bb2b5b88968a
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.6.3-install.diff
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2004-03-06 01:13:28.763115720 +0100
++++ Makefile.in	2004-03-06 01:13:42.349050344 +0100
+@@ -233,7 +233,7 @@
+ 	ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
+ 	)
+ ###	cp -df lib/*@SHAREDLIBEXT@* $(DESTDIR)$(LIBDIR)/
+-	cp -rf plugins/pwlib         $(DESTDIR)$(LIBDIR)
++###	cp -rf plugins/pwlib         $(DESTDIR)$(LIBDIR)
+ 	cp -rf include/ptclib        $(DESTDIR)$(PREFIX)/include/
+ 	cp -rf include/ptlib         $(DESTDIR)$(PREFIX)/include/
+ 	cp -rf include/ptbuildopts.h $(DESTDIR)$(PREFIX)/include/
diff --git a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
index 98fa0551e380..d7d498c28178 100644
--- a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild,v 1.9 2003/09/11 01:10:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild,v 1.10 2004/03/09 00:48:59 stkn Exp $
 
 DESCRIPTION="Libs needed for GnomeMeeting"
 HOMEPAGE="http://www.openh323.org/"
diff --git a/dev-libs/pwlib/pwlib-1.4.11.ebuild b/dev-libs/pwlib/pwlib-1.4.11.ebuild
index e9711f21387b..81a6c38775ce 100644
--- a/dev-libs/pwlib/pwlib-1.4.11.ebuild
+++ b/dev-libs/pwlib/pwlib-1.4.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.4.11.ebuild,v 1.6 2003/09/11 01:10:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.4.11.ebuild,v 1.7 2004/03/09 00:48:59 stkn Exp $
 
 DESCRIPTION="Libs needed for GnomeMeeting"
 HOMEPAGE="http://www.openh323.org/"
diff --git a/dev-libs/pwlib/pwlib-1.5.0.ebuild b/dev-libs/pwlib/pwlib-1.5.0.ebuild
index 8bbd9e90fdeb..ce4f30c9903c 100644
--- a/dev-libs/pwlib/pwlib-1.5.0.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.0.ebuild,v 1.8 2003/09/11 01:10:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.0.ebuild,v 1.9 2004/03/09 00:48:59 stkn Exp $
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
diff --git a/dev-libs/pwlib/pwlib-1.5.2-r1.ebuild b/dev-libs/pwlib/pwlib-1.5.2-r1.ebuild
index 06d92bbc10b0..769c11924947 100644
--- a/dev-libs/pwlib/pwlib-1.5.2-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2-r1.ebuild,v 1.2 2003/11/09 22:54:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2-r1.ebuild,v 1.3 2004/03/09 00:48:59 stkn Exp $
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
diff --git a/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild b/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild
index 49f4e9472999..1a0227b6e857 100644
--- a/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild,v 1.1 2003/11/13 01:34:28 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild,v 1.2 2004/03/09 00:48:59 stkn Exp $
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
diff --git a/dev-libs/pwlib/pwlib-1.5.2.ebuild b/dev-libs/pwlib/pwlib-1.5.2.ebuild
index 7b10d160cba7..a183a2b4838f 100644
--- a/dev-libs/pwlib/pwlib-1.5.2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2.ebuild,v 1.3 2003/09/11 01:10:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2.ebuild,v 1.4 2004/03/09 00:48:59 stkn Exp $
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
diff --git a/dev-libs/pwlib/pwlib-1.6.3.ebuild b/dev-libs/pwlib/pwlib-1.6.3.ebuild
new file mode 100644
index 000000000000..c0d576c368dd
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.6.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3.ebuild,v 1.1 2004/03/09 00:48:59 stkn Exp $
+
+IUSE="ssl sdl ieee1394 alsa esd ldap"
+
+DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND=">=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	dev-libs/expat
+	>=sys-apps/sed-4
+	ldap? ( net-nds/openldap )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	alsa? ( media-libs/alsa-lib )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		sys-libs/libraw1394 )
+	esd? ( media-sound/esound )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/make
+
+	# filter out -O3 and -mcpu embedded compiler flags
+	sed -i \
+		-e "s:-mcpu=\$(CPUTYPE)::" \
+		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
+		unix.mak
+}
+
+src_compile() {
+	local plugins
+	local myconf
+
+	if [ "`use ssl`" ]; then
+		export OPENSSLFLAG=1
+		export OPENSSLDIR="/usr"
+		export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	## gnomemeeting-1.00 requires pwlib to be built w/ IPV6 support
+	## (even if itself is built without...)
+	#use ipv6 \
+	#	&& myconf="${myconf} --enable-ipv6" \
+	#	|| myconf="${myconf} --disable-ipv6"
+	myconf="${myconf} --enable-ipv6"
+
+	# plugins, oss and v4l are default
+	plugins="oss v4l"
+
+	use ieee1394 \
+		&& plugins="${plugins} avc"
+
+	use alsa \
+		&& plugins="${plugins} alsa"
+
+	use esd \
+		&& plugins="${plugins} esd"
+
+	# merge plugin options (safe way if default = "")
+	plugins="`echo ${plugins} | sed -e "y: :,:"`"
+
+	econf ${myconf} \
+		--enable-plugins \
+		--with-plugins=${plugins} || die "configure failed"
+
+	# Horrible hack to strip out -L/usr/lib to allow upgrades
+	# problem is it adds -L/usr/lib before -L${S} when SSL is
+	# enabled.  Same thing for -I/usr/include.
+	sed -i -e "s:^\(LDFLAGS.*\)-L/usr/lib:\1:" \
+		-e "s:^\(STDCCFLAGS.*\)-I/usr/include:\1:" \
+		${S}/make/ptbuildopts.mak
+	sed -i -e "s:^\(LDFLAGS[\s]*=.*\) -L/usr/lib:\1:" \
+		-e "s:^\(LDFLAGS[\s]*=.*\) -I/usr/include:\1:" \
+		-e "s:^\(CCFLAGS[\s]*=.*\) -I/usr/include:\1:" \
+		${S}/make/ptlib-config
+
+	emake opt || die "make failed"
+	emake PWLIBDIR=${S} -C plugins opt || die "make plugins failed"
+}
+
+src_install() {
+	# make these because the makefile isn't smart enough
+	dodir /usr/bin /usr/lib /usr/share /usr/include
+	make PREFIX=${D}/usr install || die "install failed"
+
+	# these are for compiling openh323
+	# NOTE: symlinks don't work when upgrading
+	# FIXME: probably should fix this with ptlib-config
+	dodir /usr/share/pwlib/include
+	cp -r ${D}/usr/include/* ${D}/usr/share/pwlib/include
+
+	dodir /usr/share/pwlib/lib
+	for x in ${D}/usr/lib/*; do
+		dosym /usr/lib/`basename ${x}` /usr/share/pwlib/lib/`basename ${x}`
+	done
+
+	# remove CVS dirs
+	find ${D} -name CVS -type d | xargs rm -rf
+
+	# fix symlink
+	rm ${D}/usr/lib/libpt.so
+	if [ ${ARCH} = "ppc" ] ; then
+		dosym /usr/lib/libpt_linux_ppc_r.so.${PV} /usr/lib/libpt.so
+	elif [ ${ARCH} = "sparc" ] ; then
+		dosym /usr/lib/libpt_linux_sparc_r.so.${PV} /usr/lib/libpt.so
+	else
+		dosym /usr/lib/libpt_linux_x86_r.so.${PV} /usr/lib/libpt.so
+	fi
+
+	# strip ${S} stuff
+	dosed "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" /usr/bin/ptlib-config
+	dosed "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" /usr/share/pwlib/make/ptbuildopts.mak
+
+	# dodgy configure/makefiles forget to expand this
+	dosed 's:${exec_prefix}:/usr:' /usr/bin/ptlib-config
+
+	# satisfy ptlib.mak's weird definition (should check if true for future versions)
+	cp ${D}/usr/bin/ptlib-config ${D}/usr/share/pwlib/make/ptlib-config
+
+	# copy version.h
+	insinto /usr/share/pwlib
+	doins version.h
+
+	dodoc ReadMe.txt History.txt
+}