gentoo resync : 12.03.2021

4 files changed, 25 insertions, 215 deletions

diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 7a280ec2cd82..9f995567b945 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,6 +1,4 @@
-DIST Rex-1.13.0.tar.gz 344412 BLAKE2B 220e3dff378bdf5c607f2be94952a68f4c3e72ab362518566e16be55a837cef64f12af8f487e1f26bec04e3b5b4781d1d8eecc6aa347a666c2eb616595371919 SHA512 9e717decbe27a630e83c8194418783cb38c63fedb7f8c4a437395ebc3db21a45cc2057bcb6b2bc689255ab8f579908ad7158031e3a019886634fae3f6e6fb511
-DIST Rex-1.13.1.tar.gz 347483 BLAKE2B bab66dffa3e0c0ae6b54bb8a76adfff0858797370389d5329169e5a7a2e6091a5d866feae14c5764b9d87bf920ff9ee5951cc69be4311c9c362e49f58f24659f SHA512 d68bf98e83a04a28d904db683e3cc0984f019ffc6be589f261b4bc44300b753c03e751b87936d9d831bf6456bdcff916cc2a84c0a1a6c11e20c47bf2533575fc
-EBUILD rex-1.13.0.ebuild 5603 BLAKE2B 0bdaeba2e9c23198835992dae76ae5064ca2d0d83ddf481f408940116011526e375c4920079ac7e53f10e902df1f23895cf8f515baebc81822531919fdccc2d3 SHA512 c9923b0ca7a82452d4ab0c03a7adece5f10530b3a0987027fc6d2ebecda9d41d688ebdc8986ee97491e79eea2108f0e7c28097a178dc137bc4bdcb1ec454a882
-EBUILD rex-1.13.1.ebuild 5612 BLAKE2B ccad3f5764782e88973c8af6d550ba6b5a6db2d9bb6dc41f29586dc25a9c79fe54bfa2165415254857f5777481e85d61fc17793671fcf77a03a6efde607e0435 SHA512 d35cf84e0c9daddc735a3b601f095579cf3b5ff78813467fb220ec2dcd1774bb0b931bea0db2dd594da625f66f79d070cd5b76336423fac4d2187d33272330a4
-EBUILD rex-9999.ebuild 6371 BLAKE2B 7f7ef17335afed00083c0af58cf8cf78d1329cd0fe500615b665a45b921324a32384f82c7c60e3080964da99d8d074fa62f2f54c1cb65ddf2b32bc6aefddab3b SHA512 726f0d3b7299a0061272f55c237482b031cd54b5c018ac77fa5094de6ddd5071ef14a38046056dbd77431ca61f7027b48707458c6b73fe54b1b47b5843ecca8b
+DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc
+EBUILD rex-1.13.3.ebuild 6372 BLAKE2B 3ca5d4c6814713a982bbc586a692a2b5359bf3fd9921b5258c58e20dba724ffdeeac256084914901889e53b7ce901b6cba82300be151b7d95818826d3d429b44 SHA512 c04ae719fb294bfcd3e2761c56f82804007b7e395c9bdf913f749280a0552e327d8d4163c893e41a17efd4c7af688ef18f7fce14edc074f4b7f42d4c4f92c8a0
+EBUILD rex-9999.ebuild 6372 BLAKE2B 3ca5d4c6814713a982bbc586a692a2b5359bf3fd9921b5258c58e20dba724ffdeeac256084914901889e53b7ce901b6cba82300be151b7d95818826d3d429b44 SHA512 c04ae719fb294bfcd3e2761c56f82804007b7e395c9bdf913f749280a0552e327d8d4163c893e41a17efd4c7af688ef18f7fce14edc074f4b7f42d4c4f92c8a0
 MISC metadata.xml 23982 BLAKE2B 1167b4f76081e6fb9470b782c9f8b0faae87244cdda4f758f59c3b97ae6cead45d36c4bdb4021841d00d36006dbc70f4594f4f4c2dce334d0204ca456740f408 SHA512 b85457a056ac8f9b52fa3015af1990943468b82ddb31b8dae94aa63a8eefc831d5e5b884479107329f2a883e932587a4986810082c470ed4e29870238850d985
