gentoo resync : 28.04.2021

5 files changed, 15 insertions, 132 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 1a45145201e9..684ddc7d479a 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,6 @@
-DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-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.3.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
+DIST mgba-0.9.1.tar.gz 12795893 BLAKE2B ec2308721683b8f00ada740f5020bef5eb0ef2fc8fc241dae0d81f92c51c4d91bfa23950370e2f9a4184daa31552d8f03bcccef9abe10bb7657b8bffec529486 SHA512 f818bbcb8d38a2caced9ccb96aa81b392c5f75860af0c16848c9ce2046f17328829cf45a00b211326bfab86c3cac76ae341dc54ab91e1b548085b1d1198a2578
+EBUILD mgba-0.8.4-r1.ebuild 2659 BLAKE2B f5f2ab5f770ff8ba4ec4667ce7a40d262692cf2a52e2644591735ecd1f780478d4b3184d3ec453321950c7cd57a8817b1f8916c697d6f1382f9fd39da53d2d37 SHA512 92c02e4d249228bd4e3e5a3142877cdda4999e20db8b65f458af275f867d6f1e8d58af50f6f2b35d2bf2ebdce4f750d62704bdeffd5d8980ba64806d21f14112
+EBUILD mgba-0.9.1-r1.ebuild 2661 BLAKE2B 98a4d8cde1bcd85498e0b509199e709d40ef81daecc3ac0edeb8bfbdb20a8931fa1f7bf504d4d5f54f976b78fce2ee1653630493814e959f4cab914af097eb21 SHA512 72701cbe4fc6a168302d37cb3defb2c00563baad01f4210b7baa8ce3d9ae07498a3f32cbbe1df82ad54df71a42d68c90f96b73ea93e0742e7b39c23fb93d184a
+EBUILD mgba-9999.ebuild 2661 BLAKE2B 98a4d8cde1bcd85498e0b509199e709d40ef81daecc3ac0edeb8bfbdb20a8931fa1f7bf504d4d5f54f976b78fce2ee1653630493814e959f4cab914af097eb21 SHA512 72701cbe4fc6a168302d37cb3defb2c00563baad01f4210b7baa8ce3d9ae07498a3f32cbbe1df82ad54df71a42d68c90f96b73ea93e0742e7b39c23fb93d184a
 MISC metadata.xml 630 BLAKE2B fdf7e92057360a0292fa7d512b55a7493df4030d0b0a4e64fcc43fec8b530f2fd5ed33bd1a81c3847ac8db28b22a3e90a9fa0b906731730b1a7c37fdb62a96e5 SHA512 2dab9ea38d95993b9f69f7a039f158d9702279edaba0239b453cc96668167f83e9cb458247422e623ce3d2d45daeedd93fd1133f90ab691a0af11484d986e16b
diff --git a/games-emulation/mgba/mgba-0.7.3.ebuild b/games-emulation/mgba/mgba-0.7.3.ebuild
deleted file mode 100644
index bf269f2432fb..000000000000
--- a/games-emulation/mgba/mgba-0.7.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="debug elf ffmpeg imagemagick opengl qt5 +sdl sqlite"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	elf? ( dev-libs/elfutils )
-	ffmpeg? ( media-video/ffmpeg:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (>=0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_ELF="$(usex elf)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		-DUSE_SQLITE3="$(usex sqlite)"
-		-DUSE_ZLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin ../${P}_build/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
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.8.3.ebuild b/games-emulation/mgba/mgba-0.8.4-r1.ebuild
index d1d5df90464f..cef008e8c593 100644
--- a/games-emulation/mgba/mgba-0.8.3.ebuild
+++ b/games-emulation/mgba/mgba-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 	MY_PV="${PV/_beta/-b}"
 	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 LICENSE="MPL-2.0"
@@ -26,6 +26,7 @@ REQUIRED_USE="|| ( qt5 sdl )
 RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( media-libs/libglvnd )
@@ -49,6 +50,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 +94,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 +103,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-0.8.4.ebuild b/games-emulation/mgba/mgba-0.9.1-r1.ebuild
index e34b02d22965..a9e24f62871c 100644
--- a/games-emulation/mgba/mgba-0.8.4.ebuild
+++ b/games-emulation/mgba/mgba-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ REQUIRED_USE="|| ( qt5 sdl )
 RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( media-libs/libglvnd )
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index e34b02d22965..a9e24f62871c 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ REQUIRED_USE="|| ( qt5 sdl )
 RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib[minizip]
+	debug? ( dev-libs/libedit )
 	elf? ( dev-libs/elfutils )
 	ffmpeg? ( media-video/ffmpeg:= )
 	opengl? ( media-libs/libglvnd )