From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- app-editors/nano/Manifest | 4 +- app-editors/nano/nano-5.5.ebuild | 89 +++++++++++++++++++++++++++++++++++++++ app-editors/nano/nano-9999.ebuild | 7 +-- 3 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 app-editors/nano/nano-5.5.ebuild (limited to 'app-editors/nano') diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index fc86be47b249..6e31f6464afa 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -3,8 +3,10 @@ AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea07 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28 +DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056 EBUILD nano-4.9.3.ebuild 2303 BLAKE2B ae1b5d040e6c7be9d49ca11fbf8dd63d93b6ae74093ac9795e8e9c0f61532b4dae83ba4ecd1179469edda487babacb0c4fafcb23155039d2ba052bb01d1026e4 SHA512 7afddc9908b55b2a397915a2a1716c775ac09666eacee600873a19bf0103c49202daa5880a9f19115b6a1488f42dcab16e235cec2c3f8b285254e51a6183fbeb EBUILD nano-5.3-r1.ebuild 2417 BLAKE2B 67f81d38936522e480337cdedd8156835e01c92cfe80f4126787015e822ecaec935bcb008a6e02808af155f0dc15b14d3cb209e4583818f1a0a45607004b4bae SHA512 a4b0af913ea15fcdf05e2a6d76eabedcd7833d2a01f879223c1a39a8b670c46c7230b36cfffc57f35b971c875552d21ca184dc108bcc044c87551bd4067f5312 EBUILD nano-5.4.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af -EBUILD nano-9999.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af +EBUILD nano-5.5.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9 +EBUILD nano-9999.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c diff --git a/app-editors/nano/nano-5.5.ebuild b/app-editors/nano/nano-5.5.ebuild new file mode 100644 index 000000000000..64c74e70f9b1 --- /dev/null +++ b/app-editors/nano/nano-5.5.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 +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 )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +REQUIRED_USE=" + 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) + ) + 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 + + use split-usr && dosym ../../bin/nano /usr/bin/nano +} diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 92473ae856c8..64c74e70f9b1 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -18,13 +18,12 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_ LICENSE="GPL-3" SLOT="0" -IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +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(+)] ) )" + nls? ( virtual/libintl )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" @@ -34,7 +33,6 @@ BDEPEND=" " REQUIRED_USE=" - !ncurses? ( slang? ( minimal ) ) magic? ( !minimal ) " @@ -60,7 +58,6 @@ src_configure() { $(use_enable nls) $(use_enable unicode utf8) $(use_enable minimal tiny) - $(usex ncurses --without-slang $(use_with slang)) ) econf "${myconf[@]}" } -- cgit v1.2.3