| 1 |
commit: 77bf3a442d06610b4d0c11b1772ebccecd9907c5 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 8 21:29:14 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 8 21:31:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bf3a44 |
| 7 |
|
| 8 |
app-emacs/ghc-mod: Clean duplicate patches. |
| 9 |
|
| 10 |
Thanks to Marty E. Plummer <hanetzer <AT> startmail.com>. |
| 11 |
|
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/7893 |
| 13 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
| 14 |
|
| 15 |
app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch | 11 ----------- |
| 16 |
app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch | 11 ----------- |
| 17 |
app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch | 4 ++-- |
| 18 |
app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild | 4 ++-- |
| 19 |
app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild | 4 ++-- |
| 20 |
5 files changed, 6 insertions(+), 28 deletions(-) |
| 21 |
|
| 22 |
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 |
| 23 |
deleted file mode 100644 |
| 24 |
index f852744aadb..00000000000 |
| 25 |
--- a/app-emacs/ghc-mod/files/ghc-mod-5.4.0.0-gentoo.patch |
| 26 |
+++ /dev/null |
| 27 |
@@ -1,11 +0,0 @@ |
| 28 |
---- ghc-mod.cabal.orig 2015-04-18 13:14:37.566613645 +0200 |
| 29 |
-+++ ghc-mod.cabal 2015-04-18 13:14:53.420241209 +0200 |
| 30 |
-@@ -26,8 +26,6 @@ |
| 31 |
- Category: GHC, Development |
| 32 |
- Cabal-Version: >= 1.14 |
| 33 |
- Build-Type: Custom |
| 34 |
--Data-Files: elisp/Makefile |
| 35 |
-- elisp/*.el |
| 36 |
- Data-Files: LICENSE COPYING.BSD3 COPYING.AGPL3 |
| 37 |
- Extra-Source-Files: ChangeLog |
| 38 |
- SetupCompat.hs |
| 39 |
|
| 40 |
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 |
| 41 |
deleted file mode 100644 |
| 42 |
index f852744aadb..00000000000 |
| 43 |
--- a/app-emacs/ghc-mod/files/ghc-mod-5.5.0.0-gentoo.patch |
| 44 |
+++ /dev/null |
| 45 |
@@ -1,11 +0,0 @@ |
| 46 |
---- ghc-mod.cabal.orig 2015-04-18 13:14:37.566613645 +0200 |
| 47 |
-+++ ghc-mod.cabal 2015-04-18 13:14:53.420241209 +0200 |
| 48 |
-@@ -26,8 +26,6 @@ |
| 49 |
- Category: GHC, Development |
| 50 |
- Cabal-Version: >= 1.14 |
| 51 |
- Build-Type: Custom |
| 52 |
--Data-Files: elisp/Makefile |
| 53 |
-- elisp/*.el |
| 54 |
- Data-Files: LICENSE COPYING.BSD3 COPYING.AGPL3 |
| 55 |
- Extra-Source-Files: ChangeLog |
| 56 |
- SetupCompat.hs |
| 57 |
|
| 58 |
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 |
| 59 |
index 40302168692..f7e6e1c4c65 100644 |
| 60 |
--- a/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch |
| 61 |
+++ b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch |
| 62 |
@@ -1,5 +1,5 @@ |
| 63 |
---- a/ghc-mod.cabal.org 2016-07-29 09:18:31.000000000 -0400 |
| 64 |
-+++ b/ghc-mod.cabal 2016-08-08 23:16:00.171679823 -0400 |
| 65 |
+--- a/ghc-mod.cabal |
| 66 |
++++ b/ghc-mod.cabal |
| 67 |
@@ -29,2 +29,0 @@ |
| 68 |
-Data-Files: elisp/Makefile |
| 69 |
- elisp/*.el |
| 70 |
|
| 71 |
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 |
| 72 |
index f46308b3aa0..3c52fd7d1b6 100644 |
| 73 |
--- a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild |
| 74 |
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2015 Gentoo Foundation |
| 77 |
+# Copyright 1999-2018 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=5 |
| 81 |
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND} |
| 82 |
SITEFILE=50${PN}-gentoo.el |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
- epatch "${FILESDIR}"/${PN}-5.4.0.0-gentoo.patch |
| 86 |
+ epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch |
| 87 |
} |
| 88 |
|
| 89 |
src_compile() { |
| 90 |
|
| 91 |
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 |
| 92 |
index 1a0636bb8be..82d7ae03eec 100644 |
| 93 |
--- a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild |
| 94 |
+++ b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild |
| 95 |
@@ -1,4 +1,4 @@ |
| 96 |
-# Copyright 1999-2016 Gentoo Foundation |
| 97 |
+# Copyright 1999-2018 Gentoo Foundation |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
EAPI=5 |
| 101 |
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND} |
| 102 |
SITEFILE=50${PN}-gentoo.el |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
- epatch "${FILESDIR}"/${PN}-5.5.0.0-gentoo.patch |
| 106 |
+ epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch |
| 107 |
} |
| 108 |
|
| 109 |
src_compile() { |
Archives