gentoo resync : 10.04.2018

6 files changed, 9 insertions, 33 deletions

diff --git a/app-emacs/ghc-mod/Manifest b/app-emacs/ghc-mod/Manifest
index f8431ec04e1e..1aeec1836a98 100644
--- a/app-emacs/ghc-mod/Manifest
+++ b/app-emacs/ghc-mod/Manifest
@@ -1,11 +1,9 @@
 AUX 50ghc-mod-gentoo.el 75 BLAKE2B 8b6c9f3d2a9d3d69700cbdf36a58a3bf07913e7a6369d9a53d39296fd31e2594564fdc20e123093908448acfed9d4d242fed4e93660a6a753ff9b551e6aeeaf0 SHA512 483a8d3e464aa4c3252b38bca4b9291a94080c04407df8f7c8ac110e14eb539c6795ae70ed3d6c217db39fd29a6be7c08b8bc295ef1fd2cd1d2aa7efeba7d0f4
-AUX ghc-mod-5.4.0.0-gentoo.patch 449 BLAKE2B 14576d7f969a53a72fd59facbcce154bbdb12fe8f7367ca4df06b288c5e474045d3a220e3a15b7d7a8d240a411cc866e69ff74ec7c4c2d9d62719353e7bd189a SHA512 71fd518ed4b47421e8edd837987b3cea30094bc4c5d74bf16e2154dc5d6873fccb44c037c7b15e6b5d7cf5598292b2abfa7a3ca404f30d450a7d2c3f4bcd41f1
-AUX ghc-mod-5.5.0.0-gentoo.patch 449 BLAKE2B 14576d7f969a53a72fd59facbcce154bbdb12fe8f7367ca4df06b288c5e474045d3a220e3a15b7d7a8d240a411cc866e69ff74ec7c4c2d9d62719353e7bd189a SHA512 71fd518ed4b47421e8edd837987b3cea30094bc4c5d74bf16e2154dc5d6873fccb44c037c7b15e6b5d7cf5598292b2abfa7a3ca404f30d450a7d2c3f4bcd41f1
-AUX ghc-mod-5.6.0.0-gentoo.patch 210 BLAKE2B 54779ece5c8d8a91f74534d3fea574c28dfc893eeb6a70b5846c612461c9e365035351deec26b4c4a0e806a5a66e0890b3ed2313f21fcd21cbbc622425f14dcd SHA512 85162dafbc6514cb9aef2b78f2ac116259e792c4654a1aee9c873824158ded69b5478310d474adeed10ea87024f0ace08b24440bc8fd1c6c0732618ec0244562
+AUX ghc-mod-5.6.0.0-gentoo.patch 134 BLAKE2B 51f5561d87628191bc070c3f4ce57d19bc0c784df483a24e1e90546014e1b74878514c13049f13efe12c81b59f2311ab1567970a1c792c316de7b44ed8f269a3 SHA512 34fda23f27d1ba0ccad898e9b6d5bbd2f3e2d235e692e910a76c35c894985d0453219b7ab53c4dacb8d3b88f7aea79f5badf92ad8eee90b764e7c1e009135e56
 DIST ghc-mod-5.4.0.0.tar.gz 132546 BLAKE2B 6670df6b271527ee2a69c74b0522b94e78e799b62d260ca744a382312c815e904d516345c6258be0d9aa82f91866126b95cc4682bc1925616078ffef1a559905 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415
 DIST ghc-mod-5.5.0.0.tar.gz 150774 BLAKE2B 87d2be174200f05da0f38a2947c4404c0b25ce77a03d3b456f8cde769e978bbe6fad6e2c04d1af61e05d61fb941c139c297baaeb4835c02390516a88bebbf539 SHA512 006f292394fc24766a2ae2c778635697a63e1b48ef96052af66dc35d1ef30eb600760cd2a517011a7a2b027a0c725ceb3b5e37cfe157741ba97f19068f1264e8
 DIST ghc-mod-5.7.0.0.tar.gz 146797 BLAKE2B b5d684dbb505001bfc061473cd62d00491bfe8ca5710cb69c72cb2544838a9a3b7d88d414be8123f9edf82cf96773f49439912a98efec843c167334d31caeaf8 SHA512 843cd0546c0a0cdf30dd9cde5e9148dabf391648bae6d7f2852c83a4cd5b8329f30d0cc578ba6afda02e8885b2ed63c7def4885e0dbaac199d311e476a0cc6e3
