gentoo resync : 28.04.2021

3 files changed, 26 insertions, 22 deletions

diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
index b67e7fc1c38b..73bcbb986ebb 100644
--- a/games-arcade/methane/Manifest
+++ b/games-arcade/methane/Manifest
@@ -1,6 +1,6 @@
 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 2885 BLAKE2B b1ff8db81d35a5f99028bd0e233f325052db84fb5495d8100309625541678cea6fcb3f4e684ea272377b6f2ed3f3710590c9604f8f6f637331b73b4c8d4d38c6 SHA512 e84412cd9df8a3946f60b0fdaeb59979a5a7720c7a730ab620f2279a7c68bfc81f979b095fd4c98e9d83fb58ffba018390c082287f3ef67f7421353b2b85012a
+AUX methane-1.5.1-gentoo.patch 2663 BLAKE2B 63e289531655cfa760f8345fb530778cd2b8d4c68dc3ea59bec908fd1ad3c1dfebcd39735578706596cf8392bd67757c78ba1082fc45a50ca2aafb9c2b8dd430 SHA512 56ab2a112336ce6a73b4de5788497f5a12c2eb23e4711afad8406375a1e3b33a70d42a412bc5d6530f27f584584e01f177b951f266abdbdd16ef48e343623fde
 DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155
-EBUILD methane-1.5.1-r1.ebuild 974 BLAKE2B 129deb2f614366d5b9c08dcd87351be395c53a03f6ea2a8fd394512f21a912c24bd874c901244af5e4a2635f08dddbdac1ef1f637987966252749d100ed8ff97 SHA512 88e09680dab7dbd51b51061febbe572a7515d27606e1b55193323d2add438ed743e8710208fc027f0dc6542849a0af78ada7216ae5b33faa979f70c88f31acf1
+EBUILD methane-1.5.1-r1.ebuild 1007 BLAKE2B 6cbafc97d23676f9c730b76cb69e76d3f738db7b80583bf3099947e1fb051b1d88e06c68d9308159512908e534a72632fc4ebf582295137c92cf39b73fb988f2 SHA512 f1727b4835aadbd0d78af7f2b82d950edcd12599f622022d83d96e7b0905368b29e3896d9695ef8c4dc38be2ad42910b0c8f108a35abf4ff06f87cb71bc686c5
 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
index 6d72a2ca7ed5..26a1b438c8a8 100644
--- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch
+++ b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
@@ -1,10 +1,10 @@
---- a/Makefile.old	2012-11-26 18:58:48.201837870 +0100
-+++ b/Makefile	2012-11-27 12:30:16.038998128 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -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`
++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
  
@@ -25,8 +25,8 @@
 +	$(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
  
  
---- a/sources/methane.cpp.old	2012-11-27 13:49:22.993003266 +0100
-+++ b/sources/methane.cpp	2012-11-27 17:37:23.051913777 +0100
+--- a/sources/methane.cpp
++++ b/sources/methane.cpp
 @@ -80,15 +80,15 @@
  				return 0;
  			}
@@ -49,8 +49,8 @@
  			}
  
  			// Set the video mode
---- a/sources/target.cpp.old	2012-11-28 21:34:32.666878913 +0100
-+++ b/sources/target.cpp	2012-11-28 21:35:16.371247221 +0100
+--- a/sources/target.cpp
++++ b/sources/target.cpp
 @@ -132,7 +132,7 @@
  	CL_GraphicContext gc = m_pWindow->get_gc();
  
diff --git a/games-arcade/methane/methane-1.5.1-r1.ebuild b/games-arcade/methane/methane-1.5.1-r1.ebuild
index d26feb258d71..7d0a032b4ccc 100644
--- a/games-arcade/methane/methane-1.5.1-r1.ebuild
+++ b/games-arcade/methane/methane-1.5.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Port from an old amiga game"
 HOMEPAGE="http://methane.sourceforge.net/"
@@ -11,34 +12,37 @@ 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
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	# From Fedora
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-fullscreen.patch
+)
 
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-
-	# From Fedora
-	eapply "${FILESDIR}"/${P}-gcc5.patch
-	eapply "${FILESDIR}"/${P}-fullscreen.patch
-
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:/usr/share:" \
 		sources/target.cpp || die
 
+	tc-export CXX PKG_CONFIG
+
 	# fix weird parallel make issue wrt #450422
 	mkdir build || die
 }
 
 src_install() {
 	dobin methane
+
 	insinto /usr/share/${PN}
 	doins resources/*
+
 	newicon docs/puff.gif ${PN}.gif
 	make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif
 	HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt