ao and sdl at the same time doesn't work. Added a clarification

Package-Manager: portage-2.1.2.2

diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 61971fbbdc9155e7e204a6d1ab52827f139886c8..b8660ad51ecf08490fbdd2a816079319cc52339c 100644 (file)
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/herrie
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.4 2007/04/17 20:21:44 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.5 2007/04/17 21:21:02 rbu Exp $
+
+  17 Apr 2007; Robert Buchholz <rbu@gentoo.org> herrie-1.6.ebuild:
+  ao and sdl at the same time doesn't work. Added a clarification
 
 *herrie-1.6 (17 Apr 2007)
 

diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 441808080a8e545d006e9aedd03043f9d72629a2..47ffb58589b30d501129676a6c5dd9c99e6b86b3 100644 (file)
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -15,14 +15,14 @@ EBUILD herrie-1.5.1.ebuild 2002 RMD160 20e0b61870c471d9ff2d79ee25dc98ef960113e8
 MD5 075f651eb20c6209ee2b711da8e965f3 herrie-1.5.1.ebuild 2002
 RMD160 20e0b61870c471d9ff2d79ee25dc98ef960113e8 herrie-1.5.1.ebuild 2002
 SHA256 e6f46826221d331a2db4f00cc176b54dffc36b2a1d36f4b619fcc42e14537fdd herrie-1.5.1.ebuild 2002
-EBUILD herrie-1.6.ebuild 2048 RMD160 3cede1f8cfe34f58935caee78fec63ddf193f999 SHA1 489fe7f5fab44004dff494bdabf30f4371d8987e SHA256 f2691f083b4af49966ec0a9830a74e9dd3595668ea17d6ead0703b0cd923725b
-MD5 43f36cc055bc8d78477d98046e0f2f53 herrie-1.6.ebuild 2048
-RMD160 3cede1f8cfe34f58935caee78fec63ddf193f999 herrie-1.6.ebuild 2048
-SHA256 f2691f083b4af49966ec0a9830a74e9dd3595668ea17d6ead0703b0cd923725b herrie-1.6.ebuild 2048
-MISC ChangeLog 733 RMD160 a2cd3183b4f3319f01f0f0eee2748eb037278fac SHA1 5cd28a2dd2bb600279e6dc102e26c6594ad090f1 SHA256 8b69b3a09b5bcba543088a012402a0a28fe3941f851ff29137ab077d2d525351
-MD5 a346e949100a940d65d788303b6fc885 ChangeLog 733
-RMD160 a2cd3183b4f3319f01f0f0eee2748eb037278fac ChangeLog 733
-SHA256 8b69b3a09b5bcba543088a012402a0a28fe3941f851ff29137ab077d2d525351 ChangeLog 733
+EBUILD herrie-1.6.ebuild 2169 RMD160 be321d796fdb04acbe82061df887017dac11aeb0 SHA1 26ce5bcb7a00f15e8c2581f8f54c078104175548 SHA256 3df637dbed7eedc5ca4ecec8294ab1b7200a21cdbfc90ca0841433cf5cb18dad
+MD5 93ea94a9271039f2a2c04a40d7f1d5ae herrie-1.6.ebuild 2169
+RMD160 be321d796fdb04acbe82061df887017dac11aeb0 herrie-1.6.ebuild 2169
+SHA256 3df637dbed7eedc5ca4ecec8294ab1b7200a21cdbfc90ca0841433cf5cb18dad herrie-1.6.ebuild 2169
+MISC ChangeLog 867 RMD160 56b20b29d7ce4a45a3069585f7594c19c895242f SHA1 64543a8932648fc66bc7d73ac1c0ee80082bffbc SHA256 ba7191a3537fe56a4f3d44830a2b270a18e4c01dbf4e168cf0a20c3a4dc6d8fa
+MD5 e11933a07fa7e5aa5ddf4925d2e2c9bb ChangeLog 867
+RMD160 56b20b29d7ce4a45a3069585f7594c19c895242f ChangeLog 867
+SHA256 ba7191a3537fe56a4f3d44830a2b270a18e4c01dbf4e168cf0a20c3a4dc6d8fa ChangeLog 867
 MISC metadata.xml 911 RMD160 e9b4f716a180fda312cd194192439d16bbaa435c SHA1 99af99f3f799499ebdb9e479ac771d1c0ad05bf7 SHA256 8ab5a1e832275427a7e49bf3d44dec79f07bfcc927854aaad327c7a9c0bec61b
 MD5 f1f8e0f1c7376cdf1a3d2abe80966d80 metadata.xml 911
 RMD160 e9b4f716a180fda312cd194192439d16bbaa435c metadata.xml 911
@@ -36,7 +36,7 @@ SHA256 baabdfe4a60374124f8cef1980b49f022eb704828503742c98d2aa87e0b1bcdf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGJSxfyZx3L/ph1soRAsaTAKCysQQ9LDJJoinkMQ0pNSQtJXWypwCeMR26
-KirfDj7fnamzz+zEfY1JMOQ=
-=Ch90
+iD8DBQFGJTpEyZx3L/ph1soRAtMuAJ9vb2mnTrdSamvepM4nhoUw3FkK8wCgsF2g
++2WsxMQtiVmBmoALodVBbIg=
+=hNFy
 -----END PGP SIGNATURE-----

diff --git a/media-sound/herrie/herrie-1.6.ebuild b/media-sound/herrie/herrie-1.6.ebuild
index b0383adb93412aeb5979352cc3093137e4aa9d97..9827ac860bf35d3f87a0ba892d8d7fec324086fc 100644 (file)
--- a/media-sound/herrie/herrie-1.6.ebuild
+++ b/media-sound/herrie/herrie-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.6.ebuild,v 1.1 2007/04/17 20:18:43 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.6.ebuild,v 1.2 2007/04/17 21:21:02 rbu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,9 +31,12 @@ DEPEND="sys-devel/gettext
        dev-util/pkgconfig"
 
 pkg_setup() {
-       if use sdl ; then
+       if use sdl && ! use ao ; then
                ewarn "Please be aware that SDL support in Herrie is highly experimental. Use it at your own risk."
        fi
+       if use sdl && use ao ; then
+               ewarn "You cannot use SDL and ao at the same time, using ao."
+       fi
 }
 
 src_unpack() {
@@ -50,7 +53,7 @@ src_compile() {
        use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
        use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
        use scrobbler || EXTRA_CONF="${EXTRA_CONF} no_scrobbler"
-       use sdl && EXTRA_CONF="${EXTRA_CONF} sdl"
+       use sdl && ! use ao && EXTRA_CONF="${EXTRA_CONF} sdl"
        use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
        use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
        use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"