From 24f72755d7b54d2761527170ce37016bc1593344 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Wed, 19 Oct 2011 21:14:37 +0000 Subject: [PATCH] EAPI=2; fix up desktop file Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- games-kids/gmult/ChangeLog | 5 ++++- games-kids/gmult/Manifest | 14 ++------------ games-kids/gmult/gmult-5.3.ebuild | 22 ++++++++++------------ 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/games-kids/gmult/ChangeLog b/games-kids/gmult/ChangeLog index 715fc60d2e67..3e67f300500d 100644 --- a/games-kids/gmult/ChangeLog +++ b/games-kids/gmult/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-kids/gmult # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/ChangeLog,v 1.13 2011/03/29 07:54:52 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/ChangeLog,v 1.14 2011/10/19 21:14:37 mr_bones_ Exp $ + + 19 Oct 2011; Michael Sterrett gmult-5.3.ebuild: + EAPI=2; fix up desktop file 29 Mar 2011; Christoph Mende gmult-5.3.ebuild: Fixed slot deps diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest index b6b8836c4440..975514c3d9f7 100644 --- a/games-kids/gmult/Manifest +++ b/games-kids/gmult/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX gmult-5.3-gcc43.patch 763 RMD160 34130ab704ec58fefb24a0492401a40a08d34e43 SHA1 f245aa0ce6554d1d9c6d55047026f1df6839fbbf SHA256 8d1db7bbb51ef63809c111e69dab04e13e719fd5fb9f070323088c98132c1059 DIST gmult-5.3.tar.bz2 142440 RMD160 bb2523698c4b07ae98caf659a853bd151df570d8 SHA1 c3d109fd9fe891f736c47cc938a85e5f8af42a53 SHA256 dc983113c27ebf29fccec8330f15d6d3d9786eb5f4d68706fc94832ca5331f5a -EBUILD gmult-5.3.ebuild 1169 RMD160 d062ba88e9c181ab0354df5a465eed7fe3021b41 SHA1 18eb4b515369529ca14193ee03f46bb24ae824b8 SHA256 45c8134c384373185586e654406061b176d089df11e49876192c6cc96810f1fa -MISC ChangeLog 1621 RMD160 f8322835aa753ecc01f64f5403b5cd9f767d9cf6 SHA1 e88d9e0635217f2b4cabdeef237b5b5ac44a1dbf SHA256 96e384ba89dae3fd6a4ed86b6d0e8a6972dc8fe1e31ac2ee07934e2224665479 +EBUILD gmult-5.3.ebuild 1204 RMD160 cd7da6819c7a1acb4553af7c527ea8b957350d77 SHA1 1e5f66d6f6286bf796b870baa7f44041801f02c2 SHA256 d32d60cdecbda2212d7ce9cef2ef59a3755ac9b25bb09f408dd3e9d96ec9cea6 +MISC ChangeLog 1727 RMD160 f197d266d7cf7ca868aab01900b7fd7f63404c51 SHA1 385b1a1e6311a6574df0d339ad781dfbde5345a6 SHA256 699ce5449ae5ba50605d83c3e240df9428276fc0dcceae7d05ea3b0b3e1ad133 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iF4EAREIAAYFAk2RkFIACgkQmWq1bYTyC0OaBgEAupVFhThCa8bkV26BxbjTk0Ut -jcnucTm0WgjoexNifAMA/0mD0cnuKV3XcTfd9YH+pc0xCbV67YK9pNQFleDDyERK -=uuTo ------END PGP SIGNATURE----- diff --git a/games-kids/gmult/gmult-5.3.ebuild b/games-kids/gmult/gmult-5.3.ebuild index 2538176443f8..a67d0cf2c035 100644 --- a/games-kids/gmult/gmult-5.3.ebuild +++ b/games-kids/gmult/gmult-5.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-5.3.ebuild,v 1.5 2011/03/29 07:54:52 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-5.3.ebuild,v 1.6 2011/10/19 21:14:37 mr_bones_ Exp $ -EAPI=1 +EAPI=2 inherit eutils gnome2-utils games DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs" @@ -19,21 +19,19 @@ RDEPEND=">=dev-cpp/gtkmm-2.6:2.4 DEPEND="${RDEPEND} sys-devel/gettext" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-gcc43.patch + sed -i -e 's/-pedantic//' gmult/Makefile.in || die sed -i \ - -e 's/-pedantic//' \ - gmult/Makefile.in \ - || die "sed failed" + -e '/Encoding/d' \ + -e '/FilePattern/d' \ + -e '/Categories/s/Application;//' \ + gmult.desktop.in || die } -src_compile() { +src_configure() { egamesconf \ - --datadir=/usr/share \ - || die - emake || die "emake failed" + --datadir=/usr/share } src_install() { -- 2.26.2