gentoo resync : 16.06.2018

18 files changed, 178 insertions, 50 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a9de1e22a8f4..53a68b12728f 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a02cd9312043..9bf1e158bfc5 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,6 +17,6 @@ EBUILD ffmpeg-3.3.5.ebuild 15958 BLAKE2B c5d4de18818f991e975e5d4e4af6ba49335c1f5
 EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
 EBUILD ffmpeg-3.4.2-r1.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
 EBUILD ffmpeg-3.4.2.ebuild 15578 BLAKE2B dd02f1200d7c713f06c606a40386f6432dc4c1b796614e1a4f1faf13e504fd9634e1557d7a70cfb94629228090ca66916510b6328dfde5d0bc0e4cd44a103049 SHA512 b95e7fd722745507d91f23bd365fec8a2193d589bc41821adfb1123fa844bf869eb5e02eb2c3bb936cf4f69b0437fdf875f7bddf821d04105d29b667678abdd8
-EBUILD ffmpeg-4.0.ebuild 16473 BLAKE2B 43f3584d6c1aa93e3a52550ee907a429d2ee5da7b11f2dd4aec8d2e60e1aa69bede325c374f3dd5e132e8b51872db3679bb5cf1fd422f43cb2617d4d8006d8a5 SHA512 48d4ac31b234a841439f6887cb6a27aaf2f4ff963f785426ed8ee3b45ba496d2ce6844563182352807a0a45465f1bddb8a4ee90c862eaa3894919295781d4d42
+EBUILD ffmpeg-4.0.ebuild 16478 BLAKE2B 86bde33dbe714c6ee01923cc6a641d76154bf9c4ec0e15fcf4903293ce9874d8f4c4c91e4ed5da2d0ba8b1d0a9a91141b3c7ffdc7cb3ab3e7ff9d7ecee45c6c4 SHA512 0b3035478c18bc4b9557daaf17f958eef8139af6dbad51b229ba3025eec1099384de6f09c4d37cbdaa0ac977ed32c542d72ff79245803490c409eb8e15fd774c
 EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 388f7d528159be1ebbba172ec58f0e2b02a509f000ab33a757579311b24b8a169bb1183960694f13bd6796f4f41f117ad0ba514a44e9d29de7a3bb386929566f SHA512 4d0d216c765c6645e9b5d8fc30dd61ab7cafe9663cbc42066793607ebb7c486ecbbee5c08ef9aa81da14ca4aff946e7db306f2f1b197681d6237e447f21777da
 MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild
index 3cde4a07c111..5e43e8e67aac 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index 8150f02c539d..de5c35a5d428 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-mplayer-1.0.8.tar.gz 1062691 BLAKE2B 0ff843b26ffdaffa7240c04a55f15f8534e657610f6483da9fa92d054e748187a288deb8e330032ae0d2e774d3e4d7b913680669ccf0b8fa9202c98fee686295 SHA512 795530313a6b8135e328e0cb8f5d9081b0b5caf8f81b1ab182a2876241bd662b96d2ef25164dc6f436fb66168472f3716e033697f0aeffe5f84c59cd8de420c2
 DIST gnome-mplayer-1.0.9.tar.gz 1082199 BLAKE2B c2219b5a6902c9e2c9849dd3a31a29e2270b7ca513945a5e9684fa429073f42e360f6ef698f42b93e61a3d39edef1215f657e92cfab1c9fe3b19d5ea85eac839 SHA512 5aaea17afddaf2f949b798b87d4d6306130b9622d2dae68a7f24abebc2174cac7cb17c3112dac6629a0643e31098865462c10355dfcd43f16d2503848e18fa7d
