gentoo resync : 18.08.2019

4 files changed, 10 insertions, 49 deletions

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 3a538785638c..5a4e195ef237 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,10 +1,8 @@
 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.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6
-DIST help2man-1.47.9.tar.xz 202012 BLAKE2B 08d0a906e61978b12fd00b9d807b8cdb6b2436165223aff539957f217786442bc31fb5d437833d6dae3bd6a4b83e1df28d7bd434d0c753f38fea96b8cf751b76 SHA512 91cddd5ebc8eb2a89bc27fab4298ee18c18fa73363378be8c220258bf415634a0147b8502970c5fea48ddaccddda63753cbd215bf6894798452c2b4b89c4309a
-EBUILD help2man-1.47.10.ebuild 1058 BLAKE2B a0757c6c80887b8d1780f51b1855690c308e83958b2cccaabbac1e1f62aabf7e0d3bd7f2593f0bf885b9ceedf3a109cbe8ab03e7e7723ff7a83b942187006a6e SHA512 090f2b3ca3206e1e622adedc13da3439e952758d5e3e8096594cd72e7484500177d588e3fc8fb3cafefff2c33a9282189c5cc978ed511f0f9dd11a7ebc5c9449
+EBUILD help2man-1.47.10.ebuild 1050 BLAKE2B 3137d9a226894343573abe91e8624cf43871e83df3256faf9e25c37210bd176b8b4c4aff20c5fa90d43f5d63729ada02e69ff3b32b5851835c20825ec6fdaaa9 SHA512 314d4646958894b25dc2282af7e068cf3fd832a4250f8340bf05ee176f3231e981f4fe7f40fd690db0715b02bbd0e5611f99daf853440ce8807632007bde71d0
+EBUILD help2man-1.47.11.ebuild 1100 BLAKE2B 70424da45e9d06d459ecfbe426c59b7d6bf8b3ce6f0bed3713ba1c7cff909610e9386684f1025b285bc34a203f54d81cb81bd1fadbc0c2a4be3cf114143d20a8 SHA512 aef361c7aa593641e5cdc420d8de89d00148f2b5d723ae6f7d562b101c1d9f46b4b23ffbe1dfbd16d5ab0f8b59ddea46df21a587c1456e4275fec8005e6ca6ac
 EBUILD help2man-1.47.6.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be
-EBUILD help2man-1.47.8.ebuild 1058 BLAKE2B a0757c6c80887b8d1780f51b1855690c308e83958b2cccaabbac1e1f62aabf7e0d3bd7f2593f0bf885b9ceedf3a109cbe8ab03e7e7723ff7a83b942187006a6e SHA512 090f2b3ca3206e1e622adedc13da3439e952758d5e3e8096594cd72e7484500177d588e3fc8fb3cafefff2c33a9282189c5cc978ed511f0f9dd11a7ebc5c9449
-EBUILD help2man-1.47.9.ebuild 1058 BLAKE2B a0757c6c80887b8d1780f51b1855690c308e83958b2cccaabbac1e1f62aabf7e0d3bd7f2593f0bf885b9ceedf3a109cbe8ab03e7e7723ff7a83b942187006a6e SHA512 090f2b3ca3206e1e622adedc13da3439e952758d5e3e8096594cd72e7484500177d588e3fc8fb3cafefff2c33a9282189c5cc978ed511f0f9dd11a7ebc5c9449
 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
index 14f693709088..8fb42ea7f5f4 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.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 ~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"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.8.ebuild b/sys-apps/help2man/help2man-1.47.11.ebuild
index 14f693709088..8b28a4b8531f 100644
--- a/sys-apps/help2man/help2man-1.47.8.ebuild
+++ b/sys-apps/help2man/help2man-1.47.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="https://www.gnu.org/software/help2man/"
@@ -14,7 +14,7 @@ IUSE="nls"
 
 RDEPEND="dev-lang/perl
 	nls? ( dev-perl/Locale-gettext )"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
 DOCS=( debian/changelog NEWS README THANKS ) #385753
 
@@ -33,7 +33,9 @@ src_prepare() {
 
 src_configure() {
 	# Disable gettext requirement as the release includes the gmo files #555018
-	econf \
-		ac_cv_path_MSGFMT=$(type -P false) \
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
 		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/sys-apps/help2man/help2man-1.47.9.ebuild b/sys-apps/help2man/help2man-1.47.9.ebuild
deleted file mode 100644
index 14f693709088..000000000000
--- a/sys-apps/help2man/help2man-1.47.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 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 ~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"
-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)
-}