gentoo resync : 25.04.2020

5 files changed, 12 insertions, 20 deletions

diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 08889e2c6d19..96642e375046 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,8 +2,8 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
-EBUILD srt-1.3.2.ebuild 1249 BLAKE2B 39bbdf7d0b084a4ac565f40f3bb319cc45c22e8dfb56ed20bd1151b2fc0b8d3bedfd15a4cb2fc833a560f20ce80f1f47dafc06b04ffb9440800c5aba0ca854d0 SHA512 c68706435da477b271334d4489b76ca8ae0fedd01f0dd780c1dfe668c510185fbb12e5608dfabae6bd313ef4a71249e87f20eda8557f95538df6792ddbc6b634
-EBUILD srt-1.4.0.ebuild 1254 BLAKE2B 377d38e6480cd261ea5106b8a735f343850ca52b525ce685bff11a0a1d15462b534f0c12c7aeff804cad91ac3d8ddb4c26c8a08847c9d443638cf06cc145f3b9 SHA512 8cf2d9f7162b27435b6474b57196624c4dc948abfbc4fb06bdc9ad644f8c87b1180783bf464db93018134ab08f86402caaa6ef407c0961ca64c22ec015eb1801
-EBUILD srt-1.4.1.ebuild 1254 BLAKE2B 6597b3e6ab38d5b8a0108b71a7a0ad95966a09119eb4be270f6bf7473a21f79f968f7515f9557f3652cd0ecbcd6f9c4e39fd0c008ad2072e223b8e7818426536 SHA512 cb585df5671adb3414c7344830ae9d1dc7bd85912a9f075a37b2b764a8a677d379524d187018902d20047995be583315fc6d4817a0ac095da218365d90834301
-EBUILD srt-9999.ebuild 1348 BLAKE2B 211466b0989c4a1ba51cd329746bb80410bcc922a30c800333e7dcb34762bf0752ae16847949d6d6b7acc49364b333070becb4e8bdcf205d7d5761f1d2d80f5c SHA512 99b05466a3a7e6809c1a79c07486ba2dafad524cec4e01617f026f2c9f463f079ed2557822477dbb33cb9541e075e892045a1aff7b0ec24148b8f0eef41c8448
+EBUILD srt-1.3.2-r1.ebuild 1161 BLAKE2B 315d7a893f0d09fbbe35d2fba5be996b6683632a29dbaa298cd9a135dddd1875606324bac9358d1e1e58296461b88d0fadb81f8250f9e8071cc56f563746609f SHA512 5dd656492e3526b4dc0ec25e7b6285b5acee7a822c921d20126549cc5bdc7033c1564b52de5e7df8d71399b0747be1edda5b6cec0261af8bf1e4706cb9d13240
+EBUILD srt-1.4.0-r1.ebuild 1173 BLAKE2B 963c7591dd13a141cddd8dca02770248e696b0c73c99d5248c887a96d1b02a55032f3cf4f0237bcf6bf66be5ba0b9f1c45194ada04d1af4263b96c25ec54412c SHA512 c55cdc6dd42ce965194243f4c99c3d7e55a3ffc8825befe8c3296edcaf4ff3049a9fa71fd9851ed3c5e912be206c522368ad52ff73f448b037fb68b639c50f9c
+EBUILD srt-1.4.1-r1.ebuild 1173 BLAKE2B 963c7591dd13a141cddd8dca02770248e696b0c73c99d5248c887a96d1b02a55032f3cf4f0237bcf6bf66be5ba0b9f1c45194ada04d1af4263b96c25ec54412c SHA512 c55cdc6dd42ce965194243f4c99c3d7e55a3ffc8825befe8c3296edcaf4ff3049a9fa71fd9851ed3c5e912be206c522368ad52ff73f448b037fb68b639c50f9c
+EBUILD srt-9999.ebuild 1260 BLAKE2B e4709688a87c70842f35920686c734ca636f22ed6c3f29075328678dd0845a3f299fd5bf3a619a21ff1654c418a4c6b3a39de035c1025f11c981758ec8d8abc5 SHA512 0707bda54bd42edead963231bf48017ab0c524578f7ce4c70709c36a2b0564ab8dfb258e81e85472e6715691fab6d5bea8ba17f8e4db05c07c964ae110a1a366
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2-r1.ebuild
index 6e2cd2ff5ef9..864f007208ac 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2-r1.ebuild
@@ -32,20 +32,18 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.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
+	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 	)
 	cmake-multilib_src_configure
diff --git a/net-libs/srt/srt-1.4.1.ebuild b/net-libs/srt/srt-1.4.0-r1.ebuild
index 715e4cbdfed9..7a9dff6b43c1 100644
--- a/net-libs/srt/srt-1.4.1.ebuild
+++ b/net-libs/srt/srt-1.4.0-r1.ebuild
@@ -32,8 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 )
@@ -41,11 +39,11 @@ PATCHES=(
 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=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 	)
 	cmake-multilib_src_configure
diff --git a/net-libs/srt/srt-1.4.0.ebuild b/net-libs/srt/srt-1.4.1-r1.ebuild
index 7188ae1c913e..7a9dff6b43c1 100644
--- a/net-libs/srt/srt-1.4.0.ebuild
+++ b/net-libs/srt/srt-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
 )
@@ -41,11 +39,11 @@ PATCHES=(
 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=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 	)
 	cmake-multilib_src_configure
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index 05f29c86c32e..283aff3244f8 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,20 +36,18 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
-DOCS=( README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-always-GNUInstallDirs.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
+	sed -i -e "s:hcrypt_ut.c::" haicrypt/*.maf || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_STATIC=OFF
 		-DUSE_GNUTLS=$(usex gnutls)
 		-DENABLE_UNITTESTS=$(usex test)
 	)