gentoo resync : 13.10.2019

7 files changed, 4 insertions, 529 deletions

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 638cb68df606..8dfba8fc7a29 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,11 +1,7 @@
 AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08230c7e9221be711983c6e525b7b550fd7062182796049f03f35a908eb12947e333b90c25085dce37ac6e7a0a51cff5a SHA512 f3b39e5c52db0e14d686ab02c7e374fae1c47304bee19a66b1e93eb24ad67c2f08af3695b9919ceccfdbf78f5533ce95f9877725aa3e6cc3f9d660c116e83050
-AUX rtmpdump-openssl-1.1.patch 9309 BLAKE2B f66a968c16f5c7c8c0eba28370131941a9352054ed3db6dc6e380dbdf96cac0d76bd66dcbe6f9e2aa5c8f720fd92b780bcd0018c7392ed2064cdac8ebb1bb57d SHA512 41f213c9f419d3b8c566746d8df1400fefd2350992bfca76531a98a3338a4a4ac0f77598466a642f4b811bf1889a012f28427f1369e00aa7e46a3a0abff8e73e
 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06
 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
-EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2281 BLAKE2B ae5c238de3a29c6ec8e916d7c22fb155cd3a96840159cc4eb45d14a8b1d0ad56adfb47c31d5bfc72a0eeb392e6994f44098d91b90efab9bf89dabdcc0e0bd552 SHA512 9fce59f5412ff228fc81442b4b9f8b954e51aff27d2d119d52eb9b2f62611d0f12101369250f992a94e5ba6c684d77f321adc735269575f092bba34a48273079
-EBUILD rtmpdump-2.4_p20161210-r2.ebuild 2691 BLAKE2B 1d059509986461e6c774a792bb183c99e6bb019d3c38f508db2c1acd49eb63dbc511107e0495c984fb9e54c9411519f8c36a5e4a01d7ae4285cec45ed89eafa3 SHA512 407809cdc6c188b8c1c69d5527243a2470e35711569c133d7b28b1ac70889e32c2e06e40e31554a13e96ca58f0b8925b2b74426ad6db1d24668a30be844087b7
-EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2730 BLAKE2B 2a9af6612d49359a97578d5b5f6f13715b3ed5ca8115904e39e2216b0fd405612d104b13e01b4d04fa4c51c6dba6a9f7fea63513ce84f34d3ccb31cd96ea1a39 SHA512 ce60049e5b91bb7d454b1770fe8fdf9440082e537cfb656b603e2d726866efe3b3b2aad5bac46a4d3716a0a645e3aa57be1e97e800854a765b67b9d570841203
-EBUILD rtmpdump-2.4_p20161210.ebuild 2260 BLAKE2B 40771266f4e6ae5821800b52a7f31dd83ddd7a138a9b169117b66b44acdf9305158e550a2bd99afec37d836f7c74fd10861c019583930d54c9f8023f8ac1f8ef SHA512 f50ecdaaa85377e079587bd38001202edd5769f7f336ac58a7532df68131ba4117acf43b74c23846baf59e4286eaf2a2bd59a79f810e0baf5880d6163145e88a
-EBUILD rtmpdump-9999.ebuild 2708 BLAKE2B 4ff6efada54e480a49888b7c18562e624be4cd434f766a533c51345b2501e70e19bb90edcbea929a73d24221e789458010dfeee46a9fcc9ae7a605493284eedd SHA512 61b8f3162c44b2c6f82480dfc64a5298010c09f12b4837f084acd6299ea560b5b327b5d3f7d00e539a28a1844e588c2fb2871db2958fc512e5d28a795efe4c7d
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2666 BLAKE2B 777369f139bb1d2b8f6fceb8ffc933aed16993195b83b175d04798154bc6188671cb1d8bca3c9dfdd916d2c9a5c643a9f7d68802bb8e554c8ff5061cbdf78ea1 SHA512 5697b0cea8dde0bd1e1a94778d82c85a768c68b5690ff701859cdf40f4aa1551ea76b040726d44ee9fdcb965b788b06438703612ba35d751e4d312219c84d75e
+EBUILD rtmpdump-9999.ebuild 2673 BLAKE2B 55215ffd874a9c376a4073de46e72d71156344508f93a37ff978f9c6cbcfc966ac46ffc76068e19b0eadd7edd498d698a184d7c6c06806d814a1b49b78673d5d SHA512 2a026172538691d6fe5a9777c577557fe88342dc252ad16727d8525d8ab5d7092b7110861139eff67ac23e72a1109ae1929e1d5efbdf86c55e681293f64da973
 MISC metadata.xml 444 BLAKE2B 97f64854abc028cf6eb902008992a94e434db6de7258b8065666b31af4b92118044e4c3427792782cf7ac7a2eb8bb0fbaee047027ca2f648178cc07f46c6ac88 SHA512 38b9987993f4a3ed479c50aeda81436a8cbec7ad48c1e509fc351a58557c3922fe0834a680cda9996a5c5ca1b0b48377772e3eef775281eb40962f95ac095e7c
