From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-admin/rex/Manifest | 12 +-- app-admin/rex/metadata.xml | 4 - app-admin/rex/rex-1.12.1.ebuild | 196 -------------------------------------- app-admin/rex/rex-1.12.2.ebuild | 203 --------------------------------------- app-admin/rex/rex-1.13.0.ebuild | 204 ++++++++++++++++++++++++++++++++++++++++ app-admin/rex/rex-1.13.1.ebuild | 203 +++++++++++++++++++++++++++++++++++++++ app-admin/rex/rex-9999.ebuild | 28 ++++-- 7 files changed, 435 insertions(+), 415 deletions(-) delete mode 100644 app-admin/rex/rex-1.12.1.ebuild delete mode 100644 app-admin/rex/rex-1.12.2.ebuild create mode 100644 app-admin/rex/rex-1.13.0.ebuild create mode 100644 app-admin/rex/rex-1.13.1.ebuild (limited to 'app-admin/rex') diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest index bd9fad330746..a5fd75843032 100644 --- a/app-admin/rex/Manifest +++ b/app-admin/rex/Manifest @@ -1,6 +1,6 @@ -DIST Rex-1.12.1.tar.gz 339065 BLAKE2B fd026e66a4e1cf6d4c8b15f7fcba0525a3e98346464170f27d5ef7bb54f1decd7450d87d9f23bee8378df4647eacf512c06a8d051bb76021cbcae472e2c2012d SHA512 774452511d97106bb6586324ff4e8642b05be628c80f3adbba7fd82558c82236878e969512bab398e26a1a7a271a7614108761bd0fb888a2122167806796bad1 -DIST Rex-1.12.2.tar.gz 343716 BLAKE2B bb546298305e2e210ea67a21c948f364d3c0ee5947c8d716606fc81cfd07c4b1eea9e6ce8fd3fd49a0cffd33a964e0d328f60d570fa18fa3452b334a7882b279 SHA512 867942eec63ba71b591b93d6c0af794605f86571ef6d1be473989314cb7fc7d4e8d906ef25e30ea56beeaefe953c884661d9b769452587a3d4892de10163b6c7 -EBUILD rex-1.12.1.ebuild 5372 BLAKE2B 2513d45fb2417fceeea5827fb68cfd69e3148105a488c3f0787179300855ff061e08d497772d55cbbdf1e0d5ad8ef4e1b79ed6feb7faf06b51972a5b9b3cfc8f SHA512 550ec06456643c3f784d29e5aedcb8d4a2903fcd6af76b48f5a1a34758dcb1f2a87284945a0b02eb06b8dbbd2ff2d9ca8043484dd4b7f6333cb27690b2885046 -EBUILD rex-1.12.2.ebuild 5560 BLAKE2B 42d1fcd35a8d980cd0e8c7353f106301dd844d28871a8558f9b785463822a26d53263211b5757385c483a4ffc9bbd8ea65bdd0b584501766f967cd3c4b46a09b SHA512 15516145dfab507ded82ad6e31392c5e61fba04857507ef6b4793948281ddf83e0ad5615d058960123bca7f01bab5d86514cffb99acac44f806077a5613c78c4 -EBUILD rex-9999.ebuild 5560 BLAKE2B 42d1fcd35a8d980cd0e8c7353f106301dd844d28871a8558f9b785463822a26d53263211b5757385c483a4ffc9bbd8ea65bdd0b584501766f967cd3c4b46a09b SHA512 15516145dfab507ded82ad6e31392c5e61fba04857507ef6b4793948281ddf83e0ad5615d058960123bca7f01bab5d86514cffb99acac44f806077a5613c78c4 -MISC metadata.xml 24205 BLAKE2B 76aa5370179f64adaaf79cb730a4cc53deb191a27e97b10cbb26efd804572eb79d67d9abdb09c5e62d08d73d969848286516a2176099237feba2a5c855cd263d SHA512 a6cae05b4f46b10502da5acc2905f622b61a30329c300483cea39348e92d182d190dd61433c551a1948d4ac6a281b9f91c47b759f425055970e8c5a6349b8693 +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 +MISC metadata.xml 24088 BLAKE2B d2e5585dba575134baf0dea274a0e351c6cdede45df9bad91ba57b3dc93435bddcd04c5cc0267e1f6ae84ba2c8a9d87f4d1883b1e4930fe69616228682a183db SHA512 bbdaafa209da031a836ea1ee2bfe7c8df0cdc76d49c745e36e03d6edc71e557d7fb8b4ef4b5ee6710039adca93182f183d16dd977d61c6c876e1da44536346c7 diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml index a1b89deccc29..ca2406f144a2 100644 --- a/app-admin/rex/metadata.xml +++ b/app-admin/rex/metadata.xml @@ -13,10 +13,6 @@ kentnl@gentoo.org Kent Fredric - - proxy-maint@gentoo.org - Proxy Maintainers - RexOps/Rex Rex diff --git a/app-admin/rex/rex-1.12.1.ebuild b/app-admin/rex/rex-1.12.1.ebuild deleted file mode 100644 index d8e8649d2bd7..000000000000 --- a/app-admin/rex/rex-1.12.1.ebuild +++ /dev/null @@ -1,196 +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="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-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=" - virtual/perl-Carp - virtual/perl-Data-Dumper - dev-perl/Data-Validate-IP - dev-perl/DBI - dev-perl/Devel-Caller - dev-perl/Digest-HMAC - virtual/perl-Digest-MD5 - dev-perl/Expect - 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/IPC-Shareable - 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-LibXML - dev-perl/XML-Simple - dev-perl/libwww-perl - dev-perl/YAML - virtual/perl-version -" - -BDEPEND=" - ${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-7.110.100 - >=dev-perl/File-ShareDir-Install-0.60.0 - test? ( - virtual/perl-File-Temp - dev-perl/Test-Deep - >=dev-perl/Test-UseAllModules-0.150.0 - 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 '/^\[Test::Perl::Critic\]/d' \ - -e '/^\[PodSyntaxTests\]/d' \ - -e '/^Test::Kwalitee =/d' \ - -e '/^Test::PerlTidy =/d' \ - -e '/^Test::Pod =/d' \ - -e '/^\[Test::CPAN::Changes\]/{N;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.12.2.ebuild b/app-admin/rex/rex-1.12.2.ebuild deleted file mode 100644 index d832e4f2b87a..000000000000 --- a/app-admin/rex/rex-1.12.2.ebuild +++ /dev/null @@ -1,203 +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 '/^\[Test::Perl::Critic\]/d' \ - -e '/^\[PodSyntaxTests\]/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.0.ebuild b/app-admin/rex/rex-1.13.0.ebuild new file mode 100644 index 000000000000..b8623b485c3c --- /dev/null +++ b/app-admin/rex/rex-1.13.0.ebuild @@ -0,0 +1,204 @@ +# 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.1.ebuild new file mode 100644 index 000000000000..6a9496d529c0 --- /dev/null +++ b/app-admin/rex/rex-1.13.1.ebuild @@ -0,0 +1,203 @@ +# 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 + 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/ || 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}'"; + + 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-9999.ebuild b/app-admin/rex/rex-9999.ebuild index d832e4f2b87a..6942c13d2e55 100644 --- a/app-admin/rex/rex-9999.ebuild +++ b/app-admin/rex/rex-9999.ebuild @@ -62,11 +62,10 @@ RDEPEND=" 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 + >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape @@ -82,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 @@ -90,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 @@ -121,8 +123,9 @@ dzil_src_prep() { # 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 '/^\[Test::Perl::Critic\]/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' \ @@ -130,10 +133,16 @@ dzil_src_prep() { -e '/^\[OptionalFeature/,/^$/d' \ -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 + # 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/ + 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 @@ -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 } -- cgit v1.2.3