gentoo resync : 25.11.2020

3 files changed, 19 insertions, 12 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index a1167e626e22..1a45145201e9 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,8 @@
 DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-DIST mgba-0.8.2.tar.gz 12014352 BLAKE2B 5a22d186b2732ba66698ac3fe47cd6ce841ca36ba856e5344948cf14a73aa9368658d94f0e6fb4fd78ae0a454c6d534182ecce221b3b24d62dde511c0aaa02a2 SHA512 181abab9e94964e2027cb039ded6128af1364e1442c418b8703263c9e0c5befeb7aca4d925fb44f3e25e8711a2cc22b198ea00483c42aea3b1c7ba077223d426
 DIST mgba-0.8.3.tar.gz 12013512 BLAKE2B 750c1bcb5cfe30e6e0965a16dbdb91b4dbf9f6b1068b7a9c343932c9b7b08c2b6aef4f7f4f38ee5d4e3ebb73d0f55222c78654be777858f36bd452b5f732e76c SHA512 8154cec08f9ab4fc7cedc7988ed8ee320ad076666e2958b4fa0620801398081aa4808b61dbafd2e7c4b9ff0edfbb761e013fd7117206e81478a6c09ef91e2a5a
+DIST mgba-0.8.4.tar.gz 12347906 BLAKE2B 7cea3bc3d291df5ac430685d261de1817798d24abbc2ea4d1fbffb55083ba130a80b6baec75513d616523daf28d0a74a53b5a1a657c1420b73caf6c5058093f8 SHA512 fe9c022211d03eb8a5db23901b2f99a5ee75a40f104e5edb2c6fd1a2860a37d9a3ba8d3b724b35ef958840986dd09002c58740a176290b415826e1a345d90390
 EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a
-EBUILD mgba-0.8.2.ebuild 2478 BLAKE2B ae2b1fb101e62f538e83fac4845ab6cc885ece3d05fc16871c65bfb87819d752833b8e59c0f09469911e984281e569ba543374c02f72203827e4d5090e5b634f SHA512 0db7779ea1470074491b0372475a2cd2b06e4f0dd765e662a228ef8df5adba0e648848cbe2db08c1d188657375eb12511762d41d40497b58e98fef508b53a1e5
 EBUILD mgba-0.8.3.ebuild 2624 BLAKE2B cccd71c843afb5f1028757a04b706303a4641ff0b30cf1157ebf3b12e0bcbead88a3d7a6593aa1d75bd44180edaf2cf38d964bd5fcd0c17aa013aa0a9fede16e SHA512 57891dead8324bfb0812e10131da5051b428b5071aaa2f9baa4e930fec5f20396fff965b9d25b273ab7cd4d44b328fc79ca9ba1ee39f6705e0065b3fffe45a05
-EBUILD mgba-9999.ebuild 2624 BLAKE2B cccd71c843afb5f1028757a04b706303a4641ff0b30cf1157ebf3b12e0bcbead88a3d7a6593aa1d75bd44180edaf2cf38d964bd5fcd0c17aa013aa0a9fede16e SHA512 57891dead8324bfb0812e10131da5051b428b5071aaa2f9baa4e930fec5f20396fff965b9d25b273ab7cd4d44b328fc79ca9ba1ee39f6705e0065b3fffe45a05
+EBUILD mgba-0.8.4.ebuild 2632 BLAKE2B aaff9ebf6fef9e87a17a1d1f13b7afa81a23c86ce4f76383d5846c63ea173538dcc6939b019f3ce86fe85382d9e0b1b443feab47a6183c1fb9dcbdcacd8e1ffa SHA512 0329b090e0fc76b8db07410c442a6e38d867b968da599ec1f1eb6fc8441376098cf1ef280283b562ff2a38f5647b04c2b6cb532ad55953615819501bd36ad2f1
+EBUILD mgba-9999.ebuild 2632 BLAKE2B aaff9ebf6fef9e87a17a1d1f13b7afa81a23c86ce4f76383d5846c63ea173538dcc6939b019f3ce86fe85382d9e0b1b443feab47a6183c1fb9dcbdcacd8e1ffa SHA512 0329b090e0fc76b8db07410c442a6e38d867b968da599ec1f1eb6fc8441376098cf1ef280283b562ff2a38f5647b04c2b6cb532ad55953615819501bd36ad2f1
 MISC metadata.xml 630 BLAKE2B fdf7e92057360a0292fa7d512b55a7493df4030d0b0a4e64fcc43fec8b530f2fd5ed33bd1a81c3847ac8db28b22a3e90a9fa0b906731730b1a7c37fdb62a96e5 SHA512 2dab9ea38d95993b9f69f7a039f158d9702279edaba0239b453cc96668167f83e9cb458247422e623ce3d2d45daeedd93fd1133f90ab691a0af11484d986e16b
diff --git a/games-emulation/mgba/mgba-0.8.2.ebuild b/games-emulation/mgba/mgba-0.8.4.ebuild
index b94cca7aa9cc..e34b02d22965 100644
--- a/games-emulation/mgba/mgba-0.8.2.ebuild
+++ b/games-emulation/mgba/mgba-0.8.4.ebuild
@@ -19,7 +19,7 @@ else
 fi
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite"
+IUSE="debug discord elf ffmpeg gles2 gles3 opengl qt5 +sdl sqlite"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
 
@@ -28,7 +28,7 @@ RDEPEND="
 	sys-libs/zlib[minizip]
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
-	opengl? ( virtual/opengl )
+	opengl? ( media-libs/libglvnd )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -39,13 +39,17 @@ RDEPEND="
 	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
 	sqlite? ( dev-db/sqlite:3 )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	gles2? ( media-libs/libglvnd )
+	gles3? ( media-libs/libglvnd )
+"
 
 src_prepare() {
 	xdg_environment_reset
 	cmake_src_prepare
 
 	# Get rid of any bundled stuff we don't want
+	local pkg
 	for pkg in libpng lzma sqlite3 zlib ; do
 		rm -r src/third-party/${pkg} || die
 	done
@@ -55,6 +59,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_GL="$(usex opengl)"
+		-DBUILD_GLES2="$(usex gles2)"
+		-DBUILD_GLES3="$(usex gles3)"
 		-DBUILD_PYTHON=OFF
 		-DBUILD_QT="$(usex qt5)"
 		-DBUILD_SDL="$(usex sdl)"
@@ -87,7 +93,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
+		dobin ${BUILD_DIR}/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -96,10 +102,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
+		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ../${P}_build/lib${PN}.so*
+	dolib.so ${BUILD_DIR}/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index d1d5df90464f..e34b02d22965 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -49,6 +49,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	# Get rid of any bundled stuff we don't want
+	local pkg
 	for pkg in libpng lzma sqlite3 zlib ; do
 		rm -r src/third-party/${pkg} || die
 	done
@@ -92,7 +93,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
+		dobin ${BUILD_DIR}/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -101,10 +102,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
+		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ../${P}_build/lib${PN}.so*
+	dolib.so ${BUILD_DIR}/lib${PN}.so*
 }
 
 pkg_preinst() {