commit: 3533eb6746b13e6ceec83ba4681572d0fba97f60 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Oct 9 11:50:21 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Oct 9 11:50:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3533eb67
app-editors/nano: Removed old. Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-editors/nano/Manifest | 2 - .../files/nano-2.8.7-minimal_compile_fix.patch | 38 ---------- app-editors/nano/files/nano-3.0-misbinding.patch | 46 ------------ app-editors/nano/nano-2.8.7.ebuild | 87 ---------------------- app-editors/nano/nano-3.0-r1.ebuild | 87 ---------------------- 5 files changed, 260 deletions(-) diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index dec79ce6f4d..3c2159b4f06 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,4 +1,2 @@ -DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d -DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1 DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03bc0bebafc458f4766561962c94f22f84cf714ece7052670c987272029d3fd6cbda20e5f09460d3bcc0ce1 SHA512 86cc1210cbc45ce2e392d6888e6e22a9214afcc24e95657f7bdb4c59476b4bea2e8ebd8b23c06b32f3acfe1da6da689135f25fcf09db34f6b1dfcc838ea5528f 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 deleted file mode 100644 index ef8d7491016..00000000000 --- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg <bensb...@telfort.nl> -Date: Tue, 29 Aug 2017 19:28:44 +0200 -Subject: tweaks: fix compilation when configured with --enable-tiny - -When moving the cursor to the top-left corner, it is not necessary -to compute leftedge because firstcolumn IS the relevant leftedge. - -Reported-by: Jordi Mallach <jo...@debian.org> ---- - src/move.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/move.c b/src/move.c -index d138356..ce276e4 100644 ---- a/src/move.c -+++ b/src/move.c -@@ -121,7 +121,7 @@ void do_page_up(void) - openfile->current = openfile->edittop; - openfile->current_y = 0; - -- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); -+ leftedge = openfile->firstcolumn; - target_column = 0; - } else - get_edge_and_target(&leftedge, &target_column); -@@ -152,7 +152,7 @@ void do_page_down(void) - openfile->current = openfile->edittop; - openfile->current_y = 0; - -- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); -+ leftedge = openfile->firstcolumn; - target_column = 0; - } else - get_edge_and_target(&leftedge, &target_column); --- -cgit v1.0-41-gc330 - diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch deleted file mode 100644 index 2312edcff06..00000000000 --- a/app-editors/nano/files/nano-3.0-misbinding.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg <bensb...@telfort.nl> -Date: Wed, 12 Sep 2018 13:18:17 +0200 -Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't - use KEY_BSP - -When curses gives no code for Ctrl+Shift+Delete, do not fall back -to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to -'cutwordleft'. - -This fixes https://savannah.gnu.org/bugs/?54642. - -Bug was introduced with version 3.0, commit e6429e78. ---- - src/nano.c | 2 +- - src/nano.h | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/nano.c b/src/nano.c -index c7e0ca2d..74e12439 100644 ---- a/src/nano.c -+++ b/src/nano.c -@@ -2580,7 +2580,7 @@ int main(int argc, char **argv) - controlhome = get_keycode("kHOM5", CONTROL_HOME); - controlend = get_keycode("kEND5", CONTROL_END); - controldelete = get_keycode("kDC5", CONTROL_DELETE); -- controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE); -+ controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE); - #ifndef NANO_TINY - /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */ - shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT); -diff --git a/src/nano.h b/src/nano.h -index e1042759..7de34bf3 100644 ---- a/src/nano.h -+++ b/src/nano.h -@@ -588,6 +588,7 @@ enum - #define SHIFT_CONTROL_DOWN 0x414 - #define SHIFT_CONTROL_HOME 0x415 - #define SHIFT_CONTROL_END 0x416 -+#define CONTROL_SHIFT_DELETE 0x417 - #define ALT_LEFT 0x421 - #define ALT_RIGHT 0x422 - #define ALT_UP 0x423 --- -2.17.1 - diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild deleted file mode 100644 index 9c57e32be25..00000000000 --- a/app-editors/nano/nano-2.8.7.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" - inherit git-r3 autotools -else - MY_P=${PN}-${PV/_} - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"; - 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" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"; - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" - -LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] - sys-libs/ncurses:0=[static-libs(+)] - magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - static? ( ${LIB_DEPEND} )" - -PATCHES=( - "${FILESDIR}/${P}-minimal_compile_fix.patch" #629510 -) - -src_prepare() { - default - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi -} - -src_configure() { - use static && append-ldflags -static - local myconf=( - --bindir="${EPREFIX}"/bin - --htmldir=/trash - $(use_enable !minimal color) - $(use_enable !minimal multibuffer) - $(use_enable !minimal nanorc) - --disable-wrapping-as-root - $(use_enable magic libmagic) - $(use_enable spell speller) - $(use_enable justify) - $(use_enable debug) - $(use_enable nls) - $(use_enable unicode utf8) - $(use_enable minimal tiny) - $(usex ncurses --without-slang $(use_with slang)) - ) - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac - econf "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}"/trash - - dodoc doc/sample.nanorc - docinto html - dodoc doc/faq.html - insinto /etc - newins doc/sample.nanorc nanorc - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED%/}"/etc/nanorc || die - fi - - dodir /usr/bin - dosym ../../bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-3.0-r1.ebuild b/app-editors/nano/nano-3.0-r1.ebuild deleted file mode 100644 index 44b716308be..00000000000 --- a/app-editors/nano/nano-3.0-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" - inherit git-r3 autotools -else - MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"; - 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" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"; - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" - -LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] - sys-libs/ncurses:0=[static-libs(+)] - magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - static? ( ${LIB_DEPEND} )" - -PATCHES=( - "${FILESDIR}"/${P}-misbinding.patch -) - -src_prepare() { - default - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi -} - -src_configure() { - use static && append-ldflags -static - local myconf=( - --bindir="${EPREFIX}"/bin - --htmldir=/trash - $(use_enable !minimal color) - $(use_enable !minimal multibuffer) - $(use_enable !minimal nanorc) - --disable-wrapping-as-root - $(use_enable magic libmagic) - $(use_enable spell speller) - $(use_enable justify) - $(use_enable debug) - $(use_enable nls) - $(use_enable unicode utf8) - $(use_enable minimal tiny) - $(usex ncurses --without-slang $(use_with slang)) - ) - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac - econf "${myconf[@]}" -} - -src_install() { - default - # don't use "${ED}" here or things break (#654534) - rm -r "${D%/}"/trash || die - - dodoc doc/sample.nanorc - docinto html - dodoc doc/faq.html - insinto /etc - newins doc/sample.nanorc nanorc - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED%/}"/etc/nanorc || die - fi - - dosym ../../bin/nano /usr/bin/nano -}
