EAPI=2; add gcc44 patch submitted by Oschtan via bug #269678

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 36 insertions, 17 deletions

diff --git a/games-arcade/ceferino/ChangeLog b/games-arcade/ceferino/ChangeLog
index c77b0b9305b3..5ee89816e0cf 100644
--- a/games-arcade/ceferino/ChangeLog
+++ b/games-arcade/ceferino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/ceferino
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ceferino/ChangeLog,v 1.12 2007/08/16 00:51:36 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ceferino/ChangeLog,v 1.13 2009/05/13 16:25:54 mr_bones_ Exp $
+
+  13 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ceferino-0.97.8-gcc44.patch, ceferino-0.97.8.ebuild:
+  EAPI=2; add gcc44 patch submitted by Oschtan via bug #269678
 
 *ceferino-0.97.8 (16 Aug 2007)
 
diff --git a/games-arcade/ceferino/Manifest b/games-arcade/ceferino/Manifest
index 431075d66534..2ab7f228aa02 100644
--- a/games-arcade/ceferino/Manifest
+++ b/games-arcade/ceferino/Manifest
@@ -1,6 +1,7 @@
+AUX ceferino-0.97.8-gcc44.patch 368 RMD160 cb66ea2f6d48758b1532642cf6d77ad4de628a63 SHA1 99f7ba77cffec93ae7513a523f845c20f0eb9e6b SHA256 00b465cc1ff59b470dbbd7e78009dd4ac0ee90d62e1e6c56c9f69bae743cbfee
 DIST ceferino-0.97.5.tar.gz 2367074 RMD160 88b17a0ddeb9db81acb75ca1ecc5f3cef6729157 SHA1 3a35e01446ae81eed7adf447e4b7bc9c4ef641ab SHA256 50b79ccbb251751ed169b5b854681c7c8c65523205ce2abc2bcd1f19b63b1d80
 DIST ceferino-0.97.8.tar.gz 2380632 RMD160 137eaf55d13d8bcce4a32dc90142d0664773334d SHA1 59d0a6d889bf916a6c546df05bb0d34a05e02f84 SHA256 6f0f2674a8a968950498570b89123e341dca50499d255e7bcdf3703a85aa3074
 EBUILD ceferino-0.97.5.ebuild 1490 RMD160 fdf887b4645fe91f3d3a70f0af07b4f813a70640 SHA1 1bd060aafd7252bb7a2022b53153edb827db1260 SHA256 93099bc71e3bb80866f6eb6644a190f7b96b1b0913f3798ddab79789c27b8497
-EBUILD ceferino-0.97.8.ebuild 1497 RMD160 ced2e19d40d84cab47bd6475010d1cc5fe898580 SHA1 3655b235ce312d5964406485544475ed9e39ca0f SHA256 2b8563433de612e10de55151a1790d8eec63a7f0301c6d67f52c39bdef86a7b7
-MISC ChangeLog 1528 RMD160 a75747a68cceef63d96e3fa7b64af4e7e4c6a2cf SHA1 61f021058528967ebefb88ec276bd202df695bba SHA256 169411a18402177d0e40e7a53c1448a70e3963e1e0af2c4149f03960bde0d2f9
+EBUILD ceferino-0.97.8.ebuild 1510 RMD160 d5bb5491f92a05077fce369f20fc3035cab65035 SHA1 390a411050d152cb3d82121fa7b10ffc72a6d278 SHA256 9c6fd6cffb3a6db7e94eeef68a8c58bbc383fc62f305ac8eae43d1c1dfcab626
+MISC ChangeLog 1709 RMD160 65e590ed2984c39f04270a30ca4fad392367b6a1 SHA1 907e9a0a383935eff5dab2c52ee976bd3ea89bda SHA256 63f4bba1b1ea6ec7ff5309ebd04bf15bbd15741b8a080e7cbf95cd5c443fa101
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/ceferino/ceferino-0.97.8.ebuild b/games-arcade/ceferino/ceferino-0.97.8.ebuild
index 0ec80069b359..4ccd9bfb2f5c 100644
--- a/games-arcade/ceferino/ceferino-0.97.8.ebuild
+++ b/games-arcade/ceferino/ceferino-0.97.8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ceferino/ceferino-0.97.8.ebuild,v 1.1 2007/08/16 00:51:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ceferino/ceferino-0.97.8.ebuild,v 1.2 2009/05/13 16:25:54 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)"
@@ -20,22 +21,24 @@ RDEPEND=">=media-libs/libsdl-1.2
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '/^\(gnu\)\?localedir /s:= .*:= /usr/share/locale:' \
-		po/Makefile.in.in || die "sed failed"
-	sed -i '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \
-		src/Makefile.in || die "sed failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	sed -i \
+		-e '/^\(gnu\)\?localedir /s:= .*:= /usr/share/locale:' \
+		po/Makefile.in.in \
+		|| die "sed failed"
+	sed -i \
+		-e '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \
+		src/Makefile.in \
+		|| die "sed failed"
 }
 
-src_compile() {
-	egamesconf $(use_enable nls) || die
-	emake || die "emake failed"
+src_configure() {
+	egamesconf $(use_enable nls)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
 	newicon data/ima/icono.png ${PN}.png
 	make_desktop_entry ceferino "Don Ceferino Hazaña"
diff --git a/games-arcade/ceferino/files/ceferino-0.97.8-gcc44.patch b/games-arcade/ceferino/files/ceferino-0.97.8-gcc44.patch
new file mode 100644
index 000000000000..96944dd382bb
--- /dev/null
+++ b/games-arcade/ceferino/files/ceferino-0.97.8-gcc44.patch
@@ -0,0 +1,11 @@
+--- src/nivel.h
++++ src/nivel.h
+@@ -34,7 +34,7 @@
+ class nivel
+ {
+ 	public:
+-		void iniciar(juego *_pjuego, grafico *grafico, grafico *pfondos, SDL_Surface *fondo);
++		void iniciar(juego *_pjuego, grafico *_grafico, grafico *pfondos, SDL_Surface *fondo);
+ 		int avanzar_nivel(int salto = 1);
+ 		int reiniciar_nivel(void);
+ 		int get_dist_suelo(int x, int y, int max);