1 |
commit: 3533eb6746b13e6ceec83ba4681572d0fba97f60 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 9 11:50:21 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 9 11:50:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3533eb67 |
7 |
|
8 |
app-editors/nano: Removed old. |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
app-editors/nano/Manifest | 2 - |
14 |
.../files/nano-2.8.7-minimal_compile_fix.patch | 38 ---------- |
15 |
app-editors/nano/files/nano-3.0-misbinding.patch | 46 ------------ |
16 |
app-editors/nano/nano-2.8.7.ebuild | 87 ---------------------- |
17 |
app-editors/nano/nano-3.0-r1.ebuild | 87 ---------------------- |
18 |
5 files changed, 260 deletions(-) |
19 |
|
20 |
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest |
21 |
index dec79ce6f4d..3c2159b4f06 100644 |
22 |
--- a/app-editors/nano/Manifest |
23 |
+++ b/app-editors/nano/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79 |
26 |
DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d |
27 |
-DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1 |
28 |
DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03bc0bebafc458f4766561962c94f22f84cf714ece7052670c987272029d3fd6cbda20e5f09460d3bcc0ce1 SHA512 86cc1210cbc45ce2e392d6888e6e22a9214afcc24e95657f7bdb4c59476b4bea2e8ebd8b23c06b32f3acfe1da6da689135f25fcf09db34f6b1dfcc838ea5528f |
29 |
|
30 |
diff --git a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch |
31 |
deleted file mode 100644 |
32 |
index ef8d7491016..00000000000 |
33 |
--- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch |
34 |
+++ /dev/null |
35 |
@@ -1,38 +0,0 @@ |
36 |
-From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001 |
37 |
-From: Benno Schulenberg <bensberg@×××××××.nl> |
38 |
-Date: Tue, 29 Aug 2017 19:28:44 +0200 |
39 |
-Subject: tweaks: fix compilation when configured with --enable-tiny |
40 |
- |
41 |
-When moving the cursor to the top-left corner, it is not necessary |
42 |
-to compute leftedge because firstcolumn IS the relevant leftedge. |
43 |
- |
44 |
-Reported-by: Jordi Mallach <jordi@××××××.org> |
45 |
---- |
46 |
- src/move.c | 4 ++-- |
47 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
48 |
- |
49 |
-diff --git a/src/move.c b/src/move.c |
50 |
-index d138356..ce276e4 100644 |
51 |
---- a/src/move.c |
52 |
-+++ b/src/move.c |
53 |
-@@ -121,7 +121,7 @@ void do_page_up(void) |
54 |
- openfile->current = openfile->edittop; |
55 |
- openfile->current_y = 0; |
56 |
- |
57 |
-- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); |
58 |
-+ leftedge = openfile->firstcolumn; |
59 |
- target_column = 0; |
60 |
- } else |
61 |
- get_edge_and_target(&leftedge, &target_column); |
62 |
-@@ -152,7 +152,7 @@ void do_page_down(void) |
63 |
- openfile->current = openfile->edittop; |
64 |
- openfile->current_y = 0; |
65 |
- |
66 |
-- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); |
67 |
-+ leftedge = openfile->firstcolumn; |
68 |
- target_column = 0; |
69 |
- } else |
70 |
- get_edge_and_target(&leftedge, &target_column); |
71 |
--- |
72 |
-cgit v1.0-41-gc330 |
73 |
- |
74 |
|
75 |
diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch |
76 |
deleted file mode 100644 |
77 |
index 2312edcff06..00000000000 |
78 |
--- a/app-editors/nano/files/nano-3.0-misbinding.patch |
79 |
+++ /dev/null |
80 |
@@ -1,46 +0,0 @@ |
81 |
-From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001 |
82 |
-From: Benno Schulenberg <bensberg@×××××××.nl> |
83 |
-Date: Wed, 12 Sep 2018 13:18:17 +0200 |
84 |
-Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't |
85 |
- use KEY_BSP |
86 |
- |
87 |
-When curses gives no code for Ctrl+Shift+Delete, do not fall back |
88 |
-to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to |
89 |
-'cutwordleft'. |
90 |
- |
91 |
-This fixes https://savannah.gnu.org/bugs/?54642. |
92 |
- |
93 |
-Bug was introduced with version 3.0, commit e6429e78. |
94 |
---- |
95 |
- src/nano.c | 2 +- |
96 |
- src/nano.h | 1 + |
97 |
- 2 files changed, 2 insertions(+), 1 deletion(-) |
98 |
- |
99 |
-diff --git a/src/nano.c b/src/nano.c |
100 |
-index c7e0ca2d..74e12439 100644 |
101 |
---- a/src/nano.c |
102 |
-+++ b/src/nano.c |
103 |
-@@ -2580,7 +2580,7 @@ int main(int argc, char **argv) |
104 |
- controlhome = get_keycode("kHOM5", CONTROL_HOME); |
105 |
- controlend = get_keycode("kEND5", CONTROL_END); |
106 |
- controldelete = get_keycode("kDC5", CONTROL_DELETE); |
107 |
-- controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE); |
108 |
-+ controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE); |
109 |
- #ifndef NANO_TINY |
110 |
- /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */ |
111 |
- shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT); |
112 |
-diff --git a/src/nano.h b/src/nano.h |
113 |
-index e1042759..7de34bf3 100644 |
114 |
---- a/src/nano.h |
115 |
-+++ b/src/nano.h |
116 |
-@@ -588,6 +588,7 @@ enum |
117 |
- #define SHIFT_CONTROL_DOWN 0x414 |
118 |
- #define SHIFT_CONTROL_HOME 0x415 |
119 |
- #define SHIFT_CONTROL_END 0x416 |
120 |
-+#define CONTROL_SHIFT_DELETE 0x417 |
121 |
- #define ALT_LEFT 0x421 |
122 |
- #define ALT_RIGHT 0x422 |
123 |
- #define ALT_UP 0x423 |
124 |
--- |
125 |
-2.17.1 |
126 |
- |
127 |
|
128 |
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild |
129 |
deleted file mode 100644 |
130 |
index 9c57e32be25..00000000000 |
131 |
--- a/app-editors/nano/nano-2.8.7.ebuild |
132 |
+++ /dev/null |
133 |
@@ -1,87 +0,0 @@ |
134 |
-# Copyright 1999-2018 Gentoo Foundation |
135 |
-# Distributed under the terms of the GNU General Public License v2 |
136 |
- |
137 |
-EAPI="6" |
138 |
- |
139 |
-inherit eutils flag-o-matic |
140 |
-if [[ ${PV} == "9999" ]] ; then |
141 |
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" |
142 |
- inherit git-r3 autotools |
143 |
-else |
144 |
- MY_P=${PN}-${PV/_} |
145 |
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz" |
146 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
147 |
-fi |
148 |
- |
149 |
-DESCRIPTION="GNU GPL'd Pico clone with more functionality" |
150 |
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" |
151 |
- |
152 |
-LICENSE="GPL-3" |
153 |
-SLOT="0" |
154 |
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" |
155 |
- |
156 |
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] |
157 |
- sys-libs/ncurses:0=[static-libs(+)] |
158 |
- magic? ( sys-apps/file[static-libs(+)] ) |
159 |
- nls? ( virtual/libintl ) |
160 |
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" |
161 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
162 |
-DEPEND="${RDEPEND} |
163 |
- nls? ( sys-devel/gettext ) |
164 |
- virtual/pkgconfig |
165 |
- static? ( ${LIB_DEPEND} )" |
166 |
- |
167 |
-PATCHES=( |
168 |
- "${FILESDIR}/${P}-minimal_compile_fix.patch" #629510 |
169 |
-) |
170 |
- |
171 |
-src_prepare() { |
172 |
- default |
173 |
- if [[ ${PV} == "9999" ]] ; then |
174 |
- eautoreconf |
175 |
- fi |
176 |
-} |
177 |
- |
178 |
-src_configure() { |
179 |
- use static && append-ldflags -static |
180 |
- local myconf=( |
181 |
- --bindir="${EPREFIX}"/bin |
182 |
- --htmldir=/trash |
183 |
- $(use_enable !minimal color) |
184 |
- $(use_enable !minimal multibuffer) |
185 |
- $(use_enable !minimal nanorc) |
186 |
- --disable-wrapping-as-root |
187 |
- $(use_enable magic libmagic) |
188 |
- $(use_enable spell speller) |
189 |
- $(use_enable justify) |
190 |
- $(use_enable debug) |
191 |
- $(use_enable nls) |
192 |
- $(use_enable unicode utf8) |
193 |
- $(use_enable minimal tiny) |
194 |
- $(usex ncurses --without-slang $(use_with slang)) |
195 |
- ) |
196 |
- case ${CHOST} in |
197 |
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 |
198 |
- esac |
199 |
- econf "${myconf[@]}" |
200 |
-} |
201 |
- |
202 |
-src_install() { |
203 |
- default |
204 |
- rm -rf "${D}"/trash |
205 |
- |
206 |
- dodoc doc/sample.nanorc |
207 |
- docinto html |
208 |
- dodoc doc/faq.html |
209 |
- insinto /etc |
210 |
- newins doc/sample.nanorc nanorc |
211 |
- if ! use minimal ; then |
212 |
- # Enable colorization by default. |
213 |
- sed -i \ |
214 |
- -e '/^# include /s:# *::' \ |
215 |
- "${ED%/}"/etc/nanorc || die |
216 |
- fi |
217 |
- |
218 |
- dodir /usr/bin |
219 |
- dosym ../../bin/nano /usr/bin/nano |
220 |
-} |
221 |
|
222 |
diff --git a/app-editors/nano/nano-3.0-r1.ebuild b/app-editors/nano/nano-3.0-r1.ebuild |
223 |
deleted file mode 100644 |
224 |
index 44b716308be..00000000000 |
225 |
--- a/app-editors/nano/nano-3.0-r1.ebuild |
226 |
+++ /dev/null |
227 |
@@ -1,87 +0,0 @@ |
228 |
-# Copyright 1999-2018 Gentoo Foundation |
229 |
-# Distributed under the terms of the GNU General Public License v2 |
230 |
- |
231 |
-EAPI=7 |
232 |
- |
233 |
-inherit flag-o-matic |
234 |
-if [[ ${PV} == "9999" ]] ; then |
235 |
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" |
236 |
- inherit git-r3 autotools |
237 |
-else |
238 |
- MY_P="${PN}-${PV/_}" |
239 |
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" |
240 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
241 |
-fi |
242 |
- |
243 |
-DESCRIPTION="GNU GPL'd Pico clone with more functionality" |
244 |
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" |
245 |
- |
246 |
-LICENSE="GPL-3" |
247 |
-SLOT="0" |
248 |
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" |
249 |
- |
250 |
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] |
251 |
- sys-libs/ncurses:0=[static-libs(+)] |
252 |
- magic? ( sys-apps/file[static-libs(+)] ) |
253 |
- nls? ( virtual/libintl ) |
254 |
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" |
255 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
256 |
-DEPEND="${RDEPEND} |
257 |
- nls? ( sys-devel/gettext ) |
258 |
- virtual/pkgconfig |
259 |
- static? ( ${LIB_DEPEND} )" |
260 |
- |
261 |
-PATCHES=( |
262 |
- "${FILESDIR}"/${P}-misbinding.patch |
263 |
-) |
264 |
- |
265 |
-src_prepare() { |
266 |
- default |
267 |
- if [[ ${PV} == "9999" ]] ; then |
268 |
- eautoreconf |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-src_configure() { |
273 |
- use static && append-ldflags -static |
274 |
- local myconf=( |
275 |
- --bindir="${EPREFIX}"/bin |
276 |
- --htmldir=/trash |
277 |
- $(use_enable !minimal color) |
278 |
- $(use_enable !minimal multibuffer) |
279 |
- $(use_enable !minimal nanorc) |
280 |
- --disable-wrapping-as-root |
281 |
- $(use_enable magic libmagic) |
282 |
- $(use_enable spell speller) |
283 |
- $(use_enable justify) |
284 |
- $(use_enable debug) |
285 |
- $(use_enable nls) |
286 |
- $(use_enable unicode utf8) |
287 |
- $(use_enable minimal tiny) |
288 |
- $(usex ncurses --without-slang $(use_with slang)) |
289 |
- ) |
290 |
- case ${CHOST} in |
291 |
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 |
292 |
- esac |
293 |
- econf "${myconf[@]}" |
294 |
-} |
295 |
- |
296 |
-src_install() { |
297 |
- default |
298 |
- # don't use "${ED}" here or things break (#654534) |
299 |
- rm -r "${D%/}"/trash || die |
300 |
- |
301 |
- dodoc doc/sample.nanorc |
302 |
- docinto html |
303 |
- dodoc doc/faq.html |
304 |
- insinto /etc |
305 |
- newins doc/sample.nanorc nanorc |
306 |
- if ! use minimal ; then |
307 |
- # Enable colorization by default. |
308 |
- sed -i \ |
309 |
- -e '/^# include /s:# *::' \ |
310 |
- "${ED%/}"/etc/nanorc || die |
311 |
- fi |
312 |
- |
313 |
- dosym ../../bin/nano /usr/bin/nano |
314 |
-} |