gentoo resync : 14.12.2020

3 files changed, 9 insertions, 6 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index bb72c94e20b1..d7356c06469d 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,10 +1,10 @@
 AUX nano-4.9.3-disable-speller_build_fix.patch 10305 BLAKE2B 1a319fa63eadfa8c98b2f3f35df3cae631253606f6ac38fce96049a1078f13b5885dc368d725d09bbf7cd840c0766d446f757282693526f9fb723b05d1d6c4f4 SHA512 ceef1ba4ce7fc296785cd579bc645d9565d16b9adffbb6871684421823addbef87a70bfcd8f3f87bc7e48477ee0c56d3b326aaa9c019e0d04a7f000bc46076c2
 AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea070e66ea445c47259d48960cb96a7a4b63cf5b4ff2a8f0254573a57b78d194354af2a3d8b4ddb43a1af9f31a6fa12ea8628f1a SHA512 a4a1ddb4c1f1999251d499f8068ddc0e743e4499a1bf3781095c604ac08a1700f8648d30441c5aa6a2e96d75df262c77dec7f64bc29faa3b87ba8b664227614a
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
-DIST nano-5.2.tar.gz 2865091 BLAKE2B 3822b3fd8dede897d698401a06ea0b4b49bf39f48d16c750e273007b1795a8adfc71654eadc08039a5c6999973ff7e70148b4c720b32a8f361424404e3c2ff3f SHA512 4c77bcfdf704a7882e944cb6d4cd571b698447500255e5701d30990def56cec0c396a33c761b8149f3cc4208a8dcd0f39372804d54cbe6bc2db9244f4a2259b3
 DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
+DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
 EBUILD nano-4.9.3.ebuild 2334 BLAKE2B a46bb4bc1a3cb5d62c0f7db03c7ad1785d168daae307275b198e7f4527d98d84c7b7557ee1cfe2f70e4aa5e60f8cda4abb5fd8261decdcd4f7ff11f54f25e686 SHA512 a8dab8ae77a332ca5576b907e8a73fd288f3da0f8fdd4c2d52ab4e747c911c30425b81db7958a6b3a256ce4b1a2d6a480a728991e67b66d6d09434f36aaad1ef
-EBUILD nano-5.2.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
-EBUILD nano-5.3-r1.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
+EBUILD nano-5.3-r1.ebuild 2448 BLAKE2B dd73412350ac462c24a68e3a980eeac058b1825fa24da42af21f35cb0f2dab33f7d536109628feeb12b6cca08670469260c5d2e7d0b6188dbfa6c20d46bcc53d SHA512 ecedf5bd813403b285c9994f86f5bc49cdae932d6ef1d27e96e5fd329c4f312c373c1f6344fd834401cc768e6d8fdf864787ca8653d5bbec589563d0d4ebd40a
+EBUILD nano-5.4.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
 EBUILD nano-9999.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index 58e6b0821478..25cf3962ed7e 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-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"
diff --git a/app-editors/nano/nano-5.2.ebuild b/app-editors/nano/nano-5.4.ebuild
index 86f22534c12f..58e6b0821478 100644
--- a/app-editors/nano/nano-5.2.ebuild
+++ b/app-editors/nano/nano-5.4.ebuild
@@ -18,7 +18,7 @@ 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 slang +spell +split-usr static unicode"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	sys-libs/ncurses:0=[static-libs(+)]
@@ -33,7 +33,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+REQUIRED_USE="
+	!ncurses? ( slang? ( minimal ) )
+	magic? ( !minimal )
+"
 
 src_prepare() {
 	default