fix-aroo upgrade path

3 files changed, 11 insertions, 10 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 7d29222c23c3..2c691f40a9ea 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,9 +1,9 @@
 # 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.26 2003/06/27 13:48:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.27 2003/06/27 13:49:50 liquidx Exp $
 
   27 Jun 2003; Alastair Tse <liquidx@gentoo.org> pwlib-1.5.0.ebuild:
-  workaround upgrade path problems
+  workaround upgrade path problems (#23594)
 
 *pwlib-1.5.0 (27 Jun 2003)
 
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index eadf860254fe..5a07c104118a 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,4 +1,4 @@
-MD5 28d81621f6c29ca5d394a078e68bb315 ChangeLog 4690
+MD5 30539eaa845ba38053028fd58c8cd6d7 ChangeLog 4699
 MD5 b2771e68ea74dfe3c71f91a4b0b48515 pwlib-1.3.11-r1.ebuild 1873
 MD5 1275b7136f865f41a1d25157dcf6317e pwlib-1.5.0.ebuild 2370
 MD5 3315895081f938146aca9ccb586466b0 pwlib-1.4.7.ebuild 2726
diff --git a/dev-libs/pwlib/pwlib-1.5.0.ebuild b/dev-libs/pwlib/pwlib-1.5.0.ebuild
index 2fe7ff3f4b41..113eca431171 100644
--- a/dev-libs/pwlib/pwlib-1.5.0.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.0.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.5.0.ebuild,v 1.1 2003/06/27 12:20:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.0.ebuild,v 1.2 2003/06/27 13:48:56 liquidx Exp $
 
 S=${WORKDIR}/${PN}
 
@@ -40,9 +40,13 @@ src_compile() {
        	export OPENSSLLIBS="-lssl -lcrypt"
 	fi
 
-	#export PWLIBDIR=${S}
-
-	econf
+	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"
 }
 
@@ -77,9 +81,6 @@ src_install() {
 	sed -i -e "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" ${D}/usr/bin/ptlib-config
 	sed -i -e "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" ${D}/usr/share/pwlib/make/ptbuildopts.mak
 
-	# strip out -L/usr/lib to allow upgrades
-	sed -i -e "s:^\(LDFLAGS.*\)-L/usr/lib:\1:" ${D}/usr/share/pwlib/make/ptbuildopts.mak
-	sed -i -e "s:^\(LDFLAGS[\s]*=.*\) -L/usr/lib:\1:" ${D}/usr/bin/ptlib-config
 
 	dodoc ReadMe.txt History.txt
 }