Version bump to new snapshot and remove old. Add nls and link USE flags, remove unnecessary libglademm dependency, use x86 assembly scalers and core, and add to games herd.

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

5 files changed, 31 insertions, 47 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index 8f05edb72cea..81ab466b45f2 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-emulation/vbam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.2 2011/02/09 20:31:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.3 2011/03/04 05:39:03 radhermit Exp $
+
+*vbam-1.8.0.1009 (04 Mar 2011)
+
+  04 Mar 2011; Tim Harder <radhermit@gentoo.org> -vbam-1.8.0_p20110206.ebuild,
+  -files/vbam-1.8.0_p20110206-cflags.patch,
+  -files/vbam-1.8.0_p20110206-disable-asm.patch, +vbam-1.8.0.1009.ebuild,
+  metadata.xml:
+  Version bump to new snapshot and remove old. Add nls and link USE flags,
+  remove unnecessary libglademm dependency, use x86 assembly scalers and core,
+  and add to games herd.
 
   09 Feb 2011; Tim Harder <radhermit@gentoo.org> vbam-1.8.0_p20110206.ebuild:
   Minor fixes as suggested by Mr_Bones and ssuominen.
diff --git a/games-emulation/vbam/files/vbam-1.8.0_p20110206-cflags.patch b/games-emulation/vbam/files/vbam-1.8.0_p20110206-cflags.patch
deleted file mode 100644
index ef303957f5a4..000000000000
--- a/games-emulation/vbam/files/vbam-1.8.0_p20110206-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vbam-1.8.0_p20110206/CMakeLists.txt.orig
-+++ vbam-1.8.0_p20110206/CMakeLists.txt
-@@ -116,8 +116,6 @@
- ELSE ( WIN32 )
-     SET( CMAKE_ASM_FLAGS "-I$(CMAKE_SOURCE_DIR)/src/filters/hq/asm/ -O1 -DELF -w-orphan-labels")
- ENDIF ( WIN32 )
--SET( CMAKE_C_FLAGS "-O3 -Wall")
--SET( CMAKE_CXX_FLAGS "-O3 -Wall")
- 
- # Source files definition
- SET(SRC_FEX
diff --git a/games-emulation/vbam/files/vbam-1.8.0_p20110206-disable-asm.patch b/games-emulation/vbam/files/vbam-1.8.0_p20110206-disable-asm.patch
deleted file mode 100644
index 2007dd7e1434..000000000000
--- a/games-emulation/vbam/files/vbam-1.8.0_p20110206-disable-asm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vbam-1.8.0_p20110206/CMakeLists.txt.orig
-+++ vbam-1.8.0_p20110206/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # The project's name is VBA-M it uses assembly, C and C++ code
--PROJECT(VBA-M ASM C CXX)
-+PROJECT(VBA-M C CXX)
- 
- cmake_minimum_required( VERSION 2.4.6 )
- if( COMMAND cmake_policy )
-@@ -10,8 +10,8 @@
- 
- # Include the definition of the ASM compiler. It will look for nasm
- # This is probably not needed if CMake 2.6 or above is used
--INCLUDE(CMakeScripts/CMakeDetermineASMCompiler.cmake)
--INCLUDE(CMakeScripts/CMakeASMInformation.cmake)
-+#INCLUDE(CMakeScripts/CMakeDetermineASMCompiler.cmake)
-+#INCLUDE(CMakeScripts/CMakeASMInformation.cmake)
- 
- # Also need to look for SFML
- INCLUDE(CMakeScripts/FindSFML.cmake)
diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml
index 8ad81e6612d1..fec07775a45c 100644
--- a/games-emulation/vbam/metadata.xml
+++ b/games-emulation/vbam/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>games</herd>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<use>
+		<flag name="link">Enable GBA linking functionality</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-emulation/vbam/vbam-1.8.0_p20110206.ebuild b/games-emulation/vbam/vbam-1.8.0.1009.ebuild
index f9a09dfe26aa..494e91136e46 100644
--- a/games-emulation/vbam/vbam-1.8.0_p20110206.ebuild
+++ b/games-emulation/vbam/vbam-1.8.0.1009.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0_p20110206.ebuild,v 1.2 2011/02/09 20:31:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1009.ebuild,v 1.1 2011/03/04 05:39:03 radhermit Exp $
 
 EAPI=2
 
-inherit confutils cmake-utils eutils games
+inherit confutils cmake-utils games
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://vba-m.ngemu.com"
@@ -13,35 +13,37 @@ SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk lirc +sdl"
+IUSE="gtk link lirc nls +sdl"
 
 RDEPEND=">=media-libs/libpng-1.4
 	media-libs/libsdl[joystick]
-	media-libs/libsfml
+	link? ( media-libs/libsfml )
 	sys-libs/zlib
 	virtual/opengl
-	gtk? ( >=dev-cpp/libglademm-2.4.0:2.4
-		>=dev-cpp/glibmm-2.4.0:2
+	gtk? ( >=dev-cpp/glibmm-2.4.0:2
 		>=dev-cpp/gtkmm-2.4.0:2.4
 		>=dev-cpp/gtkglextmm-1.2.0 )
 	lirc? ( app-misc/lirc )"
 DEPEND="${RDEPEND}
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"
 
 pkg_setup() {
 	confutils_require_any sdl gtk
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-disable-asm.patch
-}
-
 src_configure() {
+	local myconf
+	use x86 && myconf="-DENABLE_ASM_SCALERS=ON -DENABLE_ASM_CORE=ON"
+
 	mycmakeargs=(
-		$(cmake-utils_use_no sdl SDL)
-		$(cmake-utils_use_no gtk GTK)
-		$(cmake-utils_use_with lirc LIRC)
+		$(cmake-utils_use_enable gtk GTK)
+		$(cmake-utils_use_enable link LINK)
+		$(cmake-utils_use_enable lirc LIRC)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable sdl SDL)
+		${myconf}
 		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
 	)