gentoo resync : 04.05.2021

5 files changed, 16 insertions, 32 deletions

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index f0b2e8a7450e..102d0befd7e0 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -3,7 +3,7 @@ AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
 DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0
-EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2795 BLAKE2B 1719b876e6fa430158036323f3a29e5c47080df2e94876419d7c2bfd67b5a54e86938d0d4b8e3a77486a01de154beb9f759e9a9c402fa4d34234dbe6f1f24de5 SHA512 b3dc94d290e431d443d6ef7b20c149fcf20315dbded2dd2e93e997613a3181a5ce0e2a5bfeb4edfcfca544fbdeb05b18fd66c0acb3de1186715cf9a4e466a658
-EBUILD rtmpdump-2.4_p20190330.ebuild 2911 BLAKE2B 73e925601fe45531fda2d566015ed856ba36f3e5e5cc6365ad5dc29ceff57a56fe369892b27126c18788395b36ea7a5a1a3fed4f2f5f266732bdee299199c6d9 SHA512 f96859bc18c82fc10f263b4cf6501716c2a6295be44125f93975f84496436677b4898030ed6896979f85224669117b01ea97e3e825271449eac007e001b72f29
-EBUILD rtmpdump-9999.ebuild 2911 BLAKE2B 73e925601fe45531fda2d566015ed856ba36f3e5e5cc6365ad5dc29ceff57a56fe369892b27126c18788395b36ea7a5a1a3fed4f2f5f266732bdee299199c6d9 SHA512 f96859bc18c82fc10f263b4cf6501716c2a6295be44125f93975f84496436677b4898030ed6896979f85224669117b01ea97e3e825271449eac007e001b72f29
-MISC metadata.xml 830 BLAKE2B c716bc86aa84124cb7729fd1ff19a4cec080124c9110773da8c27360a155fe10e03e6d7be6af812ab8eff3d460c4b9cdfe3713432329500dc85f8612f14ae2db SHA512 111e30937fc4cfedbd0f03fc41fa6096d9ffdc6dff414c57dd9af1cf632eaa3721d76f66b6937eba786dbbfc035398879f03448098c0a9ff581203bdfa272f4b
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2696 BLAKE2B ac811b42e9812140688c9b5a33a2255b4457e095de83b096eaae4f9959d0de8a50e919d1e6fb7385e7d256af25ab23c8bd980da70532bc67d8c730e2da4d6af5 SHA512 653d227609c0c1a38a85ce9ceb0eeaca3b6628ba79af5e877d1a2a76e58d2296222ba584da04a55abb784a05c2a8dfdc9d27a95ab07fb16317f36c1c22b73edc
+EBUILD rtmpdump-2.4_p20190330.ebuild 2626 BLAKE2B f27169162b747cabe0feee80cd643ba8216a8d0034c0fff6671e09bc05ca53d59ecf9582850ca8ce27396c1422da2020e4cf08c580e617dfad04603746848029 SHA512 36b3792e7320513001c2986163d6dd7205d2d5ce9e64571a28e7772dfd34d807f8970499ae165d09a90d98e10a8d3dd66377fc6452fb4565c7611584fce26f93
+EBUILD rtmpdump-9999.ebuild 2628 BLAKE2B d42035baeef31109ce56ff60db20b0f6a90938549d005d67e423742b771851ffccae8b85e885e8449dc82d96f2ca40db0f2799cc14b26630670a215579f5ff80 SHA512 50db9397b5e4c51b5c31b5b1c8116a14e8bfea5f620df4f43fd2cd76d09eff74cc1d80c22a0b485a04256c0e91b3bd02251ee685db45382b8a942f99dbc172e5
+MISC metadata.xml 745 BLAKE2B 82d1570828f878a8c32cf642e4405c481d17134321b2046fc602107e3d2873cfcbcab439a2d94a341ddb223d0efdecf6b264c0816b768a15b10e1072df1c7c77 SHA512 b1ced41c93cd142aae5808f35fffdcb99c919a524fb386a463fddbba74f51c221121350fbfd2ca2807c2ee370bbf77a14127a9e7f215841b5d0bc72dd3343745
diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 77d74434352c..0aab57cd9eae 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -14,7 +14,6 @@
     <use>
        <flag name="ssl">Enable Cryptographic features</flag>
        <flag name="gnutls">Use GnuTLS instead of OpenSSL for Cryptography</flag>
-       <flag name="libressl">Use LibreSSL instead of OpenSSL for Cryptography</flag>
        <flag name="tools">Enable installation of various binary tools in addition to librtmp library</flag>
     </use>
 </pkgmetadata>
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index a3b8a59caac3..fb6e6d60d9f0 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="gnutls ssl static-libs libressl"
+IUSE="gnutls ssl static-libs"
 
 DEPEND="ssl? (
 		gnutls? (
@@ -19,8 +19,7 @@ DEPEND="ssl? (
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
@@ -67,7 +66,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
index c5698f9c7a33..839b25613c0b 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,17 +11,14 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs +tools libressl"
-
-REQUIRED_USE="?? ( gnutls libressl )"
+IUSE="gnutls ssl static-libs +tools"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -47,10 +44,6 @@ pkg_setup() {
 			ewarn "USE='gnutls' is ignored without USE='ssl'."
 			ewarn "Please review the local USE flags for this package."
 		fi
-		if use libressl; then
-			ewarn "USE='libressl' is ignored without USE='ssl'."
-			ewarn "Please review the local USE flags for this package."
-		fi
 	fi
 }
 
@@ -64,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index c5698f9c7a33..fcab996e0c09 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,17 +11,14 @@ HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs +tools libressl"
-
-REQUIRED_USE="?? ( gnutls libressl )"
+IUSE="gnutls ssl static-libs +tools"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		!gnutls? (  dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -47,10 +44,6 @@ pkg_setup() {
 			ewarn "USE='gnutls' is ignored without USE='ssl'."
 			ewarn "Please review the local USE flags for this package."
 		fi
-		if use libressl; then
-			ewarn "USE='libressl' is ignored without USE='ssl'."
-			ewarn "Please review the local USE flags for this package."
-		fi
 	fi
 }
 
@@ -64,7 +57,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
-	use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
+	use ssl && use !gnutls  && eapply "${FILESDIR}/${PN}-openssl-1.1-v2.patch"
 	default
 	multilib_copy_sources
 }