gentoo resync : 13.10.2019

1 files changed, 15 insertions, 37 deletions

diff --git a/Manifest b/Manifest
index 033d8b4771db..5d3bb7663ea5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,45 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-<<<<<<< HEAD
-MANIFEST Manifest.files.gz 29632 BLAKE2B ed1f7816d1da2f33d6db863d9723327c69b6cb834b875f8290fa29eefe723e53ca95ff0bf53a38a3700c171e5c6a882417577022e3593afadbd9324dfffea092 SHA512 7ace8ac52b3015be764d340dae7c6a4a0f4103fcf55fb70a63089dac7a0d234d9901b0d5d2580faab8c0cce7e356e2627bdb5daad8fbfef0924a5e3514dceb20
-TIMESTAMP 2019-09-25T17:39:05Z
+MANIFEST Manifest.files.gz 29470 BLAKE2B d2127e54911d40d8a13c651861cb72428784d9d12272da87caf9bcc1cee42382a7bc87bb08b73fb18f3e1d1c68e1dea82d2b035e8b6a091af4eb41289951a73e SHA512 47c3d3a011a1765a6ddf94330f2466d50431c953573e130060fdb59c2de2f1786be18216159aca5abee040cd5b3866cb1f062cecd00944706d0d98145713598d
+TIMESTAMP 2019-10-13T20:38:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2LpjlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2ji2JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDwoxAAhW7IaSdDzjNLTfsNykO5zNjIxXF3lso3lW+iTVXgi2ZPMOxuge1K6Rxh
-YC4LD6NJEgQtlSXShQhDB5Lf5Ld9E5oDxJU8k36GEEJA9Hycr9DEW2FqIaqZN2Bd
-MyR9tU3z2lcoPcboUXyUOePO28AsWv6IBxDSQzKKjHino8z4qkPRTEpl9BCdonWo
-lxToi+rvQ/U2MVwE3s8zROtZaHon/4btnlu2y+hFXO4zjopYxB1r9I/V8yn9yriP
-xzJR7zxramDSmZUYgeaRQpiWit12iHcE6wbEUFICWxr2JYWiJxqt4AKig+ob5txY
-RokigUk3oshbpLZ3oWWGvU9nr2vA0Zw8NW7nYvnUD7dWKoaSa1LjO/s886sDgksb
-JbCBblv+qYGLqgarD6UBaANX/JtRaEuuPHTwtI919++HTqBQ9UDxys3fUUKk1Fr/
-nD3XziNRHT8SnMlvhy8Dvn5WU9gNFg5uQaqk9C+2aOWOBtczAmDrQxKrPxvM9qUN
-YwOWcmhA9SAtcJ+7sc0nsLxx1KSeK2HyUPu7e3H4B4QxPCfSE4hQKF+ep5alVuR5
-9ySWWb4rfJ2BplwZJBn8R29vB9sE5+aY7fkC+OAW0Nq5F9iwr6re1Ui4m0cl7yRE
-9L9IHIZCglFEPQe1LZiUKSRDpXmd6bf4VMgB+FP1rSAgqKL2DPE=
-=Agss
-=======
-MANIFEST Manifest.files.gz 29596 BLAKE2B 5a563e8b1c35d49483009a3c0a3584c45223dc08669b6d343a398048bed14216fa8c67e951223d01ba38f0350f79fdf79fb2e5a649295aa9db7a2f21aa32a507 SHA512 025e08feea505435f5da06653ab09c55831112eb9a0f2a2a4c9e0c8fdcc8352aef711710de9447f62841ccff85e2a2f6535b19d9b99f0070c953ba84c18ecf98
-TIMESTAMP 2019-09-28T05:09:01Z
------BEGIN PGP SIGNATURE-----
-
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2O6u1fFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
-RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDguQ/9ED8ahRcCOEDmmaTGmlAkv+/xIa4g6SQ+7vJaUOnElIEny37KeDohf+Fc
-HHep4hyaA95F/1pYqGSVu8Zy/+op2AARd4ILPFSRt424wFhOjE3PtPli2D4w3b0Z
-DHVytfTAhRmV/QoOMsWH1iGylEBuXfXjnf3HwwgFliSl0lT2CrQIviRzPKAIpue3
-M2KuuL1/dmQHPpxHnxkkx9sLC5AdSbzAmbPu7I11Uj6/f6kQEQtG7p4LRUFi8p2M
-lKta3W7cZ7ZPqa8iipQzGJNhd1/N7VcB5BlEilpIcDZXUEofwgj/wENfwQzsMamV
-liK9urbAmH85wozyyu34s4BvKpRzLS6dqpEVuAIMbkXS0UDRCh6eIxIW7vkGVCR0
-exx0pfoPoCqb6jwAvEEmWCn/e8IhmyaRXBYLEU+ObIYrCwkDZPP5k5yHELILQQcV
-dCGy1aegEDaw2lng0/ow6bDjNNM3KKou+GdkjjFggNsK/u9qSmfdOkpzQEyZfKLf
-QgvpVq6fw5X2TmZOYuQF5UIMxzkfwSIcbOnN73/gEII/BVVY2qhYpxidQUzo+36W
-VHgxah93rc7+K05EJvOzRNMCs3ldr6PVrI9AdJaivrPWw9QsqSy/PaGpaPQL80Le
-NIZ+QK+1y/iH6wMGuXTHEV9GNAjGJg0wxL7gy683wkAknujjsRM=
-=ul2O
->>>>>>> next
+klDKyhAAgLvcW9Zzu4k26mnSdln+ylaXHGeZzfSiDFjE+L+tna6YQ+C8Wm1Xqzi1
+ZH6uqiRg/EPcEBKzpAuTIGBs7pbNZvkb+icjorZyEkE0ySooCSyVlDHicYEuH/by
+VLR8bPFgTAbtKC5CObK4IJZAed+MpYqs4SK2fVBy4aCyj98PN6Pp4LkLxiZk4Ys1
+yy4icoqTGnGjfrS3OsfTIm88uApn/qDdWzhtv2FUhCtVjbzY0KxMDHV3THxJK4/h
+to5IInntojAYIYSNpI/Q9Y6lK5+DTJ1jeZxCNsR2MXKnxWcu3KBUHq9Fo7Y2jDr7
+0pD29eluFDHO/uVANRtSmgCnv7Got5Z86S4PVt7ak79KqL42Mj0QUTimyJEvajrR
+JQyPtyP/tg40iVi4CC5/b2r+ahjk1CCyxlrjtyAu4z/vsN3vVytHsmJhc04G+mZG
+l1kSF417hjc/V5vdht5ZvGzcdAE3vM3JpmLmV4UzXemXvoy7GfQV5FsvjYxQnIr/
+JH97UJ1cnJg/CpzmVpry0nYhe2XaVjEIlWxl4WxsFcEKrHYsw0BT7g8NCzN+I2xc
+JU5EuE9/gjGBNomVz+wE6xqN0ik+ST5an+IXruQTRI3zDLNuQ0sHSbYua+fzGM3s
+4n5kkEgpivaPPO2j9124sNJzdja9tn72SsaGIq5VZ2otjnyGaFY=
+=1Faj
 -----END PGP SIGNATURE-----