gentoo auto-resync : 07:11:2024 - 03:03:27

4 files changed, 234 insertions, 3 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4a02c3f1cb3a..c134d2428469 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index c9ed8da85f2b..524c957151db 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,4 +1,6 @@
 DIST Rex-1.14.3.tar.gz 377627 BLAKE2B 40285856b42488f8b557ee2621c3c4ba1019b014d93e3d2e05c09590cb9d1cfa2738e3588aa8cb102ceb3c645cf5aa8113c279a18e23636ad80db09db0825d19 SHA512 7a64221b76f6949f2c5176adc86af9acaff80e9745ad19bc54ffc93d9542bb3c5250d4c511250a0917afb58b92d7a2cf2b24f6915331237c4e2635a760230b70
+DIST Rex-1.15.0.tar.gz 357974 BLAKE2B ab9ba419444f6e9472278e5e20ba1a96cfc12ccd3de6ad733a5d911f624a5ad369d1cea305b15f1578ce5239bc6519cf22f8bea27b20568d5f4a272245f28bc4 SHA512 e712c35141ec7ae4db2e0cb59261f3d1590eb2a36dc82d2bedc538dbc999c38dce2233fc946293e15037e3bad6dd4b144d2429bed8cc6802d28ab32b3a55e710
 EBUILD rex-1.14.3.ebuild 6634 BLAKE2B db3727cf7dfcff290d61cf00d797722f73bf5109a9928d2e60ad1b1d55e4dfebcb02aa6f0e4535555b078dc353521a4ba63bfa8221f85edd5648fe4f83752886 SHA512 4668e6d99e1a993773fc2a5e4f883d5f86cc5ee747b6f0cf22d0c033be3fbde85767f100bb1b1cff477e349b81b105cf1d6299aaf182e68683d31259cfdf9300
-EBUILD rex-9999.ebuild 6634 BLAKE2B db3727cf7dfcff290d61cf00d797722f73bf5109a9928d2e60ad1b1d55e4dfebcb02aa6f0e4535555b078dc353521a4ba63bfa8221f85edd5648fe4f83752886 SHA512 4668e6d99e1a993773fc2a5e4f883d5f86cc5ee747b6f0cf22d0c033be3fbde85767f100bb1b1cff477e349b81b105cf1d6299aaf182e68683d31259cfdf9300
+EBUILD rex-1.15.0-r1.ebuild 6654 BLAKE2B 4151d760bcaf98f845ff3c53b33ffb2a2ad9d734f26ee8b1aef52c3c527e6744445732a8081a7c4a4213be2552e7cf01e8c480455545b3672544bed0b858c0a4 SHA512 f32f6d9acfa9ee096c4d5be0752f05f21051620a99d3708d913230a24c7babf062d96a7df6d9ad8064509f2fc0a19614aa262d66a4bbd1c6fd19a8775e45e64f
+EBUILD rex-9999.ebuild 6654 BLAKE2B 325e7b74d405e6446232326c08402d9a4553e0b1ba1b98cfb12104efcc60ea18c81c7757b3065e77126e7663e0bd84c23221e9ecc0457c5a2f71357dbe0db695 SHA512 ccbb9e1a329b9edb91ddaf6f22402e7aae3355ee1db1506bb2af75ad5ea07d62d6f90912f988a2c78586dc15a5de0185f48371367a8428047c7c99a3f9b8cb30
 MISC metadata.xml 23997 BLAKE2B 1c0d4d5488171646c777d9d1099ae20abecde3d53fcab1a172a69f866e409c8b9c7db32e7944d48b3ad6a9fdfd4e083907bb891b084c6308585887ceccfeeb3b SHA512 e19019443dd2da2f30dd9a0bde7b3e242c1601bd776faf8312d0973afb05294bce6f22bb7a5657085c6b059f157ad9cd517b2e325b8de9a04db64159f63d698b
diff --git a/app-admin/rex/rex-1.15.0-r1.ebuild b/app-admin/rex/rex-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..f6d8bf63a494
--- /dev/null
+++ b/app-admin/rex/rex-1.15.0-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+HOMEPAGE="https://metacpan.org/dist/Rex https://www.rexify.org"
+
+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? (
+		app-admin/augeas
+		dev-perl/DBI
+		dev-perl/Expect
+		dev-perl/IPC-Shareable
+		dev-perl/Parallel-ForkManager
+		dev-perl/XML-LibXML
+		net-misc/rsync
+	)
+	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-Tty
+	dev-perl/JSON-MaybeXS
+	virtual/perl-MIME-Base64
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	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
+	virtual/perl-Term-ANSIColor
+"
+# 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
+	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	virtual/perl-Module-Metadata
+	test? (
+		!minimal? (
+			app-admin/augeas
+			|| ( dev-perl/File-LibMagic sys-apps/file )
+			dev-vcs/git
+		)
+		virtual/perl-File-Temp
+		dev-perl/Sub-Override
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-Output
+		dev-perl/Test-UseAllModules
+		dev-perl/Test-Warnings
+		virtual/perl-autodie
+		virtual/perl-Module-Load-Conditional
+	)
+"
+
+[[ ${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"
+
+	# 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 :(
+	mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed"
+	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}'";
+
+	S="${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"
+
+	# 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
+}
+
+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-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 1b5ca9f0db12..ed83e4352353 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -44,9 +44,11 @@ DZIL_DEPENDS="
 "
 RDEPEND="
 	!minimal? (
+		app-admin/augeas
 		dev-perl/DBI
 		dev-perl/Expect
 		dev-perl/IPC-Shareable
+		dev-perl/Parallel-ForkManager
 		dev-perl/XML-LibXML
 		net-misc/rsync
 	)
@@ -61,14 +63,12 @@ RDEPEND="
 	dev-perl/HTTP-Message
 	dev-perl/Hash-Merge
 	virtual/perl-IO
-	dev-perl/IO-String
 	dev-perl/IO-Tty
 	dev-perl/JSON-MaybeXS
 	virtual/perl-MIME-Base64
 	dev-perl/Net-OpenSSH
 	dev-perl/Net-SFTP-Foreign
 	>=virtual/perl-Scalar-List-Utils-1.450.0
-	dev-perl/Parallel-ForkManager
 	dev-perl/Sort-Naturally
 	dev-perl/String-Escape
 	virtual/perl-Storable
@@ -93,6 +93,7 @@ BDEPEND="
 	virtual/perl-Module-Metadata
 	test? (
 		!minimal? (
+			app-admin/augeas
 			|| ( dev-perl/File-LibMagic sys-apps/file )
 			dev-vcs/git
 		)