gentoo resync : 02.08.2019

6 files changed, 2 insertions, 192 deletions

diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 09c0f90c8485..f1e4e68e497b 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,11 +1,5 @@
-AUX srt-1.3.1-no-rpath.patch 1199 BLAKE2B f813d6203a1c1cb55380b651202ffa577c45b16b07764b0d674fba9e8e5fa2e3ac59c36bee328f490f7a75ee1aa53201a415307c2d1484d83c59944d046195b7 SHA512 a824f88f8ca1494ee86708662fda7340cb215ef6b12ef8dbcfaef9ece0d4cc82c42c1122aef163430244869e5bc2019566d3e481d64c881bec901591a426fa65
-AUX srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch 2750 BLAKE2B 6e25055db2a54cf046fc848619700bf0c7eaf85201ee910a0f32e968a8abf94cb02e1c3415b77e2d01c0f311387d5120f4b12bc727ff7915d1afd8dedb92a464 SHA512 947dacf17f899ee3657feb121e8840457c9f5a428d50b835b20bd39aa554e002050e8fe1f1e63dd829bde325ae8e1ba311c0cc9acccbb38a44bda971d284edb4
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
-DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a
-DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41668f3b3db76055917cff767b6d04b1fdd97b676772fbb561f36f3d2f712e1d1165a26033f728c1bf9efdc SHA512 1f8fdfc0e1d92bc8c477651982c23afeacb65e2293a7225227927e1b6f71a01355a3311600097d77b3df638503e4856acbcb52ed270b650480f20b98c1be5ec2
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
-EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
-EBUILD srt-1.3.1-r1.ebuild 1347 BLAKE2B 99c91c175f9c3102e1b29a6f9802c4a73576c2840c5d815494632a77c2ff9334a17ae2cc4b5709132de4dd52bc7cb0db482fa6f5c6f85dfe532e03cefdeed543 SHA512 76c669ab9a37339d041a28fdd888fbab0ea1e36f4f29705fa262b7d68a4cce1d80b9f3e29289f342b951d20a61f65b0b074a03b42cf1ec62fe54ffc1f2d064b5
-EBUILD srt-1.3.2.ebuild 1213 BLAKE2B 4fdff2527035526fcacd3263d54e52dc146d974c9b67377e0baf807b5ba9f7fa0d5131899a2a2ebc583c938c83f909527417ecd077e65ab6395dd2a6c3c0f59d SHA512 db006c8e6736eb63b3e81a94ba78fc3b278222291d5eaddc0caf5f86927b80339d54e13b513b5b0d53b2eca5c2cb22ee69e6bc818546540b34ca961bcb09c068
+EBUILD srt-1.3.2.ebuild 1212 BLAKE2B 48b3642928d55c296ec7d874a932f3d966e447d05c06f5be4f2e25facc1d0c8f57f125abf044b59c9aa1bc269eb69588f222e8bf9ff7b95bcd7f5a5c9b2ab9cf SHA512 775c84e4611618ef0fff1edaec95d2da9cc85ba1f06a094421c797bf54419be35b0b0f56f3f4c659a19c1ed7a8c2edfc3e3744ee07539b91746d06dee5b058c3
 EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/files/srt-1.3.1-no-rpath.patch b/net-libs/srt/files/srt-1.3.1-no-rpath.patch
