brute force approach to bug #171942

Package-Manager: portage-2.1.2.2

diff --git a/games-emulation/dosbox/ChangeLog b/games-emulation/dosbox/ChangeLog
index ee945a667a6426a0bd81229cec2fcad8cd75bb47..0ff3c952e63bf60eb45655d88ad593a2a03b0022 100644 (file)
--- a/games-emulation/dosbox/ChangeLog
+++ b/games-emulation/dosbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-emulation/dosbox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.30 2007/03/20 04:39:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.31 2007/04/09 19:06:07 mr_bones_ Exp $
+
+  09 Apr 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/dosbox-0.70-alsa.patch, dosbox-0.70.ebuild:
+  brute force approach to bug #171942
+
+  26 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/dosbox-0.70-alsa.patch, dosbox-0.70.ebuild:
+  patch to turn alsa off with --disable-alsa from ebfe via bug #171942; took out
+  some of the use flags in deps that weren't also checked by configure
 
   20 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org> dosbox-0.70.ebuild:
   add USE=debug support with patch from ebfe (bug #121372)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index e26090f0728a88b5e55b64b870b68207d2e5b4b3..f250a48d7c55bdd1b7b29338693eaf46bd291b83 100644 (file)
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,3 +1,7 @@
+AUX dosbox-0.70-alsa.patch 517 RMD160 f901884c89a985c36a8e74dfd934ce8d2ca79638 SHA1 bb0e1d9d28a19e86f92c3a45011635a8750c9cca SHA256 25733e932ec6cd5103a5af8bb420b10885ca9d2ead4e946ac0084477cbc0c7c8
+MD5 4a2b33e6e9f3960be310c486e6ba1b0a files/dosbox-0.70-alsa.patch 517
+RMD160 f901884c89a985c36a8e74dfd934ce8d2ca79638 files/dosbox-0.70-alsa.patch 517
+SHA256 25733e932ec6cd5103a5af8bb420b10885ca9d2ead4e946ac0084477cbc0c7c8 files/dosbox-0.70-alsa.patch 517
 DIST dosbox-0.58.tar.gz 421487 RMD160 6002c462c2694e57d5357f93a85cabdd7653175c SHA1 42174dee95fbdce7b0f9d74cf94faaf0fbd50440 SHA256 34c58d1236930c9ecc978c0c0cfee632d847eb387c834da32e89462ad262f14b
 DIST dosbox-0.65.tar.gz 848989 RMD160 1d05002ae0ddcac74071180d0fa81aba3092e6f1 SHA1 4e9b65c9c2091ab30a952e3b7e63b74df605f419 SHA256 23fd001e2006f66ffdfe63adb6478ba85027f65b5078d6c69ad59e7f678d761f
 DIST dosbox-0.70.tar.gz 934649 RMD160 85654a664d66d7c1d1d51370d429f503029cb924 SHA1 de2f63b7246c0e1f7a473b0d4571c4da391a340e SHA256 05fdfd561eee33de12d978795b7f12338327c6da1ce65971463b58f2e90b48e4
@@ -9,14 +13,14 @@ EBUILD dosbox-0.65.ebuild 1407 RMD160 7d87302c1a3e2a22fc52fda5faafe181e8e80087 S
 MD5 73f859d182162ec3818e381246540be0 dosbox-0.65.ebuild 1407
 RMD160 7d87302c1a3e2a22fc52fda5faafe181e8e80087 dosbox-0.65.ebuild 1407
 SHA256 328eaa2af2b269f77a3ddcf55e8203f38d7dc3193146b853449faf43294d7b72 dosbox-0.65.ebuild 1407
-EBUILD dosbox-0.70.ebuild 1512 RMD160 56789f5fcb78f2d9b0fb781b25c1ab4b33adf9af SHA1 a1282853ac16866e5ed3cface3513b013c1f8d9d SHA256 b261a68c9dbb9a782c6d5663179a637871dec80925dc97720c24a33af7a6a4f0
-MD5 adbfeff785dced1ab58bc407aa071102 dosbox-0.70.ebuild 1512
-RMD160 56789f5fcb78f2d9b0fb781b25c1ab4b33adf9af dosbox-0.70.ebuild 1512
-SHA256 b261a68c9dbb9a782c6d5663179a637871dec80925dc97720c24a33af7a6a4f0 dosbox-0.70.ebuild 1512
-MISC ChangeLog 4082 RMD160 4cab0793db7cbd90e6a2dc57684a2cfd03cab755 SHA1 f676041cb9127e92fbe096f3048b88dd44b772fd SHA256 05449624c9df7dbb0b8a1b6e93734201edec411e73d0c2ce29e91faa1ad29a9d
-MD5 d6bd33bd8c4a96900b441c7d56a31be7 ChangeLog 4082
-RMD160 4cab0793db7cbd90e6a2dc57684a2cfd03cab755 ChangeLog 4082
-SHA256 05449624c9df7dbb0b8a1b6e93734201edec411e73d0c2ce29e91faa1ad29a9d ChangeLog 4082
+EBUILD dosbox-0.70.ebuild 1247 RMD160 47198b12ce130da06904bcb6bc590c63dfcfcb5e SHA1 23175d55ba4b96847daac0dc8c9c83e022bcb13a SHA256 cb31b6691cd37b8ae2ec8cf58694e578ac80bb573feb10c777b2c048996874a2
+MD5 ee1de92f32c6f66a25cdf92bc9f1c523 dosbox-0.70.ebuild 1247
+RMD160 47198b12ce130da06904bcb6bc590c63dfcfcb5e dosbox-0.70.ebuild 1247
+SHA256 cb31b6691cd37b8ae2ec8cf58694e578ac80bb573feb10c777b2c048996874a2 dosbox-0.70.ebuild 1247
+MISC ChangeLog 4490 RMD160 acf5922cf83d29dd7d89c1382ae9a79a9eb6f5a2 SHA1 139088dde18a3d1d7d612f402d05678a3842dbd0 SHA256 cc86b7cba83a153e86090202dd925cbf3c26e9374c3eb99acb44ceaf716ae662
+MD5 8bafc5296a6ea66d6c810bab2fbe03ad ChangeLog 4490
+RMD160 acf5922cf83d29dd7d89c1382ae9a79a9eb6f5a2 ChangeLog 4490
+SHA256 cc86b7cba83a153e86090202dd925cbf3c26e9374c3eb99acb44ceaf716ae662 ChangeLog 4490
 MISC metadata.xml 221 RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 SHA1 e947c4afb6291420a09d464cb18472cfcf1cb498 SHA256 80c34a967b80bba5f0f27215677fdad5b1ed739678287b62db1f6c345cf69811
 MD5 95e2b5bfd7767aeae061c77f7e1a055e metadata.xml 221
 RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 metadata.xml 221

diff --git a/games-emulation/dosbox/dosbox-0.70.ebuild b/games-emulation/dosbox/dosbox-0.70.ebuild
index 60e36896e1a6076c16250db2e3cf63c9df21d959..2d3049fcf4351f6941beff8ce1e3a0a685a3f9ad 100644 (file)
--- a/games-emulation/dosbox/dosbox-0.70.ebuild
+++ b/games-emulation/dosbox/dosbox-0.70.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/games-emulation/dosbox/dosbox-0.70.ebuild,v 1.4 2007/03/20 04:39:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.70.ebuild,v 1.5 2007/04/09 19:06:07 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -11,18 +11,18 @@ SRC_URI="mirror://sourceforge/dosbox/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="alsa debug hardened opengl sdl png"
+IUSE="alsa debug hardened opengl"
 
-DEPEND="alsa? ( media-libs/alsa-lib )
+DEPEND="media-libs/alsa-lib
        opengl? ( virtual/opengl )
-       png? ( media-libs/libpng )
        debug? ( sys-libs/ncurses )
+       media-libs/libpng
        media-libs/libsdl
-       sdl? ( media-libs/sdl-net
-               media-libs/sdl-sound )"
+       media-libs/sdl-net
+       media-libs/sdl-sound"
 
 pkg_setup() {
-       if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+       if ! built_with_use --missing true media-libs/alsa-lib midi; then
                eerror "To be able to build dosbox with ALSA support you need"
                eerror "to have built media-libs/alsa-lib with midi USE flag."
                die "Missing midi USE flag on media-libs/alsa-lib"
@@ -31,21 +31,10 @@ pkg_setup() {
 }
 
 src_compile() {
-       local myconf=
-
-       if ! use alsa ; then
-               myconf="--without-alsa-prefix --without-alsa-inc-prefix --disable-alsatest"
-       fi
-       # bug #66038
-       if use hardened ; then
-               myconf="${myconf} --disable-dynamic-x86"
-       fi
-       if use debug ; then
-               myconf="${myconf} --enable-debug"
-       fi
        egamesconf \
                --disable-dependency-tracking \
-               ${myconf} \
+               $(use_enable !hardened dynamic-x86) \
+               $(use_enable debug) \
                $(use_enable opengl) \
                || die
        emake || die "emake failed"

diff --git a/games-emulation/dosbox/files/dosbox-0.70-alsa.patch b/games-emulation/dosbox/files/dosbox-0.70-alsa.patch
new file mode 100644 (file)
index 0000000..e07d5ac
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.70-alsa.patch
@@ -0,0 +1,13 @@
+--- configure.in.orig  2007-03-26 03:09:08.000000000 -0400
++++ configure.in       2007-03-26 03:10:11.000000000 -0400
+@@ -93,7 +93,9 @@
+ #switch language back
+ AC_LANG_POP(C++)
+ 
+-AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : )
++AC_ARG_ENABLE(alsa,AC_HELP_STRING([--enable-alsa],[Enable ALSA for MIDI]),[
++       AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : )
++])
+ 
+ #Check for big endian machine, should #define WORDS_BIGENDIAN if so
+ AC_C_BIGENDIAN