gentoo resync : 07.07.2018

7 files changed, 12 insertions, 6 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 6bdade2948f4..93767418e2f4 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 18d0870341d0..1493bb6dce3e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -26,5 +26,5 @@ EBUILD kodi-17.6-r2.ebuild 8744 BLAKE2B 67d8bbffea4f9ab543a2099af0a843bfc10ff9d2
 EBUILD kodi-17.6-r3.ebuild 8618 BLAKE2B 17bd96da57cc644b97bff5b37ec2929d71e4fd57b952973f6b744826679f103f085e841ebd8db779b73c8d7ae81c5ff899ab9dae67b65c6b1fe601c2e193bce9 SHA512 01158cbba4f8156c6c62c4fecb86e5cd769ca63b9b5a1f8fec6cc293e1efab5a6cc41f4689ec20404aaadec5d8be56ec68ea90ef142f1ef95cdc633d05bdb612
 EBUILD kodi-17.6-r4.ebuild 8666 BLAKE2B 9f4de45d367398d5c144c189b46b3524c075f3d757e6340a48826747aefeaabef2c7b06d620d2d2011ae9ee87b982ad13f68899af00140f604fa404cb6b019f1 SHA512 bd24505ce883e63bf98059495bd6b1adcc8e6d76b7cdf846cfa88983caaba15f3818d686f1530d5dabd5903d31921fba8efd0fb39da7e0bd237615041a4e8ce2
 EBUILD kodi-17.6.ebuild 8746 BLAKE2B 395d3403c75cd6c73a28dce7bbb221d27e418edd84f575c2037d9a4c30f327339193c00d05a3ff56b875b7bc1df7190da75055ac338ef5713fc0d02a9b207e64 SHA512 b4ba942c94019328250e27b1158e8681f12c319ee9f32c633005ddade17a1c09a3e2c875282ba10c93eb3484e19e220bd1aa4e95f96d80f632c8881722172711
-EBUILD kodi-9999.ebuild 8906 BLAKE2B bf0594c8aa841441d869a8e630f38b160b456f30418b3793e7888fcbe93892cb35d0f93492fc878769741e89b7526ed99db5d300f471f007bf928ad930610021 SHA512 da5fe187761dcdc7b393ac7d950b34427a428f9d0757b0b4c8a9a7fac31f95cc48d40c91c1dd616fcf98b79bcfeb7d95a336f684b5d6eb8e046f3a247f812ede
+EBUILD kodi-9999.ebuild 8905 BLAKE2B 28bd8ebb90a371d9da30f62f3fd2146ed8f8b05240b4f6bbe15e0ec42bcec012b86a69fbd0b1edda089ecdff0c0c4a7cc2aa6db950edf816f75cb35f417e6649 SHA512 09f10352ac6fd085bb43a0f9fd9c1680a7c9c1409ea320fdc3fe7da4a5560da0a112ffa839c64a0c51787b13ad297298d6ee3a3f664f57a0cdadeb67122f4d9b
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 554523916aee..50e6c8b36d35 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -296,7 +296,7 @@ src_install() {
 
 	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.md,copying.txt}* || die
 
 	newicon media/icon48x48.png kodi.png
 
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 8678c00295f5..a8f9127cf1e4 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -7,5 +7,5 @@ DIST plexmediaserver_1.12.3.4973-215c28d86_amd64.deb 109277946 BLAKE2B 6a868943c
 DIST plexmediaserver_1.13.2.5154-fd05be322_amd64.deb 111093662 BLAKE2B 26b1161107a8f9223f7065ff4119a32470c06794a159a42181b9278107a6d14f9fbb582e515223aaa659e9007d9b18299cd65b2a068e1d7dd934d52552a44cd1 SHA512 548c033272d56f6c54ab073536327b285fdbda3192c203a3ea3ff2b6c7afbc79ba7d56d7251f623ca1e09db572c92000d7baa7a8a555d853d85fdb9d1dfb8479
 EBUILD plex-media-server-1.11.3.ebuild 4677 BLAKE2B a383ba8725a3b464d4f26df41db9823b6f63d704d7071723a92d03e07b3e40619afefeb64991e4a9051a47c0d2943416aa3da906cccd9033fbb8d91d29a1fab0 SHA512 b2b97885dc31e520aac8278df291c03c81169931940ec65aa5197957dee2bffb18ac32e11c1e049b14a196a9b5c096f210b439efd7800e9cac8d7e3743193682
 EBUILD plex-media-server-1.12.3.ebuild 4737 BLAKE2B a08d70d804e55777bdda1b67ed3438cb94013f93c2020a1c175c4839c0dc3d6f2727045be262a8ff01225666d006899dd11817f9d2309ea6b788744c8ee1c4de SHA512 18e182da95d918349f59bec88f860442dd4bef8778abbde77db8d7cd88db9c83dfb6f654afff9554101880a87542e7309f2e3411a70e159990e1417d86f97af3
