gentoo resync : 15.12.2019

3 files changed, 154 insertions, 2 deletions

diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index daaa7f1807b1..f029f438bd8a 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,4 +1,5 @@
+AUX milkytracker-1.0.0-cmake.patch 6172 BLAKE2B d0ee8dd866ff5d9b7c7558f5ca5d7b2f75a4b3e37abba2b7798816a8131ea24e250fccdd405bb48f1effb363d437115f89d7b44aae87fdbe21234b1ad08c544c SHA512 395d93dab58a9a5a7c000382ea946b1e28eecf55d3867a7acf07cef7ee2bbb7ea90ff5946125c5bf16c2ecd658f7711859e02b7058c19dbaaea39c9b3ee8c881
 AUX milkytracker-1.0.0-docdir.patch 2319 BLAKE2B 256f8f2eba611e2a6f19df117e2b4ccf6057f4de380a2098f48b0cbf4a136f7b5d45eb203990b8de36407765b6f4a9547f1801d50dec7400a55917bf286a9193 SHA512 f5e44258717a9b84956c29506c27e97e72cd50092ac179c328f3773f07f0573ac77aa50e4a27cea62f23b4f6318e1132fac2a0a039e3cf604efd1d595b357173
 DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
-EBUILD milkytracker-1.0.0.ebuild 1085 BLAKE2B 2a06770c8a9420bee964ded3acf7cfaf700698385d97d09a5cbbda648c01c81d1e5581ca16e9c398b18e85b3ede9459b968f8812030380e5235745d500c1cf51 SHA512 b0341d628a83ad235c0b8ac1a9c92125bb5e18c2f8dd78ad8a0212b09a0e9adfb2475cea6598829755e09a6e9cf826eab64a9a68a313bf3fd1cd220701851ac8
+EBUILD milkytracker-1.0.0.ebuild 1111 BLAKE2B b3f5fb99df3a3f5efe9342b832f961ad9543c4112174087bdc155b00348f4f4a0f1974489aca694315a29c02c94f27e0203c30d070074e948c9d8ff4ab1e9546 SHA512 71d67645d2c7460e5a8ca871e4d635ea47d854d06b4dc220d9a1d1afde77c7bdddbc2cd72b81a3f1edce1dc0953ba451b1bb54ac3521ee15faa5840c2cb54ffb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
new file mode 100644
index 000000000000..391ec55c7d8d
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
@@ -0,0 +1,148 @@
+From 87d0f55cd8868d91472f96cccafaf6fdb9e0cbbc Mon Sep 17 00:00:00 2001
+From: Dale Whinham <daleyo@gmail.com>
+Date: Thu, 31 Oct 2019 21:21:28 +0000
+Subject: [PATCH] CMake: Use SDL2's official CMake package mechanism
+
+We shouldn't need to rely on a FindSDL2.cmake, as SDL2 comes with a
+CMake package definition that should be installed by the distro into a
+location where CMake can find it.
+
+Fixes #168.
+---
+ CMakeLists.txt       |   4 +-
+ cmake/FindSDL2.cmake | 104 -------------------------------------------
+ 2 files changed, 1 insertion(+), 107 deletions(-)
+ delete mode 100644 cmake/FindSDL2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27ad4a18..5b6ed9f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,6 @@ if(FORCESDL)
+     unset(APPLE)
+     unset(WIN32)
+     add_definitions(-D__FORCE_SDL_AUDIO__)
+-    # Frameworks not supported by findSDL2.cmake
+-    set(CMAKE_FIND_FRAMEWORK NEVER)
+ endif()
+ 
+ # Lowercase project name for binaries and packaging
+@@ -166,7 +164,7 @@ else()
+     # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
+     cmake_policy(SET CMP0004 OLD)
+ 
+-    find_package(SDL2 2 REQUIRED)
++    find_package(SDL2 REQUIRED)
+ endif()
+ 
+ # Prefer static linkage under OS X for libraries located with find_package()
+diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
+deleted file mode 100644
+index 27c78f05..00000000
+--- a/cmake/FindSDL2.cmake
++++ /dev/null
+@@ -1,104 +0,0 @@
+-# - Find SDL2 library and headers
+-# 
+-# Find module for SDL 2.0 (http://www.libsdl.org/).
+-# It defines the following variables:
+-#  SDL2_INCLUDE_DIRS - The location of the headers, e.g., SDL.h.
+-#  SDL2_LIBRARIES - The libraries to link against to use SDL2.
+-#  SDL2_FOUND - If false, do not try to use SDL2.
+-#  SDL2_VERSION_STRING - Human-readable string containing the version of SDL2.
+-#
+-# This module responds to the the flag:
+-#  SDL2_BUILDING_LIBRARY
+-#    If this is defined, then no SDL2_main will be linked in because
+-#    only applications need main().
+-#    Otherwise, it is assumed you are building an application and this
+-#    module will attempt to locate and set the the proper link flags
+-#    as part of the returned SDL2_LIBRARIES variable.
+-#
+-# Also defined, but not for general use are:
+-#   SDL2_INCLUDE_DIR - The directory that contains SDL.h.
+-#   SDL2_LIBRARY - The location of the SDL2 library.
+-#   SDL2MAIN_LIBRARY - The location of the SDL2main library.
+-#
+-
+-#=============================================================================
+-# Copyright 2013 Benjamin Eikel
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions are met:
+-#     * Redistributions of source code must retain the above copyright
+-#       notice, this list of conditions and the following disclaimer.
+-#     * Redistributions in binary form must reproduce the above copyright
+-#       notice, this list of conditions and the following disclaimer in the
+-#       documentation and/or other materials provided with the distribution.
+-#     * Neither the name of the <organization> nor the
+-#       names of its contributors may be used to endorse or promote products
+-#       derived from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_SDL2 QUIET sdl2)
+-
+-find_path(SDL2_INCLUDE_DIR
+-  NAMES SDL.h
+-  HINTS
+-    ${PC_SDL2_INCLUDEDIR}
+-    ${PC_SDL2_INCLUDE_DIRS}
+-  PATH_SUFFIXES SDL2
+-)
+-
+-find_library(SDL2_LIBRARY
+-  NAMES SDL2
+-  HINTS
+-    ${PC_SDL2_LIBDIR}
+-    ${PC_SDL2_LIBRARY_DIRS}
+-  PATH_SUFFIXES x64 x86
+-)
+-
+-if(NOT SDL2_BUILDING_LIBRARY)
+-  find_library(SDL2MAIN_LIBRARY
+-    NAMES SDL2main
+-    HINTS
+-      ${PC_SDL2_LIBDIR}
+-      ${PC_SDL2_LIBRARY_DIRS}
+-    PATH_SUFFIXES x64 x86
+-  )
+-endif()
+-
+-if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
+-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
+-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
+-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
+-  string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
+-  string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
+-  string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
+-  set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH})
+-  unset(SDL2_VERSION_MAJOR_LINE)
+-  unset(SDL2_VERSION_MINOR_LINE)
+-  unset(SDL2_VERSION_PATCH_LINE)
+-  unset(SDL2_VERSION_MAJOR)
+-  unset(SDL2_VERSION_MINOR)
+-  unset(SDL2_VERSION_PATCH)
+-endif()
+-
+-set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
+-
+-include(FindPackageHandleStandardArgs)
+-
+-find_package_handle_standard_args(SDL2
+-                                  REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARY
+-                                  VERSION_VAR SDL2_VERSION_STRING)
+-
+-mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY)
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
index cf204b74101f..f2fac2cf6422 100644
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -22,7 +22,10 @@ RDEPEND="
 	jack? ( media-sound/jack-audio-connection-kit )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-cmake.patch
+)
 
 S="${WORKDIR}/MilkyTracker-${PV}"