commit:     b5ae99c38720cbb62931eb630a10621ab345f1e1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  8 08:40:41 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug  8 09:54:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ae99c3

games-emulation/dolphin: Remove use of plocale.eclass

Remove plocale.eclass usage.  The tiny .mo files are not worth the added
complexity.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...9999.ebuild => dolphin-5.0_p20210506-r1.ebuild} | 30 +++++-----------------
 games-emulation/dolphin/dolphin-9999.ebuild        | 17 +-----------
 2 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-9999.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
similarity index 84%
copy from games-emulation/dolphin/dolphin-9999.ebuild
copy to games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 891daca38b3..8b084ec1f69 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -3,21 +3,17 @@
 
 EAPI=7
 
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils pax-utils plocale
+inherit cmake desktop xdg-utils pax-utils
 
 if [[ ${PV} == *9999 ]]
 then
        EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin";
-       EGIT_SUBMODULES=( Externals/mGBA/mgba )
        inherit git-r3
 else
        inherit vcs-snapshot
-       commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+       commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
        
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64"
+       KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
@@ -25,7 +21,7 @@ HOMEPAGE="https://www.dolphin-emu.org/";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba profile 
pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
        dev-libs/hidapi:0=
@@ -72,6 +68,8 @@ BDEPEND="
 RDEPEND="${RDEPEND}
        vulkan? ( media-libs/vulkan-loader )"
 
+PATCHES=("${FILESDIR}"/${P}-musl.patch)
+
 src_prepare() {
        cmake_src_prepare
 
@@ -109,9 +107,6 @@ src_prepare() {
                picojson
                # No code to detect shared library.
                zstd
-
-               # This is a stripped-down mGBA for integrated GBA support
-               mGBA
        )
        local s
        for s in "${KEEP_SOURCES[@]}"; do
@@ -123,18 +118,6 @@ src_prepare() {
                mv -v "${s}" "Externals/" || die
        done
 
-       remove_locale() {
-               # Ensure preservation of the backup locale when no valid LINGUA 
is set
-               if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ 
"${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
-                       return
-               else
-                       rm "Languages/po/${1}.po" || die
-               fi
-       }
-
-       plocale_find_changes "Languages/po/" "" '.po'
-       plocale_for_each_disabled_locale remove_locale
-
        # About 50% compile-time speedup
        use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
 
@@ -153,7 +136,6 @@ src_configure() {
                -DENCODE_FRAMEDUMPS=$(usex ffmpeg)
                -DENABLE_LLVM=OFF
                -DENABLE_LTO=$(usex lto)
-               -DUSE_MGBA=$(usex mgba)
                -DENABLE_PULSEAUDIO=$(usex pulseaudio)
                -DENABLE_QT=$(usex qt5)
                -DENABLE_SDL=OFF # not supported: #666558

diff --git a/games-emulation/dolphin/dolphin-9999.ebuild 
b/games-emulation/dolphin/dolphin-9999.ebuild
index 891daca38b3..c46031141fb 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils pax-utils plocale
+inherit cmake desktop xdg-utils pax-utils
 
 if [[ ${PV} == *9999 ]]
 then
@@ -123,18 +120,6 @@ src_prepare() {
                mv -v "${s}" "Externals/" || die
        done
 
-       remove_locale() {
-               # Ensure preservation of the backup locale when no valid LINGUA 
is set
-               if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ 
"${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
-                       return
-               else
-                       rm "Languages/po/${1}.po" || die
-               fi
-       }
-
-       plocale_find_changes "Languages/po/" "" '.po'
-       plocale_for_each_disabled_locale remove_locale
-
        # About 50% compile-time speedup
        use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
 

Reply via email to