diff options
| author | Ulrich Müller <ulm@gentoo.org> | 2018-04-08 23:29:14 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2018-04-08 23:31:54 +0200 |
| commit | 77bf3a442d06610b4d0c11b1772ebccecd9907c5 (patch) | |
| tree | 085f8b70259dbadfb81d0d04c1e09128b703a1cd /app-emacs | |
| parent | 961385ab4aad30f9c6f2c73cfcba21556d2051db (diff) | |
| download | gentoo-77bf3a442d06610b4d0c11b1772ebccecd9907c5.tar.gz gentoo-77bf3a442d06610b4d0c11b1772ebccecd9907c5.tar.xz | |
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
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch | 11 | ||||
| -rw-r--r-- | app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch | 11 | ||||
| -rw-r--r-- | app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch | 4 | ||||
| -rw-r--r-- | app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild | 4 | ||||
| -rw-r--r-- | app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild | 4 |
5 files changed, 6 insertions, 28 deletions
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 f852744aadb..00000000000 --- 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 f852744aadb..00000000000 --- 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 40302168692..f7e6e1c4c65 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 f46308b3aa0..3c52fd7d1b6 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 1a0636bb8be..82d7ae03eec 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() { |