gentoo resync : 29.12.2022

4 files changed, 34 insertions, 117 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 939e2f475e0f..edaa3c622e14 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,7 @@
 AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0
-DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
-EBUILD nano-5.9.ebuild 2284 BLAKE2B af8a47119587f66407d2b16815bdd79034d1ec7c84aa85739c32d9d1f0d0b9e4e15f7f149e4a84ce9f4dba02f83589546d26a4e5656366dc694878d27c4c2f67 SHA512 beec13ea4b555f016dbdd64312ad64c6cd73cba23e284d06e74aacf4d31cd9cda02f2521861c923bbf39d495e128a9171edad12ecc83aa3b21ba5d97cd46bc92
 EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641
-EBUILD nano-6.3.ebuild 2357 BLAKE2B a04a268929814dfecdb6ceddcd0aa6b7118085719dc13525922311b3dc62529a66aae7ddf63d3d0b8cc0c5c3da2ccde009fd118a7b8c17008c753d38fbdbbb26 SHA512 283e6c687dad1d1730dad88f1993b88d11e076757af0b0bccec8e59caa4193b4c16474453c5b4f4b99445824d0e3a894dde653cce8059139027bc0a2bdac4682
+EBUILD nano-6.3.ebuild 2601 BLAKE2B f5c3d6099d58630b85666120c19cb35081c343dcf56dccef413ab320b13955a974b87dc2386352e34f51804a8e13d7b9cb51043586344da84c04ccae9f6df9aa SHA512 33fac004b01a9b4b44300b48fd549b141a2e3f6316990dce709e23efde3841f02ffbb36066cb1409b26b255554b4276dcc1f10a860409ad029878cb578f8a77d
 EBUILD nano-9999.ebuild 2350 BLAKE2B c158c4c173632d6b05ae33b0d4b56d308fffd04a39354d1d009819c2a04a7bc3648599b342d34f66dfb674453cd46b520da8be593e58a7dea3188420d81e1e6f SHA512 822a2a3fd233de2bbb2e176328ec5e2825a07078063cc90015ef9ace5513cbb68e324c9405b8c4adce1a7067828a6c5e1cae6a7d238e5b4693830bf5509cc0eb
-MISC metadata.xml 1643 BLAKE2B 0281963fbe6aff1bc6765b1c9964ac2a7e1237b4759c4ae34e83a9c79c86975d910a43edfec80f279ebf17beb58db2eeb430915a165ea252042900ecefa3c57e SHA512 8636fa9e9f1b2bbc72f3b7a4395a99a7158de48e6f10487f6b5d450e6c35226b0f4d4a68e5e995dd625065831a343070c4f227d1c4422a2140e09f9c003d8fdd
+MISC metadata.xml 1666 BLAKE2B ee53e5f23c192741ff6d59594105a9365fa8fddff9547dc7bbc14fe967d49c0d294bb56fa2e6d0c40d53dc64e8a031fea3294e62ca6ea2fc31dd028b00a423ee SHA512 58691db7bb106774da8b59db6afb199e2c61444a6feedbef09a22d6fef184512102f1fa4d7cfe7edf9171f3e7a542fac294eacc5eb1a3cb7de724b986b6884a0
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index 6ec35ae205da..c298b35286c5 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
 GNU nano - an enhanced clone of the Pico text editor.
 
 The nano project was started because of a few "problems" with the
@@ -21,22 +21,22 @@ 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>
- <flag name="split-usr">
-  Enable this if /bin and /usr/bin are separate directories
- </flag>
-</use>
+	</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>
+		<flag name="split-usr">
+			Enable this if /bin and /usr/bin are separate directories
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-editors/nano/nano-5.9.ebuild b/app-editors/nano/nano-5.9.ebuild
deleted file mode 100644
index 92f76e20465c..000000000000
--- a/app-editors/nano/nano-5.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 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 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:=[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 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-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
index 9bd57c68b191..ff0fcf25cd44 100644
--- a/app-editors/nano/nano-6.3.ebuild
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -91,3 +91,12 @@ src_install() {
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
 }
+
+pkg_postrm() {
+	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
+}