gentoo resync : 16.01.2018

3 files changed, 39 insertions, 48 deletions

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 4e1842786fbd..ee77c733c28d 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4448 BLAKE2B 4dcdfc0bb5c6ca3fbb60a18c16d8f35bc9833e677a9bfbb015ea7176e362b1be15d57d45b5cae478739872b4bac0743236789807b50d3d22c7b64f95aa659a74 SHA512 c233e2117543315b920fa79fa73c3dcf56b0f7fea102be1464c1830c4308c9de3e8751b747fbb4423e4adc5c18bef64df2845f725661941e42152c749edb7d9e
-EBUILD dolphin-9999.ebuild 4788 BLAKE2B 32c316edeeeb8a9c17f8dd610d12f00e4c7c26d7fa4eee5e63e78d22ca0a76a7666ea924de0c4ff7282446516d33032e4f183afc95887f3d206247285092301c SHA512 45bcc0bfbe7b1db17713f94a89be5df7146b720457ce4fe1f881ac981b4757c5e0125f9079b3fa10d4f313443919c469c790bfb095acbd107078fc2d6933f988
+EBUILD dolphin-5.0.ebuild 4532 BLAKE2B 1938ea8a2833c7ea7193ba01957d2ebf9f362ce0ea7b37d908f0b7d12cc7a269ee46abb1c1d45024c56caa48a123dc1a206b4fc4c15d40e5f3c5a394ca8091ed SHA512 fd654aad5ae739a9381b07b6d3bab7e38ddc34b381de57f9685241c156760eb9d8241c52519171cf7dd8060749b36e4b628117a347a33be0da44028dcc3eb222
+EBUILD dolphin-9999.ebuild 4585 BLAKE2B 863f9e2639e4536e65d40563fda50efbe20afc497d249a3ec456d1e6f690cb98b59165889400fecc4fc5a8d1b76055a835a23b2807e477d52900612b5d97eefa SHA512 18860e2bf29b291fd6e50e8d97ab0a78931d40f11782e9b6f43273277f014932d9cf21b9815afe2eeb0e85cc5276f909956af1e8b8340563ba7bc53e8b10c30b
 MISC metadata.xml 836 BLAKE2B 786a1a9f4e7d76c0111bd9755f784a0bba5607465e2693986c6e2f37e0a32f9ceea84c902464ea47b66f84c183660d5767f569ae933c6b8774d47a15de4c6f30 SHA512 7bdcb2ba2f3a1fa247080a08da495274bea1f61bec1a88e824ebd44fb7e21e74e7ef52855c1c6fba07f12b278df19c0014ba98a5b6ec50f62c08b0ee31e5fc6b
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 190053251053..56737af95d72 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_B
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop l10n pax-utils toolchain-funcs versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 KEYWORDS="amd64"
@@ -170,4 +170,10 @@ pkg_postinst() {
 		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
 		ewarn "USE=\"portaudio\""
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b726d122197e..1df45aa19853 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt_BR pt ro_RO ru sr sv tr zh_CN zh_TW"
+PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
 
-if [[ ${PV} == 9999* ]]
+if [[ ${PV} == *9999 ]]
 then
 	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 	KEYWORDS="~amd64"
@@ -24,15 +23,15 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
 
-RDEPEND=">=media-libs/libsfml-2.1
+RDEPEND="
+	>=media-libs/libsfml-2.1
 	>net-libs/enet-1.3.7
 	>=net-libs/mbedtls-2.1.1
 	dev-libs/lzo
-	media-libs/libpng:=
-	sys-libs/glibc
-	sys-libs/readline:=
+	media-libs/libpng:0=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	x11-libs/libXext
 	x11-libs/libXi
@@ -44,14 +43,17 @@ RDEPEND=">=media-libs/libsfml-2.1
 	bluetooth? ( net-wireless/bluez )
 	egl? ( media-libs/mesa[egl] )
 	evdev? (
-			dev-libs/libevdev
-			virtual/udev
+		dev-libs/libevdev
+		virtual/udev
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
 	)
-	ffmpeg? ( virtual/ffmpeg )
 	llvm? ( sys-devel/llvm )
 	openal? (
-			media-libs/openal
-			media-libs/libsoundtouch
+		media-libs/openal
+		media-libs/libsoundtouch
 	)
 	portaudio? ( media-libs/portaudio )
 	profile? ( dev-util/oprofile )
@@ -64,35 +66,18 @@ RDEPEND=">=media-libs/libsfml-2.1
 	sdl? ( media-libs/libsdl2[haptic,joystick] )
 	upnp? ( >=net-libs/miniupnpc-1.7 )
 	wxwidgets? (
-				dev-libs/glib:2
-				x11-libs/gtk+:2
-				x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)
-	"
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
+	)"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.8.8
-	>=sys-devel/gcc-4.9.0
 	app-arch/zip
 	media-libs/freetype
 	sys-devel/gettext
-	virtual/pkgconfig
-	"
-
-pkg_pretend() {
-
-	local ver=4.9.0
-	local msg="${PN} needs at least GCC ${ver} set to compile."
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! version_is_at_least ${ver} $(gcc-fullversion); then
-			eerror ${msg}
-			die ${msg}
-		fi
-	fi
-
-}
+	virtual/pkgconfig"
 
 src_prepare() {
+	cmake-utils_src_prepare
 
 	# Remove automatic dependencies to prevent building without flags enabled.
 	if use !alsa; then
@@ -146,13 +131,12 @@ src_prepare() {
 }
 
 src_configure() {
-
 	if use wxwidgets; then
 		need-wxwidgets unicode
 	fi
 
 	local mycmakeargs=(
-		"-DUSE_SHARED_ENET=ON"
+		-DUSE_SHARED_ENET=ON
 		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
 		$( cmake-utils_use log FASTLOG )
 		$( cmake-utils_use profile OPROFILING )
@@ -169,12 +153,7 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-
-	cmake-utils_src_compile
-}
 src_install() {
-
 	cmake-utils_src_install
 
 	dodoc Readme.md
@@ -195,4 +174,10 @@ pkg_postinst() {
 		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
 		ewarn "USE=\"portaudio\""
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }