Remove expat and zlib USE flags, bug #249459

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 i686

4 files changed, 20 insertions, 17 deletions

diff --git a/games-emulation/advancemame/ChangeLog b/games-emulation/advancemame/ChangeLog
index 4d0dd31b140c..acf3610d66b5 100644
--- a/games-emulation/advancemame/ChangeLog
+++ b/games-emulation/advancemame/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/advancemame
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/ChangeLog,v 1.45 2008/03/10 18:09:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/ChangeLog,v 1.46 2008/12/05 16:19:25 nyhm Exp $
+
+  05 Dec 2008; Tristan Heaven <nyhm@gentoo.org> advancemame-0.106.0.ebuild:
+  Remove expat and zlib USE flags, bug #249459
 
   10 Mar 2008; Michael Sterrett <mr_bones_@gentoo.org>
   advancemame-0.106.0.ebuild:
diff --git a/games-emulation/advancemame/advancemame-0.106.0.ebuild b/games-emulation/advancemame/advancemame-0.106.0.ebuild
index 2040055efa49..281b4700ac24 100644
--- a/games-emulation/advancemame/advancemame-0.106.0.ebuild
+++ b/games-emulation/advancemame/advancemame-0.106.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/advancemame-0.106.0.ebuild,v 1.6 2008/03/10 18:09:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/advancemame-0.106.0.ebuild,v 1.7 2008/12/05 16:19:25 nyhm Exp $
 
 inherit eutils flag-o-matic games
 
@@ -11,15 +11,14 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 LICENSE="GPL-2 XMAME"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="alsa expat fbcon oss sdl static svga truetype zlib"
+IUSE="alsa fbcon oss sdl static svga truetype"
 
 # sdl is required (bug #158417)
 RDEPEND="app-arch/unzip
 	app-arch/zip
 	media-libs/libsdl
+	dev-libs/expat
 	alsa? ( media-libs/alsa-lib )
-	expat? ( >=dev-libs/expat-1.95.6 )
-	zlib? ( sys-libs/zlib )
 	truetype? ( media-libs/freetype )
 	svga? ( >=media-libs/svgalib-1.9 )"
 DEPEND="${RDEPEND}
@@ -51,16 +50,16 @@ src_compile() {
 
 	PATH="${PATH}:${T}"
 	egamesconf \
+		--enable-expat \
 		--enable-sdl \
+		--enable-zlib \
 		--disable-slang \
 		$(use_enable alsa) \
-		$(use_enable expat) \
 		$(use_enable fbcon fb) \
 		$(use_enable oss) \
 		$(use_enable static) \
 		$(use_enable svga svgalib) \
 		$(use_enable truetype freetype) \
-		$(use_enable zlib) \
 		$(use_enable x86 asm) \
 		--with-emu=${PN/advance} \
 		|| die
diff --git a/games-emulation/advancemenu/ChangeLog b/games-emulation/advancemenu/ChangeLog
index 1925c1a5300c..3cf2c8f3be41 100644
--- a/games-emulation/advancemenu/ChangeLog
+++ b/games-emulation/advancemenu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/advancemenu
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.28 2008/11/19 05:27:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.29 2008/12/05 16:19:47 nyhm Exp $
+
+  05 Dec 2008; Tristan Heaven <nyhm@gentoo.org> advancemenu-2.4.13.ebuild:
+  Remove expat and zlib USE flags, bug #249459
 
   19 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org>
   advancemenu-2.4.13.ebuild:
diff --git a/games-emulation/advancemenu/advancemenu-2.4.13.ebuild b/games-emulation/advancemenu/advancemenu-2.4.13.ebuild
index 011706128ba7..73249522440e 100644
--- a/games-emulation/advancemenu/advancemenu-2.4.13.ebuild
+++ b/games-emulation/advancemenu/advancemenu-2.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.4.13.ebuild,v 1.7 2008/11/19 05:27:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.4.13.ebuild,v 1.8 2008/12/05 16:19:47 nyhm Exp $
 
 inherit eutils games
 
@@ -11,17 +11,16 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa debug expat fbcon ncurses oss sdl slang static svga truetype zlib"
+IUSE="alsa debug fbcon ncurses oss sdl slang static svga truetype"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	expat? ( dev-libs/expat )
+RDEPEND="dev-libs/expat
+	alsa? ( media-libs/alsa-lib )
 	ncurses? ( sys-libs/ncurses )
 	sdl? ( media-libs/libsdl )
 	slang? ( >=sys-libs/slang-1.4 )
 	svga? ( >=media-libs/svgalib-1.9 )
 	!sdl? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )
-	zlib? ( sys-libs/zlib )"
+	truetype? ( >=media-libs/freetype-2 )"
 DEPEND="${RDEPEND}
 	x86? ( >=dev-lang/nasm-0.98 )
 	fbcon? ( virtual/os-headers )"
@@ -49,9 +48,10 @@ src_unpack() {
 src_compile() {
 	export PATH="${PATH}:${T}"
 	egamesconf \
+		--enable-expat \
+		--enable-zlib \
 		$(use_enable alsa) \
 		$(use_enable debug) \
-		$(use_enable expat) \
 		$(use_enable fbcon fb) \
 		$(use_enable ncurses) \
 		$(use_enable truetype freetype) \
@@ -62,7 +62,6 @@ src_compile() {
 		$(use_enable svga svgalib) \
 		$(use !sdl && use !svga && use !fbcon && echo --enable-sdl) \
 		$(use_enable x86 asm) \
-		$(use_enable zlib) \
 		|| die
 	STRIPPROG=true emake || die "emake failed"
 }
@@ -86,7 +85,6 @@ pkg_postinst() {
 	elog "Execute:"
 	elog "     advmenu -default"
 	elog "to generate a config file"
-	ewarn "In order to use advmenu, you must properly configure it!"
 	elog
 	elog "An example emulator config found in advmenu.rc:"
 	elog "     emulator \"snes9x\" generic \"/usr/games/bin/snes9x\" \"%f\""