gentoo auto-resync : 18:12:2022 - 15:59:06

4 files changed, 92 insertions, 1 deletions

diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
index 39c8a34d9c42..cd082448fbde 100644
--- a/games-arcade/methane/Manifest
+++ b/games-arcade/methane/Manifest
@@ -1,6 +1,10 @@
 AUX methane-1.5.1-fullscreen.patch 2575 BLAKE2B 070ef125fd26fbfb3103ce27b729877f85f497a4e8ab0c7fd10e75410bc70d3c96b18d24215a3e36fd01b0ce276775da9585ae1e78cd7d4c648060e53b120639 SHA512 8cf757c5fff8577ab79bc2ca9c062b8ac710704449fd1b7cbe2071bd62ff3bd39cf6c83f78f1136b8780ef4f0477677d4f866f55d4b9af67e0c5ab58b5a208ac
 AUX methane-1.5.1-gcc5.patch 2193 BLAKE2B 6377bdf4375daed5b9bf37c64ef80a1a8e01a934286c49f7330be05f290e0ca5a55b871179a08b5361fa3559463a6305910f85a8e5ee68f205656988ffffdacb SHA512 fa61ca7f68ea27fdf3c9952595a72776652810a0158eb206a7144ea9dd0df61986573722e9beb8b3a56d82ca19edc1daebdd23594d8310e7f5a89b721eb844c7
 AUX methane-1.5.1-gentoo.patch 2663 BLAKE2B 63e289531655cfa760f8345fb530778cd2b8d4c68dc3ea59bec908fd1ad3c1dfebcd39735578706596cf8392bd67757c78ba1082fc45a50ca2aafb9c2b8dd430 SHA512 56ab2a112336ce6a73b4de5788497f5a12c2eb23e4711afad8406375a1e3b33a70d42a412bc5d6530f27f584584e01f177b951f266abdbdd16ef48e343623fde
+AUX methane-2.0.1-makefile.patch 1431 BLAKE2B 317719dff5db1c9225a34cb48768e480f57eee2af17e21d8cd90b6994b975446969659670e6e4bd59f51b6246fcc87b2fe4f2323ef0353af4aa8a5b52c75c88e SHA512 3a56e628d9d3ffc702826d0404bc1707f8d409acdd75064a8df7ce9f6d5ed6acf93f4bac6ffdfcdae06c6c0ce895a497f6c03ef58d7269f7aa0a79048c98b096
 DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155
+DIST methane-2.0.1.tar.gz 1058487 BLAKE2B 2fc450c03dbbd57439b22e8e6ac8eebd2db18f97a3338180decdc0a437207b581a00e664e6353595c9eb50c16f7d9fead96bddf6ca50b67326ecea6dd4bb935a SHA512 96b005eb5964185adea89aa43afda375c474db8088a132b2d46a843a1eca6ba91f83bf41277a3f3cfa24c4f9b9dae7098527414284fd0521e92a34c225e06bd9
+DIST methane.png 4034 BLAKE2B b10ebd8ca4bf2f6330aa89e3adb77a14bb183bf3d0dd40e305c87d58e0a6a4249662cdee8a457fc3df93a9c0b0daecf0dd8cb307c33a6b5f6e48543062b1b18f SHA512 a56e453c9971b8819904f19af4ed3e417ef0538f87bfa121918c8fa4f93c14ba922b7d29584f0c69497a7b56585a92a7df902997cf18f6f2672c31c960ea7772
 EBUILD methane-1.5.1-r1.ebuild 1007 BLAKE2B 6cbafc97d23676f9c730b76cb69e76d3f738db7b80583bf3099947e1fb051b1d88e06c68d9308159512908e534a72632fc4ebf582295137c92cf39b73fb988f2 SHA512 f1727b4835aadbd0d78af7f2b82d950edcd12599f622022d83d96e7b0905368b29e3896d9695ef8c4dc38be2ad42910b0c8f108a35abf4ff06f87cb71bc686c5