deleted file mode 100644
index 6e3650709c63..000000000000
--- a/net-libs/srt/files/srt-1.3.1-no-rpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a90e6ab27bc20fa34536c19828db5be44be4ef4d Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 26 Nov 2018 21:51:20 -0500
-Subject: [PATCH] Do not force rpath on Linux
-
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb2582c..60c4507 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -663,14 +663,6 @@ macro(srt_make_application name)
- 	# set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- 	# set (FORCE_RPATH BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
- 
--	if (LINUX)
--		# This is only needed on Linux, on Windows (including Cygwin) the library file will
--		# be placed into the binrary directory anyway.
--		# XXX not sure about Mac.
--		# See this name used already in install(${TARGET_srt} LIBRARY DESTINATION...).
--		set(FORCE_RPATH LINK_FLAGS -Wl,-rpath,.,-rpath,../${CMAKE_INSTALL_LIBDIR} BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
--	endif()
--
- 	# We state that Darwin always uses CLANG compiler, which honors this flag the same way.
- 	set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${CFLAGS_CXX_STANDARD} ${EXTRA_stransmit}" ${FORCE_RPATH})
- 
diff --git a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch b/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
deleted file mode 100644
index 2859ed1bac3b..000000000000
--- a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 09afc227e0880b12a98e18ee8182f89c3a80e3a6 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Sat, 15 Dec 2018 23:21:17 +0100
-Subject: [PATCH] CMakeLists.txt: Respect DESTDIR when creating stransmit
- symlink
-
-Fixes: #357
----
- CMakeLists.txt        | 20 ++++++--------------
- scripts/haiUtil.cmake |  5 -----
- 2 files changed, 6 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb2582c..fe45919 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -705,28 +705,20 @@ if ( ENABLE_CXX11 )
- 	# For backward compatibility with the old name
- 	if (SYMLINKABLE)
- 		set (REPLI_COMMAND create_symlink )
-+		# It appears impossible to get the filename component from the generator
-+		# expression $<TARGET_FILE:srt-live-transmit>, hence we predict it as:
-+		set (srt_live_transmit_name srt-live-transmit${CMAKE_EXECUTABLE_SUFFIX})
- 	else()
- 		set (REPLI_COMMAND copy)
-+		set (srt_live_transmit_name $<TARGET_FILE:srt-live-transmit>)
- 	endif()
- 
- 	set (stransmit_path $<TARGET_FILE_DIR:srt-live-transmit>/stransmit${CMAKE_EXECUTABLE_SUFFIX})
- 	add_custom_command(
- 		TARGET srt-live-transmit
- 		POST_BUILD
--		COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} $<TARGET_FILE:srt-live-transmit> ${stransmit_path})
--
--	if (SYMLINKABLE)
--		message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use symbolic link")
--		srt_install_symlink(srt-live-transmit ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/stransmit)
--	elseif(${CMAKE_MAJOR_VERSION} LESS 3)
--		message(FATAL_ERROR "Your system can't install symbolic link to 'stransmit', copy-on-install requires cmake at least 3.0.2")
--	else()
--		# This installation doesn't work with cmake earlier than 3.0
--		# (looxlike cmake 2.8 somehow doesn't have a problem with resolving the $<TARGET_FILE_DIR:...>
--		# inside the generated makefile, but does have problem with its own generated cmake_install.cmake :D)
--		message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use copying")
--		install(PROGRAMS ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR})
--	endif()
-+		COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} ${srt_live_transmit_name} ${stransmit_path})
-+	install(FILES ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
- 	srt_add_application(srt-file-transmit ${VIRTUAL_srtsupport})
- 
-diff --git a/scripts/haiUtil.cmake b/scripts/haiUtil.cmake
-index 417128d..f60bc11 100644
---- a/scripts/haiUtil.cmake
-+++ b/scripts/haiUtil.cmake
-@@ -48,5 +48,0 @@ FUNCTION(join_arguments outvar)
--macro(srt_install_symlink filepath sympath)
--    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} ${sympath})")
--    install(CODE "message(\"-- Created symlink: ${sympath} -> ${filepath}\")")
--endmacro(srt_install_symlink)
--
--- 
-2.20.0
-
diff --git a/net-libs/srt/srt-1.2.2.ebuild b/net-libs/srt/srt-1.2.2.ebuild
deleted file mode 100644
index 66d1b1dadb46..000000000000
--- a/net-libs/srt/srt-1.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/Haivision/srt"
-SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc libressl gnutls"
-
-RDEPEND="
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-#PATCHES=( "${FILESDIR}/${P} )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GNUTLS=$(usex gnutls)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/srt/srt-1.3.1-r1.ebuild b/net-libs/srt/srt-1.3.1-r1.ebuild
deleted file mode 100644
index 4233da5f8f4a..000000000000
--- a/net-libs/srt/srt-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/Haivision/srt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gnutls libressl"
-
-DEPEND="
-	gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
-	"${FILESDIR}/${P}-no-rpath.patch"
-	"${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GNUTLS=$(usex gnutls)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index a0f93824ca65..998bdd69626e 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"