Added patch to fix #100432, see ChangeLog for details.

(Portage version: 2.0.51.22-r2)

6 files changed, 41 insertions, 5 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 5301d61f158e..dc53cebf7e0d 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.84 2005/08/15 19:19:36 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.85 2005/08/15 19:43:02 stkn Exp $
+
+  15 Aug 2005; <stkn@gentoo.org> +files/pwlib-1.6.3-dyn-esd.patch,
+  pwlib-1.6.3-r3.ebuild, pwlib-1.6.6-r2.ebuild, pwlib-1.8.3-r1.ebuild,
+  pwlib-1.8.4.ebuild:
+  Newer version of esound doesn't install libesd.a anymore,
+  added patch (provided by Geoff Leach) to use the dynamic library
+  instead (fixes #100432). Basic compile testing done with latest
+  revisions of 1.6.3, 1.6.6, 1.8.3 and 1.8.4. Extended build testing
+  with pwlib-1.8.4 and openh323-1.15.3.
 
   15 Aug 2005; <stkn@gentoo.org> -pwlib-1.5.2.ebuild,
   -pwlib-1.5.2-r1.ebuild, -pwlib-1.5.2-r2.ebuild, -pwlib-1.6.3.ebuild,
diff --git a/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch b/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch
new file mode 100644
index 000000000000..638fd78c9536
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch
@@ -0,0 +1,11 @@
+--- make/unix.mak	2004-11-16 11:32:34.000000000 +1100
++++ make/unix.mak.N	2005-07-27 14:12:35.000000000 +1000
+@@ -928,7 +928,7 @@
+ # define ESDDIR variables if installed
+ ifdef  ESDDIR
+ STDCCFLAGS	+= -I$(ESDDIR)/include -DUSE_ESD=1
+-ENDLDLIBS	+= $(ESDDIR)/lib/libesd.a  # to avoid name conflicts
++ENDLDLIBS	+= -lesd  # to avoid name conflicts
+ HAS_ESD		= 1
+ endif
+ 
diff --git a/dev-libs/pwlib/pwlib-1.6.3-r3.ebuild b/dev-libs/pwlib/pwlib-1.6.3-r3.ebuild
index eb65d8a34b4b..60871839e7ee 100644
--- a/dev-libs/pwlib/pwlib-1.6.3-r3.ebuild
+++ b/dev-libs/pwlib/pwlib-1.6.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r3.ebuild,v 1.1 2005/02/03 19:57:59 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r3.ebuild,v 1.2 2005/08/15 19:43:02 stkn Exp $
 
 inherit multilib
 
@@ -38,6 +38,10 @@ src_unpack() {
 		-e "s:-mcpu=\$(CPUTYPE)::" \
 		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
 		unix.mak
+
+	# newer esound package doesn't install libesd.a anymore,
+	# use dynamic library instead (fixes #100432)
+	epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch
 }
 
 src_compile() {
diff --git a/dev-libs/pwlib/pwlib-1.6.6-r2.ebuild b/dev-libs/pwlib/pwlib-1.6.6-r2.ebuild
index 33004f961fb8..d8db7730e0ba 100644
--- a/dev-libs/pwlib/pwlib-1.6.6-r2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.6.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.6-r2.ebuild,v 1.2 2005/02/19 20:08:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.6-r2.ebuild,v 1.3 2005/08/15 19:43:02 stkn Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -47,6 +47,10 @@ src_unpack() {
 
 	# dmix patch for alsa support (#68553)
 	epatch ${FILESDIR}/${P}-alsa_dmix.diff
+
+	# newer esound package doesn't install libesd.a anymore,
+	# use dynamic library instead (fixes #100432)
+	epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch
 }
 
 src_compile() {
diff --git a/dev-libs/pwlib/pwlib-1.8.3-r1.ebuild b/dev-libs/pwlib/pwlib-1.8.3-r1.ebuild
index 32117017cbd7..0374b674caeb 100644
--- a/dev-libs/pwlib/pwlib-1.8.3-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.3-r1.ebuild,v 1.4 2005/07/27 10:35:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.3-r1.ebuild,v 1.5 2005/08/15 19:43:02 stkn Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -42,6 +42,10 @@ src_unpack() {
 		-e "s:-mcpu=\$(CPUTYPE)::" \
 		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
 		unix.mak
+
+	# newer esound package doesn't install libesd.a anymore,
+	# use dynamic library instead (fixes #100432)
+	epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch
 }
 
 src_compile() {
diff --git a/dev-libs/pwlib/pwlib-1.8.4.ebuild b/dev-libs/pwlib/pwlib-1.8.4.ebuild
index 515e657eabba..d13bcbdf4822 100644
--- a/dev-libs/pwlib/pwlib-1.8.4.ebuild
+++ b/dev-libs/pwlib/pwlib-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.3 2005/07/27 10:35:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.4 2005/08/15 19:43:02 stkn Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -38,6 +38,10 @@ src_unpack() {
 		-e "s:-mcpu=\$(CPUTYPE)::" \
 		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
 		unix.mak
+
+	# newer esound package doesn't install libesd.a anymore,
+	# use dynamic library instead (fixes #100432)
+	epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch
 }
 
 src_compile() {