fixed bug #45016 and #45059

3 files changed, 28 insertions, 23 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index f56e0699aab4..55bd61d0c3bd 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.38 2004/03/12 01:41:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.39 2004/03/19 00:29:19 stkn Exp $
+
+  19 Mar 2004; Stefan Knoblich <stkn@gentoo.org> pwlib-1.6.3-r1.ebuild:
+  fixes bugs #45016 and #45059 (thx to Konrad Rieck <kr@roqe.org>)
 
 *pwlib-1.6.3-r1 (12 Mar 2004)
 
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index e92a4e4b3f69..f12760fa5c20 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,22 +1,22 @@
-MD5 a634ad7ee1e74ab13f72d007451757e2 ChangeLog 6671
+MD5 d5fb2e019414956344bb48c487d0bab2 pwlib-1.6.3-r1.ebuild 3996
+MD5 96e73190da797ba1b76d5f5b0481bad7 ChangeLog 6810
+MD5 ee511cb279081b1442c5d73620ddf47a pwlib-1.5.0-r1.ebuild 2401
+MD5 aa13dda1fe74f8f5f357bbffd4e3bc3f pwlib-1.6.3.ebuild 3818
+MD5 a5b6ebd56c6c62b0fed0fa2bc689e18d pwlib-1.5.2.ebuild 2603
+MD5 3c86a33bad23535614b87ad3180005fe pwlib-1.3.11-r1.ebuild 1829
+MD5 c860b7cf9587c5f7de83f1a7e18026e7 pwlib-1.5.2-r1.ebuild 2767
+MD5 77bc7dacfe0c49a7da3aa8f6a00deaac pwlib-1.5.0.ebuild 2315
+MD5 b5a9d6bf84db87abb2b2dcc83110eb93 pwlib-1.4.11.ebuild 2171
+MD5 2bbdf3e971c624a04d0c8650b5bf54aa pwlib-1.5.2-r2.ebuild 2962
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
-MD5 29f48b472720520ac71097df39d9b62c pwlib-1.3.11-r1.ebuild 1830
-MD5 09bb1ba73d9c8a3fb027e9db73ae53c3 pwlib-1.4.11.ebuild 2172
-MD5 c8da706d4a9f277b7e7d7ce31e06b169 pwlib-1.5.0.ebuild 2316
-MD5 9fff057a9b69b5bc5eae882c3d95b50d pwlib-1.5.2.ebuild 2604
-MD5 81375738c851fe839d6e73c89a77ef89 pwlib-1.6.3-r1.ebuild 3978
-MD5 3560f4dfcc2f3ec3c4ece621e407aed0 pwlib-1.5.2-r1.ebuild 2768
-MD5 fe04ae0e2b2d8b3b5c25962f236026a6 pwlib-1.5.2-r2.ebuild 2963
-MD5 fbbfbcada209826765af251cdc821afa pwlib-1.5.0-r1.ebuild 2402
-MD5 bc0174d1f8a78e55b2a8b3121b7eeb8d pwlib-1.6.3.ebuild 3819
-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 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3 64
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r2 64
-MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
 MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
 MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r1 64
-MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3 64
+MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
+MD5 0c5d290a2ad15d1e8b2ae85365a83bd6 files/digest-pwlib-1.3.11-r1 64
+MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2 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-r1 64
diff --git a/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild b/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild
index b644ec6db725..115b32c8e6a7 100644
--- a/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild,v 1.1 2004/03/12 01:41:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild,v 1.2 2004/03/19 00:29:19 stkn Exp $
 
-IUSE="ssl sdl ieee1394 alsa esd ldap"
+IUSE="ssl sdl ieee1394 alsa esd"
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
@@ -16,7 +16,7 @@ DEPEND=">=sys-devel/bison-1.28
 	>=sys-devel/flex-2.5.4a
 	dev-libs/expat
 	>=sys-apps/sed-4
-	ldap? ( net-nds/openldap )
+	net-nds/openldap
 	sdl? ( media-libs/libsdl )
 	ssl? ( dev-libs/openssl )
 	alsa? ( media-libs/alsa-lib )
@@ -65,8 +65,10 @@ src_compile() {
 	use alsa \
 		&& plugins="${plugins} alsa"
 
-	use esd \
-		&& plugins="${plugins} esd"
+	if [ -n "`use esd`" ]; then
+		# fixes bug #45059
+		export ESDDIR=/usr
+	fi
 
 	# merge plugin options (safe way if default = "")
 	plugins="`echo ${plugins} | sed -e "y: :,:"`"