Version bump

Package-Manager: portage-2.0.51.19

4 files changed, 168 insertions, 8 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 016cefd86219..63aaf9df3f77 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.81 2005/04/10 22:00:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.82 2005/04/10 22:03:32 stkn Exp $
+
+*pwlib-1.8.4 (11 Apr 2005)
+
+  11 Apr 2005; Stefan Knoblich <stkn@gentoo.org> +pwlib-1.8.4.ebuild:
+  Version bump.
 
   11 Apr 2005; Stefan Knoblich <stkn@gentoo.org> -files/pwlib-1.3.11-r1.diff,
   -pwlib-1.3.11-r1.ebuild, -pwlib-1.4.11.ebuild:
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index c66a14185786..e0b5694c9ede 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,7 +1,5 @@
-MD5 fcf2133850a0bdcab2265ce234938f1d pwlib-1.4.11.ebuild 2155
-MD5 9c7bc7c4159f25cfd3c5b503d75a3eea ChangeLog 12296
+MD5 3c83ef48d2d5e9eddba45d832dcfa460 ChangeLog 12556
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
-MD5 0359c7e3f0d538a3f5300db8027de809 pwlib-1.3.11-r1.ebuild 1830
 MD5 7b71ebcce6d852f0dc6738ee8b77ea49 pwlib-1.5.0-r1.ebuild 2403
 MD5 4690d9e7395046ed1c573e68a47bd053 pwlib-1.5.0.ebuild 2304
 MD5 7f4606efc346a8a592508825e2ddc90f pwlib-1.5.2-r1.ebuild 2756
@@ -17,9 +15,7 @@ MD5 3ad89ec3baf9161b22df083d18e1383e pwlib-1.8.3.ebuild 3980
 MD5 cb07517afa0abeada47244ef880bab05 pwlib-1.6.3-r3.ebuild 4179
 MD5 68012b40f788131065a0502f6dfe597b pwlib-1.6.6-r2.ebuild 4395
 MD5 9c583084de7546392ef1f70260a0c6d1 pwlib-1.8.3-r1.ebuild 4315
-MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
-MD5 0c5d290a2ad15d1e8b2ae85365a83bd6 files/digest-pwlib-1.3.11-r1 64
-MD5 c1a54c4c742e40812c02bea08e570604 files/digest-pwlib-1.4.11 64
+MD5 2a19d3e876a9e437056ffc77088c5d69 pwlib-1.8.4.ebuild 4194
 MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
 MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2 64
@@ -32,10 +28,11 @@ MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r2 64
 MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6 69
 MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6-r1 69
 MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3 69
-MD5 91035c6391e112595e0003cebda275f6 files/pwlib-1.3.11-r1.diff 2260
+MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
 MD5 8c6469f000dea2a13869631fcedbe0ff files/pwlib-1.5.2-asnparser-secfix.diff 1299
 MD5 0fbee42a70e13b6fe530a1f1ca8086ac files/pwlib-1.6.6-alsa_dmix.diff 7450
 MD5 ef62669acbbbc63a30d475ca9865adb6 files/pwlib-1.6.6-ieee1394dc-fix.diff 7207
 MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r3 64
 MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6-r2 69
 MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3-r1 69
+MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.8.4 b/dev-libs/pwlib/files/digest-pwlib-1.8.4
new file mode 100644
index 000000000000..ad49bcbb1250
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.8.4
@@ -0,0 +1 @@
+MD5 fc638a64216b7751271c539ee4ccd0a8 pwlib-1.8.4.tar.gz 1382438
diff --git a/dev-libs/pwlib/pwlib-1.8.4.ebuild b/dev-libs/pwlib/pwlib-1.8.4.ebuild
new file mode 100644
index 000000000000..73a3b9037b08
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.8.4.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.1 2005/04/10 22:03:32 stkn Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE="ssl sdl ieee1394 alsa esd v4l2"
+
+MY_P="${PN}-v${PV//./_}"
+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 ~sparc ~alpha ~ppc ~amd64"
+
+DEPEND=">=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	dev-libs/expat
+	>=sys-apps/sed-4
+	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
+		media-plugins/libdc1394 )
+	esd? ( media-sound/esound )"
+
+S=${WORKDIR}/${P}
+
+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
+
+	# may cause ICE (bug #70638)
+	filter-flags -fstack-protector
+
+	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 dc"
+
+	use alsa \
+		&& plugins="${plugins} alsa"
+
+	if use v4l2; then
+		myconf="${myconf} --enable-v4l2"
+		plugins="${plugins} v4l2"
+	fi
+
+	if use esd; then
+		# fixes bug #45059
+		export ESDDIR=/usr
+
+		# ESD includes are in /usr/include?
+		# remove include path, bad things may happen if we leave it in there
+		sed -i -e "s:-I\$(ESDDIR)/include::" \
+			${S}/make/unix.mak
+	fi
+
+	# 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 -j1 opt || die "make failed"
+}
+
+src_install() {
+	# makefile doesn't create ${D}/usr/bin
+	dodir /usr/bin
+	make PREFIX=/usr DESTDIR=${D} install || die "install failed"
+
+	## vv will try to fix the mess below, requires a lot of patching though...
+
+	# 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/$(get_libdir)
+	for x in ${D}/usr/$(get_libdir)/*; do
+		dosym /usr/$(get_libdir)/`basename ${x}` /usr/share/pwlib/$(get_libdir)/`basename ${x}`
+	done
+
+	# just in case...
+	if [[ "$(get_libdir)" = "lib64" ]]; then
+		dosym /usr/share/pwlib/$(get_libdir) /usr/share/pwlib/lib
+	fi
+
+	## ^^ bad stuff
+
+	# fix symlink
+	# only amd64 needs special handling, afaics
+	rm ${D}/usr/$(get_libdir)/libpt.so
+	if use amd64; then
+		dosym /usr/$(get_libdir)/libpt_linux_x86_64_r.so.${PV} /usr/$(get_libdir)/libpt.so
+	else
+		dosym /usr/$(get_libdir)/libpt_linux_${ARCH}_r.so.${PV} /usr/$(get_libdir)/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
+
+	# copy version.h
+	insinto /usr/share/pwlib
+	doins version.h
+
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt mpl-1.0.htm
+}