gentoo resync : 28.04.2021

4 files changed, 54 insertions, 19 deletions

diff --git a/games-util/higan-purify/Manifest b/games-util/higan-purify/Manifest
index 4c87e06c40d0..ba6048580d33 100644
--- a/games-util/higan-purify/Manifest
+++ b/games-util/higan-purify/Manifest
@@ -1,4 +1,5 @@
-AUX higan-purify-03-QA.patch 1404 BLAKE2B 670d0897fb3d3fb565c36ec30c5dedefdb71bc13770e49a3532059356f3caf652df3a11e00c35e27724ea75e033a248124abca2fc60aa33140d2f858138e39a4 SHA512 31e1fdcd147e75fcaedd1778ef636edc97552fdf520468dd4723112f6557fde0d01a1f476c451e638ca05988543549fa1c76fd83ea70b7f0dbb03a61a4ff02b9
+AUX higan-purify-03-QA.patch 1324 BLAKE2B 74522e8b439cb0e030721788fccd559e7f5b13c4fd848f146d5ae25e8aef4f9991c6cfe87eb4585e2e418c6ea3bda800a5bc061c343f855765c6feb02b8b2e58 SHA512 bd3dbf9261e1a15163116fce4298d61f11b359f5d66db26970ba0dedfcd9200f28934be12f09e97d4269ed60f750a05e3bd4b0cdb83423eea789e88c67ea1376
+AUX higan-purify-03-respect-CXX.patch 1018 BLAKE2B 523a8fcbfa83951619263ab4ca1dc8e5520e1efc846f727caba02fc62750b3dbafc90e4b01def96b44c14fa84d1b026f9cac63564d4db0c414420db1680d19cc SHA512 c17610a1e14cface97325a91c2f129de95cbd00cc51babc4cdde20562baf4f1ee4166f98e385d8ae44bb20e15d511159d1665542eb33a1be1147734302fe4947
 DIST purify_v03-source.tar.xz 196924 BLAKE2B f4d22ccc34d1c345a2dee20c14bab2614b71b0df2660f3f0883df1b56b5e5fc7fc99872f73ebe674faca8bb455f1a90e5bf79ce9b893f980e99b94546bbcf400 SHA512 095b62013f5a33e720b87c48f32c41239d8cef4c6ddc2b6d119d15b3f8b92bc15d744afa0b2bc8d7a49ef53f8f3fa7f2247be490499a9b194863534f9c1a4b3d
-EBUILD higan-purify-03.ebuild 774 BLAKE2B 09397611fc72e84e516b87f98f7773795bc3273c59d52cc4b68cc6045b8a6e9bcd36af5791ab0cd3bc07701d5c087825ac2a2336c14f69f399e7911051eea093 SHA512 e90d83850caf9f0fa3485763b90652767d8a6eceb5ddcfcc7282a2d6362c24948c02c7434ffbb6f471d7ebb57bc25b1a9685fc58a964a1093e444dff96082598
+EBUILD higan-purify-03.ebuild 863 BLAKE2B b95d1a69a9edacc6ecb961cb2c2f78167edb39f58df4d29779550c399e4a14b0ec1c1c3b3ae60e5d4c60cfa58b2800236a320234a68c84ab74dc4c2ce2e191b5 SHA512 642f565f1f2ef635da2eb1dae3bbee6593ebe5bd205e9a4d1dbf9db2a625f05628ca702df78ce7a89e8023b66655f31b71c86d563e75b4f7b58ffb60cceb58cf
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch
index e523ba4cad95..5b2d1e6c3d3a 100644
--- a/games-util/higan-purify/files/higan-purify-03-QA.patch
+++ b/games-util/higan-purify/files/higan-purify-03-QA.patch
@@ -1,5 +1,5 @@
---- purify_v03-source/purify/Makefile
-+++ purify_v03-source/purify/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,8 +2,8 @@
  include phoenix/Makefile
  
@@ -20,23 +20,23 @@
  else ifeq ($(platform),win)
  	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
  	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
---- purify_v03-source/purify/phoenix/Makefile
-+++ purify_v03-source/purify/phoenix/Makefile
+--- a/phoenix/Makefile
++++ b/phoenix/Makefile
 @@ -4,13 +4,13 @@
    endif
  
    ifeq ($(phoenix),gtk)
 -    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0`
 -    phoenixlink := `pkg-config --libs gtk+-2.0`
-+    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0 x11`
-+    phoenixlink := `pkg-config --libs gtk+-2.0 x11` -ldl
++    phoenixflags := -DPHOENIX_GTK `${PKG_CONFIG} --cflags gtk+-2.0 x11`
++    phoenixlink := `${PKG_CONFIG} --libs gtk+-2.0 x11` -ldl
    endif
  
    ifeq ($(phoenix),qt)
 -    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui`
 -    phoenixlink := `pkg-config --libs QtCore QtGui`
-+    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui x11`
-+    phoenixlink := `pkg-config --libs QtCore QtGui x11` -ldl
++    phoenixflags := -DPHOENIX_QT `${PKG_CONFIG} --cflags QtCore QtGui x11`
++    phoenixlink := `${PKG_CONFIG} --libs QtCore QtGui x11` -ldl
    endif
  else ifeq ($(platform),win)
    phoenixflags := -DPHOENIX_WINDOWS
diff --git a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
new file mode 100644
index 000000000000..00a6a1e4c69b
--- /dev/null
+++ b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index 2a56366..59a3795 100755
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,18 @@ endif
+ all: build;
+ 
+ obj/phoenix.o: phoenix/phoenix.cpp
+-	$(cpp) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
++	$(CXX) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
+ 
+ obj/purify.o: purify.cpp
+-	$(cpp) $(flags) -o obj/purify.o -c purify.cpp
++	$(CXX) $(flags) -o obj/purify.o -c purify.cpp
+ 
+ build: $(objects)
+ ifeq ($(platform),x)
+-	$(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
++	$(CXX) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
+ else ifeq ($(platform),win)
+ 	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
+-	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
+-	$(cpp) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
++	$(CXX) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
++	$(CXX) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
+ endif
+ 
+ resource: force
diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
index e9613fa1ec22..7f5fcaa1f834 100644
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ b/games-util/higan-purify/higan-purify-03.ebuild
@@ -1,39 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=purify_v${PV}-source
-
 DESCRIPTION="Rom purifier for higan"
 HOMEPAGE="http://byuu.org/higan/"
 SRC_URI="https://higan.googlecode.com/files/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}/purify
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-games/higan-ananke
 	x11-libs/gtk+:2
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}"/${MY_P}/purify
+PATCHES=(
+	"${FILESDIR}"/${P}-QA.patch
+	"${FILESDIR}"/${PN}-03-respect-CXX.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-QA.patch
+	default
+
 	sed -i \
 		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
 		nall/dl.hpp || die
 }
 
 src_compile() {
+	tc-export CXX
+
 	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		platform="x" \
 		compiler="$(tc-getCXX)" \
 		phoenix="gtk"