-EBUILD gnome-mplayer-1.0.8.ebuild 1853 BLAKE2B 590fcf443548d2d5c5d2306b9e9172e86ba5e0ad36d57392c696173bc67fef53de56c7d05e22e973c6ccafc56cae1fe1f8f015c3ee5123275ba40baf0ced30c0 SHA512 afb16e11717f6a4f97ab492c991dd620f49340069eceaa98e583014ab404402d97fc65cddfb0015003a2f32a5ef4100a3d944fe105e71fed27d32904fb47063f
-EBUILD gnome-mplayer-1.0.9.ebuild 1967 BLAKE2B f1e4dcc47204d48808ba9d33d8e2dc48a9b25547e063ff47001488dd28cf5ca9e630c364da261bf2eb66bb22b1d3ebad083f07edca7c69772d7e3ec552a9820a SHA512 0051da8dee3bb1058f5282265574f06c54634214beb064dabf68a86335ef6c16c98d3b10b4c5a3d6c108696ff02eaa2b2330e7d1982ac1156f4f1f6fc4b4b964
+EBUILD gnome-mplayer-1.0.8.ebuild 1842 BLAKE2B 3f170e2ec80a8f02065a1f6421fdb7d74a64e8522b7ca6345e0b4f08b06d7704c9ad9e5bb59dcbd4c81afc6cccb64efae9b0a9f329dde9385d4247d4305b65ff SHA512 8c113790c51ea05cfce90409288c447f53b21a99cfccec0332b68d465605974f4a670bbdac2d09d1cd7a3bcd590e619b13a6806b4da621178d2e5e9d5a42e2eb
+EBUILD gnome-mplayer-1.0.9.ebuild 1956 BLAKE2B 986944c3d72416ca54a6a761d28effe13e71fb24cfac7245af4d574599944793f6bb551d08d9770b0024af3386a333f30768a7135df074e09dc287c7555c64c9 SHA512 43b5d05c61673133676821019083555bcf355116c73d02c507afce206240b1189f505770ba17f833f27deb3ae1156c5b59da3da28ca36d8bb6e2279fa3af3bc4
 MISC metadata.xml 398 BLAKE2B e6cef861c1aa0178c3ff271532dc97bef997513cf5f5c37ab4a41dfe0e3430d5b2f7fdfcf0f7952a5ff6811a96520139531d23b8a446b226e21f57d6df739a4f SHA512 5916892e84d2f43920e341fce811b49419c27a81a1c95e8e8a6a269b1a9b58702aef3d5728b947afc2699dffc788e877f44dce45380f0024894c4422750c9a87
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
index 9f874a98641f..c4b1bf9cb060 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A GTK+ interface to MPlayer"
 HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
@@ -63,15 +63,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
index 5000169c4c1c..5deb795cc254 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A GTK+ interface to MPlayer"
 HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
@@ -65,15 +65,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 8f4c5e2d018e..a9a34d467bfd 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,10 +3,11 @@ AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938
 AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
 AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
+AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3461 BLAKE2B 60a5c9e6acd71c5254fd0ca26e38f161ba53f8a24ea9a8856f55d9a80d8fc877566e83344ae20ab2941787292b54d1ef00ec43eddd5077157e2f2e243c272f03 SHA512 3499a090bc797415b05e138f55aa8fa57292a790d6f5a305e9ee7a0d6cceeada5306048027257f272cd2804d61e2dc99a402498f3a2a4745d8d31fd159040df4
+EBUILD gpac-0.7.1.ebuild 3499 BLAKE2B 30ef351d63cc2e35d1380fcd973accdec5dbf2fd0e486e44fd7693e6ee889f13dd4e7d0166a4f947f61943b0bb1935247b1d2113f15e8174d69c1de4a49530ae SHA512 3db6c70aee8146a3db6a862d0919dbb96a58fc9077f9b6b4d8a23ab077ae2c209fddf392c1a1e5961af952ff35efe0299f85f052f88cf852c8113755f19df368
 EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
