fix for gcc-2.95 systems (bug #33204)

4 files changed, 115 insertions, 2 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index aa9c10c6cf8d..a7c98be2b114 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2003/11/09 23:01:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.35 2003/11/13 01:34:28 stkn Exp $
+
+*pwlib-1.5.2-r2 (13 Nov 2003)
+
+  13 Nov 2003; <stkn@gentoo.org> pwlib-1.5.2-r2.ebuild:
+  fixes include problems on gcc-2.95 systems when using ssl support,
+  found and fixed by Martin Schlemmer <azarah@gentoo.org>
+  (bug #33204)
 
   10 Nov 2003; <stkn@gentoo.org> metadata.xml:
   new maintainer
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 3563887ac704..d23fd8fb2862 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,13 +1,15 @@
-MD5 718f310d8600bcc903336b425bba8ae6 ChangeLog 5635
+MD5 a6d2032e5aad2ebecb9b5e800e3eb32c ChangeLog 5865
 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 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
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2 64
 MD5 91035c6391e112595e0003cebda275f6 files/pwlib-1.3.11-r1.diff 2260
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r1 64
+MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r2 64
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.5.2-r2 b/dev-libs/pwlib/files/digest-pwlib-1.5.2-r2
new file mode 100644
index 000000000000..612e63c4b4d3
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.5.2-r2
@@ -0,0 +1 @@
+MD5 0fa33ba1b32b254abe0b731a52c0f2f9 pwlib_1.5.2.tar.gz 1085203
diff --git a/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild b/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..49f4e9472999
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.5.2-r2.ebuild
@@ -0,0 +1,103 @@
+# 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-r2.ebuild,v 1.1 2003/11/13 01:34:28 stkn 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.  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"
+}
+
+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
+}