commit: 39195e6d59b20ed6293f5ea50c577d686966b95f Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Dec 15 19:20:23 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Dec 15 19:20:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=39195e6d
app-editors/nano: migrated to gx86 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-editors/nano/Manifest | 1 - app-editors/nano/files/nano-2.7.3-tiny.patch | 29 --------- app-editors/nano/metadata.xml | 38 ----------- app-editors/nano/nano-5.4.ebuild | 94 ---------------------------- app-editors/nano/nano-9999.ebuild | 94 ---------------------------- 5 files changed, 256 deletions(-) diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest deleted file mode 100644 index c1739a154c..0000000000 --- a/app-editors/nano/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28 diff --git a/app-editors/nano/files/nano-2.7.3-tiny.patch b/app-editors/nano/files/nano-2.7.3-tiny.patch deleted file mode 100644 index 148716d5db..0000000000 --- a/app-editors/nano/files/nano-2.7.3-tiny.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fc89ac11d25a5d052a63c01006c1fd767d9f5879 Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.ja...@posteo.de> -Date: Thu, 29 Dec 2016 13:43:06 -0500 -Subject: [PATCH] speller: fix build when tiny build is enabled - -URL: https://bugs.gentoo.org/604000 ---- - src/text.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/text.c b/src/text.c -index bd1737687e65..a8b34f2f6bba 100644 ---- a/src/text.c -+++ b/src/text.c -@@ -3079,9 +3079,11 @@ const char *do_alt_speller(char *tempfile_name) - stat(tempfile_name, &spellfileinfo); - if (spellfileinfo.st_mtime != timestamp) { - set_modified(); -+#ifndef NANO_TINY - /* Flush the undo stack, to avoid making a mess when the user - * tries to undo things in spell-corrected lines. */ - discard_until(NULL, openfile); -+#endif - } - #ifndef NANO_TINY - /* Unblock SIGWINCHes again. */ --- -2.11.0 - diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml deleted file mode 100644 index 707af36144..0000000000 --- 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>vap...@gentoo.org</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-5.4.ebuild b/app-editors/nano/nano-5.4.ebuild deleted file mode 100644 index 3cf92143d5..0000000000 --- a/app-editors/nano/nano-5.4.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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.gz"; - KEYWORDS="~x64-cygwin ~amd64-linux ~arm-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 +split-usr 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} - static? ( ${LIB_DEPEND} )" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -REQUIRED_USE=" - !ncurses? ( slang? ( minimal ) ) - magic? ( !minimal ) -" - -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) - $(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)) - ) - 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 - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - fi - - if use split-usr || ( use prefix && ! use prefix-guest ) ; then - dosym ../../bin/nano /usr/bin/nano - fi -} diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild deleted file mode 100644 index 8fb6906314..0000000000 --- a/app-editors/nano/nano-9999.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 +split-usr 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} - static? ( ${LIB_DEPEND} )" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -REQUIRED_USE=" - !ncurses? ( slang? ( minimal ) ) - magic? ( !minimal ) -" - -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) - $(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)) - ) - 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 - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - fi - - if use split-usr || ( use prefix && ! use prefix-guest ) ; then - dosym ../../bin/nano /usr/bin/nano - fi -}
