Revision bump and remove old. Fix desktop and icon install locations (bug #362259) and only install them when the gtk frontend is enabled.

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

3 files changed, 36 insertions, 5 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index f6785c83fbe0..647d8753a30b 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2011/05/04 13:29:22 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.5 2011/06/09 21:35:36 radhermit Exp $
+
+*vbam-1.8.0.1009-r1 (09 Jun 2011)
+
+  09 Jun 2011; Tim Harder <radhermit@gentoo.org> -vbam-1.8.0.1009.ebuild,
+  +vbam-1.8.0.1009-r1.ebuild, +files/vbam-1.8.0.1009-desktop.patch:
+  Revision bump and remove old. Fix desktop and icon install locations (bug
+  #362259) and only install them when the gtk frontend is enabled.
 
   04 May 2011; Tristan Heaven <nyhm@gentoo.org> vbam-1.8.0.1009.ebuild:
   Call games_pkg_setup; add virtual/libintl rdep
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1009-desktop.patch b/games-emulation/vbam/files/vbam-1.8.0.1009-desktop.patch
new file mode 100644
index 000000000000..2a2e404623d4
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1009-desktop.patch
@@ -0,0 +1,11 @@
+--- vbam-1.8.0.1009/CMakeLists.txt.orig
++++ vbam-1.8.0.1009/CMakeLists.txt
+@@ -374,8 +374,6 @@
+     )
+ 
+     INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam DESTINATION bin)
+-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.desktop DESTINATION share/applications)
+-    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/ DESTINATION share/icons/hicolor PATTERN ".svn" EXCLUDE)
+     INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/ui DESTINATION ${DATA_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR})
+ 
diff --git a/games-emulation/vbam/vbam-1.8.0.1009.ebuild b/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
index 871f869d4476..3ab855efdbd0 100644
--- a/games-emulation/vbam/vbam-1.8.0.1009.ebuild
+++ b/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1009.ebuild,v 1.2 2011/05/04 13:29:22 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild,v 1.1 2011/06/09 21:35:36 radhermit Exp $
 
 EAPI=2
 
@@ -35,6 +35,12 @@ pkg_setup() {
 	games_pkg_setup
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	sed -i -e "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" CMakeLists.txt || die
+}
+
 src_configure() {
 	local myconf
 	use x86 && myconf="-DENABLE_ASM_SCALERS=ON -DENABLE_ASM_CORE=ON"
@@ -46,7 +52,7 @@ src_configure() {
 		$(cmake-utils_use_enable nls NLS)
 		$(cmake-utils_use_enable sdl SDL)
 		${myconf}
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-DDATA_INSTALL_DIR=share/games/${PN}"
 	)
 
 	cmake-utils_src_configure
@@ -54,9 +60,16 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
+
 	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman debian/vbam.1
+		dodoc doc/ReadMe.SDL.txt || die
+		doman debian/vbam.1 || die
 	fi
+
+	if use gtk ; then
+		domenu src/gtk/gvbam.desktop || die
+		doicon src/gtk/icons/scalable/apps/vbam.svg || die
+	fi
+
 	prepgamesdirs
 }