diff options
author | Ferenc Erki <erkiferenc@gmail.com> | 2020-04-11 18:34:24 +0200 |
---|---|---|
committer | Kent Fredric <kentnl@gentoo.org> | 2020-04-23 08:17:20 +1200 |
commit | 39868a637839ba1b3eb52e645a855cb5babfeb52 (patch) | |
tree | 0005a228ecbcf4cabe4bd87046fad8707bc16694 /app-admin | |
parent | package.mask: reference #718832 for flask-bootstrap (diff) | |
download | gentoo-39868a637839ba1b3eb52e645a855cb5babfeb52.tar.gz gentoo-39868a637839ba1b3eb52e645a855cb5babfeb52.tar.bz2 gentoo-39868a637839ba1b3eb52e645a855cb5babfeb52.zip |
app-admin/rex: bump version to 1.9.0
Closes: https://bugs.gentoo.org/705190
Closes: https://github.com/gentoo/gentoo/pull/14313
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Ferenc Erki <erkiferenc@gmail.com>
Signed-off-by: Kent Fredric <kentnl@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/rex/Manifest | 1 | ||||
-rw-r--r-- | app-admin/rex/metadata.xml | 7 | ||||
-rw-r--r-- | app-admin/rex/rex-1.9.0.ebuild | 185 |
3 files changed, 193 insertions, 0 deletions
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest index 0f9e21d527bb..c4495a8f5b3d 100644 --- a/app-admin/rex/Manifest +++ b/app-admin/rex/Manifest @@ -3,3 +3,4 @@ DIST Rex-1.4.0.tar.gz 289330 BLAKE2B 70d74753e5b04b05ea7a5507f5c8c19ae953b4cc28e DIST Rex-1.4.1.tar.gz 317358 BLAKE2B 8c12d54e86684ec224a75693f82fd4728af32a986f166d530bccc2d06c5087fdb29f067d4419f3160244d37c12ace6cd29ba1322992bcc9f4a481c06e00efa51 SHA512 07e7d950326aaa60e05977f2acb2ac90f07efe0d56411ba202a4c60a890c37e984c6786383623ac67f8e36052cf8436e8430fd024dde282a7d2530425b420e8e DIST Rex-1.5.0.tar.gz 327424 BLAKE2B ea735ebeef7a4d879ec61783c7ee803f198b4091882bbdbaee1b415330fcb20ba408f082e7ecaaa5c63664d905690bd6b5601d2d726ff20f5dc9d1f8c6d470a4 SHA512 43a1e147e5d2dccdc641479f2bf5449b0051651d152823738caf946bb3ceecb444011c3273f0c70ca5feab737702f6cd609f5b211eec8261e1facd80c82b6c73 DIST Rex-1.6.0.tar.gz 331330 BLAKE2B cb3a2895c1b7fd775aa762e8af7fbfdf3d14aac0d4ed5cd32bc65f4eb2b7794e438015daf9602cea3a852ed17dd207c9647303a106d8fff2cc89b5ce7a5ff0a2 SHA512 8e4421e034ddf7337266ce2002e96cad12a632ff37742991685d2919e3b11a4f6f3348097fd36717ab83a38e2e46aa974d0e56c67568a857c30f7ea673a51cda +DIST Rex-1.9.0.tar.gz 331106 BLAKE2B 74bdf06be9454bc41c444a7d2bf576740e8ecfd2dd575d96172becaac5ee6031506b5ef111c6755a3bc3dcb1eb45722a14c050578cf816815954686a0e79a5ab SHA512 9f9f629d681cc9af3fabccbbb31a881ab7a0414b51e6f1fc45600772b5f7207f8bf27a757955576b15eb7e8e7339e9f4746c497e4111904ad57614ebf1e3cb55 diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml index 8ff646c52b5c..a1b89deccc29 100644 --- a/app-admin/rex/metadata.xml +++ b/app-admin/rex/metadata.xml @@ -29,6 +29,7 @@ <remote-id type="cpan-module">Rex::Box</remote-id> <remote-id type="cpan-module">Rex::Box::Amazon</remote-id> <remote-id type="cpan-module">Rex::Box::Base</remote-id> + <remote-id type="cpan-module">Rex::Box::Docker</remote-id> <remote-id type="cpan-module">Rex::Box::KVM</remote-id> <remote-id type="cpan-module">Rex::Box::VBox</remote-id> <remote-id type="cpan-module">Rex::CLI</remote-id> @@ -224,6 +225,7 @@ <remote-id type="cpan-module">Rex::Pkg::SunOS::OpenCSW</remote-id> <remote-id type="cpan-module">Rex::Pkg::SunOS::pkg</remote-id> <remote-id type="cpan-module">Rex::Pkg::Ubuntu</remote-id> + <remote-id type="cpan-module">Rex::Pkg::VoidLinux</remote-id> <remote-id type="cpan-module">Rex::PkgConf</remote-id> <remote-id type="cpan-module">Rex::PkgConf::Base</remote-id> <remote-id type="cpan-module">Rex::PkgConf::Debian</remote-id> @@ -263,6 +265,7 @@ <remote-id type="cpan-module">Rex::Service::SunOS</remote-id> <remote-id type="cpan-module">Rex::Service::SunOS::svcadm</remote-id> <remote-id type="cpan-module">Rex::Service::Ubuntu</remote-id> + <remote-id type="cpan-module">Rex::Service::VoidLinux</remote-id> <remote-id type="cpan-module">Rex::Shared::Var</remote-id> <remote-id type="cpan-module">Rex::Shared::Var::Array</remote-id> <remote-id type="cpan-module">Rex::Shared::Var::Common</remote-id> @@ -306,11 +309,15 @@ <remote-id type="cpan-module">Rex::Virtualization::Docker::daemon</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::delete</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::destroy</remote-id> + <remote-id type="cpan-module">Rex::Virtualization::Docker::guestinfo</remote-id> + <remote-id type="cpan-module">Rex::Virtualization::Docker::images</remote-id> + <remote-id type="cpan-module">Rex::Virtualization::Docker::import</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::info</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::list</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::reboot</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::shutdown</remote-id> <remote-id type="cpan-module">Rex::Virtualization::Docker::start</remote-id> + <remote-id type="cpan-module">Rex::Virtualization::Docker::status</remote-id> <remote-id type="cpan-module">Rex::Virtualization::LibVirt</remote-id> <remote-id type="cpan-module">Rex::Virtualization::LibVirt::blklist</remote-id> <remote-id type="cpan-module">Rex::Virtualization::LibVirt::clone</remote-id> diff --git a/app-admin/rex/rex-1.9.0.ebuild b/app-admin/rex/rex-1.9.0.ebuild new file mode 100644 index 000000000000..26385e391279 --- /dev/null +++ b/app-admin/rex/rex-1.9.0.ebuild @@ -0,0 +1,185 @@ +# 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 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 + test? ( + virtual/perl-File-Temp + dev-perl/Test-Deep + >=dev-perl/Test-UseAllModules-0.150.0 + ) +" + +[[ ${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() { + # NextVersion 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 +} |