app-emacs/ghc-mod: Clean duplicate patches.

Thanks to Marty E. Plummer <hanetzer@startmail.com>.

Closes: https://github.com/gentoo/gentoo/pull/7893
Package-Manager: Portage-2.3.28, Repoman-2.3.9

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 (file)
index f852744..0000000
--- 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 (file)
index f852744..0000000
--- 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 40302168692ab5c029ed79480d0e3c71811239c9..f7e6e1c4c654d6646e0854028ddacd65e1959f25 100644 (file)
--- 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 f46308b3aa0e5540834662b80d418df1f05e1dee..3c52fd7d1b66bdc90829d1b0fc8280e41b4f268a 100644 (file)
--- 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 1a0636bb8be039d9dc57667bbee1d1d8e19d7a1d..82d7ae03eec4500df5e1461ade27f7ded11d7747 100644 (file)
--- 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() {