gentoo resync : 28.04.2018

13 files changed, 184 insertions, 23 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index a9132482fd69..0981a7000f9d 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 9687fec43b5e..691a62df2ca4 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -18,10 +18,10 @@ DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a
 DIST libdvdnav-6.0.0-Leia-Alpha-1.tar.gz 138014 BLAKE2B dea8723c271fcc58ae61f9ebf0875aae7dc2237810dc0073b111dec7a2f4a23888716734022c68ef7376bf893ea94736fe98148b2b6cb24d0deef9679a189739 SHA512 24e3d7ebbf66ae9e75e234b3aea597c8f2d5e1a6f211d22900aa62d918e3dc38c80f2678c94fa360c100a630081573188ce7e15758843be7497011b96da89ec4
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 37521d50f9983290df5209db417e39ea4f3dcf5c36eafe9f75a8c23689c7302c29c4197e40eebb0f1b35cd16e5264e251a72548a0ce2ec2ba1a3a22c1768adaf SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2
 DIST libdvdread-6.0.0-Leia-Alpha-1.tar.gz 130629 BLAKE2B e7f5c08ed1aca3d35fad178d57b852587196bd250865a47ee7e9e60bca1f21967503e13dd947086a7be357bfceec55982600525c4927dadda72e21f2bf0632b0 SHA512 4fa4c7d6856713ccd10a022e699bb13dacab8682eceb8f0d30ec9266646e493f667000d36246b91330e68f1c59ce5c7cb26c531a123ce4f847678cef9bf32ea9
