gentoo resync : 16.09.2020

3 files changed, 2 insertions, 43 deletions

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 73657a3c74a1..da621edbc2c2 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.15.tar.xz 202776 BLAKE2B 3f06bc254fc8e0e8884d9b8bd63b53f23ea4f9a9e1d16f7f7f2ba83ee052f35a85489ffad7b59bb41277ef68b22caa35790513115d5af43fb09cc8d5cdf4ebb0 SHA512 2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
-EBUILD help2man-1.47.10.ebuild 1023 BLAKE2B b19c59b3453733e9d1eb6a88ba2a62d526c975222c1a2d4ea58c0d1a5bfb3aa3a39f943aa99c3ae18a65213b640f1d52de90bbb820eb5c39d079b3d2ce9e6198 SHA512 8798779819277de34b892a71395504cee115c1310dbab921a2fe4866967e16d0f40f34e5b13a31496b69b462bd5b944fd1470dd87b425fc21fdbec8372b1a38c
 EBUILD help2man-1.47.15.ebuild 1065 BLAKE2B 5b9e08ece924027563088cdcf9d0312f9fc200d3ee6e147cb7f5f0e279f8f1d5cf7533dc40e308a5fb146247ca1950673f5937621829216beada81061ca88f74 SHA512 fd52cabb54f98186e31eb20ef05eea28d89415bca7ae439fb36710d8047e2218841768ad9a3b6994d4ba50d6a1845977e5f554a12bc6b3c21dbbbaae374eee6d
-EBUILD help2man-1.47.16.ebuild 1067 BLAKE2B bced1d136bd6f2bcafd9231857dd21a6a2c230ff51f6d77d47d7f2a6dc986cc655de323accdbbd534df73da4ddd7f5ea41d6cebbb224e1639d418cd4ec5a2940 SHA512 2dcb76c9e2fae8cce8d60a2a3d5fa69727b7054087658af7e48e27b90e8cb4b595699449b67531f5c29d5b1f8fe59e5fa219f9c8025094963111fcd60340e966
+EBUILD help2man-1.47.16.ebuild 1066 BLAKE2B 1b62baa25c49ca724e3d0145b16f6cf545234c422e9b70bfe660fed0826803bceb083dd9f871274efcc5d9cd1b4ab4478c36d6e196a7e0f28652355e48b9cb34 SHA512 95af5d8c023fdc215eaba118a505e1d96cc4919294f0d73a0332b4c9443b033c198f466d66c8923dd56a993f7dc979ce23a307aaac694b8920d6facb6fe8c567
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
deleted file mode 100644
index df194845937c..000000000000
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-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"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND=${RDEPEND}
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	default
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	econf \
-		ac_cv_path_MSGFMT=$(type -P false) \
-		$(use_enable nls)
-}
diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index 29c33cc929f6..cb87c560fb4d 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-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"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl