gentoo resync 08.09.2018

6 files changed, 2 insertions, 183 deletions

diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest
index 1fcd26f1cd33..5c0cdeab9528 100644
--- a/media-libs/rtaudio/Manifest
+++ b/media-libs/rtaudio/Manifest
@@ -1,12 +1,7 @@
-AUX rtaudio-4.0.11-cflags.patch 977 BLAKE2B a67f7d83f1c1b44d2177510932ca5d2795ca40430de6224cae926de10462f20b16762ba0a85e0b0d97c565b4ae772a005fbf1785773a23b76611d90d689541e9 SHA512 7295c7ab58dfb2c685a5a740d338e42daa550da09969a5a1c2a8897c832b497774457b5dc1cb9f1b8203e12edc2fb56b2e1e787d0fccd21873c1c20fe843b37b
-AUX rtaudio-4.0.12-configure.patch 3067 BLAKE2B b08f2c9377c238d22dc5abcc4d6a86777ea56ef559a21e822679c81cd9e40aedc8f1aea75fb2a12f85183aa93f17405f0f416bc9f803a3173e399a5e56250850 SHA512 15b9e2855fac77a612b6a61f5005a9c5ce3f5f26b5c79be440372ddd450dbc06750fa8ea7bcc935138ee6b2511eecd2db10bc42153fc53699a7dc9db284e5ac5
-AUX rtaudio-4.0.12-makefile.patch 387 BLAKE2B 2341779589f5ec648893ea88f1218f0197cccac6b88ec6c12f63ec655301d3e216c0472eb955f2c78e790c669e25b5f4159c840c7f47731e1a00fc1d8db02344 SHA512 d9af95399ce9b76adf532c8febd7543a0aacedc6b3ba214fa0e53c0dc607ebb086762442330d07dc182c8d96e5de834c016798b9b6c4eefab8c96a06332cd207
 AUX rtaudio-4.1.2-cflags.patch 405 BLAKE2B cb495081882e3df93c29e8b4cff0d71e70a7f0ef3937338345a3956f4dfd32f8bea28d316a5ad9dfdc8a984d62942b42805df1b6e0f3e9a4575033fdf35b327c SHA512 6958533ff2a33bd5e1daf18206ffa816d279b9f39993cbd3987148228099f08910df0e243dbdd1112bdcd6e8fe554dbea9dfc79ef9217695c76996c817310375
 AUX rtaudio-4.1.2-configure.patch 3054 BLAKE2B a1ea744db19ba3f59229d738cf4ec1aefd71d38c29ede28d13d403db69ee7c4dbb72c8c91fb3048b183086e7aea08224ed7b1be5711f57a95d609e19805e0b0e SHA512 d359742fa55d7d188a0032f512165cb73300fff3e85e03221a7b30340941fab5149645fe8683cad79f26c5ebdcfcef1a591cc16d0096fb0d5a699e6e7a819ed9
-DIST rtaudio-4.0.12.tar.gz 330048 BLAKE2B 682abd5df8bd7cd4ea06c8825f11a04ee58c3adf71e019a0eeb42e4b390996ed13742328a4cfe7ae30b65d08370271b438c66d4951c5982223e73cbb221fda8f SHA512 43068cafaf460425334588775bbeee115d1651142d8fa62808880296763952159bff297c482e6d58200cfb6d382205778405993dbbb3a769e4b1228ff0aee3b6
 DIST rtaudio-4.1.2.tar.gz 682382 BLAKE2B ddfb0797db8ffef9a73b1af1864a7e9ec5028ff92473a82c8198fc0e8cce35e76ce820487b750988a91b7a519230659f446f2644288b0347c12c2f72b03fd45d SHA512 1e7f7f0f4dc451d023a7c8ab287fe63034cf6b4e18fe138bab253c307d6dd0cddb669b031f6c21325aaac0ce53002acd2a17dd1e47bd8ac2cb14e058cfce1a21
 DIST rtaudio-5.0.0.tar.gz 615284 BLAKE2B ffb21042896b868b5368708594e050773ea23638e5eca8ea4c63204ee8ad3e433e26f1cc7f359a113df3a962dcaceaff72846346357c9e134c30dde89813cf0a SHA512 390b6c454c42cf066fa94af397b784430dadc1650de320be377b7bbd09eda8705936bff3ee4327358815c3d5247a38fead81c8778cd85db30a12a6ace742c84a