-MISC metadata.xml 331 BLAKE2B de22beb730808df7e809767c9e27d669b9624316e4514d3c69ceb14bd1516742774d96705ab0bef3d304896afa83d52e48930b3f9f5a09cbb409340232dd336d SHA512 988b287a75bade47f8413fbc2426af8ecc0fbb63fea4ea74e8b8e594100b6b9d582989557bbbdd407990c8bbc3567ab921aa97036edd6be6c54a24209ea55277
+EBUILD methane-2.0.1.ebuild 913 BLAKE2B dd08878d4e5661c60cc08636f2c7d3109bb70f147a85fa8b2abfb6af4defcc112822112da270ec716ec3fd7b6681f42f5d0ef8cecf1d4117c003d964a5548938 SHA512 be4e42fe5baee5f25b045be3e96dd2268c86da8851e2e938f307732fc670b9b1c7c3c66a78bf6170573bc158e4611bd4f4581d2880d7e1b7b7919c8625b88d0a
+MISC metadata.xml 386 BLAKE2B ad398e6a96148c9ad446561ebf3db06c0d0331181422772c3d71dbb46c232dc9bd0a83367a021b4375bed1010ccdeb403f2323aae521a4f776671d97c6355b2c SHA512 a1a286b7722ef07e39177dba6f1ef79bd5f3d1b49a75b80fdba92c6c32f028d97f9e790dc6650133df4f59e43c67b2ff93801f9cddedbc105200c91ec6fbc6bc
diff --git a/games-arcade/methane/files/methane-2.0.1-makefile.patch b/games-arcade/methane/files/methane-2.0.1-makefile.patch
new file mode 100644
index 000000000000..0cf205041ed7
--- /dev/null
+++ b/games-arcade/methane/files/methane-2.0.1-makefile.patch
@@ -0,0 +1,41 @@
+From 7fa0b482546993d5279911a43ad6cb75c96ec1f0 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Wed, 14 Dec 2022 00:28:51 +0300
+Subject: [PATCH] Use portable variables in Makefile
+
+---
+ Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 35c3eb1..f827efc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,6 @@
+-METHANE_FLAGS = `pkg-config --cflags clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod` -Isources
+-METHANE_LIBS = `pkg-config --libs clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod`
++PKG_CONFIG ?= pkg-config
++METHANE_FLAGS := $(shell ${PKG_CONFIG} --cflags clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod) -Isources
++METHANE_LIBS := $(shell ${PKG_CONFIG} --libs clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod)
+ 
+ OBJF = sources/precomp.o \
+     sources/player.o \
+@@ -37,7 +38,7 @@ message:
+ 	@echo "================================="
+ 
+ methane: ${OBJF}
+-	g++ ${CXXFLAGS} ${OBJF}	-o methane ${METHANE_LIBS}
++	$(CXX) ${CXXFLAGS} ${LDFLAGS} ${OBJF}	-o methane ${METHANE_LIBS}
+ 
+ clean:
+ 	@rm -f sources/*.o
+@@ -49,5 +50,5 @@ distclean: clean
+ # The main source code
+ %.o:%.cpp
+ 	@echo "  Compiling $<..."
+-	gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
++	$(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
+ 
+-- 
+2.37.4
+
diff --git a/games-arcade/methane/metadata.xml b/games-arcade/methane/metadata.xml
index 8c93ac9be921..b826a80f7a10 100644
--- a/games-arcade/methane/metadata.xml
+++ b/games-arcade/methane/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">rombust/Methane</remote-id>
 		<remote-id type="sourceforge">methane</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/methane/methane-2.0.1.ebuild b/games-arcade/methane/methane-2.0.1.ebuild
new file mode 100644
index 000000000000..33e4e2941888
--- /dev/null
+++ b/games-arcade/methane/methane-2.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Port from an old Amiga game"
+HOMEPAGE="https://methane.sourceforge.net/"
+SRC_URI="https://github.com/rombust/Methane/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://src.fedoraproject.org/rpms/methane/raw/f37/f/methane.png
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/Methane-${PV}"
+
+RDEPEND="
+	dev-games/clanlib:4.1[opengl,sound]
+	media-libs/libmikmod
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export PKG_CONFIG
+}
+
+src_install() {
+	dobin methane
+
+	insinto /usr/share/${PN}
+	doins resources/*
+
+	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry ${PN} "Super Methane Brothers"
+	HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt
+}