From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0287138359 for ; Sun, 5 Jul 2020 17:26:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1FF6E0870; Sun, 5 Jul 2020 17:26:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB5B9E0870 for ; Sun, 5 Jul 2020 17:26:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80A8334F29D for ; Sun, 5 Jul 2020 17:26:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 646CD21D for ; Sun, 5 Jul 2020 17:26:28 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1593969985.d96bb099141b0aa85965362b7991e86047f33477.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: d96bb099141b0aa85965362b7991e86047f33477 X-VCS-Branch: master Date: Sun, 5 Jul 2020 17:26:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e72deaf5-b624-44ec-a0f3-9f24f4dd279b X-Archives-Hash: eedb652a4d8e55d29f15220b8e31f5d5 commit: d96bb099141b0aa85965362b7991e86047f33477 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 5 16:43:45 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 5 17:26:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96bb099 games-emulation/dolphin: update to EAPI=7 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich gentoo.org> games-emulation/dolphin/dolphin-9999.ebuild | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index 55392d47b0f..706fa7cec8d 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +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-utils desktop gnome2-utils l10n pax-utils +inherit cmake desktop xdg-utils l10n pax-utils if [[ ${PV} == *9999 ]] then @@ -71,7 +71,7 @@ RDEPEND="${RDEPEND} media-libs/vulkan-loader" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Remove all the bundled libraries that support system-installed # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. @@ -146,13 +146,18 @@ src_configure() { -DUSE_DISCORD_PRESENCE=$(usex discord-presence) -DUSE_SHARED_ENET=ON -DUSE_UPNP=$(usex upnp) + + # Undo cmake-utils.eclass's defaults. + # All dolphin's libraries are private + # and rely on circular dependency resolution. + -DBUILD_SHARED_LIBS=OFF ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install dodoc Readme.md if use doc; then @@ -167,9 +172,9 @@ src_install() { pkg_postinst() { # Add pax markings for hardened systems pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update }