fix building when neither oss or alsa is specified - patch from Preston Crow via bug #139785

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 22 insertions, 14 deletions

diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index 043d40f78b61..80de12f2d56c 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/crossfire-client
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.16 2006/07/04 02:23:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.17 2006/07/10 01:07:42 mr_bones_ Exp $
+
+  10 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  crossfire-client-1.9.1.ebuild:
+  fix building when neither oss or alsa is specified - patch from Preston Crow
+  via bug #139785
 
 *crossfire-client-1.9.1 (04 Jul 2006)
 
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index da3b6d1c828a..442b6925330a 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -7,14 +7,14 @@ EBUILD crossfire-client-1.9.0.ebuild 1494 RMD160 661beeb5709fc8cd59fdd52ca99ddc1
 MD5 18cd9052bb6f710e5070323e9f26f10b crossfire-client-1.9.0.ebuild 1494
 RMD160 661beeb5709fc8cd59fdd52ca99ddc13a43c862c crossfire-client-1.9.0.ebuild 1494
 SHA256 e5a92598c427ac4778ec161c512c50275d160f4c35c7580e4d7339321110cf17 crossfire-client-1.9.0.ebuild 1494
-EBUILD crossfire-client-1.9.1.ebuild 1494 RMD160 47f6a8fae7196ca37b543c38b288aa533fd6f7b3 SHA1 72a8bf9a7eb66748ec0548b74d930452fc6f6ebd SHA256 31bdbc031fff37e35498fa3578cb157928ee65259bb566fc9ae11833a536be44
-MD5 d99d25b04bfea21eb1e607a8dc83ce4e crossfire-client-1.9.1.ebuild 1494
-RMD160 47f6a8fae7196ca37b543c38b288aa533fd6f7b3 crossfire-client-1.9.1.ebuild 1494
-SHA256 31bdbc031fff37e35498fa3578cb157928ee65259bb566fc9ae11833a536be44 crossfire-client-1.9.1.ebuild 1494
-MISC ChangeLog 3240 RMD160 57e24f19bdd952db54d2e3987337a204765be96e SHA1 34a1a43097954b33df3acea419c17a6c3b13733e SHA256 789a1d0731f47cb9972141e6106d80f7000b869f5648f2c61e531a9b52955717
-MD5 ce99b44b598d749edfcaba3a0288fbed ChangeLog 3240
-RMD160 57e24f19bdd952db54d2e3987337a204765be96e ChangeLog 3240
-SHA256 789a1d0731f47cb9972141e6106d80f7000b869f5648f2c61e531a9b52955717 ChangeLog 3240
+EBUILD crossfire-client-1.9.1.ebuild 1544 RMD160 213a23c29cc956ec4fec29995cb71098e34c6f86 SHA1 9e6555a993bf80d010d10ab3221ae446d6d77c7a SHA256 a00656ac32c1f465478d1012be4ad8715c832fca9ff50227d4eb41f7fc2d32d4
+MD5 fdd765563c69e8d02b4293be44f3c8d0 crossfire-client-1.9.1.ebuild 1544
+RMD160 213a23c29cc956ec4fec29995cb71098e34c6f86 crossfire-client-1.9.1.ebuild 1544
+SHA256 a00656ac32c1f465478d1012be4ad8715c832fca9ff50227d4eb41f7fc2d32d4 crossfire-client-1.9.1.ebuild 1544
+MISC ChangeLog 3426 RMD160 1773ee41a7f5883cb981c4cc7b69ef1b27c70db1 SHA1 4fcda0596f2be864f14436f69b5190e196c88532 SHA256 ce8d003629f27bae3a16c2b5ce01401745969efced7c4ff73124fe95fc2daf6f
+MD5 653d555ffe99ad7b2c3786e1024dc83c ChangeLog 3426
+RMD160 1773ee41a7f5883cb981c4cc7b69ef1b27c70db1 ChangeLog 3426
+SHA256 ce8d003629f27bae3a16c2b5ce01401745969efced7c4ff73124fe95fc2daf6f ChangeLog 3426
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -28,7 +28,7 @@ SHA256 dae9a3d1dfea12be53311f1b0c1a55bb49efbb6ec77209dffcb00fff4cf17e4a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqdFF9AbAhSK0CiwRAivnAJ92E1hHGAHxGVQZSjgsc65kJ0oHOwCfaYeA
-5VGsqXPsNheqSp8k0vb+kW0=
-=ri2Y
+iD8DBQFEsahl9AbAhSK0CiwRAur8AJ4sAme1fkSl4f07IIq57w9VUGfhqQCfU45U
+AQ33DoPXEonWp+Kk0fb+1yE=
+=kBIb
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.9.1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.9.1.ebuild
index 71ff49f5e40c..71572d032b60 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.9.1.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.9.1.ebuild,v 1.1 2006/07/04 02:23:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.9.1.ebuild,v 1.2 2006/07/10 01:07:42 mr_bones_ Exp $
 
 inherit games
 
@@ -48,7 +48,10 @@ src_compile() {
 		myconf="${myconf} --disable-sound"
 	fi
 	egamesconf ${myconf} || die
-	emake -j1 -C sound-src || die "sound building failed"
+	# bug 139785
+	if use alsa || use oss ; then
+		emake -j1 -C sound-src || die "sound building failed"
+	fi
 	emake || die "emake failed"
 }