-EBUILD ghc-mod-5.4.0.0.ebuild 2605 BLAKE2B 2cd31947d4702f7939ffe89d9e9c9f13d3409c0ff4dba49cc2dc418e190b8f2bf9006f9f72bf2feb092dd9d15b4f8960d554b1330b6d9c47606ff4eb2d1932ae SHA512 12d41267fa77a2e9186a731835f961875056e0598f7e9986352f37c232fbd0d3843cc77f274a4ee16f08cc02bdfc3e6f4f09c796a86ea9f21fd93b6b6a0c1f56
-EBUILD ghc-mod-5.5.0.0-r1.ebuild 3063 BLAKE2B a390f559b492d2e0c5f362c3477951f9dc969d7b87dfcd2bad10cfc7e5c06f86a8dadcc5dd8573e2af287c3e15454619bae1833edf425b0936af04d77655519e SHA512 d1d6911a8b7b98ce052a8e9ff577b28f58e472bf50aa5514f0ccbda125bf898fb2dfdd566d4419c6e6895c75ce8bcf775975a460cb90983a6db5b9f6b54ea4a7
+EBUILD ghc-mod-5.4.0.0.ebuild 2605 BLAKE2B ae293eb8f1417d88a0659a5d4b2d4899c6f697f42e8090dfc34f69b7f1ee9056c0e58101f5367fa8b0877ef6833e89f4d81bdc7389901661083d647b1afc1ea4 SHA512 7432db717423e013f51521d7faea351f4138d0215f8ff80e0891d996a28ae3991bfd183c7929f09e324d00b490719e383b6434f592ef565125e1a1dbe32e0a8d
+EBUILD ghc-mod-5.5.0.0-r1.ebuild 3063 BLAKE2B 0982900342cfad1ebdd568ca17be7a624eb3881b98e762575aa1f88088d59830dad99e025feea0172801c72bf41b883644f02b56861e2edf478cccad85b52319 SHA512 a2e922544860a0de09a9fae0e37fa4ef2b6627478e8c085c9f5287f24bf943c95a00f390fefd97a4f9e50f21da58e38b8b3f9960e36c81031cde70670bf95278
 EBUILD ghc-mod-5.7.0.0.ebuild 3372 BLAKE2B b628625dae8816f22c811cf6c6fab880ce3f1721aca59fcf886a1f4d03875a4663f8b39042e16fca39947b031789453d0c4f18abd5884239db57d28a630ec704 SHA512 071a98379192e9470d9e10de2aec2f6737545de1553d888bdded5bdf125dcd5d66c3eb1ee390cbb6b24618dfb788c52a63c8e3610d2ded2a049c5d446697ac08
 MISC metadata.xml 703 BLAKE2B 633cfa473fd42566e57255fd97a3b92bb95b2d0e69fb108091aafa8b6d2293c19b8bd09308ad566bbe55ebebb92eed7cf1f70b0f0110384d79788b8b48ae3dfc SHA512 3aff74a7020a4e77247301e09821025a5e7fce4e39186e2a7b316c4c06f7e99b836bdce4d91ae190fa05e5481bbf1d33c12e440387797ee83403017e21559e31
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch
deleted file mode 100644
index f852744aadb9..000000000000
--- a/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghc-mod.cabal.orig	2015-04-18 13:14:37.566613645 +0200
-+++ ghc-mod.cabal	2015-04-18 13:14:53.420241209 +0200
-@@ -26,8 +26,6 @@
- Category:               GHC, Development
- Cabal-Version:          >= 1.14
- Build-Type:             Custom
--Data-Files:             elisp/Makefile
--                        elisp/*.el
- Data-Files:             LICENSE COPYING.BSD3 COPYING.AGPL3
- Extra-Source-Files:     ChangeLog
-                         SetupCompat.hs
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch
deleted file mode 100644
index f852744aadb9..000000000000
--- a/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghc-mod.cabal.orig	2015-04-18 13:14:37.566613645 +0200
-+++ ghc-mod.cabal	2015-04-18 13:14:53.420241209 +0200
-@@ -26,8 +26,6 @@
- Category:               GHC, Development
- Cabal-Version:          >= 1.14
- Build-Type:             Custom
--Data-Files:             elisp/Makefile
--                        elisp/*.el
- Data-Files:             LICENSE COPYING.BSD3 COPYING.AGPL3
- Extra-Source-Files:     ChangeLog
-                         SetupCompat.hs
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
index 40302168692a..f7e6e1c4c654 100644
--- a/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
+++ b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
@@ -1,5 +1,5 @@
---- a/ghc-mod.cabal.org	2016-07-29 09:18:31.000000000 -0400
-+++ b/ghc-mod.cabal	2016-08-08 23:16:00.171679823 -0400
+--- a/ghc-mod.cabal
++++ b/ghc-mod.cabal
 @@ -29,2 +29,0 @@
 -Data-Files:             elisp/Makefile
 -                        elisp/*.el
diff --git a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
index f46308b3aa0e..3c52fd7d1b66 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.0.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
index 1a0636bb8be0..82d7ae03eec4 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.5.0.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch
 }
 
 src_compile() {