Bump eapi, fix desktop file, amd64 stable

(Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)

3 files changed, 39 insertions, 15 deletions

diff --git a/games-arcade/monster-masher/ChangeLog b/games-arcade/monster-masher/ChangeLog
index 87edcc40a77a..c1806194e277 100644
--- a/games-arcade/monster-masher/ChangeLog
+++ b/games-arcade/monster-masher/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/monster-masher
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/ChangeLog,v 1.28 2012/06/30 22:17:34 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/ChangeLog,v 1.29 2014/11/23 20:24:35 pacho Exp $
+
+*monster-masher-1.8.1-r2 (23 Nov 2014)
+
+  23 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/monster-masher-1.8.1-desktop.patch, +monster-masher-1.8.1-r2.ebuild,
+  -monster-masher-1.8.1-r1.ebuild:
+  Bump eapi, fix desktop file, amd64 stable
 
   30 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org>
   monster-masher-1.8.1-r1.ebuild:
diff --git a/games-arcade/monster-masher/files/monster-masher-1.8.1-desktop.patch b/games-arcade/monster-masher/files/monster-masher-1.8.1-desktop.patch
new file mode 100644
index 000000000000..f9812802da74
--- /dev/null
+++ b/games-arcade/monster-masher/files/monster-masher-1.8.1-desktop.patch
@@ -0,0 +1,16 @@
+--- monster-masher.desktop.in.old	2014-11-23 21:20:33.967676333 +0100
++++ monster-masher.desktop.in	2014-11-23 21:21:30.518718141 +0100
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Monster Masher
+ _Comment=Mash monsters and save the gnomes
+ Exec=monster-masher
+-Icon=monster-masher.png
++Icon=monster-masher
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Game;ArcadeGame;
+-StartupNotification=true
++Categories=GNOME;Game;
++StartupNotify=true
diff --git a/games-arcade/monster-masher/monster-masher-1.8.1-r1.ebuild b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
index c4458808718f..4e6ba6790683 100644
--- a/games-arcade/monster-masher/monster-masher-1.8.1-r1.ebuild
+++ b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/monster-masher-1.8.1-r1.ebuild,v 1.4 2012/06/30 22:17:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild,v 1.1 2014/11/23 20:24:35 pacho Exp $
 
-EAPI=3
+EAPI=5
 GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2
@@ -13,33 +13,34 @@ SRC_URI="http://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="x11-libs/libSM
+RDEPEND="
+	x11-libs/libSM
 	>=dev-cpp/gtkmm-2.6:2.4
 	>=dev-cpp/gconfmm-2.6
 	>=dev-cpp/libglademm-2.4:2.4
 	>=dev-cpp/libgnomecanvasmm-2.6:2.6
 	gnome-base/libgnome
-	media-libs/libcanberra"
+	media-libs/libcanberra
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_prepare() {
 	# Port to libcanberra, bug #348605
 	epatch "${FILESDIR}"/${P}-libcanberra.patch
+
+	# Fix .desktop file
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
 	# build with newer glib - bug #424313
 	sed -i -e 's:glib/gtypes:glib:' src/pixbuf-drawing.hpp || die
 
-	intltoolize --force --copy --automake || die
 	eautoreconf
-
 	gnome2_src_prepare
 }
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README" gnome2_src_install
-}