gentoo resync : 05.03.2021

7 files changed, 98 insertions, 7 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 8ea5e269b584..c93b9dec222c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 2319d2da0e74..8e935c3599c0 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,10 @@
 DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
 DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
+DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
 DIST nano-5.6.tar.gz 2956090 BLAKE2B 753c49e67403577ac272438b2a577f29978f621cb1823f3ccc4fb5df229b805c72a7123d5e5632cb9e1d4b50c7cf90675d748e7e88709703be44126e11231974 SHA512 fff8a558b435b9f372f19306e63c3bad34a60b4b1979ddf2a5724f96ca69fd7fd5850e841f714fad2e382ffc8e5c3f5085f6a6e965ff30f44bf12b8ac865fe6b
 EBUILD nano-5.3-r1.ebuild 2417 BLAKE2B 67f81d38936522e480337cdedd8156835e01c92cfe80f4126787015e822ecaec935bcb008a6e02808af155f0dc15b14d3cb209e4583818f1a0a45607004b4bae SHA512 a4b0af913ea15fcdf05e2a6d76eabedcd7833d2a01f879223c1a39a8b670c46c7230b36cfffc57f35b971c875552d21ca184dc108bcc044c87551bd4067f5312
 EBUILD nano-5.5.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
+EBUILD nano-5.6.1.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
 EBUILD nano-5.6.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.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
new file mode 100644
index 000000000000..64c74e70f9b1
--- /dev/null
+++ b/app-editors/nano/nano-5.6.1.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/retext/Manifest b/app-editors/retext/Manifest
index dd6373eca8d4..b9237c3daff8 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
 DIST ReText-7.2.0.tar.gz 516895 BLAKE2B e35cfa59b248135be4454359516c36f94e927cb13d60669cffde6b8b70eb5049e2083e6bd50ea1f602f7454025271599a92e34d4bc95920cb17271882f8f6d31 SHA512 ed1cb0088fcd3f1cba96bb07137766c6ae8177e8c9a91f22334ef2f949b58792e03f0b5022d9ef71bfb611b7969c651b4c7920f48ed8e1ad07caff2f69c85a35
-EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 6035dcc2cc18d8058ab116873db58b1a97c65df58a813dae6136b59e1335c3addb198220669d7ea9bfe0274f427a1fbc146f4ff78f49ec61afb58852a340af04 SHA512 0221e5f05f50d2cf16dd625ab06e9421eefdfc889af1ab45cde6500031d8b695cc8585704f29dc3ba7c40cc55c6d54e9e7b3d685c2fdb2d257bed92c926c87fa
-EBUILD retext-7.2.0-r1.ebuild 1966 BLAKE2B 88148cf5fd35d5f1f319b387d5fe34c9f57d0b36f12951b517d9f73a8d0b28c3ec1629e838750046d0fb66c75b46b6f61c6c7d8267cbcaa9e18ed434d114eee0 SHA512 5c79c14f6b5160cfc760f658d30e25ffd3e98bb035faa8100054531a6e554ff33e6ed2adcb62c69c3d05256f1d00af41ef8f4e374012a5c90b64666c834bb336
-EBUILD retext-9999.ebuild 1966 BLAKE2B 88148cf5fd35d5f1f319b387d5fe34c9f57d0b36f12951b517d9f73a8d0b28c3ec1629e838750046d0fb66c75b46b6f61c6c7d8267cbcaa9e18ed434d114eee0 SHA512 5c79c14f6b5160cfc760f658d30e25ffd3e98bb035faa8100054531a6e554ff33e6ed2adcb62c69c3d05256f1d00af41ef8f4e374012a5c90b64666c834bb336
+EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
+EBUILD retext-7.2.0-r1.ebuild 1965 BLAKE2B 6e48ae5156e88e2eec311fc15ece653c3391b8f8e7285a524d7ad053b0bbc7caa40342e03eb1bf9684bd65907632a91c823f66736c7f2291a4b36565410d3069 SHA512 a6754a88e641e595871e3fb29dafa0a9c704dea062717313c24b1992539e82665d1f3e8f34dce83a6ac88bcf3d05b64822e73c803205fa196073230695f0133c
+EBUILD retext-9999.ebuild 1965 BLAKE2B 6e48ae5156e88e2eec311fc15ece653c3391b8f8e7285a524d7ad053b0bbc7caa40342e03eb1bf9684bd65907632a91c823f66736c7f2291a4b36565410d3069 SHA512 a6754a88e641e595871e3fb29dafa0a9c704dea062717313c24b1992539e82665d1f3e8f34dce83a6ac88bcf3d05b64822e73c803205fa196073230695f0133c
 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559
diff --git a/app-editors/retext/retext-7.1.0.ebuild b/app-editors/retext/retext-7.1.0.ebuild
index 3f4ce67e3805..3d983b56ce76 100644
--- a/app-editors/retext/retext-7.1.0.ebuild
+++ b/app-editors/retext/retext-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ EAPI=7
 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit distutils-r1 optfeature virtualx xdg-utils
 DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature virtualx xdg-utils
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
diff --git a/app-editors/retext/retext-7.2.0-r1.ebuild b/app-editors/retext/retext-7.2.0-r1.ebuild
index 4da9da3b40b9..845734a88fb2 100644
--- a/app-editors/retext/retext-7.2.0-r1.ebuild
+++ b/app-editors/retext/retext-7.2.0-r1.ebuild
@@ -61,7 +61,7 @@ pkg_postinst() {
 	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
 	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
 	einfo "For more details take a look at:"
-	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"	
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
 
 pkg_postrm() {
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 4da9da3b40b9..845734a88fb2 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -61,7 +61,7 @@ pkg_postinst() {
 	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
 	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
 	einfo "For more details take a look at:"
-	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"	
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
 
 pkg_postrm() {