app-editors/nano: version bump to 2.6.1

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 4faa5b90fd1ece3967f3c05ca389ee6bb9c3e4ab..22e0e2aa9c9babcb9e2e86adab94699a165e04db 100644 (file)
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,2 +1,3 @@
 DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607
 DIST nano-2.5.3.tar.gz 1967760 SHA256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee SHA512 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 WHIRLPOOL a2ca1c41d3cb26756cc9aba5b5fa0aeaea220626b98d0abfa1c5c4d4d57c3a5ef688d5edf00a6a00849ee25a67b2bbab93c4d454f6eb5a204b10fa01de3e298f
+DIST nano-2.6.1.tar.gz 1999439 SHA256 56f2ba1c532647bee36abd5f87a714400af0be084cf857a65bc8f41a0dc28fe5 SHA512 224d643ce08b4c031263c1926d767c671d41e58b182b7ad32f9de2a8ed606c5b39da924cbe62052455584e087a8966285da17cb1fbf235680639351c390aec90 WHIRLPOOL da902989aceac4b15438c58603a56e1cc02b61ff0972f56032130af25d40b0d40344b063feb1aa2f1fd3f5bacbb325505865d0d0daf2e215aafbac0527ee41d6

diff --git a/app-editors/nano/nano-2.6.1.ebuild b/app-editors/nano/nano-2.6.1.ebuild
new file mode 100644 (file)
index 0000000..ca58974
--- /dev/null
+++ b/app-editors/nano/nano-2.6.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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} )"
+
+src_prepare() {
+       if [[ ${PV} == "9999" ]] ; then
+               eautoreconf
+       fi
+       epatch_user
+}
+
+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/nanorc.sample
+       dohtml doc/faq.html
+       insinto /etc
+       newins doc/nanorc.sample 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-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 50acfae93bdde5052b252479240d064f31c8b608..ca58974459664750bd3fb9caba3a29911ba9768e 100644 (file)
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
@@ -10,12 +9,12 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3 autotools
 else
        MY_P=${PN}-${PV/_}
-       SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+       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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
 
 LICENSE="GPL-3"
 SLOT="0"