-EBUILD kodi-17.3-r1.ebuild 8577 BLAKE2B 89b0b422d7aafcd17a23d85e9821185e2afb7ae86e39cd0bee8355b7dbbd4478dc08f2010312d6af7a1987e33578b3a6db2c1b28549e2541c843617594168989 SHA512 be9bf1b24d6bcd3d797ee9f12a9495a7bd1245904b1a361a5bb67fff64eae69a9c5f8f3ae9b2a9c2aebe28b62c755135daeea7ae4f077e68ce5f0cad3169a78c
-EBUILD kodi-17.5-r1.ebuild 8830 BLAKE2B 8f09f8a724708f406157cb6a3acb81e06ca2c2f54bc81dab24b44b539ac1f3ca20cc450ce369fb516f7e8f80e0586af7e654418bca701e9df897e5f0f579a04d SHA512 68e7232a7a45afdfe8b042b4b999e2b7d803bf2812d021155636c40789ec713da025c7c8d01e094bc94121e7f8b22e6cccfc6871f99086646886059476da8df0
-EBUILD kodi-17.6-r1.ebuild 8741 BLAKE2B 63512c0c3c77736a551d2b0a255048a7579f852a5c3b592cb70581747dd7fc04a7beb9b1ceee60222266cb9e478e01f39dbb07f4e84f1a35b509bdb6552ff779 SHA512 6be7bb9f2bc68ef8dfbdf71972d221c503133f99ad42d1b434256d4c55fa6b9edeadc097f928c5176b1038d687b3dc5b38ce083aae969af6147e64562f68cf9e
-EBUILD kodi-17.6-r2.ebuild 8743 BLAKE2B d0d6014cc8735bf9cc273ca9848aff83c466257f551694c3dbd67ce3882b85f7dfab8c29302289f3406848935f8ee4700ad16e8ab7e9445ead5dca29d7d12fd4 SHA512 01ef54d3ae4404f768c126fac8a39ba66ebcf038104322a2f14bd903d336430d935f0201dc84d1025f9d1fd1ea4109de73c7de2342c8f47154a8b08e9c73a571
-EBUILD kodi-17.6.ebuild 8745 BLAKE2B 98d3a0a1b855474eb0bf68b49bbf26a229ad0e8d7a825f10aa131e423401de090bc237a1dae00da87575a851b5f62e27c086964f58afdc6b8e3649b5093b3bab SHA512 e0ab4f578136da46ae6910886d2a8239bf81acdb39256158d616d12a4a6ee168fb45424a3fbd5f31d110117223dcae85d9d881485d238c9c7f59101ca112cc57
-EBUILD kodi-9999.ebuild 8881 BLAKE2B 07f8111d393793eaa8dd7bf0fdc7741b2dfeeb378b6fa3ee4384fb1e5d3024483834b2dd4f1e344e1e072a2e15eadf02d34edb22a9e197f829e83656a4a5fb7b SHA512 22f94bf0d28fb1b25fcee1303f22e6fbfb1a55d2c9e6225d2109cc15a925292e533c9ec7682a4a1932d5ff71cd5e9f4e117d63a42bae29fb23c09a65383b3bff
+EBUILD kodi-17.3-r1.ebuild 8578 BLAKE2B 21fbf62bcfc7515fe2051b3ddd71cf8b08a222225865cf56e87e77fbd30ed73c2fad54d490557bb6c3e4f8e6d40c737d67177cc11110a9bff720b56eb09e6c1c SHA512 3fcf592b43f830ba32309d1e43192e3c6f40e9e882fe835c471d061e0aa3861f25f87fd1359e18be820eb21e32b7858c5a4285b02abf05686287a81beda02fd5
+EBUILD kodi-17.5-r1.ebuild 8831 BLAKE2B d000b959e2290f0b0d4a81f76f2f1b15eea719708355c40eec0c443b1a7a9afb024364852ce5ef49a95bbcce252217f3a0c0ded61a149bbe2c40d91613aa5471 SHA512 2f0f4a338862a6a2b6c7077e2cdab03555f720ba5a37ab56f4d7d27d7f474ae012b7f18841174c58cde0b1931ddf7a56a31ceddeee0d6e307b87a620b81df30c
+EBUILD kodi-17.6-r1.ebuild 8742 BLAKE2B 0312ac3de60702ef038f007d7c4f98739956769b335468425b17a6e1ba7a7e28e1cb86e6a109106d45818abf5a52b425cfb30b30928c80b842bb11c828131c62 SHA512 1662699a15383d3dded76b3a6aa473604075a59218723d0179da19ba7df996a21f9b8b85d2bcf7dec1ddbd7abca8243a54eaf657a962199c374f5d5d30d97d0d
+EBUILD kodi-17.6-r2.ebuild 8744 BLAKE2B 67d8bbffea4f9ab543a2099af0a843bfc10ff9d2905d0a713e0f7ed653bb991ed194cd1b8ddd03532658a532436db0344be0816f8d866aa3e3006799fec59d53 SHA512 dd81f1691b3a97567aa426f1383caf3dac95f6a5f12d40305206d05486601da656b90aa969dcc37df627823e23fd9f2c33678d28fba50cfb4cf64787a0b02c6b
+EBUILD kodi-17.6.ebuild 8746 BLAKE2B 395d3403c75cd6c73a28dce7bbb221d27e418edd84f575c2037d9a4c30f327339193c00d05a3ff56b875b7bc1df7190da75055ac338ef5713fc0d02a9b207e64 SHA512 b4ba942c94019328250e27b1158e8681f12c319ee9f32c633005ddade17a1c09a3e2c875282ba10c93eb3484e19e220bd1aa4e95f96d80f632c8881722172711
+EBUILD kodi-9999.ebuild 8986 BLAKE2B b6a4ac3ada1630cbdecf9d3d993f4f073dde633403d62a25222acbe5c7dbea67f84963e02bc23ee78b7babf2059b8b83accd5afd2cbaf722456bafbaf4369a22 SHA512 7df60a153371c5b776f912b5692d1d00896ef281d6a246bcd0814ef5d813b713c826d0f923f9cc8bcbdb77497661343e9b801c5614ec55dada9acf7e8ba2af16
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
index eb3d668f39fb..0cdd592a39a7 100644
--- a/media-tv/kodi/kodi-17.3-r1.ebuild
+++ b/media-tv/kodi/kodi-17.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-tv/kodi/kodi-17.5-r1.ebuild b/media-tv/kodi/kodi-17.5-r1.ebuild
index b92c08d6fe3a..07177ef2af00 100644
--- a/media-tv/kodi/kodi-17.5-r1.ebuild
+++ b/media-tv/kodi/kodi-17.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-tv/kodi/kodi-17.6-r1.ebuild b/media-tv/kodi/kodi-17.6-r1.ebuild
index 4d0f122c12cb..2ad92c9b0944 100644
--- a/media-tv/kodi/kodi-17.6-r1.ebuild
+++ b/media-tv/kodi/kodi-17.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-tv/kodi/kodi-17.6-r2.ebuild b/media-tv/kodi/kodi-17.6-r2.ebuild
index 2cabe7ef521d..bbe0f7a8e452 100644
--- a/media-tv/kodi/kodi-17.6-r2.ebuild
+++ b/media-tv/kodi/kodi-17.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild
index 1b8733326e66..9768b1c6e34f 100644
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ b/media-tv/kodi/kodi-17.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index aada1e2a2692..dc671f9b1bb2 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -71,7 +71,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libass-0.13.4
 	media-libs/mesa[egl]
 	>=media-libs/taglib-1.11.1
