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.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

6 files changed, 42 insertions, 60 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/Manifest b/games-emulation/vbam/Manifest
index 6862c6a1c6e9..f30566112fb7 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vbam-1.8.0_p20110206-cflags.patch 346 RMD160 126999119e657144c71a38cae3b502e41d0e676a SHA1 a149bdca79538a96c120c6b988af310e9b01ae4f SHA256 1c91cd230eebfd92bbceca165f7831a5f162317a932d0a538555ecdeb5ef0945
-AUX vbam-1.8.0_p20110206-disable-asm.patch 714 RMD160 9f88cb349ea00a9bd4f72a6ce10718e4d8319c19 SHA1 10455397fe9f38f1c10a516c78d9b5fcd2f470ab SHA256 99c33a9f880f358bf11a44f7a4be7acc559b10512af29e648ecca81d1edc118e
-DIST vbam-1.8.0_p20110206.tar.bz2 761419 RMD160 f85755e853e3934bb1d59feee27ef83c609ea418 SHA1 7aceb34b7b4531061cde6c5fa120f715dc561d85 SHA256 91c4c8be6c31a6943ae25871a302f36e53f2ba7f84f7f01695cc861c9364d69f
-EBUILD vbam-1.8.0_p20110206.ebuild 1325 RMD160 04956d5915571e1d78d34e9893d2c5f5494141b3 SHA1 021682db8920b26c2d63074329ec3ec207a0121c SHA256 eb8f07b822bda09caaedb243fb241f100c486fd23b302e99a006557c1eaf062c
-MISC ChangeLog 620 RMD160 515c041076e6da7a2f9b113b02a43f1e0eb93fe4 SHA1 e854a024596fee53114ec15fe6f4b6ec4c75c009 SHA256 e3dfbf6a30d7461ef5a41713f6201749f84f166b72121d8a2d5aa7145c98bb38
-MISC metadata.xml 258 RMD160 8f31a918ae02f4fa77ecfb604d1fb8921602b607 SHA1 9d9bd6ee17be6077633c0520f17dd6c055299ef2 SHA256 8227ed861dc0c54468bf18cae1dff9694de2a1eae059978a98dff0414aacc8d6
+DIST vbam-1.8.0.1009.tar.bz2 779577 RMD160 571b51946dfd0aa85c56701e0279aef866431c64 SHA1 affc48667d140ca232120d1c3f80f311f52dc0bc SHA256 918143ae0d8a4cd30a0af16692e836b57c2d3627e8ab4db5729ff7017b6169cd
+EBUILD vbam-1.8.0.1009.ebuild 1449 RMD160 e2fe54bdcaa0f3c8bbff214222691c7df3a3a4c4 SHA1 c382ec42f67d1c9a609027264a5d0b60cdf568b0 SHA256 2dddb68eb1e77bc2ff4b2fb5859743d81565a8d5378b9064191d35ce06ae96dd
+MISC ChangeLog 1045 RMD160 510f378eb3693c883540a6735284ec2c8f47d826 SHA1 37554c09387c20c1baae977faae722c2cdd237c5 SHA256 276612e05c1911b087e4f64fa616665ad36a8ea0b16dc7c8accf626f3a912d57
+MISC metadata.xml 331 RMD160 34d4fd47bec0dcb8f0d08d4a17cab47d506633a5 SHA1 fc463ad416b0cfc238ea427f72ae068b069da90b SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNUvmZAAoJEEqz6FtPBkyjZoMH/1Q4VXA5kFQAlHV5x9Rxg1q5
-aqzI9Pd2biuXa3+dAF13zRgMEW1xGO3WGwudUmDNiY4n3PBwHJdm+TZ2vihp4/Rm
-imRt8b8gNu4oKFs/FtF9T1mS+VHJXtq9+FwohdMrC8srCNd31oCKkcL2PGF0unGF
-B3S6b63NTZkFd4CVqG8pmiCE3NX96sTUIbgPtoSyVAc8nmdM9uYGdU7sqtKSP34f
-lAR0aJ1fc+OhLU+1ia7wBP28uq2Ze7zQ1FATC0TIRH9ZRbDA/tRz5wOv+opsIKyr
-ZXOQjb/mdw8bMGiBzRrwjYbGcDw2kybU4LsmPhQQTmc4nvGxXfi3xTD8HvCfXv4=
-=38T+
+iQEcBAEBAgAGBQJNcHsAAAoJEEqz6FtPBkyjYy0IAK3fYKhTxQOpFEF312RxWD2t
+njd3J314y2iAmAQamwne61YALbl8NBfD47aJ+50mi0cZ6L9VTMGsBo18SrpRPl7M
+YZbQIOI6vt5eP2ZpAGakr+TFVuHQNda/17v38F4VQSny95mDrEBta5mb7kGOg+Px
+ZbZla4HPUER/oUjMfwvvGzOSH5DhmTQd+fsq651RU5Fu3kMx3upy/8brkh2Rk/7l
+Ct6crS60QfLee27h35Iq9NNAa11B16jEcqq+tsNlQgFuwbqLBy9eIGPBMgIsGYms
+8f58llebzFZ4xUiVEnZoSJgMyk4dQf+MToFHcLONEcWk0Mdmn/a8lRRltLh6tLA=
+=ivB9
 -----END PGP SIGNATURE-----
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}"
 	)