diff --git a/app-admin/rex/rex-1.13.0.ebuild b/app-admin/rex/rex-1.13.0.ebuild
deleted file mode 100644
index b8623b485c3c..000000000000
--- a/app-admin/rex/rex-1.13.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	GITHUB_USER=RexOps
-	GITHUB_REPO=Rex
-	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
-	VCS_ECLASS="git-r3"
-else
-	# This is intentional to stop perl-module.eclass doing magic things when it
-	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
-	# Also prevents perl-module.eclass provisioning SRC_URI
-	DIST_AUTHOR=FERKI
-	DIST_NAME=Rex
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit bash-completion-r1 perl-module ${VCS_ECLASS}
-
-DESCRIPTION="(R)?ex, the friendly automation framework"
-
-SLOT="0"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-DZIL_DEPENDS="
-	dev-perl/Dist-Zilla
-	dev-perl/Dist-Zilla-Plugin-CheckExtraTests
-	dev-perl/Dist-Zilla-Plugin-ContributorsFile
-	dev-perl/Dist-Zilla-Plugin-Git
-	dev-perl/Dist-Zilla-Plugin-Git-Contributors
-	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
-	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
-	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
-	dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic
-	dev-perl/Dist-Zilla-Plugin-OSPrereqs
-	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
-	dev-perl/Dist-Zilla-Plugin-Run
-	dev-perl/Software-License
-"
-RDEPEND="
-	!minimal? (
-		dev-perl/DBI
-		dev-perl/Expect
-		dev-perl/IPC-Shareable
-		dev-perl/XML-LibXML
-	)
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	dev-perl/Data-Validate-IP
-	dev-perl/Devel-Caller
-	dev-perl/Digest-HMAC
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	dev-perl/HTTP-Message
-	dev-perl/Hash-Merge
-	virtual/perl-IO
-	dev-perl/IO-String
-	dev-perl/IO-Tty
-	dev-perl/JSON-MaybeXS
-	dev-perl/List-MoreUtils
-	virtual/perl-MIME-Base64
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SFTP-Foreign
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	virtual/perl-Storable
-	dev-perl/TermReadKey
-	virtual/perl-Test-Simple
-	dev-perl/Text-Glob
-	virtual/perl-Text-Tabs+Wrap
-	virtual/perl-Time-HiRes
-	dev-perl/URI
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-version
-"
-
-BDEPEND="
-	${RDEPEND}
-	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
-	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	virtual/perl-Module-Metadata
-	test? (
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		dev-perl/Test-Output
-		dev-perl/Test-UseAllModules
-		virtual/perl-autodie
-	)
-"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
-
-src_unpack() {
-	if [[ $PV == 9999 ]]; then
-		"${VCS_ECLASS}"_src_unpack
-		mkdir -p "${S}" || die "Can't make ${S}"
-	else
-		default
-	fi
-}
-
-dzil_src_prep() {
-	einfo "Patching dist.ini"
-
-	# This block of sed invocations removes all plugins that aren't
-	# useful for users to have on Gentoo, because all of them are
-	# conditional and subjective style checks, which don't indicate
-	# a real issue for users, and paying the price of their dependencies is undesired.
-
-	# The {N;d} trick adds the [n]ext line after the match to the pattern-space
-	# so that the final [d]elete deletes the next line too. Can be expanded for each
-	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
-	sed -e '/^\[Test::Kwalitee\]/d' \
-		-e '/^\[PodSyntaxTests\]/d' \
-		-e '/^Perl::Critic::Freenode =/d' \
-		-e '/^Perl::Critic::TooMuchCode =/d' \
-		-e '/^Test::Kwalitee =/d' \
-		-e '/^Test::PerlTidy =/d' \
-		-e '/^Test::Pod =/d' \
-		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
-		-e '/^\[OptionalFeature/,/^$/d' \
-		-e '/^\[Test::MinimumVersion\]/{N;d}' \
-		-i dist.ini || die "Can't patch dist.ini"
-}
-dzil_env_setup() {
-	# NextRelease noise :(
-	mkdir -p ~/.dzil/
-	local user="$(whoami)"
-	local host="$(hostname)"
-	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
-
-}
-dzil_to_distdir() {
-	local dzil_root dest has_missing modname dzil_version
-	dzil_root="$1"
-	dest="$2"
-
-	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
-
-	dzil_src_prep
-	dzil_env_setup
-
-	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
-	einfo "Generating CPAN dist with ${dzil_version}"
-
-	has_missing=""
-
-	einfo "Checking dzil authordeps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-		has_missing=1
-			eerror "'dzil authordeps' indicates missing build dependencies"
-			eerror "These will prevent building, please report a bug"
-			eerror "Missing:"
-		fi
-		eerror "  ${modname}"
-	done < <( dzil authordeps --missing --versions )
-
-	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
-
-	einfo "Checking dzil build deps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-			has_missing=1
-			ewarn "'dzil listdeps' indicates missing build dependencies"
-			ewarn "These may prevent building, please report a bug if they do"
-			ewarn "Missing:"
-		fi
-		ewarn "  ${modname}"
-	done < <( dzil listdeps --missing --versions --author )
-
-	einfo "Generating release"
-	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		# Uses git sources in WORKDIR/rex-git
-		# to generate a CPAN-style tree in ${S}
-		# before letting perl-module.eclass do the rest
-		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
-	fi
-	cd "${S}" || die "Can't enter build dir"
-	perl-module_src_prepare
-}
-
-src_install() {
-	newbashcomp "share/${PN}-tab-completion.bash" "${PN}"
-
-	insinto /usr/share/zsh/site-functions
-	newins "share/${PN}-tab-completion.zsh" "_${PN}"
-
-	perl-module_src_install
-}
diff --git a/app-admin/rex/rex-1.13.1.ebuild b/app-admin/rex/rex-1.13.3.ebuild
index 6a9496d529c0..9576447c0078 100644
--- a/app-admin/rex/rex-1.13.1.ebuild
+++ b/app-admin/rex/rex-1.13.3.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
@@ -65,7 +65,7 @@ RDEPEND="
 	virtual/perl-MIME-Base64
 	dev-perl/Net-OpenSSH
 	dev-perl/Net-SFTP-Foreign
