remove alsa use flag (bug #514600); use system portmidi lib; drop ppc until portmidi is keyworded

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 22 insertions, 25 deletions

diff --git a/games-emulation/sdlmess/ChangeLog b/games-emulation/sdlmess/ChangeLog
index 487a16682a8e..e00af99ad49a 100644
--- a/games-emulation/sdlmess/ChangeLog
+++ b/games-emulation/sdlmess/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/sdlmess
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/ChangeLog,v 1.5 2014/05/15 16:40:37 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/ChangeLog,v 1.6 2015/01/30 18:25:58 mr_bones_ Exp $
+
+  30 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> sdlmess-0.148_p1.ebuild,
+  sdlmess-0.149.ebuild:
+  remove alsa use flag (bug #514600); use system portmidi lib; drop ppc until
+  portmidi is keyworded
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> sdlmess-0.148_p1.ebuild,
   sdlmess-0.149.ebuild:
diff --git a/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild b/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild
index adc1f61968b2..0d9fedaf6af7 100644
--- a/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild
+++ b/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild,v 1.4 2014/05/15 16:40:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild,v 1.5 2015/01/30 18:25:58 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -25,8 +25,8 @@ fi
 
 LICENSE="XMAME"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="X alsa debug opengl"
+KEYWORDS="amd64 x86"
+IUSE="X debug opengl"
 REQUIRED_USE="debug? ( X )"
 
 RDEPEND="dev-libs/expat
@@ -36,7 +36,7 @@ RDEPEND="dev-libs/expat
 	media-libs/sdl-ttf
 	sys-libs/zlib
 	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
+	media-libs/portmidi
 	X? (
 		gnome-base/gconf
 		x11-libs/gtk+:2
@@ -91,10 +91,11 @@ src_prepare() {
 		"${FILESDIR}"/${P}-no-opengl.patch
 
 	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: expat, flac, jpeg, zlib"
+	einfo "Disabling embedded libraries: expat, flac, jpeg, portmidi, zlib"
 	disable_feature BUILD_EXPAT
 	disable_feature BUILD_FLAC
 	disable_feature BUILD_JPEG
+	disable_feature BUILD_MIDILIB
 	disable_feature BUILD_ZLIB
 
 	if use amd64; then
@@ -117,11 +118,6 @@ src_prepare() {
 		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
 	fi
 
-	if ! use alsa ; then
-		einfo "Disabling alsa midi support"
-		enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
-	fi
-
 	if ! use X ; then
 		einfo "Disabling X support"
 		enable_feature NO_X11 src/osd/sdl/sdl.mak
diff --git a/games-emulation/sdlmess/sdlmess-0.149.ebuild b/games-emulation/sdlmess/sdlmess-0.149.ebuild
index c20377e89dbc..546cf8e8a628 100644
--- a/games-emulation/sdlmess/sdlmess-0.149.ebuild
+++ b/games-emulation/sdlmess/sdlmess-0.149.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/sdlmess-0.149.ebuild,v 1.2 2014/05/15 16:40:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/sdlmess-0.149.ebuild,v 1.3 2015/01/30 18:25:58 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -25,8 +25,8 @@ fi
 
 LICENSE="XMAME"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X alsa debug opengl"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug opengl"
 REQUIRED_USE="debug? ( X )"
 
 RDEPEND=">=dev-lang/lua-5.2
@@ -37,7 +37,7 @@ RDEPEND=">=dev-lang/lua-5.2
 	media-libs/sdl-ttf
 	sys-libs/zlib
 	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
+	media-libs/portmidi
 	debug? (
 		x11-libs/gtk+:2
 		gnome-base/gconf
@@ -96,12 +96,13 @@ src_prepare() {
 		"${FILESDIR}"/${P}-debugger-linking.patch
 
 	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: expat, flac, jpeg, zlib, lua"
+	einfo "Disabling embedded libraries: expat, flac, jpeg, lua, portmidi, zlib"
 	disable_feature BUILD_EXPAT
 	disable_feature BUILD_FLAC
 	disable_feature BUILD_JPEG
-	disable_feature BUILD_ZLIB
 	disable_feature BUILD_LUA
+	disable_feature BUILD_MIDILIB
+	disable_feature BUILD_ZLIB
 
 	if use amd64; then
 		einfo "Enabling 64-bit support"
@@ -126,11 +127,6 @@ src_prepare() {
 		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
 	fi
 
-	if ! use alsa ; then
-		einfo "Disabling alsa midi support"
-		enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
-	fi
-
 	if ! use X ; then
 		einfo "Disabling X support"
 		enable_feature NO_X11 src/osd/sdl/sdl.mak