-EBUILD rtaudio-4.0.12-r1.ebuild 1336 BLAKE2B 173b0c4a163a7601c2f0b43f629e046881eac486bd4b8bfc161bdac9af011e83b3417dab592cd4b6f6ce31f525a42fac11351b3f715669e63d33470bde9417a2 SHA512 e5fd5815667dee9d7eeb89134d824c3ee026a1d3bb7b7c1eccfb7b25a20adc37adce8693c9d43238c8236df6a982f2c1ded11e87b792d61241a6a7395859df62
-EBUILD rtaudio-4.1.2.ebuild 1213 BLAKE2B eafacc90519cc26a87613ed920d8c1500e4d22e24eae73e82470e7ba9b10ed864e327f9300d7229edd53b1e5cd028930fe96da1d53c274a68f51a501c9e4063e SHA512 e2a3cbe30ae1ced7693ff96d1e01ae62ce6b4aaeea6ddc908c5f8dd0ced73adb62d42c5c4c8f14c6aa9975035e552a6967e54371d774ca2bc90c800802f8d10d
+EBUILD rtaudio-4.1.2.ebuild 1212 BLAKE2B bf0dfba065a33fe12a3966773c5ec458f17e272a09d812824be939c90564f67a15b29babf73a54dc87f84fd2295fe830a342c7ee54df9d4029ccbaecfa92b7c1 SHA512 2f2da6ce17abdfcc9952cff3f99dc2f7636104b4fc1737587f5a0cbc17a7c8679c17c57555b908c68544cb884d78279016107113980204a10a77db3e9d81285e
 EBUILD rtaudio-5.0.0.ebuild 1177 BLAKE2B a5cd56683afc73425e31c913ee347b3304e4157570120f9f8e207331262da019b2c5500784e66e9240072233b86f4c277c96b83775b73aed4cc5f67e19ff8ab2 SHA512 d4675911998df6955ff8b6c06dcaf4ece06576374735963e4833fb633d7382757b113f5cd2fa46e374bd1f85767a2f964701cb0479c789b5bd43677b1eb26cd0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.11-cflags.patch b/media-libs/rtaudio/files/rtaudio-4.0.11-cflags.patch