new file mode 100644
index 000000000000..e25a5bca78bb
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
@@ -0,0 +1,126 @@
+From e64a7d229fdcb5c190064b7860ade50124dcc735 Mon Sep 17 00:00:00 2001
+From: Aurelien David <aurelien.david@telecom-paristech.fr>
+Date: Fri, 6 Oct 2017 16:46:18 +0200
+Subject: [PATCH] compatibility with OpenSSL 1.1.x (#616)
+
+diff --git a/src/utils/downloader.c b/src/utils/downloader.c
+index b8c923b88..3b7d37b41 100644
+--- a/src/utils/downloader.c
++++ b/src/utils/downloader.c
+@@ -204,7 +204,7 @@ struct __gf_download_manager
+ 	u32 limit_data_rate, read_buf_size;
+ 	u64 max_cache_size;
+ 	Bool allow_broken_certificate;
+-	
++
+ 	GF_List *skip_proxy_servers;
+ 	GF_List *credentials;
+ 	GF_List *cache_entries;
+@@ -392,10 +392,18 @@ static Bool init_ssl_lib() {
+ 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
+ 		return GF_TRUE;
+ 	}
++
++	/* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
++	** As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required.
++	** Similarly it will also automatically deinitialise as required.
++	*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
+ 	SSLeay_add_all_algorithms();
+ 	SSLeay_add_ssl_algorithms();
++#endif
++
+ 	_ssl_is_initialized = GF_TRUE;
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
+ 	return GF_FALSE;
+@@ -422,6 +430,7 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+ 	}
+ 
+ 	switch (mode) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case 0:
+ 		meth = SSLv23_client_method();
+ 		break;
+@@ -436,6 +445,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+ 	case 3:
+ 		meth = TLSv1_client_method();
+ 		break;
++#else /* for openssl 1.1+ this is the prefered method */
++	case 0:
++		meth = TLS_client_method();
++		break;
++#endif
+ 	default:
+ 		goto error;
+ 	}
+@@ -771,7 +785,7 @@ void gf_dm_sess_del(GF_DownloadSession *sess)
+ 		gf_sk_del(sess->sock);
+ 	gf_list_del(sess->headers);
+ 	gf_mx_del(sess->mx);
+-	
++
+ 	gf_free(sess);
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
+ }
+@@ -1145,7 +1159,7 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ {
+ 	GF_DownloadSession *sess;
+ 	if (!dm) return NULL;
+-	
++
+ 	GF_SAFEALLOC(sess, GF_DownloadSession);
+ 	if (!sess) {
+ 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
+@@ -1166,8 +1180,8 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ 		gf_free(sess);
+ 		return NULL;
+ 	}
+-	
+-	
++
++
+ 	assert( dm );
+ 
+ 	*e = gf_dm_sess_setup_from_url(sess, url);
+@@ -1225,7 +1239,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
+ 		gf_mx_v(sess->mx);
+ 		return GF_IP_CONNECTION_CLOSED;
+ 	}
+-	
++
+ #ifdef GPAC_HAS_SSL
+ 	if (sess->ssl) {
+ 		s32 size;
+@@ -1451,7 +1465,11 @@ static void gf_dm_connect(GF_DownloadSession *sess)
+ 							const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
+ 							if (altname->type == GEN_DNS)
+ 							{
+-								unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++								#if OPENSSL_VERSION_NUMBER < 0x10100000L
++									unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++								#else
++									unsigned char *altname_str = (unsigned char *)ASN1_STRING_get0_data(altname->d.ia5);
++								#endif
+ 								gf_list_add(valid_names, altname_str);
+ 							}
+ 						}
+@@ -1806,7 +1824,7 @@ GF_DownloadManager *gf_dm_new(GF_Config *cfg)
+ 		dm->limit_data_rate = 1000 * atoi(opt) / 8;
+ 	else
+ 		gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
+-	
++
+ 
+ 	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+ 	//when rate is limited, use smaller smaller read size
+@@ -2943,7 +2961,7 @@ static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
+ 			hdrp->value = gf_strdup(hdr_val);
+ 			gf_list_add(sess->headers, hdrp);
+ 		}
+-	
++
+ 		if (sep) sep[0]=':';
+ 		if (hdr_sep) hdr_sep[0] = '\r';
+ 	}
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index ed5c090d045f..fea54fdfefe0 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.7.1-configure.patch"
 	"${FILESDIR}/ffmpeg4.patch"
 	"${FILESDIR}/${PN}-freetype.patch"
