Fix QA issues, bug #116385

(Portage version: 2.1.2-r9)

4 files changed, 27 insertions, 12 deletions

diff --git a/games-emulation/mupen64-alsasnd/ChangeLog b/games-emulation/mupen64-alsasnd/ChangeLog
index a32a68386625..c2ecfdb89a86 100644
--- a/games-emulation/mupen64-alsasnd/ChangeLog
+++ b/games-emulation/mupen64-alsasnd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/mupen64-alsasnd
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.11 2006/10/08 23:06:15 nyhm Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.12 2007/02/15 09:58:08 nyhm Exp $
+
+*mupen64-alsasnd-0.4-r1 (15 Feb 2007)
+
+  15 Feb 2007; Tristan Heaven <nyhm@gentoo.org> files/0.4-gentoo.patch,
+  -mupen64-alsasnd-0.4.ebuild, +mupen64-alsasnd-0.4-r1.ebuild:
+  Fix QA issues, bug #116385
 
   08 Oct 2006; Tristan Heaven <nyhm@gentoo.org> mupen64-alsasnd-0.4.ebuild:
   Use qt3 eclass
diff --git a/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch b/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch
index 1a6481b9e7c3..470262c9d13e 100644
--- a/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch
+++ b/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch
@@ -1,16 +1,23 @@
---- Makefile.orig	2003-12-27 04:24:26.397424080 -0500
-+++ Makefile	2003-12-27 04:25:01.939020936 -0500
+--- Makefile
++++ Makefile
 @@ -1,4 +1,3 @@
 -GRAPHICAL_INTERFACE=gtk1
  
  ifeq ($(GRAPHICAL_INTERFACE),gtk1)
  	GUICFLAGS = -DUSE_GTK `gtk-config --cflags`
-@@ -21,7 +20,7 @@
+@@ -21,13 +20,13 @@
  all: $(PLUGIN) instructions
  
  DEBUGCXXFLAGS = -g -Wall -DDEBUG
 -CXXFLAGS = -DNO_DEBUG -DNDEBUG -O3 -Wall -mcpu=athlon -march=athlon -fomit-frame-pointer -ffast-math -fno-rtti
-+CXXFLAGS += -DNO_DEBUG -DNDEBUG -fno-rtti
++CXXFLAGS += -DNO_DEBUG -DNDEBUG -fno-rtti -fPIC
  OBJECTS += string.o audio.o snd_plugin.o gui.o
  
  string.o: string_class.cpp string_class.h
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ audio.o: audio.cpp audio.h
+-	$(CXX) $(CXXFLAGS) -c -o $@ $<
++	$(CXX) $(CXXFLAGS) -fno-strict-aliasing -c -o $@ $<
+ gui.o: gui.cpp gui.h
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ snd_plugin.o: snd_interface.cpp audio.h gui.h
diff --git a/games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4 b/games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4-r1
index 6fda5768f84f..6fda5768f84f 100644
--- a/games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4
+++ b/games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4-r1
diff --git a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild
index f24b1a2f1162..dec0c05cc1f9 100644
--- a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
+++ b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild,v 1.16 2006/10/08 23:06:15 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild,v 1.1 2007/02/15 09:58:09 nyhm Exp $
 
 inherit eutils qt3 games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* x86"
 IUSE="gtk qt3"
 
-DEPEND=">=media-libs/alsa-lib-0.9.0
+DEPEND="media-libs/alsa-lib
 	gtk? ( =x11-libs/gtk+-2* )
 	qt3? ( $(qt_min_version 3.3) )
 	!gtk? ( !qt3? ( =x11-libs/gtk+-2* ) )"
@@ -23,8 +23,9 @@ S=${WORKDIR}/alsa_plugin
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-gentoo.patch" \
-		"${FILESDIR}/${PV}-gtk.patch" \
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-gtk.patch \
 		"${FILESDIR}"/${P}-gcc41.patch
 }
 
@@ -33,10 +34,11 @@ src_compile() {
 	use qt3 && export GRAPHICAL_INTERFACE=qt3
 	use gtk && export GRAPHICAL_INTERFACE=gtk2
 	emake || die "emake failed"
+	unset GRAPHICAL_INTERFACE
 }
 
 src_install() {
-	exeinto "${GAMES_LIBDIR}/mupen64/plugins"
+	exeinto "${GAMES_LIBDIR}"/mupen64/plugins
 	doexe mupen64_alsasnd-${PV}.so || die "doexe failed"
 	dodoc README
 	prepgamesdirs