deleted file mode 100644
index 9fa657929c21..000000000000
--- a/media-libs/rtaudio/files/rtaudio-4.0.11-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- rtaudio-4.0.11/configure.ac
-+++ rtaudio-4.0.11/configure.ac
-@@ -23,8 +23,8 @@
- AC_MSG_CHECKING(whether to compile debug version)
- AC_ARG_ENABLE(debug,
-   [  --enable-debug = enable various debug output],
--  [AC_SUBST( cppflag, [-D__RTAUDIO_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
--  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O2] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
-+  [AC_SUBST( cppflag, [-D__RTAUDIO_DEBUG__] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
-+  [AC_SUBST( cppflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
- 
- 
- # Checks for functions
-@@ -33,10 +33,6 @@
- # For -I and -D flags
- CPPFLAGS="$CPPFLAGS $cppflag"
- 
--# For debugging and optimization ... overwrite default because it has both -g and -O2
--#CXXFLAGS="$CXXFLAGS $cxxflag"
--CXXFLAGS="$cxxflag"
--
- # Check compiler and use -Wall if gnu.
- if [test $GXX = "yes" ;] then
-   AC_SUBST( cxxflag, [-Wall] )
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch b/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch
deleted file mode 100644
index 7680f75d40d3..000000000000
--- a/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- rtaudio-4.0.12/configure.ac
-+++ rtaudio-4.0.12/configure.ac
-@@ -25,9 +25,9 @@
- AC_PROG_CXX(g++ CC c++ cxx)
- AC_PROG_RANLIB
- AC_PATH_PROG(AR, ar, no)
--if [[ $AR = "no" ]] ; then
--    AC_MSG_ERROR("Could not find ar - needed to create a library");
--fi
-+AS_IF([test "x$AR" == "x" ], [
-+  AC_MSG_ERROR("Could not find ar - needed to create a library")
-+])
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -83,39 +83,46 @@
-   ;;
- 
-   *-*-linux*)
--  AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (mac and linux only)], [
-+  AC_ARG_WITH([jack], AS_HELP_STRING([--with-jack], [choose JACK server support (mac and linux only)]))
-+
-+  AS_IF([test "x$with_jack" != "xno"], [
-     api="$api -D__UNIX_JACK__"
-     AC_MSG_RESULT(using JACK)
-     AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )
-+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))])
- 
-   # Look for ALSA flag
--  AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [
-+  AC_ARG_WITH([alsa], AS_HELP_STRING([--with-alsa], [choose native ALSA API support (linux only)]))
-+
-+  AS_IF([test "x$with_alsa" != "xno"], [
-     api="$api -D__LINUX_ALSA__"
-     req="$req alsa"
-     AC_MSG_RESULT(using ALSA)
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )
-+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
- 
-   # Look for PULSE flag
--  AC_ARG_WITH(pulse, [  --with-pulse = choose PulseAudio API support (linux only)], [
-+  AC_ARG_WITH([pulse], AS_HELP_STRING([--with-pulse], [choose PulseAudio API support (linux only)]))
-+
-+  AS_IF([test "x$with_pulse" != "xno"], [
-     api="$api -D__LINUX_PULSE__"
-     req="$req libpulse-simple"
-     AC_MSG_RESULT(using PulseAudio)
-     PKG_CHECK_MODULES([PULSE], [libpulse-simple], , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))
--        LIBS="$LIBS `pkg-config --libs libpulse-simple`" ], )
-+        LIBS="$LIBS `pkg-config --libs libpulse-simple`" ])
- 
-   # Look for OSS flag
--  AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [
-+  AC_ARG_WITH([oss], AS_HELP_STRING([--with-oss], [choose OSS API support (linux only)]))
-+
-+  AS_IF([test "x$with_oss" != "xno"], [
-     api="$api -D__LINUX_OSS__"
--    AC_MSG_RESULT(using OSS)], )
-+    AC_MSG_RESULT(using OSS)])
- 
-   # If no audio api flags specified, use ALSA
--  if [test "$api" == "";] then
-+  AS_IF([test "x$api" == "x"], [
-     AC_MSG_RESULT(using ALSA)
-     AC_SUBST( api, [-D__LINUX_ALSA__] )
-     req="$req alsa"
--    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
--  fi
-+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
- 
-   AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
-   ;;
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch b/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch
deleted file mode 100644
index adf109de5de9..000000000000
--- a/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rtaudio-4.0.12/Makefile.in
-+++ rtaudio-4.0.12/Makefile.in
-@@ -24,9 +24,11 @@
- tests:
- 	cd tests && $(MAKE) all
- 
--$(LIBRARIES): $(OBJECTS)
-+$(STATIC): $(OBJECTS)
- 	$(AR) ruv $(STATIC) $(OBJECTS)
--	ranlib $(STATIC)
-+	$(RANLIB) $(STATIC)
-+
-+$(SHARED): $(OBJECTS)
- 	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
- 	$(LN) -sf @sharedname@ $(SHARED)
- 	$(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
diff --git a/media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild b/media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild
deleted file mode 100644
index fbef5aab668f..000000000000
--- a/media-libs/rtaudio/rtaudio-4.0.12-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools toolchain-funcs
-
-DESCRIPTION="A set of cross-platform C++ classes for realtime audio I/O"
-HOMEPAGE="https://www.music.mcgill.ca/~gary/rtaudio/"
-SRC_URI="https://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa doc jack pulseaudio static-libs"
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? (
-		media-libs/alsa-lib
-		media-sound/jack-audio-connection-kit
-	)
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.11-cflags.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-
-	if ! use static-libs ; then
-		sed -i '/^LIBRARIES =/s/$(STATIC)//' Makefile.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# OSS support requires OSSv4
-	econf \
-		--without-oss \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with pulseaudio pulse)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	dolib.so librtaudio.so*
-	use static-libs && dolib.a librtaudio.a
-
-	dobin rtaudio-config
-	doheader *.h
-	dodoc readme doc/release.txt
-
-	if use doc ; then
-		dohtml -r doc/html/*
-		dodoc -r doc/images
-	fi
-}
diff --git a/media-libs/rtaudio/rtaudio-4.1.2.ebuild b/media-libs/rtaudio/rtaudio-4.1.2.ebuild
index 1920e9acd349..7f19d2f895d4 100644
--- a/media-libs/rtaudio/rtaudio-4.1.2.ebuild
+++ b/media-libs/rtaudio/rtaudio-4.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa doc jack pulseaudio static-libs"
 REQUIRED_USE="|| ( alsa jack pulseaudio )"