gentoo resync : 22.06.2019

3 files changed, 4 insertions, 85 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 1b4de6c00b08..42f5de004ffb 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,8 @@
 DIST nano-3.2.tar.gz 2944045 BLAKE2B 8d29d574ebf543f82608d4df26f551c0b3c77863b2ac8cfd0d3aea45340954abe6221069c9c72beab256c2c8cc4fcd3de27804404d97a98144c69ad26223de09 SHA512 33b3bbc5b5044b4003347e87926046fb5a0e83edfd6de858085526b7eaa9ea7ee26a598da00060a6b62edbd0366c7cb06b5a9878f6f0149a9501e4ada80b88f3
-DIST nano-4.1.tar.gz 2918354 BLAKE2B 6f5438b2e4bb9a6de405a7519d1767697df1504e67aae37a75743b658b82d9bf13e0b561177415445827f8a63456afd4f689b1d34b6a3eb53c940972fa01f93d SHA512 982b845197aa2942eb8a49b2ac1bfd8cc65ec9b6b7f60190059367b4f9156b4f0bb5e56a123f0659b23c6c9d1d85733123350a8f04c433ccb32d4c8ef1135d12
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
+DIST nano-4.3.tar.gz 2939418 BLAKE2B 2464118a1cd16477637a8e98c1d179cbea1f33cc1548eff09b3b77b613b5b2b628915da1d11c04064f7211a0254461eab09ddae6dda582004d77adea9dff2360 SHA512 2fb76e61079efb0a16f3ea27fdc7da749c71d61a752d96beee4f8376ad0071792ecaa5f3dc627fbcce175227ca48c60c1a4a3e17bfbc89180aa484c28fe37746
 EBUILD nano-3.2.ebuild 2263 BLAKE2B 23649d985976112b666b5ebf1f7c3217d33bfe61073a60c7a657619367ebf46260d769ec188e0e6c5edbac7f7847ee4fcb47907d3ac4f5a5f073fccbc5552ddf SHA512 eac38b715bd01e4a952955a67325c12290f03789545fdc1ad5c0ff77779c0dbcf531f7e2d2b4eec8face8040b640d588baf27bff8781d95d1263bd3d62405502
-EBUILD nano-4.1.ebuild 2168 BLAKE2B 23761d70bd47af380f5b73f7c6489e07629c8bae17a8f76ae6f8117adf19281012a70ad71a2baa0b1a7b112ff0698b30d67db92f466bf043fe83cbfc6cf2bc2c SHA512 4cfa9450c94543ec866a4b1d002401a7accd206cd8083487fa059aad4cb182b754c5f5a461156a2c8862f57d2590e61f2ea4d1649950c9dff3967f5012d86f2b
-EBUILD nano-4.2.ebuild 2174 BLAKE2B ba029103d7598dc8e0a4fe6ff08edecd4da002d10aa60fbe4c0351b00d7c63d9152cd67da4dc0bb9b7a6c149e5df60803f23ce891ed0b78cd8437b6571bfb177 SHA512 4d1a201d46bca5410d3adcc688499069f0d34fa292397385a7f453f8bfbc8facf77e049005cb51b0927a8dc37ab2f14b95f633156c65ce08dc870b4b3b120557
+EBUILD nano-4.2.ebuild 2167 BLAKE2B 95ac98531233de28533502994feaab74a4dd203da4a339b074a95f32002235dd2cea12a8d2588f1d9713f9ebceda5b964b02f0b30eac90b50ef5de8f2e1aebe7 SHA512 dae700a1298882a845e25834115e787e58991bd0b89f55835307af4a495d44acc9dcbcb3ce39611c4fa93ff580a86b52baeaead992985bfe679b5f67bb60810e
+EBUILD nano-4.3.ebuild 2174 BLAKE2B ba029103d7598dc8e0a4fe6ff08edecd4da002d10aa60fbe4c0351b00d7c63d9152cd67da4dc0bb9b7a6c149e5df60803f23ce891ed0b78cd8437b6571bfb177 SHA512 4d1a201d46bca5410d3adcc688499069f0d34fa292397385a7f453f8bfbc8facf77e049005cb51b0927a8dc37ab2f14b95f633156c65ce08dc870b4b3b120557
 EBUILD nano-9999.ebuild 2174 BLAKE2B ba029103d7598dc8e0a4fe6ff08edecd4da002d10aa60fbe4c0351b00d7c63d9152cd67da4dc0bb9b7a6c149e5df60803f23ce891ed0b78cd8437b6571bfb177 SHA512 4d1a201d46bca5410d3adcc688499069f0d34fa292397385a7f453f8bfbc8facf77e049005cb51b0927a8dc37ab2f14b95f633156c65ce08dc870b4b3b120557
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-4.1.ebuild b/app-editors/nano/nano-4.1.ebuild
deleted file mode 100644
index c4767d265bd6..000000000000
--- a/app-editors/nano/nano-4.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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"
-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 slang +spell 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 )
-	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-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)
-		$(usex ncurses --without-slang $(use_with slang))
-	)
-	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
-	fi
-
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-4.2.ebuild b/app-editors/nano/nano-4.2.ebuild
index 232301c01447..b6f24ab46055 100644
--- a/app-editors/nano/nano-4.2.ebuild
+++ b/app-editors/nano/nano-4.2.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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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"