gentoo resync : 07.04.2018

3 files changed, 0 insertions, 60 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c8318aa5c758..e527a5e0c620 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 0ae9c98fac5d..8b6740ce6900 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,4 +1,3 @@
-AUX mgba-0.5.2-imagemagick7.patch 2041 BLAKE2B cc3f8cb1dbee6a6917e8220798f9fcb69c02bfb76a49b8e5aef880b575d90d9247c20ef873178baff0b48917e8e89f1a00af61801dda70062b8f212bc65434fe SHA512 628912800231d1c084b55e52b63932e03ac127441cfffe8fb7d822a3abcbb15a038d8e1bfc50b4f36643f106d08c99cb3807c5de3e0d80a76074c82105c70a70
 DIST mgba-0.6.1.tar.gz 7437240 BLAKE2B d00ed8a517b6e82f477537702d757bd9d86d007ee7bea022b67751b0423a2f386706e410c5e41b984ae8e7e66efabbf41356b846fdcba438cb5a64c89bc2379c SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57
 DIST mgba-0.6.2.tar.gz 7441969 BLAKE2B f807a3a26667f50cbf3b87ac6e7887ec7fb99516895e1168855fafee417025a1d1e5605ca3f87a171fde563fd69878d5d164e068247643401c2696164d7460c1 SHA512 8afe4fb331f4163f4cd96cc73a51136bdb9008178b74c0ecb827c1f06dee79eba3cf753e1c35657972d8593ab97d294c15287ebf2c5ffa6a135527d5611d3574
 EBUILD mgba-0.6.1.ebuild 2372 BLAKE2B a1044752dd33c7a2019f88d79cb247013a8de227ae5730cdfbc1ccc28409a9a767fa598a2000db5c962efe11e7f3031ed7b35353606885879838e147c9b20ef8 SHA512 33ebba4a7c94922750bbad82c1c06a1185f03336a2138ecd39bdc5d3dfbee9b7ac5f3b190cc693936790010e5cf86102ef1a4a25cc4ff28114c7710923e911e1
diff --git a/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch b/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch
deleted file mode 100644
index 965e66466e5c..000000000000
--- a/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2e3daaedc208824c9b8a54480bd614160cdda9e7 Mon Sep 17 00:00:00 2001
-From: Vicki Pfau <vi@endrift.com>
-Date: Wed, 18 Jan 2017 12:51:05 -0800
-Subject: [PATCH] Feature: Support ImageMagick 7
-
----
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38120827e..6be159915 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -322,6 +322,7 @@ if(HAVE_UMASK)
- endif()
- 
- # Feature dependencies
-+set(FEATURE_DEFINES)
- set(FEATURES)
- if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
- 	set(LIBEDIT_LIBRARIES -ledit)
-@@ -431,11 +432,16 @@ if(USE_MAGICK)
- 	list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
- 	list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
- 	string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
-+	string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION})
- 	if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
- 		set(MAGICKWAND_DEB_VERSION "5")
-+	elseif(${MagickWand_VERSION} EQUAL "6.9.7")
-+		set(MAGICKWAND_DEB_VERSION "-6.q16-3")
- 	else()
- 		set(MAGICKWAND_DEB_VERSION "-6.q16-2")
- 	endif()
-+	list(APPEND FEATURE_DEFINES MAGICKWAND_VERSION_MAJOR=${MAGICKWAND_VERSION_MAJOR})
-+
- 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}")
- endif()
- 
-@@ -595,7 +601,6 @@ if(USE_DEBUGGERS)
- 	list(APPEND FEATURES DEBUGGERS)
- endif()
- 
--set(FEATURE_DEFINES)
- foreach(FEATURE IN LISTS FEATURES)
- 	list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
- endforeach()
-diff --git a/src/feature/imagemagick/imagemagick-gif-encoder.h b/src/feature/imagemagick/imagemagick-gif-encoder.h
-index 13505e6db..842cad942 100644
---- a/src/feature/imagemagick/imagemagick-gif-encoder.h
-+++ b/src/feature/imagemagick/imagemagick-gif-encoder.h
-@@ -15,7 +15,11 @@ CXX_GUARD_START
- #define MAGICKCORE_HDRI_ENABLE 0
- #define MAGICKCORE_QUANTUM_DEPTH 8
- 
-+#if MAGICKWAND_VERSION_MAJOR >= 7
-+#include <MagickWand/MagickWand.h>
-+#else
- #include <wand/MagickWand.h>
-+#endif
- 
- struct ImageMagickGIFEncoder {
- 	struct mAVStream d;