1 |
commit: 40bf37bd9f3b2d730a9d1c04c476dad670d091f7 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 9 07:59:30 2017 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 9 07:59:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bf37bd |
7 |
|
8 |
app-emacs/magit: cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
app-emacs/magit/Manifest | 2 -- |
13 |
app-emacs/magit/magit-1.2.2.ebuild | 40 ------------------------------------- |
14 |
app-emacs/magit/magit-2.10.2.ebuild | 29 --------------------------- |
15 |
app-emacs/magit/metadata.xml | 3 --- |
16 |
4 files changed, 74 deletions(-) |
17 |
|
18 |
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest |
19 |
index 7495084a6ae..b5ac2de0596 100644 |
20 |
--- a/app-emacs/magit/Manifest |
21 |
+++ b/app-emacs/magit/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
-DIST magit-1.2.2.tar.gz 111245 BLAKE2B 357da63085cfc934eafbbef3439880e12e9baac1e47be08e30803b9c51fba7cc6ec616fc2996da6795e95d331e71da8934a107ccc661b907550f33eabb99d17d SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a |
24 |
-DIST magit-2.10.2.tar.gz 429389 BLAKE2B d197a1d4ad2e6dccbe693ca9daf44cde91d276cddc8b9d07f13b12c907afe0a2a7591419f909ddeb1b8c107ce8a529d562a0a4cdd1d2f888367a1fb552d2b4fe SHA512 3309824a4a9fe36316912911f53a1c9aa8f93230b6461cf4bbcb9cdb38d474ba59c8450fe1722155959c8cf5610358ea9ec28723cdbbce226219f4cf1c5c4bd2 |
25 |
DIST magit-2.10.3.tar.gz 430343 BLAKE2B 61afda0c50ca315d1d601ddaa2b6df2425a83d6dd3f501f5499df446c8498db0846d2ec58c7f1760933c0d05aec89d4b39d2ea19297f1302a156a97e29f3bd0c SHA512 54cd4c54548583972111ffb18c3b4e0834e061d84d071d5b559fe4b800872eadc214d01c8efc4452ed725184ec5bb1954e897d94fdb82397c9e953aa7236532b |
26 |
DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6 |
27 |
DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed |
28 |
|
29 |
diff --git a/app-emacs/magit/magit-1.2.2.ebuild b/app-emacs/magit/magit-1.2.2.ebuild |
30 |
deleted file mode 100644 |
31 |
index 01a953c9b50..00000000000 |
32 |
--- a/app-emacs/magit/magit-1.2.2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,40 +0,0 @@ |
35 |
-# Copyright 1999-2015 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-inherit elisp |
41 |
- |
42 |
-DESCRIPTION="An Emacs mode for GIT" |
43 |
-HOMEPAGE="http://magit.github.io/" |
44 |
-SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="GPL-3+ FDL-1.2+" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
49 |
-IUSE="contrib" |
50 |
-RESTRICT="test" |
51 |
- |
52 |
-SITEFILE="50${PN}-gentoo.el" |
53 |
- |
54 |
-src_compile() { |
55 |
- # The upstream build system ignores errors during byte-compilation |
56 |
- # and happily installs broken files, causing errors at runtime. |
57 |
- # Call elisp-compile, in order to catch them here already. |
58 |
- elisp-compile *.el |
59 |
- emake core docs |
60 |
- use contrib && emake contrib |
61 |
- rm 50magit.el magit-pkg.el || die |
62 |
-} |
63 |
- |
64 |
-src_install() { |
65 |
- elisp-install ${PN} *.{el,elc} |
66 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
67 |
- doinfo magit.info |
68 |
- dodoc README.md |
69 |
- |
70 |
- if use contrib; then |
71 |
- elisp-install ${PN} contrib/*.{el,elc} |
72 |
- dobin contrib/magit |
73 |
- fi |
74 |
-} |
75 |
|
76 |
diff --git a/app-emacs/magit/magit-2.10.2.ebuild b/app-emacs/magit/magit-2.10.2.ebuild |
77 |
deleted file mode 100644 |
78 |
index 490d7199ec4..00000000000 |
79 |
--- a/app-emacs/magit/magit-2.10.2.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,29 +0,0 @@ |
82 |
-# Copyright 1999-2017 Gentoo Foundation |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=5 |
86 |
-NEED_EMACS=24 |
87 |
- |
88 |
-inherit elisp |
89 |
- |
90 |
-DESCRIPTION="A Git porcelain inside Emacs" |
91 |
-HOMEPAGE="https://magit.vc/" |
92 |
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz" |
93 |
- |
94 |
-LICENSE="GPL-3+" |
95 |
-SLOT="0" |
96 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
97 |
- |
98 |
-S="${WORKDIR}/${P}/lisp" |
99 |
-SITEFILE="50${PN}-gentoo.el" |
100 |
-ELISP_TEXINFO="../Documentation/*.texi" |
101 |
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt" |
102 |
- |
103 |
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.10" |
104 |
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4" |
105 |
-DEPEND="${DEPEND} sys-apps/texinfo" |
106 |
- |
107 |
-src_prepare() { |
108 |
- default |
109 |
- echo "(setq magit-version \"${PV}\")" > magit-version.el || die |
110 |
-} |
111 |
|
112 |
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml |
113 |
index e7019045770..122cc974266 100644 |
114 |
--- a/app-emacs/magit/metadata.xml |
115 |
+++ b/app-emacs/magit/metadata.xml |
116 |
@@ -15,9 +15,6 @@ |
117 |
support for cherry picking, reverting, merging, rebasing, and other common |
118 |
Git operations. |
119 |
</longdescription> |
120 |
-<use> |
121 |
- <flag name="contrib">Install user-contributed files</flag> |
122 |
-</use> |
123 |
<upstream> |
124 |
<remote-id type="github">magit/magit</remote-id> |
125 |
</upstream> |