-	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Scalar-List-Utils-1.450.0
 	dev-perl/Parallel-ForkManager
 	dev-perl/Sort-Naturally
 	dev-perl/String-Escape
@@ -81,7 +81,7 @@ RDEPEND="
 	dev-perl/YAML
 	virtual/perl-version
 "
-
+# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
 BDEPEND="
 	${RDEPEND}
 	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
@@ -89,6 +89,9 @@ BDEPEND="
 	>=dev-perl/File-ShareDir-Install-0.60.0
 	virtual/perl-Module-Metadata
 	test? (
+		!minimal? (
+			dev-perl/File-LibMagic
+		)
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
 		dev-perl/Test-Output
@@ -130,6 +133,12 @@ dzil_src_prep() {
 		-e '/^\[OptionalFeature/,/^$/d' \
 		-e '/^\[Test::MinimumVersion\]/{N;d}' \
 		-i dist.ini || die "Can't patch dist.ini"
+
+	# Removals/additions have to be tracked by git or dzil build fails
+	# Spurious warning during src_prepare
+	git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t"
+	# Spurious warning during src_prepare
+	git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t"
 }
 dzil_env_setup() {
 	# NextRelease noise :(
@@ -146,7 +155,7 @@ dzil_to_distdir() {
 
 	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
 
-	dzil_src_prep
+	S="${dzil_root}" dzil_src_prep
 	dzil_env_setup
 
 	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
@@ -190,6 +199,13 @@ src_prepare() {
 		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
 	fi
 	cd "${S}" || die "Can't enter build dir"
+
+	# If you DIY installed Test::mysqld, but didn't patch
+	# it to handle the fact on Gentoo, mysql_install_db is NOT in PATH
+	# tests fail. So this test is patched out if mysql_install_db is not in PATH
+	if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then
+		perl_rm_files "t/db.t"
+	fi
 	perl-module_src_prepare
 }
 
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 6942c13d2e55..9576447c0078 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.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
@@ -134,7 +134,7 @@ dzil_src_prep() {
 		-e '/^\[Test::MinimumVersion\]/{N;d}' \
 		-i dist.ini || die "Can't patch dist.ini"
 
-	# Removals/additons have to be tracked by git or dzil build fails
+	# Removals/additions have to be tracked by git or dzil build fails
 	# Spurious warning during src_prepare
 	git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t"
 	# Spurious warning during src_prepare