Fix by R. Bosch to use strsignal as needed by uClibc systems #103189 by Chan Min Wai.

(Portage version: 2.0.53_rc4)

4 files changed, 41 insertions, 10 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 40aca50f50fe..a680b317897b 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.109 2005/09/14 06:59:10 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.110 2005/10/10 21:55:16 vapier Exp $
+
+  10 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/alsa-utils-1.0.9a-strsignal.patch, alsa-utils-1.0.9a-r1.ebuild,
+  alsa-utils-1.0.10_rc1.ebuild:
+  Fix by R. Bosch to use strsignal as needed by uClibc systems #103189 by Chan
+  Min Wai.
 
   14 Sep 2005; Aron Griffis <agriffis@gentoo.org> alsa-utils-1.0.9a.ebuild:
   Mark 1.0.9a stable on alpha
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild
index d6ffe2b6900e..3b4a4a01129d 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild,v 1.4 2005/09/13 09:50:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.10_rc1.ebuild,v 1.5 2005/10/10 21:55:16 vapier Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 MY_P="${P/_rc/rc}"
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -22,11 +21,14 @@ DEPEND=">=sys-libs/ncurses-5.1
 RDEPEND="${DEPEND}
 	sys-apps/pciutils"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-largefile.patch
-	epatch ${FILESDIR}/${P}-nls.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-largefile.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
+	epatch "${FILESDIR}"/${PN}-1.0.9a-strsignal.patch #103189
 
 	aclocal || die "aclocal failed"
 	autoconf || die "autoconf failed"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild
index 45207aec3529..8b5ad2ad8d04 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild,v 1.4 2005/09/13 09:50:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.9a-r1.ebuild,v 1.5 2005/10/10 21:55:16 vapier Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -19,6 +19,12 @@ DEPEND=">=sys-libs/ncurses-5.1
 RDEPEND="${DEPEND}
 	sys-apps/pciutils"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-strsignal.patch #103189
+}
+
 src_compile() {
 	# Largefile support, bug #91056
 	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch
new file mode 100644
index 000000000000..e61783c984a6
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.9a-strsignal.patch
@@ -0,0 +1,17 @@
+Using sys_siglist is deprecated in favor of strsignal
+
+Patch by R. Bosch
+
+http://bugs.gentoo.org/103189
+
+--- alsa-utils-1.0.9a/alsamixer/alsamixer.c
++++ alsa-utils-1.0.9a/alsamixer/alsamixer.c
+@@ -2207,7 +2207,7 @@
+ mixer_signal_handler (int signal)
+ {
+   if (signal != SIGSEGV)
+-    mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
++    mixer_abort (ERR_SIGNAL, strsignal(signal), 0);
+   else
+     {
+       fprintf (stderr, "\nSegmentation fault.\n");