+	"${FILESDIR}/${P}-openssl-1.1.patch"
 )
 
 DOCS=(
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 7954ca4d68fe..087b1b19bae5 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -6,7 +6,7 @@ AUX gxine-0.5.907-underlinking.patch 781 BLAKE2B 14a02ab58d17507486e43bb803f60b3
 DIST gxine-0.5.907.tar.xz 910528 BLAKE2B 6c45e1b1d9819bdf9f51fbb3c8be5265144ae62f4e419eb4ab002b14c9705b48f943b28a67ff826a90e945679d487f16c9188ed45f26aa8fda0b0b45ddfe7657 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045
 DIST gxine-0.5.908.tar.xz 917780 BLAKE2B ef5fc2e9003c6ff206d2655d1bdc127d3b7ca3994c015c0f275e987ea8356c38e1e2100118c2207b048603a2ed81db3c8a31059277e83be0c947fb66effb6bdc SHA512 6172f442948655178fde837a5fa9194fdb06b5cc50f8cbbfcd153b72f9a360a5497bd7ebd09c8f2340547fd7a0c834d5c673712a13202768bf0c762ee41c5454
 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215
-EBUILD gxine-0.5.907-r1.ebuild 2515 BLAKE2B f5fb88d7bebc79c6edcde1c6475cf5bd4526c794423b415392006834908a1224878e0ff392a791e46cf69747a735edb7e485b9113aa97e098033bdff1226eb32 SHA512 bdcdc345a3f089d806a6d39f2c982fa599b7823f190b39633429223138de87fbc37e0746f6d9cc194e850e2848e56444dc9c17a632e0d8dd59a75f00cef3c076
-EBUILD gxine-0.5.908-r1.ebuild 2498 BLAKE2B 3ef17f9868b0dcc3b6b0e89fff09f90a1850f6f5b5243c629b85630f0a8a41728f6aea365308a55b51f46136c5a33b5c60999ace9e5a2e55756579029b9defc3 SHA512 a56c1babe19b80e558d626fbaef4b752885b534523336a9853c8c1101900d60f2c811aae85ae0379f85f573b4969d5471d964819901f2d138d5d15e0e1115aae
-EBUILD gxine-0.5.909.ebuild 2071 BLAKE2B 1c9bcc4526bcaff6ddbd325993544528448a5f5f06c99016b3024989694aa7eb2bcbe196f6ba378a8b69abf8e7ba57fc2a6c28be2b7254bccef64a1a61e72f70 SHA512 94aa9ba801c77f9921b68124f1051f4ce9025fe23b75a744444288a0a336ae03e2d49ed9abb056d9738cf60aec6bd8cbbbe0172c3140cb623f8f700ead921646
+EBUILD gxine-0.5.907-r1.ebuild 2504 BLAKE2B 93b1b1ac3fec11f459b69b648751a50b09cbc8ca774942a252b23f2108cdd57925d1dbec73581a27f90888bc1a66ee5c4633f7a52603c71dadda53676339d7d9 SHA512 e18d406dceb14b977f3a17aca43e13fd314b7c5e5624b8baaf07201e3d4781eca2ee4f446f05356864253cec73e3598abf05d3a5db96ead9c927af3d1137bfca
+EBUILD gxine-0.5.908-r1.ebuild 2487 BLAKE2B 2d92a9c3ba6ac48e243e3e37aa9c3a98374f307db38f93ff7144be391a02754205a1d4b643adfa1fcf912ac178295464a7a2d9cac91c52b6d271a49c56f7d3dc SHA512 ce0363edba368831622ce31f87e6c75fc2d224b2e3b53cdbf1bd63cb8a73654868b771088a39f547404837f48c176e5bd24c65c41cb78d570fb7c324f95d977c
+EBUILD gxine-0.5.909.ebuild 2060 BLAKE2B 4b36d4284296662b27b0d459f321be85c40b03cd6172882796a5bb59fca9657bf5d7fa7727d4cab342f4149d395bc4d44281a95714209be3793d9eea7e3bc1f4 SHA512 2dc7c01f3049ba90308ca4df2049cdb4ef9ea894c899e31f37c65b73523724bee261a05c921b4b4a213df4802867e55049bcf5e28427658d24989e45f8295e34
 MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587
diff --git a/media-video/gxine/gxine-0.5.907-r1.ebuild b/media-video/gxine/gxine-0.5.907-r1.ebuild
index 7c7560b032eb..cb6ef3322c28 100644
--- a/media-video/gxine/gxine-0.5.907-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.907-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils
 
 DESCRIPTION="GTK+ Front-End for libxine"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -89,13 +89,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-video/gxine/gxine-0.5.908-r1.ebuild b/media-video/gxine/gxine-0.5.908-r1.ebuild
index de2ecd10783c..25fa1cc225e1 100644
--- a/media-video/gxine/gxine-0.5.908-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.908-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils
 
 DESCRIPTION="GTK+ Front-End for libxine"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -89,13 +89,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-video/gxine/gxine-0.5.909.ebuild b/media-video/gxine/gxine-0.5.909.ebuild
index 59fb4ac46bf6..d8154294cae0 100644
--- a/media-video/gxine/gxine-0.5.909.ebuild
+++ b/media-video/gxine/gxine-0.5.909.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils
 
 DESCRIPTION="GTK+ Front-End for libxine"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -76,13 +76,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b7e9cd397f82..6275fccbd169 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -20,5 +20,5 @@ EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e
 EBUILD vlc-3.0.2-r1.ebuild 13436 BLAKE2B 7ac65a355a8d490ee6d4b2b10367f7e07010f5b3875d7fa02852186d1076ba565c5c9326b75b71635629a1f040f305dbed86817fe746f9bbb7c10cdc079b090a SHA512 fd565e3519b7b2b223aacff1ba77238463704eb96d59cf0fcd6ac5bc32786e616395c25a51375b7e708a30691e2d42de3823445d92915c3a77b30717ddc29c9d
 EBUILD vlc-3.0.3-r1.ebuild 13313 BLAKE2B fdadc67821d36e0bead20ec448b45b7f3e79d311119ab0ae8c11c313d9b77588af86d5f208e04c4389c5e0b576a4f0ebcdbb8bab8ea56a8ec9716889eaab3d9f SHA512 e9d144db32e6d5545fd879f0aaed9740fbed086c4d5af851d3f3f46691cbd02f4a2d74f5976a3143d02d16a1532209e58b49dabd64e74231de3feb1bec9cae62
 EBUILD vlc-3.0.9999.ebuild 13267 BLAKE2B 2a0a81c8834d61a1c98a6beb92884ac9f3131174a2b7549b107266ef434ab90db3f75b9d2a94ccf77115d9eec34f5f79f2683e0ca836e9018f9f27f14b58d05b SHA512 ea3aa2cc6be36e4df082bde8e0a63aa570585da4f874bccd465b800f3097fd60cc9b0a1dc838c05f81a8199b921a5ae4fd853edd91d063cc1138c9932d920284
-EBUILD vlc-9999.ebuild 13177 BLAKE2B 17e1191c77a9ef2671e2c0d4ff54099769d888120cf06946e843d2a4ce7183b1458114eb07164303f0fe6d9b3cc091d10e38810a1a701f4eeff0b60eb1c2948d SHA512 50a0ece6fb2a4d5a567fe2f2234f4786c61668ed8b597f38e085b5c500f080530689feb46973c901b43d5b9e011f8b54ac9506c0c43bc6c28eda5e6c59e53ac2
+EBUILD vlc-9999.ebuild 13191 BLAKE2B cbbedfc8ff756fea752b2db31d298eda1c33287a02a99cd55d023afa09bc7b6e62ced8674edb8a2a184e9522a5d0164a98de20485043f33726e46cdaf64f4dcb SHA512 344bfd2a577748f7d2361d88d35a8d4c2b0a619b132a7b35cdfdb17344102b57a4f85b70fd13a8ecd81513f86558c69d8add7f10680d35384b46bfd268b9ae1e
 MISC metadata.xml 6646 BLAKE2B 569faa5b058689cd2fae2bf6832c166d0e7ab539cf489188b7ed5e780ed5a8d6fcb3a2bd1ef71b3905ad66b6f53c05ebff98b9b56a969ecb5a43383b94ab49a1 SHA512 e239b5ef49f73bce91cff3cd420c16435943f8ee8a22503a41cb610033fe3b9e1e13482398c26f7f1315257b3fc381eb9b49a59ae577f9bc516fdd0ef460bedc
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 464b5d025845..db33c8ab2ce2 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -201,8 +201,8 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
-		dev-libs/wayland
-		dev-libs/wayland-protocols
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.12
 	)
 	X? (
 		x11-libs/libX11
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 55ae576ca114..f0448758f55b 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,5 @@
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.9.tar.xz 1759568 BLAKE2B 5e8d94c64d254f52c0e5f6926b5c0e8cc7ba065f00363e728e48d6dafb26e2cd5496fb20e3d81a1c4f5bf6165b6f13ed2b28eea31e6efd4f9e9256bed5bafc49 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7
-EBUILD xine-ui-0.99.10.ebuild 1912 BLAKE2B c3ee7cb696709c5ac0f96e4347cb0a344d9696a13bddb411bd9e752b771ca7e58d0aa30eb2ebd5f78e48aa7bc986a581b3926fc5926410af7c1f79503d35d7ca SHA512 9500d44b63514ac49853bdff5253bb07b0143f15442f6f1833e05c82bea68df037592e7efab78d2fa89d87e50d319ff0d339b2c02a329c5eefaed7b62dd84512
-EBUILD xine-ui-0.99.9.ebuild 1907 BLAKE2B d6279195e900834fc843225183f1c06e8b31723cde27606ff12971927d668128a1645143a71a01c3a35dcdfc54724ad62b12af1a8ac1ac4f158de6fde771f75d SHA512 fb80d210a88e3f01cd3d60e9bab73fc5af3918815a3ea3d90c1fdf6120bca47046816134e300e872a9a31f3f20cd37c92d7c5278094652e832fba80111968fd2
+EBUILD xine-ui-0.99.10.ebuild 1901 BLAKE2B 7266d73e30442b60ffd941f1074fe749d105b1307c15ab1b3587e9f2b1d54502e9ff22ae931bb1a8e0af211d4ddefa85b1f85d81170f7cf5a16839ac8d906c42 SHA512 d948983d5834e1f2f34b02744f04e56c9c57e6ff9cf21bebfcb17436589beac6bc60cfa7d032b6f58dcb6e1eb5cdc2c0dfddc88a9bf4398f9d32ce1d41b73196
+EBUILD xine-ui-0.99.9.ebuild 1896 BLAKE2B 06d87ab48f19bf0fdfee3cecac3f1961fa10ea7bcf2bbdc21fd598a82d97be8cb8742174a7ac1324184cf469b8dea1322e08e40133b986983ef5f7c196942da2 SHA512 ae3d41e072d4c65f50721d0ef22b75dac11db5f5a8e432b4f625a32c6c16a73665dbe3e79fa9804dbda58018fe8a3679fd4c7738fe14263cca578a39ad6053df
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index a01737dad30d..90ab46eefcff 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -78,13 +78,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild b/media-video/xine-ui/xine-ui-0.99.9.ebuild
index 1740be0f676c..87e7ac371634 100644
--- a/media-video/xine-ui/xine-ui-0.99.9.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -78,13 +78,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }