[gentoo-commits] proj/musl:master commit in: app-editors/nano/, app-editors/nano/files/

[Aric Belsito]

commit:     4dfab1c8f5e997a67b7de782257cfe3b436a91af
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Thu Jan 25 19:28:23 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Jan 25 19:58:09 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=4dfab1c8

app-editors/nano: in tree works

 app-editors/nano/Manifest                       |  1 -
 app-editors/nano/files/nano-2.6.3-minimal.patch | 97 -------------------------
 app-editors/nano/metadata.xml                   | 38 ----------
 app-editors/nano/nano-2.8.2.ebuild              | 83 ---------------------
 4 files changed, 219 deletions(-)

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
deleted file mode 100644
index d307f30..0000000
--- a/app-editors/nano/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nano-2.8.2.tar.gz 2778849 SHA256 0aa9cd6bd5b372ce9a196a9677af58c1826a9235a14daffe604100a9c259854b SHA512 7f4626de4bf8c2250e494c6682743ad599632023a839acff66685ac045a88789061c0a6fc70eba7c3c57f960e633acf425b033d1cc5fbfa644b422515b810f75 WHIRLPOOL a1bfff134cfff6d9f203d252303822d383b206311a738020f771c0222863b58bff33b646336bfe78941112ea01a39a2e013684e660bac0e98f4f3d1a1d65adbb

diff --git a/app-editors/nano/files/nano-2.6.3-minimal.patch b/app-editors/nano/files/nano-2.6.3-minimal.patch
deleted file mode 100644
index 7e5387e..0000000
--- a/app-editors/nano/files/nano-2.6.3-minimal.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://bugs.gentoo.org/591026
-
-From 928a24c20444a652212e544a506ed55c44efdf3b Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@×××××××××.net>
-Date: Thu, 11 Aug 2016 12:37:11 +0200
-Subject: [PATCH] input: look at the modifier keys only when compiled on Linux
-
-This fixes https://savannah.gnu.org/bugs/?48751 reported by Andrew Ho.
-
-This also fixes compilation when configured with --enable-tiny.
----
- src/global.c | 3 +++
- src/nano.c   | 3 ++-
- src/proto.h  | 3 +++
- src/winio.c  | 4 ++++
- 4 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/global.c b/src/global.c
-index 69c66473508d..3347476f1afb 100644
---- a/src/global.c
-+++ b/src/global.c
-@@ -33,8 +33,11 @@ volatile sig_atomic_t sigwinch_counter = 0;
- 	/* Is incremented by the handler whenever a SIGWINCH occurs. */
- #endif
- 
-+#if defined(__linux__) && !defined(NANO_TINY)
- bool console;
- 	/* Whether we're running on a Linux VC (TRUE) or under X (FALSE). */
-+#endif
-+
- bool meta_key;
- 	/* Whether the current keystroke is a Meta key. */
- bool focusing = TRUE;
-diff --git a/src/nano.c b/src/nano.c
-index 6e55f4948346..4d82c938628c 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -2482,9 +2482,10 @@ int main(int argc, char **argv)
-     /* Set up the terminal state. */
-     terminal_init();
- 
-+#if defined(__linux__) && !defined(NANO_TINY)
-     /* Check whether we're running on a Linux console. */
-     console = (getenv("DISPLAY") == NULL);
--
-+#endif
- #ifdef DEBUG
-     fprintf(stderr, "Main: set up windows\n");
- #endif
-diff --git a/src/proto.h b/src/proto.h
-index 6396f3735127..4f6624ea0f16 100644
---- a/src/proto.h
-+++ b/src/proto.h
-@@ -30,7 +30,10 @@
- extern volatile sig_atomic_t sigwinch_counter;
- #endif
- 
-+#if defined(__linux__) && !defined(NANO_TINY)
- extern bool console;
-+#endif
-+
- extern bool meta_key;
- extern bool focusing;
- 
-diff --git a/src/winio.c b/src/winio.c
-index bcfb8a2adf3f..1f31195af5d3 100644
---- a/src/winio.c
-+++ b/src/winio.c
-@@ -23,7 +23,9 @@
- #include "proto.h"
- #include "revision.h"
- 
-+#if defined(__linux__) && !defined(NANO_TINY)
- #include <sys/ioctl.h>
-+#endif
- 
- #include <stdio.h>
- #include <stdarg.h>
-@@ -504,6 +506,7 @@ int parse_kbinput(WINDOW *win)
- 	return sc_seq_or(do_next_block, 0);
- #endif
- 
-+#if defined(__linux__) && !defined(NANO_TINY)
-     /* When not running under X, check for the bare arrow keys whether
-      * the Ctrl key is being held together with them. */
-     if (console && (retval == KEY_UP || retval == KEY_DOWN ||
-@@ -521,6 +524,7 @@ int parse_kbinput(WINDOW *win)
- 		return sc_seq_or(do_next_word_void, 0);
- 	}
-     }
-+#endif /* __linux__ && !NANO_TINY */
- 
-     switch (retval) {
- #ifdef KEY_SLEFT
--- 
-2.11.1
-

diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
deleted file mode 100644
index 707af36..0000000
--- a/app-editors/nano/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>vapier@g.o</email>
-</maintainer>
-<longdescription>
-GNU nano - an enhanced clone of the Pico text editor.
-
-The nano project was started because of a few "problems" with the
-wonderfully easy-to-use and friendly Pico text editor.
-
-First and foremost is its license: the Pine suite does not use the
-GPL or a GPL-friendly license, and has unclear restrictions on
-redistribution.  Because of this, Pine and Pico are not included with
-many GNU/Linux distributions.  Also, other features (like goto line
-number or search and replace) were unavailable until recently or
-require a command line flag.  Yuck.
-
-nano aims to solve these problems by emulating the functionality of
-Pico as closely as possible while addressing the problems above and
-perhaps providing other extra functionality.
-</longdescription>
-<use>
- <flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
- <flag name="debug">
-  Enable debug messages and assert warnings.  Note that these will all be sent
-  straight to stderr rather than some logging facility.
- </flag>
- <flag name="magic">
-  Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
- </flag>
- <flag name="minimal">
-  Disable all fancy features, including ones that otherwise have a dedicated
-  USE flag (such as spelling).
- </flag>
-</use>
-</pkgmetadata>

diff --git a/app-editors/nano/nano-2.8.2.ebuild b/app-editors/nano/nano-2.8.2.ebuild
deleted file mode 100644
index 75a36dd..0000000
--- a/app-editors/nano/nano-2.8.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 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="amd64 arm ~mips ppc x86"
-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} )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-	default
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=()
-	case ${CHOST} in
-	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
-	esac
-	econf \
-		--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)) \
-		"${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
-}