Add ~x86-fbsd keyword and a patch to fix mode_t vaarg passing.

(Portage version: 2.1_pre10-r2)

4 files changed, 32 insertions, 8 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 6b2f43e19d00..a8f2a52a7fc6 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.65 2006/01/22 02:11:43 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.66 2006/05/06 00:14:17 flameeyes Exp $
+
+  06 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/esound-0.2.36-mode_t.patch, esound-0.2.36-r1.ebuild:
+  Add ~x86-fbsd keyword and a patch to fix mode_t vaarg passing.
 
   22 Jan 2006; Joshua Jackson <tsunam@gentoo.org> ChangeLog:
   Stable on x86 for bug #119634; Stabilize Gnome-2.12.2
diff --git a/media-sound/esound/esound-0.2.36-r1.ebuild b/media-sound/esound/esound-0.2.36-r1.ebuild
index c0bc91189ec4..a654be8abf32 100644
--- a/media-sound/esound/esound-0.2.36-r1.ebuild
+++ b/media-sound/esound/esound-0.2.36-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.14 2005/12/31 11:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.15 2006/05/06 00:14:17 flameeyes Exp $
 
 inherit libtool gnome.org eutils
 
@@ -28,6 +28,10 @@ src_unpack() {
 	# please note, this is a conditional, version specific patch!!!
 	# when bumping avoid bugs like #103969
 	use ppc-macos && epatch ${FILESDIR}/${P}-ppc-macos.patch
+
+	epatch "${FILESDIR}/${P}-mode_t.patch"
+
+	elibtoolize
 }
 
 src_compile() {
@@ -35,11 +39,9 @@ src_compile() {
 		$(use_enable static) $(use_enable debug debugging) $(use_enable alsa) \
 		$(use_with tcpd libwrap)"
 
-	elibtoolize
-
 	econf $myconf || die "Configure failed"
 
-	make || die "Make failed"
+	emake || die "Make failed"
 }
 
 src_install() {
@@ -48,14 +50,14 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TIPS TODO
 
-	[ -d "docs/html" ] && dohtml -r docs/html/*
+	[[ -d "docs/html" ]] && dohtml -r docs/html/*
 
 	newconfd ${FILESDIR}/esound.conf.d esound
 
 	extradepend=""
 	use tcpd && extradepend=" portmap"
 	use alsa && extradepend="$extradepend alsasound"
-	sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound
+	sed -e "s/@extradepend@/$extradepend/" ${FILESDIR}/esound.init.d >${T}/esound
 	doinitd ${T}/esound
 
 }
diff --git a/media-sound/esound/files/digest-esound-0.2.36-r1 b/media-sound/esound/files/digest-esound-0.2.36-r1
index 171c1f34096e..9ec79c050716 100644
--- a/media-sound/esound/files/digest-esound-0.2.36-r1
+++ b/media-sound/esound/files/digest-esound-0.2.36-r1
@@ -1 +1,3 @@
 MD5 3facb5aa0115cc1c31771b9ad454ae76 esound-0.2.36.tar.bz2 369952
+RMD160 1a6d4a1f31311e6265324fb1a392f9b0491cf1f9 esound-0.2.36.tar.bz2 369952
+SHA256 68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76 esound-0.2.36.tar.bz2 369952
diff --git a/media-sound/esound/files/esound-0.2.36-mode_t.patch b/media-sound/esound/files/esound-0.2.36-mode_t.patch
new file mode 100644
index 000000000000..b7b610e71de2
--- /dev/null
+++ b/media-sound/esound/files/esound-0.2.36-mode_t.patch
@@ -0,0 +1,16 @@
+Index: esound-0.2.36/esddsp.c
+===================================================================
+--- esound-0.2.36.orig/esddsp.c
++++ esound-0.2.36/esddsp.c
+@@ -227,7 +227,10 @@ open (const char *pathname, int flags, .
+   dsp_init ();
+ 
+   va_start (args, flags);
+-  mode = va_arg (args, mode_t);
++  if ( sizeof(mode_t) < sizeof(int) )
++    mode = va_arg (args, int);
++  else
++    mode = va_arg (args, mode_t);
+   va_end (args);
+ 
+   if (!strcmp (pathname, "/dev/dsp"))