gentoo resync : 31.12.2018

3 files changed, 67 insertions, 1 deletions

diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 4525c59b848f..6377ff27f385 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,8 +1,9 @@
 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
 EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
-EBUILD srt-1.3.1.ebuild 1230 BLAKE2B f88af13e4cd496575db0de715f95567c74a260aaa2ac2c0d2ed06ca9b0f99880f3d0ca66fa5b5102514cfc5a0744460159ec3ca04e98dac166ac15d1e655ee41 SHA512 29358c59e3ce22048033a631d4cbc95731419298c38cd044c91999d07a44c9f42431f51fcbdff9159b4a12f2a1c2f23b06afb581c5a7a245f69d55e73f774387
+EBUILD srt-1.3.1.ebuild 1322 BLAKE2B 62b84a6e154b00f53b48efe0f811b6f39457b9d22085e2b5dac58b970bfdd2c8568692e3934731270c783895309dbee3dc0a3d779ad9eee4db96e62cd1c3906b SHA512 c936659d1f8ac7c71dc9dd12aac4c60070efb29b11bd5b443f1fb7381687d71f3f0c3c368ff850ebd095ae99520d1305b7dfa46971578d75715aecec6d839214
 EBUILD srt-9999.ebuild 1286 BLAKE2B 5b4ce6b439f58a6af3d1d2a640556b657bad14a589451170d2e0c862bbc6017237d1029df10ed02c66832e9feec9f334e41322a93f973ec122c94441fb431e9e SHA512 599ad5fcc603ee02f518fd76cd6c560f03ba9e0dcb66cba1fb1fbee491f3ae33deabf52d3ac05b77b7909e68b2f4d9d00eb8f290a570b2cfaf4276c51f0b49f1
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
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
new file mode 100644
index 000000000000..2859ed1bac3b
--- /dev/null
+++ b/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
@@ -0,0 +1,64 @@
+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.3.1.ebuild b/net-libs/srt/srt-1.3.1.ebuild
index d326da6dca6e..f73f9d54a82a 100644
--- a/net-libs/srt/srt-1.3.1.ebuild
+++ b/net-libs/srt/srt-1.3.1.ebuild
@@ -33,6 +33,7 @@ DOCS=( README.md )
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 	"${FILESDIR}/${P}-no-rpath.patch"
+	"${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch"
 )
 
 src_prepare() {