From d479c9c5c724c7b1300a98e44975f31f4f2e51dd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 6 Dec 2022 21:11:24 +0000 Subject: gentoo auto-resync : 06:12:2022 - 21:11:24 --- app-editors/Manifest.gz | Bin 14240 -> 14238 bytes app-editors/nano/Manifest | 4 +- app-editors/nano/nano-7.0-r1.ebuild | 111 +++++++++++++++++++++++++++++++++++ app-editors/nano/nano-7.0.ebuild | 113 ------------------------------------ app-editors/nano/nano-9999.ebuild | 4 +- 5 files changed, 114 insertions(+), 118 deletions(-) create mode 100644 app-editors/nano/nano-7.0-r1.ebuild delete mode 100644 app-editors/nano/nano-7.0.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 089d2d2a754e..dfe25f7cd6e6 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 785392c7d082..adc7177f606a 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -2,6 +2,6 @@ AUX gentoo.nanorc-r1 5378 BLAKE2B 0d9a506a87ec75eab5cf04d94f65c3089f0cb442e705fb DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b DIST nano-7.0.tar.xz 1598528 BLAKE2B 5212aa2a65cc7bccb33ebd66934e53ea7c6bd739ceae94796397bd193698453417eae2a5cf63c995e90aa077795f9bcf70568a35208716a09c9a6d89d75ff409 SHA512 927db4dec1fcde316104a59ab208ffadea52a65c63888187794d4b47c5d49b591c39d490fdc31255b82f04d77a4321b2f6bb150022a5f88dd3c2500df327b983 EBUILD nano-6.4.ebuild 2703 BLAKE2B 77ce48f293a4c8200b3e8175bf07e8aa1158229887062324c8aafbdb96846c66bfe9ca5d8cf3889595c060dd13982cea0bfa42fc8b125075311e259f2d5a08be SHA512 786d9897c4ec70eac6d3107b9ce6fed248af4b76c450eab17df5ed37aa325faa73d7c764b5ac7aabb98b1d64c362aeb3624f7ff18468c322e584b33ad81c25e5 -EBUILD nano-7.0.ebuild 2711 BLAKE2B 006aeed5a9c878a74019dc9e3f64616292893900e7d30d43178266bced135393de234044453c775210318ea1a1c5f1c7be9e6c9c1294ff610e289c4df1eb1768 SHA512 4cc302df2531125f62f1e3ab4a41dde065268b544652d6607aeb4f01d01168bccc5ece0257e07e0be4842b137021ae3336a0c802c7fd8fb01e99f69de5ebb2a6 -EBUILD nano-9999.ebuild 2711 BLAKE2B 006aeed5a9c878a74019dc9e3f64616292893900e7d30d43178266bced135393de234044453c775210318ea1a1c5f1c7be9e6c9c1294ff610e289c4df1eb1768 SHA512 4cc302df2531125f62f1e3ab4a41dde065268b544652d6607aeb4f01d01168bccc5ece0257e07e0be4842b137021ae3336a0c802c7fd8fb01e99f69de5ebb2a6 +EBUILD nano-7.0-r1.ebuild 2646 BLAKE2B 0b405af8ca54fff520dc1e37d821c38df33ee9fc92c4b3e428e97fcc367434e97d27564c1c2f9795844141a9aa9f9cff81d369c7d8540c6c99b88730f96439d9 SHA512 12e5c4ee587a052cc062a602e1f62ec932507bdf1ac5f02cf3f82c9403ee20c7ca18a64362307c26fa94cde5311d93b0d5a97cc46cefb741d0aea921e7f8343b +EBUILD nano-9999.ebuild 2646 BLAKE2B 0b405af8ca54fff520dc1e37d821c38df33ee9fc92c4b3e428e97fcc367434e97d27564c1c2f9795844141a9aa9f9cff81d369c7d8540c6c99b88730f96439d9 SHA512 12e5c4ee587a052cc062a602e1f62ec932507bdf1ac5f02cf3f82c9403ee20c7ca18a64362307c26fa94cde5311d93b0d5a97cc46cefb741d0aea921e7f8343b MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f diff --git a/app-editors/nano/nano-7.0-r1.ebuild b/app-editors/nano/nano-7.0-r1.ebuild new file mode 100644 index 000000000000..7cdc35604620 --- /dev/null +++ b/app-editors/nano/nano-7.0-r1.ebuild @@ -0,0 +1,111 @@ +# 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+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" +SLOT="0" +IUSE="debug justify magic minimal ncurses nls +spell 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 +} + +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-7.0.ebuild b/app-editors/nano/nano-7.0.ebuild deleted file mode 100644 index 3ccb2377fa61..000000000000 --- a/app-editors/nano/nano-7.0.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+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" -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 3ccb2377fa61..7cdc35604620 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_ LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell static unicode" LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] @@ -97,8 +97,6 @@ src_install() { insinto "${rcdir}" newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc fi - - use split-usr && dosym ../../bin/nano /usr/bin/nano } pkg_postrm() { -- cgit v1.2.3