-	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
 	mysql? ( virtual/mysql )
 	>=net-misc/curl-7.56.1
 	nfs? ( >=net-fs/libnfs-2.0.0:= )
@@ -97,7 +101,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
 	wayland? (
-		>=dev-cpp/waylandpp-0.2.2:=
+		>=dev-cpp/waylandpp-0.2.3:=
 		media-libs/mesa[wayland]
 		>=dev-libs/wayland-protocols-1.7
 		>=x11-libs/libxkbcommon-0.4.1
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 2ea4c1c4b998..627b4fd47f0d 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,6 +4,8 @@ AUX systemd/plex-media-server.service 159 BLAKE2B d4988890f6424e0b9160e90df0125f
 AUX virtualenv_start_pms.patch 839 BLAKE2B 20d6a53b40a2c714153bc7f04c2bbad568b75197cd450cb52129cc3718fad1db09f9fe2a92e8608e1e95b710e0b4af58a373650ab4017438b63fe61132f13d75 SHA512 55fb8f3234942d10c0d6d1820fbab48b8a9f26f069031946dae551cde8b7d18d61ef36ec994719d2519687dc75e5ec27205702395a8af112bda720b7a62072aa
 DIST plexmediaserver_1.11.3.4803-c40bba82e_amd64.deb 108830880 BLAKE2B 7ed912756b8bdedb695c4cbf99d0565da53904814cedb8e026614b8db9bb638cbd437f35e05915d6d22221c87ecf1136ea9ae08797bca2ebbe4f2e0a861b4841 SHA512 0bda324e733b1e86e8dba7c10f6bab3e9dad5463113c5998059492bd7d4a49e105068d1d9313c9405d7a3c85c99e6528be6c0f1c9f52db115a1da1545a9485b5
 DIST plexmediaserver_1.12.1.4885-1046ba85f_amd64.deb 109238814 BLAKE2B 52f44e4531c3ffb4a7f6d6cc5fdaed97ce3b44a7469074c6c4e81a5a9991b7a371a40a3d4db30f8cab5e10ae6caeb9798822c541dc27b1f5597d464fdd0292c2 SHA512 8125fa8132b6ed928f08660ddbff6dd8855719c0833c4c2b5dc8193674d8d22148f95848ce8b500612b12379efbc6e180ea72b2f90d695e1bf40ba2705def8a4
+DIST plexmediaserver_1.12.3.4973-215c28d86_amd64.deb 109277946 BLAKE2B 6a868943c77a1355dd0a4dbe88323b937d827dbfe84e729cf1f5c5c7d4a7d44e9af7e69121a7e3cf9f5d60786c9877bd3e303d9d5d301c86f08984afb1062730 SHA512 1befe9196926bf4cabd1f9c746e958efc72392479a844f8c3d9161282618fe28e29dbb9c12ddccf5db5b852ae58cd43dc0d988f00732431e16106021c8618347
 EBUILD plex-media-server-1.11.3.ebuild 4676 BLAKE2B 61d01851e31c0ee8da3ade91cc5e99db6e8b073eef97558d9afa21a551c22e348beb1ca69b2b76b84be0737580a1ebaba8600eed1f9ead51e663d074af7a04c7 SHA512 ed3c3e5a5737f39b50d30c3c6115787caca16bb0a68899dc787deb1fa03a06d3ca8430249b5057177e75699d9ca786a21f64703b5c5db413bb029fc94889ef47
-EBUILD plex-media-server-1.12.1.ebuild 4737 BLAKE2B 7616fdb0cc751e2f3bc53e0abde76c632d72c7e516a83fbd36c17f22bb4405643cd785716661d104d187f02a3b473a780e1a5fd2e81f7ac88a68820343c82f36 SHA512 3fa4bffc755d2df496c28b4ce9b37ed661f60c4b5fba1f6f5718f6c43135d75086872a18e079932739463cf6e6afd337b1142a5d4ee03140bad9cd63df1aabf6
+EBUILD plex-media-server-1.12.1.ebuild 4736 BLAKE2B 0e73cd36cdde7bde7e33c934e3685a71a0107156ebb614acdb12513854192ab89ff4b371c807e3757776b30f517cf20d3e4be1793971c8871afc42288f9fa180 SHA512 e3e6c456ec19a751ed39b2dc33caef8ca13e3352ec0f314970aeae409364e6128f93337689995ad5e3e86f8e1ef963152dbf3e518bcf85b5c621fa3d15630133
+EBUILD plex-media-server-1.12.3.ebuild 4737 BLAKE2B e71844f154fbae97ef40ac486d71d02d09202fc02639818fd53186bce0536a98b6281df1bf831ed785971675a9dee2fafd46065915043dd44f8b27dcb11d5cdc SHA512 87685141af8041d51d0b6252760644a5ec5105a6722f5f0ee057bfd07bf2c098bea705daea48a81ad1da15d3119f8239b339e98e384207d0abc1a2dd8b330ef4
 MISC metadata.xml 272 BLAKE2B 084b8ae019863d5cda604c5cafb2ae06aaa78efedd73224cdddf5089fc709ef783841063c23d2d599dcea7d4c49770158d12dee34738322fc5933ca80fec71c5 SHA512 21fe9d289af64cd556f7c8edb452857c3285dec0e3b83a3be2e8a67dda1da59994ab70de86c78a5d9fe9a3c488ff82dc909f7e5fee946386bffb410b02caafdb
diff --git a/media-tv/plex-media-server/plex-media-server-1.12.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.12.1.ebuild
index 3997a207e48b..a79b2b6be859 100644
--- a/media-tv/plex-media-server/plex-media-server-1.12.1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.12.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64
 SLOT="0"
 LICENSE="Plex"
 RESTRICT="bindist strip"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
new file mode 100644
index 000000000000..51b3b7f13354
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils user systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="4973-215c28d86"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server"
+
+DESCRIPTION="A free media library that is intended for use with a plex client."
+HOMEPAGE="http://www.plex.tv/"
+SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* ~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-apps/fix-gnustack
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
+BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
+
+pkg_setup() {
+	enewgroup ${_USERNAME}
+	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local CONFIG_VANILLA="/etc/default/plexmediaserver"
+	local CONFIG_PATH="/etc/${_SHORTNAME}"
+	dodir "${CONFIG_PATH}"
+	insinto "${CONFIG_PATH}"
+	doins "${CONFIG_VANILLA#/}"
+	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -rf "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	local LOGGING_DIR="/var/log/pms"
+	dodir "${LOGGING_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
+	keepdir "${LOGGING_DIR}"
+
+	# Create default library folder with correct permissions
+	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
+	dodir "${DEFAULT_LIBRARY_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
+	keepdir "${DEFAULT_LIBRARY_DIR}"
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	# Disabling due to Bug 644694
+	#_handle_multilib
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has its own precompiled libraries.
+	_mask_plex_libraries_revdep
+
+	# Install systemd service file
+	local INIT_NAME="${PN}.service"
+	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
+	systemd_newunit "${INIT}" "${INIT_NAME}"
+
+	_remove_execstack_markings
+	_add_pax_markings
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	einfo ""
+	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
+}
+
+# Disabling the follow function due to Bug 644694.
+# We shouldn't register plex libraries in global
+# library path since this will cause other packages
+# on the system to break.
+
+# Finds out where the library directory is for this system
+# and handles ldflags as to not break library dependencies
+# during rebuilds.
+_handle_multilib() {
+	# Prevent revdep-rebuild, @preserved-rebuild breakage
+	cat > "${T}"/66plex <<-EOF || die
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
+	EOF
+
+	doenvd "${T}"/66plex
+}
+
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
+
+# Remove execstack flags from some libraries/executables
+# so that it works in hardened setups.
+_remove_execstack_markings() {
+	for f in "${EXECSTACKED_BINS[@]}"; do
+		# Unquoting 'f' so that expansion works.
+		fix-gnustack -f ${f} > /dev/null
+	done
+}
+
+# Add pax markings to some binaries so that they work on hardened setup.
+_add_pax_markings() {
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+}
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 39f2865084d8..aaae74fc45de 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -6,5 +6,5 @@ DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec
 EBUILD xmltv-0.5.57.ebuild 5401 BLAKE2B 0c4ca8aa05463ca5d41790431d844adefddad12def480b846b5a04273d8c7b3ff67d698af343d81eedc384c15fae90f093441972d3ed516944d2eb074a305b83 SHA512 881ec922d61a10fe6911e0fd9f6d3dcc15e58ba4ed480cf6eb79dddaf73d5b46fda6c0e084e83681a9ab4ea544bfc3c97722e9de2b8bd225008c50abe3b24e35
 EBUILD xmltv-0.5.67.ebuild 5971 BLAKE2B 3c5a941937f5d6fcb10bcd6762c53fd6bc7ad4b6caa83f568b15ac5f5b444e0293bdb9ecaf7d6d8cf3bdc712db5079ac293d8d0c3133ea7d0ac5a8374636643d SHA512 7b4b31e15a636959ebbf6c5190249524cf3f06cf6223651835e0b9035d84d750ef187d7abd36cd2a7338c52ba694146d332e64d26a96121b84187f79d87f774a
 EBUILD xmltv-0.5.68.ebuild 6280 BLAKE2B 8f089f19c0de98bbc11b4d3e12c448b747734d64c0b40aca835987341c93ba2c402b2fc473da3444abc7cf08045b98c7a1667940ff74859126bda010bd72a682 SHA512 b3df365bd447cd5380f00c17e569f33f3177d587c2dac357a6f2b658444298f77daa66d757450c3dae354a52455e28f18f9afc2d188e47e9401151350cec7cd5
-EBUILD xmltv-0.5.70.ebuild 5270 BLAKE2B f3fa105e78cad4a4d7efa5a1bb95b2bae3aa1c1c4a3b43cbb5da139bde0c6ff05ead8e2ec1ad10457383c2c66741b751d5357b320b304bb88f54e148860634b3 SHA512 83c242900b8a1329a4b544e59117f12b6e383d4736c5bb422e60f6ee62c1fd1553795bb4b27676cb4bd758f2c9a1c5a9b9a0f77805be8a59430d07d1f8eb33d1
+EBUILD xmltv-0.5.70.ebuild 5269 BLAKE2B 7425d098a995713ce9d3f09097772c7e2af2dc77015db95130b9ea4c1bf56afe48c7286f5f85b5e560850df734f1b4da09b1e3432ea3a0a83bbc4a8dd0e67a9b SHA512 c9567dfae53cfe951528f63f3309134da7a94450001b9fd858dca6c3055352e03c8adfc9fc26534da29f01bcc4c69c0e1d1bb3026bc884c1ddead6057be8d3ca
 MISC metadata.xml 3113 BLAKE2B 1b85dc12e84ff83cf2a703a2a4d6467a8f3cf59368d602957b3acf1962e22aa4fd89234aa7a7f9e0839295bb83755c7b0ef44529cac948afa20427fd72f8a1ac SHA512 c77c3598460917c623132854c822d8c9924910632964dc80a7bba2abf24530cb796f70eaf0cb0007869759a2a033baf6c0e5d6473cdb7a4b817e431ff11be1a6
diff --git a/media-tv/xmltv/xmltv-0.5.70.ebuild b/media-tv/xmltv/xmltv-0.5.70.ebuild
index dd339abb1baa..5f81716d88f5 100644
--- a/media-tv/xmltv/xmltv-0.5.70.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.70.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~x86-linux"
 
 IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_epg fi fi_sv
 fr fr_kazer huro il is it na_dd na_dtv na_tvmedia nl no_gf pt_meo se_swedb