gentoo resync : 16.06.2019

4 files changed, 2 insertions, 124 deletions

diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 3b15243ff4e3..46fe87fe145f 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,6 +1,3 @@
-AUX openal-1.18.2-dont-specify-macros-as-arguments.patch 2072 BLAKE2B b42ed02e6be499198c2fbfb212a47a3c08aba72a63699e725f504b18662086335513a0a177fa85f2dd019d65b18074ea5e7b19348e34dbf17bcce208fe96ba11 SHA512 e28b2ad70c35fd7018491cba84f33bcd5e6d6dd9944d47ad4cbba5852663d436be16a901e3e643b48f5e29d72d5b154c79ce83cd291075ff4ad272a1c77a2fb4
-DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
-EBUILD openal-1.18.2-r1.ebuild 2087 BLAKE2B 21e2e6683182f2eb8779763cc46b682c01c33cb28b1a0828b5bf227eb9fd41c0f747ae136173eeb29b63f24d44de59293e3a5770d614dc7384a82f993bed6ca8 SHA512 24c1cd5cbadf059edc9554bf719e4318623412fc7f63bed1d0fdb15db75cac978072bec83ddee6480f14210008ed6cc85aadc3f4b439fdbe975fb25c1859f42f
-EBUILD openal-1.19.1.ebuild 2088 BLAKE2B aa1e2d78e7ebb6a4c1770e5e893e72c30e6013f30458a2df66618ebd01cb8b1e081ee14cfba972d5cb0742deec9aff86c8a761b78ebbf4527041c044668d1753 SHA512 63b6d8309f65e17af7034e1c872b3e955f9853246b68e209091e8125bec53d86f75345dcd8257503a10072cfcc7b4bba4bff7cf6325902e14157616710d9c5ce
+EBUILD openal-1.19.1.ebuild 2100 BLAKE2B f3ffceaf42231e82ddd9930a38cc2f2d9ff88ef91e74eabcc05b34aa167a544cd8177cd26c7cf1490cc125484ca9e09eb7f1fa82239896d1841c032c6db2dc84 SHA512 972e908e5f16d92a88c4389646d597d26bba0ec145a4af1f825877e2118ca30e0606f47d289aeac93a3968bd527ce8cdf36ee6d11ed2898fc12cd38d65776ca9
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch
deleted file mode 100644
index 83fc33d0a332..000000000000
--- a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cae4b1a062b53dd25eba7caa41622be730106749 Mon Sep 17 00:00:00 2001
-From: Chris Robinson <chris.kcat@gmail.com>
-Date: Wed, 28 Mar 2018 14:34:58 -0700
-Subject: [PATCH] Don't specify macros as arguments to CHECK_INCLUDE_FILE(S)
-
----
- CMakeLists.txt | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df1dfe63..07454f15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -577,7 +577,12 @@ ENDIF()
- 
- 
- # Check if we have Windows headers
--CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H -D_WIN32_WINNT=0x0502)
-+SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
-+CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
-+SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
-+UNSET(OLD_REQUIRED_DEFINITIONS)
-+
- IF(NOT HAVE_WINDOWS_H)
-     CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY)
-     IF(NOT HAVE_GETTIMEOFDAY)
-@@ -975,8 +980,11 @@ OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF)
- OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF)
- OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF)
- IF(HAVE_WINDOWS_H)
-+    SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+    SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
-+
-     # Check MMSystem backend
--    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
-+    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
-     IF(HAVE_MMSYSTEM_H)
-         CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
-         IF(HAVE_LIBWINMM)
-@@ -1013,6 +1021,9 @@ IF(HAVE_WINDOWS_H)
-             SET(ALC_OBJS  ${ALC_OBJS} Alc/backends/wasapi.c)
-         ENDIF()
-     ENDIF()
-+
-+    SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
-+    UNSET(OLD_REQUIRED_DEFINITIONS)
- ENDIF()
- IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM)
-     MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend")
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
deleted file mode 100644
index ccc0f0929a40..000000000000
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.2-dont-specify-macros-as-arguments.patch
-)
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index dfd436080f61..72d3436e0101 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1