-EBUILD plex-media-server-1.13.2.ebuild 4738 BLAKE2B c904b7d9c462174c177242815e9e3fdec358b3994efc8877e280308c27b11d8b11eeb2228fc8599dfda7aa9c79bc20f1142d754d258a9f4a23c5a7c01345e838 SHA512 f10c781f83c466621c0a9c71ce830b45cd6a2d075af6ea7a8419f7fe4fd93f2fa76377db048aab3d85db3834d57bdc157a853428357933c5f727799cc4b401d5
+EBUILD plex-media-server-1.13.2-r1.ebuild 5115 BLAKE2B b37cfd6a579c959ecee460e5e519581a078e37ecc1285489df2e3bb235306b31563ab5b40cf1a1ee806ac907eb4b548048f5fa91cac5b9045df77abf1a591507 SHA512 c2406e229ba4a921888f028b3664d9b49dcacc36030d9fbbc5b00f51daf12a5bfa5ccc9d27c61d16d134f3d93aed8e0eb5d45114b65c767e6cc14bf3b9f21fd8
 MISC metadata.xml 272 BLAKE2B 084b8ae019863d5cda604c5cafb2ae06aaa78efedd73224cdddf5089fc709ef783841063c23d2d599dcea7d4c49770158d12dee34738322fc5933ca80fec71c5 SHA512 21fe9d289af64cd556f7c8edb452857c3285dec0e3b83a3be2e8a67dda1da59994ab70de86c78a5d9fe9a3c488ff82dc909f7e5fee946386bffb410b02caafdb
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
index 63a8831254d1..62c09b5f2ab2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
@@ -135,7 +135,13 @@ _handle_multilib() {
 # 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
+
+	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+	# Thus we will match upstream's directory automatically. If upstream switches their location,
+	# then so should we.
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
 }
 
 # Remove execstack flags from some libraries/executables
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index a11b247b1dd9..7b3084e46638 100644
--- a/media-tv/tvnamer/Manifest
+++ b/media-tv/tvnamer/Manifest
@@ -1,5 +1,5 @@
 DIST tvnamer-2.3.tar.gz 44415 BLAKE2B 7623dbd90bfc793b97f4e642a294034b46191765ceb0aca9c0f250303c1199b954db06321bbd85cc1683e3dbdb426a75ad445d0b4a1d3d64939b24e610396c28 SHA512 b1b0ac4e665a04215cb3d4e738197285c800c554b276e56ccd14af17fc624ffe7dab92b208f9791806045eb1ad0a59d6e76e52464e488f919e48dff2a879d96c
 DIST tvnamer-2.4.tar.gz 45272 BLAKE2B d00c584b95f2f1e3878dbf8618c9829412838b5ce72086b52620960a5d2a7b79768a78ae5e67230d7a83f12d1918f2428c5c0cccaadd1f08e5d4b1908ae31d34 SHA512 9271dca535910abed3f5ce24de4e65f7b951d2b6f80e07854bef06d52f7cdf40be8eb76934467ebae08bf919503a434c527a37caade1a3e696fbceb4446884fd
 EBUILD tvnamer-2.3.ebuild 460 BLAKE2B a435d47ef60000bba61770041965a6413e65bec017d00d1c8a5adbb91bafeeb8c43265007353ca31f3086037b15f0a531d74f8f055e7ee36e55de59e83ef9863 SHA512 a6e53665b9c6f660b67f47cb1ca91cd1a69332b1ec5136cf47a36038e38d60e1a39cf8851db0fc1dbfacdb5a541a39f19f94b2cd8dda96ce37e4a4eb78d12a0c
-EBUILD tvnamer-2.4.ebuild 515 BLAKE2B a105faa0eea4a78efe7cabb13998ac0c3fb485469b0826ac06a16e93c79621a6c9849a563c3705d199c2e44dd114574b75657be315270e373eeff05dd5bb8cfe SHA512 63a30f378b0ae4b222c8f2a76e863c80f1b3d3820d5b27c612be61aad676dec15a9ccdfc9b8c2c6b7c046a04fcc1c6e97e8acb4422b809b1c360fd101664a7fb
+EBUILD tvnamer-2.4.ebuild 513 BLAKE2B 0e2206fe3d0cf78b0dbf20ea5a952c18ab52d4c85287b3e1c11b40f7041ef207621a61ba0b3032724736762e20853836449913e5781aafed9662b3909e1d8da1 SHA512 408b737ac93caa071e6fc27fb26ac7164bb31ed351a828e6f79d3690807e804c49298f5745ff661eb13376717cce6684aaf77df4ca46845480c6c66e31474d75
 MISC metadata.xml 379 BLAKE2B 79d429f9497154662e75f4693ab95c5251d65ed6ea06d3870e1f2a639cd470a9207d02ade929f10f9d0d7b0e91ad9629a899546ea02f40b6a4e5aeb5f846716e SHA512 d7a09db1fcdc1ec0b6fb78769fd219248bb4c5e858273d45554d5ac2021678a5d97f9b81cfbcd2ae05a1f9446c1c218463e8375d195335613df5834617463ae6
diff --git a/media-tv/tvnamer/tvnamer-2.4.ebuild b/media-tv/tvnamer/tvnamer-2.4.ebuild
index 1a7e6c6b35b4..b09e2438c1d8 100644
--- a/media-tv/tvnamer/tvnamer-2.4.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/tvdb_api-1.10_pre[${PYTHON_USEDEP}]"