From 7cbe57539bfeb1d1c06c51c8713fb2077a6a424f Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Sun, 31 Oct 2004 09:52:09 +0000
Subject: [PATCH] Added check for /dev/sound for bug #20647.

---
 media-sound/xmms/ChangeLog             |  5 +++--
 media-sound/xmms/Manifest              | 10 +++++-----
 media-sound/xmms/xmms-1.2.10-r9.ebuild | 13 ++++++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index c040666f9247..95ffd0c565b2 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,10 +1,11 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.149 2004/10/31 09:37:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.150 2004/10/31 09:52:09 eradicator Exp $
 
   31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-1.2.10-r9.ebuild:
-  Removing .desktop from applnk.  Removed postinst ewarning
+  Removing .desktop from applnk.  Removed postinst ewarning.  Added check
+  for /dev/sound for bug #20647.
 
 *xmms-1.2.10-r9 (30 Oct 2004)
 
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 43ef4eca19e6..8645dcdda392 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -2,10 +2,10 @@
 Hash: SHA1
 
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 275ddb73126e337656076e2b6fdf4c30 ChangeLog 27461
+MD5 0dd8881a77a9941c175ffee961b22ffe ChangeLog 27508
 MD5 33180edc5b30f54debff69322fae465a xmms-1.2.8-r4.ebuild 5271
 MD5 e8f74b9f98c9a742f9d9e7559227ef84 xmms-1.2.10-r5.ebuild 5386
-MD5 460a27e5bf93d9652aac81d7f9ecac22 xmms-1.2.10-r9.ebuild 3356
+MD5 a7dd23b5856ef765e4ed17baedb74680 xmms-1.2.10-r9.ebuild 3408
 MD5 567e6084702a3338a1ddeed984fe7d11 files/digest-xmms-1.2.10-r9 277
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
@@ -13,7 +13,7 @@ MD5 aa46b23a1cf0655c7f09adbdd623d49f files/digest-xmms-1.2.10-r5 219
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBhLJ3ArHZZzCEUG0RAh62AJ9qguNeugqdY7E4lNvGSAz+sbCRhACePcVU
-M21/lm74Py+ODtVicCzot/g=
-=QN0O
+iD8DBQFBhLX8ArHZZzCEUG0RAnJUAJ0UrBmHjPRmHB0Ht9J9mrjiP7yTEgCeJ/cD
+QXzk0cNTlOmG8iM43aEjQ08=
+=qewT
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms/xmms-1.2.10-r9.ebuild b/media-sound/xmms/xmms-1.2.10-r9.ebuild
index 7e5d130e61f2..10b674a543d8 100644
--- a/media-sound/xmms/xmms-1.2.10-r9.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r9.ebuild,v 1.2 2004/10/31 09:37:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r9.ebuild,v 1.3 2004/10/31 09:52:09 eradicator Exp $
 
 IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 alsa oss arts jack sndfile lirc flac mad"
 
@@ -78,10 +78,13 @@ src_compile() {
 
 	use xml || myconf="${myconf} --disable-cdindex"
 
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable oggvorbis vorbis` \
+	if [ -e /dev/sound ]; then
+		myconf="${myconf} \
+			--with-dev-dsp=/dev/sound/dsp \
+			--with-dev-mixer=/dev/sound/mixer"
+	fi
+
+	econf	`use_enable oggvorbis vorbis` \
 		`use_enable esd` \
 		`use_enable mikmod` \
 		`use_with mikmod libmikmod` \
-- 
2.26.2