gentoo resync : 14.07.2018

4 files changed, 120 insertions, 0 deletions

diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
new file mode 100644
index 000000000000..0a5c77f21481
--- /dev/null
+++ b/games-arcade/methane/Manifest
@@ -0,0 +1,4 @@
+AUX methane-1.5.1-gentoo.patch 2873 BLAKE2B 3cb70f3813614b9a82a56cbced6d8186969e4c098af7056be04b1cf29784a776476c03125e178d535ec2e6fcbe470cbb805e0fa3ba168c458020e9a8e9b6c018 SHA512 21d117144cd1bc1813cea80ed07f18f046a1600449bc1be231cec46e6a2c185c30b572ccdc921e8333e0d32ace2c65b1821c61a726f8ced4be094cafa5fb3768
+DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155
+EBUILD methane-1.5.1.ebuild 1095 BLAKE2B 99f469e627db95dcff7aac65e6395900cacaa473c253687b06f3b53509cfa70fa2763f94ab8c3a5675c0e958de8a6cf5a7f52ae2a8926c166aa82602a99fb10f SHA512 7a2ce47530e10eb6f614b338a40ebd670db1a1ac1eaf28ced845a61db021422c46c94f523e4b27b994e954a4b37d0e12bb377746a0379521e79d2ef60005d0f2
+MISC metadata.xml 330 BLAKE2B 29205dbe4c0acf2e057c19d5c24057eff9fd7727fee56876d2bf9705baf2613ba80c59a6bcaf80d2346629259d4287ae7697c63466aa4f053ab3105f7efad5bf SHA512 fbb2b283c78c2952bb974a7b247ad80e4d1a9c1d8af47fa13e3d48fc91c9372c09b04212c55c6b06bbc939ea55e64c42bdd6fbae7cbb60c8fa6ed60f48305960
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..9e49ecdff25c
--- /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 $@
++	$(CXX) ${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/metadata.xml b/games-arcade/methane/metadata.xml
new file mode 100644
index 000000000000..4df86fb4c243
--- /dev/null
+++ b/games-arcade/methane/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">methane</remote-id>
+	</upstream>
+</pkgmetadata>
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..5eb599ba6769
--- /dev/null
+++ b/games-arcade/methane/methane-1.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic 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:2.3[opengl,mikmod]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		sources/target.cpp || die
+
+	# fix weird parallel make issue wrt #450422
+	mkdir build || die
+	append-cxxflags -Wno-narrowing # build with gcc5 (bug #573788)
+}
+
+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
+}