diff --git a/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch b/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch
deleted file mode 100644
index b3bb508af21a..000000000000
--- a/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-https://github.com/xbmc/inputstream.rtmp/blob/dc9353823f9cfd2943f97b586230fe387cc55dc6/depends/common/librtmp/0003-openssl-1.1.patch
---- a/librtmp/dh.h
-+++ b/librtmp/dh.h
-@@ -253,20 +253,44 @@
-   if (!dh)
-     goto failed;
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_new(dh->g);
- 
-   if (!dh->g)
-     goto failed;
-+#else
-+  BIGNUM *g = NULL;
-+  MP_new(g);
-+  if (!g)
-+    goto failed;
-+
-+  DH_set0_pqg(dh, NULL, g, NULL);
-+#endif
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_gethex(dh->p, P1024, res);	/* prime P1024, see dhgroups.h */
-+#else
-+  BIGNUM* p = NULL;
-+  DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL);
-+  MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
-+#endif
-   if (!res)
-     {
-       goto failed;
-     }
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_set_w(dh->g, 2);	/* base 2 */
-+#else
-+  MP_set_w(g, 2);   /* base 2 */
-+  DH_set0_pqg(dh, NULL, g, NULL);
-+#endif
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   dh->length = nKeyBits;
-+#else
-+  DH_set_length(dh, nKeyBits);
-+#endif
-   return dh;
- 
- failed:
-@@ -293,12 +317,24 @@
-       MP_gethex(q1, Q1024, res);
-       assert(res);
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       res = isValidPublicKey(dh->pub_key, dh->p, q1);
-+#else
-+      BIGNUM const* pub_key = NULL;
-+      BIGNUM const* p = NULL;
-+      DH_get0_key(dh, &pub_key, NULL);
-+      DH_get0_pqg(dh, &p, NULL, NULL);
-+      res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1);
-+#endif
-       if (!res)
- 	{
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	  MP_free(dh->pub_key);
- 	  MP_free(dh->priv_key);
- 	  dh->pub_key = dh->priv_key = 0;
-+#else
-+          DH_free(dh);
-+#endif
- 	}
- 
-       MP_free(q1);
-@@ -314,15 +350,29 @@
- DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
- {
-   int len;
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   if (!dh || !dh->pub_key)
-+#else
-+  BIGNUM const* pub_key = NULL;
-+  DH_get0_key(dh, &pub_key, NULL);
-+  if (!dh || !pub_key)
-+#endif
-     return 0;
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   len = MP_bytes(dh->pub_key);
-+#else
-+  len = MP_bytes(pub_key);
-+#endif
-   if (len <= 0 || len > (int) nPubkeyLen)
-     return 0;
- 
-   memset(pubkey, 0, nPubkeyLen);
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
-+#else
-+  MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
-+#endif
-   return 1;
- }
- 
-@@ -364,7 +414,13 @@
-   MP_gethex(q1, Q1024, len);
-   assert(len);
- 
-+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   if (isValidPublicKey(pubkeyBn, dh->p, q1))
-+#else
-+  BIGNUM const* p = NULL;
-+  DH_get0_pqg(dh, &p, NULL, NULL);
-+  if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1))
-+#endif
-     res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
-   else
-     res = -1;
---- a/librtmp/handshake.h
-+++ b/librtmp/handshake.h
-@@ -31,9 +31,9 @@
- #define SHA256_DIGEST_LENGTH	32
- #endif
- #define HMAC_CTX	sha2_context
--#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
--#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
-+#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
-+#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(ctx, buf, len)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
- 
- typedef arc4_context *	RC4_handle;
- #define RC4_alloc(h)	*h = malloc(sizeof(arc4_context))
-@@ -50,9 +50,9 @@
- #endif
- #undef HMAC_CTX
- #define HMAC_CTX	struct hmac_sha256_ctx
--#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
--#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
-+#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(ctx, len, key)
-+#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(ctx, len, buf)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
- #define HMAC_close(ctx)
- 
- typedef struct arcfour_ctx*	RC4_handle;
-@@ -64,14 +64,23 @@
- 
- #else	/* USE_OPENSSL */
- #include <openssl/sha.h>
-+#include <openssl/ossl_typ.h>
- #include <openssl/hmac.h>
- #include <openssl/rc4.h>
- #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
- #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
- #endif
--#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
--#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, buf, len)
--#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
-+#else
-+#define HMAC_setup(ctx, key, len)       HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
-+#endif
-+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, buf, len)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, dig, &dlen); HMAC_CTX_cleanup(ctx)
-+#else
-+#define HMAC_finish(ctx, dig, dlen)     HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx)
-+#endif
- 
- typedef RC4_KEY *	RC4_handle;
- #define RC4_alloc(h)	*h = malloc(sizeof(RC4_KEY))
-@@ -117,7 +126,7 @@
- {
-   uint8_t digest[SHA256_DIGEST_LENGTH];
-   unsigned int digestLen = 0;
--  HMAC_CTX ctx;
-+  HMAC_CTX* ctx = NULL;
- 
-   RC4_alloc(rc4keyIn);
-   RC4_alloc(rc4keyOut);
-@@ -266,7 +275,7 @@
- 	   size_t keylen, uint8_t *digest)
- {
-   unsigned int digestLen;
--  HMAC_CTX ctx;
-+  HMAC_CTX* ctx = NULL;
- 
-   HMAC_setup(ctx, key, keylen);
-   HMAC_crunch(ctx, message, messageLen);
---- a/librtmp/hashswf.c
-+++ b/librtmp/hashswf.c
-@@ -37,9 +37,9 @@
- #define SHA256_DIGEST_LENGTH	32
- #endif
- #define HMAC_CTX	sha2_context
--#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
--#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(&ctx, buf, len)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
-+#define HMAC_setup(ctx, key, len)	sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
-+#define HMAC_crunch(ctx, buf, len)	sha2_hmac_update(ctx, buf, len)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
- #define HMAC_close(ctx)
- #elif defined(USE_GNUTLS)
- #include <nettle/hmac.h>
-@@ -48,19 +48,27 @@
- #endif
- #undef HMAC_CTX
- #define HMAC_CTX	struct hmac_sha256_ctx
--#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
--#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
--#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
-+#define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(ctx, len, key)
-+#define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(ctx, len, buf)
-+#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
- #define HMAC_close(ctx)
- #else	/* USE_OPENSSL */
- #include <openssl/ssl.h>
- #include <openssl/sha.h>
- #include <openssl/hmac.h>
- #include <openssl/rc4.h>
--#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
--#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, (unsigned char *)buf, len)
--#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
--#define HMAC_close(ctx)	HMAC_CTX_cleanup(&ctx)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
-+#else
-+#define HMAC_setup(ctx, key, len) HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
-+#endif
-+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, (unsigned char *)buf, len)
-+#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, (unsigned char *)dig, &dlen);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define HMAC_close(ctx)	HMAC_CTX_cleanup(ctx)
-+#else
-+#define HMAC_close(ctx) HMAC_CTX_reset(ctx); HMAC_CTX_free(ctx)
-+#endif
- #endif
- 
- extern void RTMP_TLS_Init();
-@@ -289,7 +297,7 @@
- struct info
- {
-   z_stream *zs;
--  HMAC_CTX ctx;
-+  HMAC_CTX *ctx;
-   int first;
-   int zlib;
-   int size;
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
deleted file mode 100644
index baadc800af89..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls ssl libressl"
-
-DEPEND="ssl? (
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
-		)
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't create source directory"
-	cd "${S}" || die
-	unpack ${A}
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
-}
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
deleted file mode 100644
index 6c6bbb4ef985..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-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 libressl"
-
-DEPEND="ssl? (
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
-		)
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
-	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS=""
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-fi
-
-pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		mkdir -p "${S}" || die "Can't create source directory"
-		cd "${S}" || die
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-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.patch"
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ; then
-			crypto="GNUTLS"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
-}
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 2bf9f5d0cefa..5f6a9cd3cb04 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -32,12 +32,11 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
deleted file mode 100644
index d7c99b0d7dc9..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-# the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls ssl libressl"
-
-DEPEND="ssl? (
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl )
-		)
-		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't create source directory"
-	cd "${S}" || die
-	unpack ${A}
-}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i -e 's:OPT=:&-fPIC :' \
-		-e 's:OPT:OPTS:' \
-		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
-		|| die "failed to fix Makefile"
-	multilib_copy_sources
-	eapply_user
-}
-
-multilib_src_compile() {
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
-		cd librtmp || die
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
-}
-
-multilib_src_install() {
-	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
-		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
-	else
-		cd librtmp || die
-	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
-	CRYPTO="${crypto}" install
-}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index d4e9a79c5e11..aef12b6aa94f 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -32,12 +32,11 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	KEYWORDS=""
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi