huge build update to support esd and ssl. Please test and report on

bug #9650. Especially ppc people as openh323 and gnomemeeting support
are next for you guys.

5 files changed, 197 insertions, 5 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index c5bb52edbc30..e6c1a49a5a56 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.10 2002/11/05 05:10:29 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.11 2002/11/05 06:43:49 raker Exp $
+
+*pwlib-1.3.11-r1 (04 Nov 2002)
+
+  04 Nov 2002; Nick Hadaway <raker@gentoo.org> pwlib-1.3.11-r1.ebuild,
+  files/digest-pwlib-1.3.11-r1, files/pwlib-1.3.11-r1.diff :
+  New ebuild with support for esd and ssl added.  Big patch update.
+  Changed -ppc to ~ppc as a user has reported success with gnomemeeting
+  on ppc.  Also fixed a problem where ptclib files were not being
+  installed.
 
 *pwlib-1.3.11 (24 Oct 2002)
 
   04 Oct 2002; Nick Hadaway <raker@gentoo.org> pwlib-1.3.11.ebuild :
-  Added dependancy on dev-libs/expat.  See bug #9650
+  Added dependancy on dev-libs/expat.
 
   24 Oct 2002; Nick Hadaway <raker@gentoo.org> pwlib-1.3.11.ebuild,
   files/digest-pwlib-1.3.11 :
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.3.11-r1 b/dev-libs/pwlib/files/digest-pwlib-1.3.11-r1
new file mode 100644
index 000000000000..e08abfa40110
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.3.11-r1
@@ -0,0 +1 @@
+MD5 da68d42d18a1b4aac93aaa2a9520de00 pwlib_1.3.11.tar.gz 892381
diff --git a/dev-libs/pwlib/files/pwlib-1.3.11-r1.diff b/dev-libs/pwlib/files/pwlib-1.3.11-r1.diff
new file mode 100644
index 000000000000..aa3a9ef6de43
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.3.11-r1.diff
@@ -0,0 +1,90 @@
+diff -urN pwlib/make/unix.mak pwlib-modified/make/unix.mak
+--- pwlib/make/unix.mak	2002-10-02 23:12:45.000000000 -0500
++++ pwlib-modified/make/unix.mak	2002-11-05 00:03:52.000000000 -0600
+@@ -652,8 +652,6 @@
+ ifeq ($(CPUTYPE),crusoe)
+ STDCCFLAGS	+= -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=0 
+ STDCCFLAGS      += -malign-jumps=0 -malign-loops=0
+-else
+-STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+ endif
+ endif
+ endif
+@@ -1250,7 +1248,7 @@
+ 
+ else
+ 
+-OPTCCFLAGS	+= -O3 -DNDEBUG
++OPTCCFLAGS	+= -DNDEBUG
+ #OPTCCFLAGS	+= -DP_USE_INLINES=1
+ #OPTCCFLAGS	+= -fconserve-space
+ ifneq ($(OSTYPE),Carbon)
+@@ -1262,26 +1260,9 @@
+ 
+ endif # DEBUG
+ 
+-
+-# define OpenSSL variables if installed
+-ifndef OPENSSLDIR
+-
+-ifneq (,$(wildcard $(SYSINCDIR)/openssl))
+-OPENSSLDIR := $(SYSINCDIR)
+-export OPENSSLDIR
+-endif
+-
+-ifneq (,$(wildcard /usr/local/ssl))
+-OPENSSLDIR := /usr/local/ssl
+-export OPENSSLDIR
+-endif
+-
+-endif
+-
+ ifdef  OPENSSLDIR
+ ifneq (,$(wildcard $(OPENSSLDIR)))
+-STDCCFLAGS	+= -DP_SSL -I$(OPENSSLDIR)/include -I$(OPENSSLDIR)/crypto
+-LDFLAGS		+= -L$(OPENSSLDIR)/lib -L$(OPENSSLDIR)
++STDCCFLAGS	+= -DP_SSL
+ ENDLDLIBS	+= -lssl -lcrypto
+ HAS_OPENSSL	= 1
+ endif
+@@ -1295,18 +1276,9 @@
+ STDCCFLAGS	+= -DP_EXPAT
+ endif
+ 
+-ifneq (,$(wildcard /usr/local/include/expat.h))
+-HAS_EXPAT	= 1
+-ENDLDLIBS	+= -lexpat
+-STDCCFLAGS	+= -DP_EXPAT -I /usr/local/include
+-LDFLAGS		+= -L /usr/local/lib
+-endif
+-
+-
+ # define ESDDIR variables if installed
+ ifdef  ESDDIR
+-STDCCFLAGS	+= -I$(ESDDIR)/include
+-ENDLDLIBS	+= $(ESDDIR)/lib/libesd.a  # to avoid name conflicts
++ENDLDLIBS	+= -lesd  # to avoid name conflicts
+ HAS_ESD		= 1
+ endif
+ 
+@@ -1328,8 +1300,7 @@
+ #STDCCFLAGS     += -fno-implement-inlines
+ 
+ # add OS directory to include path
+-STDCCFLAGS	+= -I$(UNIX_INC_DIR)
+-
++STDCCFLAGS     += -I$(UNIX_INC_DIR)
+ 
+ # add library directory to library path and include the library
+ LDFLAGS		+= -L$(PW_LIBDIR)
+diff -urN pwlib/src/ptclib/pxmlrpcs.cxx pwlib-modified/src/ptclib/pxmlrpcs.cxx
+--- pwlib/src/ptclib/pxmlrpcs.cxx	2002-10-02 03:54:01.000000000 -0500
++++ pwlib-modified/src/ptclib/pxmlrpcs.cxx	2002-11-05 00:12:30.000000000 -0600
+@@ -195,4 +195,5 @@
+   return reply;
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
++
diff --git a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
new file mode 100644
index 000000000000..b576115b7105
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2002 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.1 2002/11/05 06:43:49 raker Exp $
+
+S=${WORKDIR}/${PN}
+
+IUSE="esd ssl"
+
+DESCRIPTION="Libs needed for GnomeMeeting"
+HOMEPAGE="http://www.openh323.org"
+SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86 ~ppc -sparc -sparc64"
+
+DEPEND=">=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	dev-libs/expat
+	ssl? ( dev-libs/openssl )
+	esd? ( media-sound/esound )"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PF}.diff || die
+
+}
+
+src_compile() {
+
+	export PWLIBDIR=${S}
+	export PWLIB_BUILD="yes"
+
+	if [ "`use ssl`" ]; then
+		export OPENSSLFLAG=1
+        	export OPENSSLDIR=/usr
+        	export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	use esd && export ESDDIR=/usr
+
+	make optshared || die
+
+	cd tools/asnparser
+	make optshared || die
+
+}
+
+src_install() {
+
+	dodir /usr/lib /usr/include/ptlib/unix/ptlib \
+		/usr/share/pwlib /usr/include/ptclib
+
+	cd ${S}	
+	cp -a lib/*so* ${D}/usr/lib
+	cp -a include/ptlib.h ${D}/usr/include
+	cp -a include/ptlib/*.h ${D}/usr/include/ptlib/
+	cp -a include/ptlib/*.inl ${D}/usr/include/ptlib/	
+	cp -a include/ptlib/unix/ptlib/*.h ${D}/usr/include/ptlib/unix/ptlib
+	cp -a include/ptlib/unix/ptlib/*.inl ${D}/usr/include/ptlib/unix/ptlib
+	cp -a include/ptclib/*.h ${D}/usr/include/ptclib/
+
+	cp -a * ${D}/usr/share/pwlib/
+	rm -rf ${D}/usr/share/pwlib/make/CVS
+        rm -rf ${D}/usr/share/pwlib/tools/CVS
+	rm -rf ${D}/usr/share/pwlib/tools/asnparser/CVS
+	rm -rf ${D}/usr/share/pwlib/src
+	rm -rf ${D}/usr/share/pwlib/include/CVS
+	rm -rf ${D}/usr/share/pwlib/include/ptlib/unix/CVS
+	rm -rf ${D}/usr/share/pwlib/include/ptlib/CVS
+
+	cd ${D}/usr/lib
+	ln -sf libpt_linux_x86_r.so.${PV} libpt.so
+
+}
diff --git a/dev-libs/pwlib/pwlib-1.3.11.ebuild b/dev-libs/pwlib/pwlib-1.3.11.ebuild
index 55ac4be69bbe..189bd2fdad57 100644
--- a/dev-libs/pwlib/pwlib-1.3.11.ebuild
+++ b/dev-libs/pwlib/pwlib-1.3.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 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.ebuild,v 1.3 2002/11/05 05:10:29 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.11.ebuild,v 1.4 2002/11/05 06:43:49 raker Exp $
 
 S=${WORKDIR}/${PN}
 
-IUSE=""
+IUSE="ssl"
 
 DESCRIPTION="Libs needed for GnomeMeeting"
 HOMEPAGE="http://www.openh323.org"
@@ -16,7 +16,9 @@ KEYWORDS="x86 -ppc -sparc -sparc64"
 
 DEPEND=">=sys-devel/bison-1.28
 	>=sys-devel/flex-2.5.4a
-	dev-libs/expat"
+	dev-libs/expat
+	ssl? ( dev-libs/openssl )
+	esd? ( media-sound/esound )"
 
 src_unpack() {
 
@@ -32,6 +34,19 @@ src_compile() {
 
 	export PWLIBDIR=${S}
 	export PWLIB_BUILD="yes"
+
+	# This is marked in the readme under the win32 instructions
+	# It seems to work for us *nix folk though...
+	if [ "`use ssl`" ]; then
+		export OPENSSLFLAG=1
+        	export OPENSSLDIR=/usr
+        	export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	# This makes gcc complain as -I/usr/include gets added to the
+	# library search path, but setting it is required for esd.
+	use esd && export ESDDIR=/usr
+
 	make optshared || die
 
 	cd tools/asnparser