version bump, email and ptlib-config fixes

4 files changed, 101 insertions, 3 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 279510ea606b..fef2aa96b611 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.29 2003/07/02 09:29:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.30 2003/09/03 10:23:12 liquidx Exp $
+
+*pwlib-1.5.2 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> pwlib-1.5.2.ebuild:
+  version bump. fixes to ptlib-config installation. switch back to using
+  emake but set MAKEOPTS=-j1
 
   02 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> pwlib-1.5.0.ebuild:
   Had trouble with parallel make. Changing emake to make.
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index be57027b8126..672b227a61a7 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,9 +1,9 @@
-MD5 7837b71e8c81ce70f3174989590ac65b ChangeLog 4981
+MD5 d6c201a4a2713d03759a79c08233868a ChangeLog 5180
 MD5 f84656fa6353d2444ee4a6ef3516cc8d metadata.xml 327
 MD5 32e25655669c27bac9083519c782882e pwlib-1.3.11-r1.ebuild 1854
 MD5 a11e7c12ac8f71ec687a211101647889 pwlib-1.4.11.ebuild 2197
 MD5 8a250817ec17be66ac943c63242c165e pwlib-1.5.0.ebuild 2327
-MD5 8a250817ec17be66ac943c63242c165e pwlib-1.5.2.ebuild 2327
+MD5 27e7fc54cb5bcb4687a35c8dde46864e pwlib-1.5.2.ebuild 2616
 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
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.5.2 b/dev-libs/pwlib/files/digest-pwlib-1.5.2
new file mode 100644
index 000000000000..612e63c4b4d3
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.5.2
@@ -0,0 +1 @@
+MD5 0fa33ba1b32b254abe0b731a52c0f2f9 pwlib_1.5.2.tar.gz 1085203
diff --git a/dev-libs/pwlib/pwlib-1.5.2.ebuild b/dev-libs/pwlib/pwlib-1.5.2.ebuild
new file mode 100644
index 000000000000..7d4de2ef6f92
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.5.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2003 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.1 2003/09/03 10:23:12 liquidx Exp $
+
+DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc -sparc"
+IUSE="ssl sdl"
+
+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 )"
+
+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() {
+	if [ "`use ssl`" ]; then
+		export OPENSSLFLAG=1
+		export OPENSSLDIR=/usr
+		export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	econf || 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 
+	sed -i -e "s:^\(LDFLAGS.*\)-L/usr/lib:\1:" ${S}/make/ptbuildopts.mak
+	sed -i -e "s:^\(LDFLAGS[\s]*=.*\) -L/usr/lib:\1:" ${S}/make/ptlib-config
+	
+	emake opt || die "make 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
+	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
+	
+	dodoc ReadMe.txt History.txt
+}