Version bump to 1.5.1 Bug #349548

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

4 files changed, 128 insertions, 7 deletions

diff --git a/games-arcade/methane/ChangeLog b/games-arcade/methane/ChangeLog
index b7dcbe412b9f..11654f107b78 100644
--- a/games-arcade/methane/ChangeLog
+++ b/games-arcade/methane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/methane
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/methane/ChangeLog,v 1.19 2012/05/04 04:22:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/methane/ChangeLog,v 1.20 2012/11/29 08:24:20 tupone Exp $
+
+*methane-1.5.1 (29 Nov 2012)
+
+  29 Nov 2012; Tupone Alfredo <tupone@gentoo.org> +methane-1.5.1.ebuild,
+  +files/methane-1.5.1-gentoo.patch:
+  Version bump to 1.5.1 Bug #349548 by Hans Meier
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> methane-1.4.8.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
index 87e7e03ae332..6f9ef41b221a 100644
--- a/games-arcade/methane/Manifest
+++ b/games-arcade/methane/Manifest
@@ -1,6 +1,19 @@
-AUX methane-1.4.8-gcc46.patch 245 RMD160 f617748dcdeade930b4be0cd23008b59d65aa03e SHA1 db1ddb4520c2fe2e3e8aa34055167202ad49ec4a SHA256 40e4b3a709a2043f394e33e5eef5f64624ae2d6b9f66d792d6647d5fdd0beb42
-AUX methane-1.4.8-ldflags.patch 1080 RMD160 53f65bd0d7f56e9927f9816b4bf868a90b33f70d SHA1 4694be0cd4ba77e21efa7d521ce8837c9d4f4416 SHA256 61f21cfee4d8493f8663e8c04fd0e389bb5b39803f7842b6e0b420a5cfd297da
-DIST methane-1.4.8.tgz 1063099 RMD160 0edb0328515b90cac66e13a3900fb4712ed0f940 SHA1 8deb3c5278b30d1eb3911a39c59af0ea8b8f8f06 SHA256 7e91d0b478b133a74565f0a7a01783cdda20bd555ca92feb4da66e51b51a9289
-EBUILD methane-1.4.8.ebuild 1313 RMD160 97345c8a396eb55df6370334f2d2ebbdb448d486 SHA1 91c777fdbf9ab3438d2cf1abf0ed2de045619e16 SHA256 9da9b45e2096db732725b473555478fd63ae837efbe8dc67f06c3048e37a9389
-MISC ChangeLog 2427 RMD160 dada6f5cd54afaaf898191fb42e26b7d710f1dc8 SHA1 d74d587fe73934cff2a10e021448d791dacc9b5f SHA256 8a6cf6525beb79d90ee493d37a60deb9ce38776f2c2141ae9b5971ffab19a2eb
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX methane-1.4.8-gcc46.patch 245 SHA256 40e4b3a709a2043f394e33e5eef5f64624ae2d6b9f66d792d6647d5fdd0beb42 SHA512 0ea98ecbc977eb03b41495a86edea164006c38c039c68eb2cd3507679a742bc2ae813e47350d83632d298f6eece7be7c48e34c6fe667cc6c68322520c1b8c9cb WHIRLPOOL c5d0b85f9afe3fcdb4fbf113e025d0c3d5e47f189522762913e3bcb368355a731e73560f09cde7613cdfcd1c44810c5880ab79e06ba44179b009804dfa745467
+AUX methane-1.4.8-ldflags.patch 1080 SHA256 61f21cfee4d8493f8663e8c04fd0e389bb5b39803f7842b6e0b420a5cfd297da SHA512 a3f6e38f108a21b0e5120e8cb14a759c7ea7447bd80989c7c15139949ce6c2045d09c0ec495152292facb99d93a842f7d7ee10fbf66d733a9ff9e5921a99f664 WHIRLPOOL 4a76d8579069c5e123904a53caaea62dcdadc2c0e1634f3325a8d5c9a8e55f2bde3be559824a43c4d37cb939323e659f53e540dc1d0e5047d42804fc23fe4dfb
+AUX methane-1.5.1-gentoo.patch 2872 SHA256 f36444c391f70951185851c0ac31ff36dd78a52df7b5fbcb7b1969455a17fe93 SHA512 9ff3b9a88298e55ded10d385a262ffe437a8e1fef87bc99dbb680567e4ed5073369bdc98a8bbf1021e6dad4f5715359f75c363e783fcc578e90e0552f3edf1de WHIRLPOOL 19107cb61eebbdc72ac892e0fca0019dab06286298873f43383784d9f0c21664820255974440b6e36af0e67429f06ee0e3a50a487de6a64540015f30c486e0f6
+DIST methane-1.4.8.tgz 1063099 SHA256 7e91d0b478b133a74565f0a7a01783cdda20bd555ca92feb4da66e51b51a9289 SHA512 6232e0529f395b8f15c2546e9ff69e9703f9cc860fa749e6b188e066aff6141e77efdfea35dfe69e321d8c831a51bc9998d1b951ecfc57b672783af123e84bbb WHIRLPOOL 9ed0c0730d9d8be3dbd8e5459cf99beeacf96e704f7d3e9cbedc5c939d9f6b5efa86fd0031cec2a2569a694b312a0628dc2ec142f8e2dc89fa00621eb319d1f5
+DIST methane-1.5.1.tgz 1057881 SHA256 ac1de7009e638c784b4d413b56a4387be94a31bd5fe3050db7b51e39ccfdd248 SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155 WHIRLPOOL b8f52b981b0a6789b4d854548787810c994c87792b57f150af8ed0d8819dc057e38a04edf1ed5791ab24cba7a7eec66a40e5e71d5260dbabe1c110c8e2044cf4
+EBUILD methane-1.4.8.ebuild 1313 SHA256 9da9b45e2096db732725b473555478fd63ae837efbe8dc67f06c3048e37a9389 SHA512 d7106c3658cb1d1c26cf215dd796030f73a7a9be051fa777e5c04a0d4812e37b82c8f6dbdd1ff0e71b01ac39e6d342acc52f71268f1def205d8369cfaac3455d WHIRLPOOL 157612f3b96f07a7372b063693865f83543eadf3e337c8e6d700c8d9b3c8f933b4f062434900c05a26a315f8920b7b42cf0ab7fc0aab3b20ff31d5676a820d9a
+EBUILD methane-1.5.1.ebuild 1060 SHA256 1c33b1ef8a45f4fa52339929cb51fbca71c2f00102b0f582b0e27a4be678f5e5 SHA512 d37b2594c1139a6bef135823b6318c004e4977c9200fa12caf6f11f2f02a777eb5f4478b537276d0e92466b37f51d069cc4d540a315d41fed95ca1d8a1990f4c WHIRLPOOL 3b6f7f040071d405c2bab0da6c6b227170ab3a1942614f60d9a35c135e362339be5ec9ebbf9ed8b6f06ffb972abbc8d12e47bae5b31f6279030129040cbd0705
+MISC ChangeLog 2618 SHA256 ea2990e5595e2007a9dae43c639c75e24ec540b49fd48501a0f1f297cfcfdc84 SHA512 15b1867eed610daaf51f1e1391e33dc26436a424097be6d7a98553286bbecde671f25a858ca8f8c202e5f63073b29761f4eeca3baf7ca9f18b90e6f4788e9f51 WHIRLPOOL f70672d1c16e0d0682bfead19d14af20fe05ad0734ecf718835d494a75e755c6c0deeee53006aea95585ba542fcdd4ff9cbf24a4f1bde2dfe1d5751050b9d5d3
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC3G7sACgkQIY77eQFFFC2AqACfbIJHoLMYvzqhVGfVcedOtLDG
+JWIAn0d4qQazP97OV4hJqoX3KoA7cXTs
+=OIFO
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
new file mode 100644
index 000000000000..119f377aadb1
--- /dev/null
+++ b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
@@ -0,0 +1,62 @@
+--- Makefile.old	2012-11-26 18:58:48.201837870 +0100
++++ Makefile	2012-11-27 12:30:16.038998128 +0100
+@@ -1,5 +1,5 @@
+-METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
+-METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2  clanSound-2.2 clanMikMod-2.2`
++METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3`
++METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3  clanSound-2.3 clanMikMod-2.3`
+ 
+ OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o
+ 
+@@ -10,7 +10,7 @@
+ 	@echo "================================="
+ 
+ methane: ${OBJF}
+-	g++ ${CXXFLAGS} ${OBJF}	-o methane ${METHANE_LIBS}
++	$(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS}
+ 
+ clean:
+ 	@rm -Rf build
+@@ -23,6 +23,6 @@
+ build/%.o : sources/%.cpp
+ 	@echo "  Compiling $<..."
+ 	@if [ ! -d build ]; then mkdir build; fi
+-	gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
++	$(CC) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
+ 
+ 
+--- sources/methane.cpp.old	2012-11-27 13:49:22.993003266 +0100
++++ sources/methane.cpp	2012-11-27 17:37:23.051913777 +0100
+@@ -80,15 +80,15 @@
+ 				return 0;
+ 			}
+ 
+-			CL_AutoPtr<CL_SetupSound> setup_sound;
+-			CL_AutoPtr<CL_SoundOutput> sound_output;
+-			CL_AutoPtr<CL_SetupMikMod> setup_mikmod;
++			CL_UniquePtr<CL_SetupSound> setup_sound;
++			CL_UniquePtr<CL_SoundOutput> sound_output;
++			CL_UniquePtr<CL_SetupMikMod> setup_mikmod;
+ 
+ 			if (GLOBAL_SoundEnable)
+ 			{
+-				setup_sound = new CL_SetupSound;
+-				sound_output = new CL_SoundOutput(44100);
+-				setup_mikmod = new CL_SetupMikMod;
++				setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound));
++				sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100)));
++				setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod));
+ 			}
+ 
+ 			// Set the video mode
+--- sources/target.cpp.old	2012-11-28 21:34:32.666878913 +0100
++++ sources/target.cpp	2012-11-28 21:35:16.371247221 +0100
+@@ -132,7 +132,7 @@
+ 	CL_GraphicContext gc = m_pWindow->get_gc();
+ 
+ 	// Find the resources directory:
+-	CL_String resource_dir = CL_Directory::get_resourcedata("methane");
++	CL_String resource_dir = "@GENTOO_DATADIR@/methane/";
+ 	CL_String dataname("page_01.png");
+ 	CL_String filename = resource_dir + dataname;
+ 	if (!CL_FileHelp::file_exists(filename))
diff --git a/games-arcade/methane/methane-1.5.1.ebuild b/games-arcade/methane/methane-1.5.1.ebuild
new file mode 100644
index 000000000000..d2fa167f5cf8
--- /dev/null
+++ b/games-arcade/methane/methane-1.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/methane/methane-1.5.1.ebuild,v 1.1 2012/11/29 08:24:20 tupone Exp $
+
+EAPI=4
+inherit eutils games
+
+DESCRIPTION="Port from an old amiga game"
+HOMEPAGE="http://methane.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-games/clanlib:0.8[opengl,mikmod]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		sources/target.cpp
+}
+
+src_install() {
+	dogamesbin methane
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins resources/*
+	dodir "${GAMES_STATEDIR}"
+	touch "${D}/${GAMES_STATEDIR}"/methanescores
+	fperms g+w "${GAMES_STATEDIR}"/methanescores
+	newicon docs/puff.gif ${PN}.gif
+	make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif
+	dodoc authors.txt history.txt readme.txt
+	dohtml docs/*
+	prepgamesdirs
+}