edging closer to solving all our pwlib/openh323 problems

8 files changed, 17 insertions, 243 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index c15c79422b03..4ac8f18b1c5c 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,9 +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.22 2003/03/27 02:02:04 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.23 2003/04/01 02:50:24 liquidx Exp $
 
 *pwlib-1.4.11 (20 Mar 2003)
 
+  01 Apr 2003; Alastair Tse <liquidx@gentoo.org> pwlib-1.4.11.ebuild:
+  workaround for problems when upgrading openh323 and pwlib. fixes #14979.
+
   20 Mar 2003; Alastair Tse <liquidx@gentoo.org> pwlib-1.4.11.ebuild:
   version bump
 
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.3.11 b/dev-libs/pwlib/files/digest-pwlib-1.3.11
deleted file mode 100644
index e08abfa40110..000000000000
--- a/dev-libs/pwlib/files/digest-pwlib-1.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da68d42d18a1b4aac93aaa2a9520de00 pwlib_1.3.11.tar.gz 892381
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.3.3 b/dev-libs/pwlib/files/digest-pwlib-1.3.3
deleted file mode 100644
index 01d2ec7686d9..000000000000
--- a/dev-libs/pwlib/files/digest-pwlib-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac142f4452a8194d775ac6fd87d682d2 pwlib_1.3.3.tar.gz 857064
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.4.10 b/dev-libs/pwlib/files/digest-pwlib-1.4.10
deleted file mode 100644
index 3b0c74da96bb..000000000000
--- a/dev-libs/pwlib/files/digest-pwlib-1.4.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9e9b7a857db74077cb33ce0f2b56159 pwlib_1.4.10.tar.gz 953621
diff --git a/dev-libs/pwlib/pwlib-1.3.11.ebuild b/dev-libs/pwlib/pwlib-1.3.11.ebuild
deleted file mode 100644
index 7498591b9eab..000000000000
--- a/dev-libs/pwlib/pwlib-1.3.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.3.11.ebuild,v 1.7 2003/02/13 10:50:51 vapier Exp $
-
-S=${WORKDIR}/${PN}
-
-IUSE="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 "
-
-DEPEND=">=sys-devel/bison-1.28
-	>=sys-devel/flex-2.5.4a
-	dev-libs/expat
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# Removes optimizations from unix make options
-	# Allows the users make.conf to set optimization level
-	patch -p1 < ${FILESDIR}/opts.diff || die
-
-}
-
-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
-
-	make optshared || die
-
-	cd tools/asnparser
-	make optshared || die
-
-}
-
-src_install() {
-
-	dodir /usr/lib /usr/include/ptlib/unix/ptlib /usr/share/pwlib
-
-	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.3.ebuild b/dev-libs/pwlib/pwlib-1.3.3.ebuild
deleted file mode 100644
index 4e6270086266..000000000000
--- a/dev-libs/pwlib/pwlib-1.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.3.3.ebuild,v 1.6 2003/02/13 10:50:55 vapier Exp $
-
-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 "
-
-DEPEND=">=sys-devel/bison-1.28
-	>=sys-devel/flex-2.5.4a"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Removes optimizations from unix make options
-	# Allows the users make.conf to set optimization level
-	patch -p1 < ${FILESDIR}/opts.diff || die
-}
-
-src_compile() {
-	export PWLIBDIR=${S}
-	export PWLIB_BUILD="yes"
-	make optshared || die
-	cd tools/asnparser
-	make optshared || die
-}
-
-src_install() {
-	dodir /usr/lib
-	dodir /usr/include/ptclib
-	dodir /usr/include/ptlib/unix/ptlib
-	dodir /usr/share/pwlib
-	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
-	#cp -a tools/* ${D}/usr/share/pwlib/tools/
-        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.4.10.ebuild b/dev-libs/pwlib/pwlib-1.4.10.ebuild
deleted file mode 100644
index 4e069d154af1..000000000000
--- a/dev-libs/pwlib/pwlib-1.4.10.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.4.10.ebuild,v 1.2 2003/03/07 14:04:44 lu_zero Exp $
-
-S=${WORKDIR}/${PN}
-
-IUSE="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"
-
-DEPEND=">=sys-devel/bison-1.28
-	>=sys-devel/flex-2.5.4a
-	dev-libs/expat
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-        ewarn ""
-        ewarn "Your compile WILL fail if you are upgrading from"
-        ewarn "a previous version of pwlib."
-        ewarn ""
-        ewarn "emerge unmerge pwlib"
-        ewarn "BEFORE upgrading to a newer version"
-        ewarn ""
-        ewarn "You have been warned :)"
-        ewarn ""
-        sleep 5
-
-	unpack ${A}
-	cd ${S}/make
-	cp unix.mak unix.mak.orig
-	sed \
-		-e "s:-mcpu=\$(CPUTYPE)::" \
-		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
-		< unix.mak.orig > unix.mak
-}
-
-src_compile() {
-
-	export PWLIBDIR=${S}
-	export PWLIB_BUILD="yes"
-
-	if [ "`use ssl`" ]; then
-		export OPENSSLFLAG=1
-        	export OPENSSLDIR=/usr
-        	export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-
-	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
-	if [ ${ARCH} = "ppc" ] ; then
-		ln -sf libpt_linux_ppc_r.so.${PV} libpt.so
-	else
-		ln -sf libpt_linux_x86_r.so.${PV} libpt.so
-	fi
-
-}
diff --git a/dev-libs/pwlib/pwlib-1.4.11.ebuild b/dev-libs/pwlib/pwlib-1.4.11.ebuild
index b8a2352784ce..842e746fff59 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.
 # 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.1 2003/03/20 00:38:55 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.4.11.ebuild,v 1.2 2003/04/01 02:50:25 liquidx Exp $
 
 S=${WORKDIR}/${PN}
 
@@ -20,24 +20,25 @@ DEPEND=">=sys-devel/bison-1.28
 	ssl? ( dev-libs/openssl )"
 
 src_unpack() {
-        ewarn ""
-        ewarn "Your compile WILL fail if you are upgrading from"
-        ewarn "a previous version of pwlib."
-        ewarn ""
-        ewarn "emerge unmerge pwlib"
-        ewarn "BEFORE upgrading to a newer version"
-        ewarn ""
-        ewarn "You have been warned :)"
-        ewarn ""
-        sleep 5
-
 	unpack ${A}
 	cd ${S}/make
+    
+    # filter out -O3 and -mcpu embedded compiler flags
 	cp unix.mak unix.mak.orig
 	sed \
 		-e "s:-mcpu=\$(CPUTYPE)::" \
 		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
 		< unix.mak.orig > unix.mak
+        
+    # patch unix.mak so it doesn't require annoying upgrades
+    cp unix.mak unix.mak.orig2
+    sed \
+    	-e "s:-DP_SSL -I\$(OPENSSLDIR)/include -I\$(OPENSSLDIR)/crypto:-DP_SSL:" \
+        -e "s:^LDFLAGS.*\+= -L\$(OPENSSLDIR)/lib -L\$(OPENSSLDIR):LDFLAGS +=:" \
+        < unix.mak.orig2 > unix.mak
+        
+    rm unix.mak.orig unix.mak.orig2
+        
 }
 
 src_compile() {