From 0a65aa74175d9ac6570321fe11725dc30c574e08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Aug 2022 13:55:12 +0100 Subject: gentoo auto-resync : 03:08:2022 - 13:55:12 --- app-editors/nano/Manifest | 7 +- app-editors/nano/files/gentoo.nanorc | 2 +- app-editors/nano/files/gentoo.nanorc-r1 | 98 --------------------------- app-editors/nano/nano-6.4.ebuild | 113 -------------------------------- app-editors/nano/nano-9999.ebuild | 34 ++++------ 5 files changed, 15 insertions(+), 239 deletions(-) delete mode 100644 app-editors/nano/files/gentoo.nanorc-r1 delete mode 100644 app-editors/nano/nano-6.4.ebuild (limited to 'app-editors/nano') diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 73d868c4de0e..3c08bfa4ef5c 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,10 +1,7 @@ -AUX gentoo.nanorc 4212 BLAKE2B e8e50c1b98f0b593d83bc35c84e79d5d0db6b076862635498bbe81c4413d4818cae3027c163556335c6ae7284545c99477c7269a0df78a9ac694912b28de1939 SHA512 b347ab4e92b2418f59e1f2e0f1d6993102fd2c237eb4cb7daac373f48cc0071f0c3b47f4354e2e4fef00285fe5df22958694238fb4b017f7eff745c84166dc10 -AUX gentoo.nanorc-r1 5378 BLAKE2B 0d9a506a87ec75eab5cf04d94f65c3089f0cb442e705fbefc70b4a5b1d08fd360bfc136b6e1cdc4ed480f4ffb6b37b81a019869aa7e322b3f96219241a2d1569 SHA512 bc8db27b8509059833ce1939a3c63d8389968366118596f2a832e188ea5f3e8eb2b66e781ceaabd58c941bbb8ca6818b363189ac267a96f0943bbd64983b5c65 +AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3 -DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641 EBUILD nano-6.3.ebuild 2636 BLAKE2B 79f9097ec7bb0052b66c476767c7d1e5ccfdd96f4c8b5ff539b7a1d65f7f171b88c124c88e31ed99ce1f39742ec1cec34e1e254d2541faec5fbef6ed8a173c39 SHA512 8ab371ea08c4afce84d74962a61bdb62e30cb5a1a1db049e6a9493b9b8fde6dce6d67424938f335654af7b997f0c239a61b69aa93fa55382599d6c9eac4915f7 -EBUILD nano-6.4.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1 -EBUILD nano-9999.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1 +EBUILD nano-9999.ebuild 2637 BLAKE2B b9f2db1e3fc8556067f5bf400fa25cbb590346a82522f62e885a0828b3829cc81be2ab8267cce53c9cbd046b092be31bfbb5840bcc0566ecfed8e12231b50eca SHA512 9787aca7f721fd1e08addf7ce8105217433346912e195009e9fabfdb958206e785de7705675df7cd3b4b959c697c22162b390f535e2e86591547138faaf4b9b6 MISC metadata.xml 1666 BLAKE2B ee53e5f23c192741ff6d59594105a9365fa8fddff9547dc7bbc14fe967d49c0d294bb56fa2e6d0c40d53dc64e8a031fea3294e62ca6ea2fc31dd028b00a423ee SHA512 58691db7bb106774da8b59db6afb199e2c61444a6feedbef09a22d6fef184512102f1fa4d7cfe7edf9171f3e7a542fac294eacc5eb1a3cb7de724b986b6884a0 diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc index edf4ae109b1e..84e9bcf28ebf 100644 --- a/app-editors/nano/files/gentoo.nanorc +++ b/app-editors/nano/files/gentoo.nanorc @@ -60,7 +60,7 @@ color magenta ":[^[:space:]]+([[:space:]]|$)" color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+" color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+" ## Accepted arches: -color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" +color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" color white "[[:space:]][*~-]?\*" ## Categories: color cyan "^[[:space:]]*[^/]*/" diff --git a/app-editors/nano/files/gentoo.nanorc-r1 b/app-editors/nano/files/gentoo.nanorc-r1 deleted file mode 100644 index 26767774a0e3..000000000000 --- a/app-editors/nano/files/gentoo.nanorc-r1 +++ /dev/null @@ -1,98 +0,0 @@ -## Syntax highlighting for Gentoo ebuilds/eclasses, -## and (further down) for Portage control files. - -syntax ebuild "\.e(build|class)$" -comment "#" - -linter bash -n - -## All the standard portage functions: -color brightgreen "(^|\" -color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>" -color brightgreen "\" -## Bash-related syntax: -color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>" -color green "\<(declare|eval|exec|export|let|local)\>" -color green "[][{}():;|`$<>!=&\]" -color green "-[defhnrsuwxzL]\>" -color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" - -## Variables... official portage ones in red, all others in bright red: -color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*" -color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" -color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>" -color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>" -color red "\<(T|TMPDIR|HOME)\>" -color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>" -color red "\" -color red "\" -color red "\<(PATCHES|(HTML_)?DOCS)\>" "\" "\" "\" "\" -color red "\" - -## Portage commands: -color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*" -color brightblue "\" -color brightblue "\" "\" -color brightblue "\" "\" "\" "\" -color brightblue "\" "\" -color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>" -color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>" -color brightblue "\" "\" -color brightblue "\" "\" -color brightblue "\<(doc|ins|exe)?into\>" "\" "\<(exe|ins|dir)opts\>" -color brightblue "\" -### common eclasses -color brightblue "\" -### flag-o-matic.eclass, toolchain-funcs.eclass -color brightblue "\<(all-flag-vars)\>" -color brightblue "\<(filter-(flags|lfs-flags|lto|mfpmath))\>" -color brightblue "\" -color brightblue "\" -color brightblue "\" "\" -color brightblue "\" -color brightblue "\<(append-atomic-flags|no-as-needed|raw-ldflags|append-libs|replace-sparc64-flags|get-flag|strip-unsupported-flags)\>" -color brightblue "\" -color brightblue "\" -color brightblue "\" -color brightblue "\" -color brightblue "\" -color brightblue "\<(clang|gcc)-(fullversion|(major-|minor|micro-)version)\>" -### debugging -color brightblue "\" - -## Common commands used in ebuilds: -color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>" -## Comments (doesn't work that well): -color yellow "(^|[[:space:]])#.*" -## Strings (doesn't work that well): -color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'" -## Trailing space is bad! -color ,green "[[:space:]]+$" -## Mixed whitespace is also bad. -color ,green " " - - -syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$" -comment "#" - -## Base text: -color green ".+" -## Likely version and slot numbers: -color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)" -color magenta ":[^[:space:]]+([[:space:]]|$)" -## Use flags (must come after version/slot): -color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+" -color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+" -## Accepted arches: -color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" -color white "[[:space:]][*~-]?\*" -## Categories: -color cyan "^[[:space:]]*[^/]*/" -## Masking regulators: -color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)" -## Comments: -color yellow "#.*" -## Trailing space is bad! -color ,green "[[:space:]]+$" -## Mixed whitespace is also bad. -color ,green " " diff --git a/app-editors/nano/nano-6.4.ebuild b/app-editors/nano/nano-6.4.ebuild deleted file mode 100644 index 1422c12825ff..000000000000 --- a/app-editors/nano/nano-6.4.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit autotools git-r3 -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 ~loong ~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:=[unicode(+)?] - sys-libs/ncurses:=[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 myconfargs=( - --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 "${myconfargs[@]}" -} - -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 - - insinto "${rcdir}" - newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc - fi - - use split-usr && dosym ../../bin/nano /usr/bin/nano -} - -pkg_postrm() { - [[ -n ${REPLACED_BY_VERSION} ]] && return - - local e - e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") - if [[ ${e##*/} == nano ]]; then - ewarn "The EDITOR variable is still set to ${e}." - ewarn "You can update it with \"eselect editor\"." - fi -} diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 1422c12825ff..c2da47a585b9 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -4,14 +4,13 @@ EAPI=8 inherit flag-o-matic - -if [[ ${PV} == 9999 ]] ; then +if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit autotools git-r3 + 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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" @@ -25,13 +24,10 @@ LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl ) -" + nls? ( virtual/libintl )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -43,16 +39,14 @@ REQUIRED_USE=" src_prepare() { default - - if [[ ${PV} == 9999 ]] ; then + if [[ ${PV} == "9999" ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - - local myconfargs=( + local myconf=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -66,14 +60,12 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - - econf "${myconfargs[@]}" + econf "${myconf[@]}" } src_install() { default - - # Don't use "${ED}" here or things break (#654534) + # don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -81,7 +73,6 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc - if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -95,16 +86,15 @@ src_install() { rmdir "${ED}"${rcdir}/extra || die insinto "${rcdir}" - newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc + doins "${FILESDIR}/gentoo.nanorc" fi use split-usr && dosym ../../bin/nano /usr/bin/nano } pkg_postrm() { - [[ -n ${REPLACED_BY_VERSION} ]] && return - local e + [[ -n ${REPLACED_BY_VERSION} ]] && return e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") if [[ ${e##*/} == nano ]]; then ewarn "The EDITOR variable is still set to ${e}." -- cgit v1.2.3