From 47223eb70974998c84966981d9e4fc2be27b3f8a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 6 Mar 2023 17:54:58 +0000 Subject: gentoo auto-resync : 06:03:2023 - 17:54:58 --- app-admin/Manifest.gz | Bin 32366 -> 32358 bytes app-admin/conky/Manifest | 2 +- app-admin/conky/conky-1.17.0.ebuild | 2 +- app-admin/rex/Manifest | 6 +- app-admin/rex/rex-1.14.0-r1.ebuild | 222 ----------------------------------- app-admin/rex/rex-1.14.1.ebuild | 225 ++++++++++++++++++++++++++++++++++++ app-admin/rex/rex-9999.ebuild | 3 + 7 files changed, 233 insertions(+), 227 deletions(-) delete mode 100644 app-admin/rex/rex-1.14.0-r1.ebuild create mode 100644 app-admin/rex/rex-1.14.1.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index d81c6175d5bd..665d91b8f069 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 6f723a932f2b..d96d0ba5107c 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -2,6 +2,6 @@ DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe482 DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1 EBUILD conky-1.13.1.ebuild 4795 BLAKE2B daff0445b97281fcd8fd737b681b862fae0570c15bbdcd9dd25fbaf5db825e8b6e0eeba771b34d09329ca338e869d341cd83b3ace80f31b28ccc103d59a66829 SHA512 75bd14e46fb12acc2d31b933adcfccf3a25e0202c8a40238bc585c9275c875e145833ae5e9870a9d0697bcf2b04b1ae5bbbb680fcd3c023ca21350fd6ead6e7f -EBUILD conky-1.17.0.ebuild 5292 BLAKE2B db42b7caf72f9fcc93c12b6547fa697a435bce0a2cd2588f0afe8c041f03b626d0d55b2c5b8ce17a917a483374c703e3e4f62a999101ff359b002f138e77507a SHA512 49e45b5599d427ad6d411e918746b3cd619d847da323a2663de097131ca2c78afe7bff27512c704057fe619b2d34291dad7680d56f87a4102128f8e6cf98dfc9 +EBUILD conky-1.17.0.ebuild 5290 BLAKE2B fd68d822a4a6236fcba4fc12f690f8d06ebce043550b6b1840fb4a3e1f4677fd9b1f34fe1b6de00a54cf7f813924d421fb69e409d4217bbee4949890bc03b5cd SHA512 45c934e10f0a114bc42bc2c35a8889885fc1864e94de9874f978cab0adf18d78277d26aee51c3a5420d85f203dc8d7627277805b4235fcae614d73e1066eb15b EBUILD conky-1.18.1.ebuild 5443 BLAKE2B e90677a3ea0cb529aaf27a9bc29852129f88e940f4b0dbbccbfebe2694c2d5f4a61a062987ccb79a7c2d4ae2178fdb6d2f6427c240b5cb1124b4a4f932cd9eb3 SHA512 f40b45c43dede63420b63e2e53e623b319df66883dcf6424f986f38a9d6794969eaad3145a74454844025696437c728a979118ebb0a7441014c5d7a890487e39 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48 diff --git a/app-admin/conky/conky-1.17.0.ebuild b/app-admin/conky/conky-1.17.0.ebuild index 2b68b5ac28bd..3db5a0db1c8d 100644 --- a/app-admin/conky/conky-1.17.0.ebuild +++ b/app-admin/conky/conky-1.17.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86" IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest index bd9b0760b4de..d904d80e854a 100644 --- a/app-admin/rex/Manifest +++ b/app-admin/rex/Manifest @@ -1,8 +1,8 @@ DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc DIST Rex-1.13.4.tar.gz 351011 BLAKE2B ec046b88f4443b03c05efbabb40900085293c61dab0ee9818a8c4d05be3cc0a1c1f53738b72cc245aaa2dfbcb00541f0e1e31b0c20f2464e9fc6586ed10707ef SHA512 27b76f4b527b42ea0b06dc1de05254dbd6e2fa3bc9a8a708af7557789ef22aec374a5d0585bf3ec4ee878a5387d51b881cf95855dbd05149b7b23929de12027d -DIST Rex-1.14.0.tar.gz 353494 BLAKE2B 3943c56df99d3dd98cefbdc68644f1a34109e20e18aa6db61e617d1f5ece8cf9612b7b098dafff7df9435820791bd1476163e5b9e6d35ef20bd47506747ad849 SHA512 fa2ad4b71c9c7b9a352303626e7530fc7fd02b295908c6184680a2646b14553b037a264af932b9a9efd5f1019ded86f3c8857db9651d7a4d7d6cf153924ac3ad +DIST Rex-1.14.1.tar.gz 354512 BLAKE2B e82248fa58b10e92f2256c57b589e8db6fc61a03532eac00a28431f2527b4a7e5fdaebbf4a0bdbdfa5b775be95826fb26fa831b58ecf354d6758f5a26649dc32 SHA512 c3cb3e64fb443858a47fbf0afabc9e57ca0a7646447ea259c109a5385a57b4347664dde23575e529afa17881f400bd1735994793362aa101519747805153cb75 EBUILD rex-1.13.3.ebuild 6438 BLAKE2B eb30c79b80eb7dd169d011fd6c4df754e6016179ae4f6c02a86404764d4a6a3d1839515670b4f4f765294759af5ff9cad2a1f131fa3193f7dd03c49bbc644f33 SHA512 67c8042bf2f5dcb4bc739fe745bcce55f0f90127390fe60f2f43142dc84e07c23af99b16b487fe8f41e1b4afad4368b2532a1e65120249e431f48ca1e137afcf EBUILD rex-1.13.4.ebuild 6438 BLAKE2B eb30c79b80eb7dd169d011fd6c4df754e6016179ae4f6c02a86404764d4a6a3d1839515670b4f4f765294759af5ff9cad2a1f131fa3193f7dd03c49bbc644f33 SHA512 67c8042bf2f5dcb4bc739fe745bcce55f0f90127390fe60f2f43142dc84e07c23af99b16b487fe8f41e1b4afad4368b2532a1e65120249e431f48ca1e137afcf -EBUILD rex-1.14.0-r1.ebuild 6488 BLAKE2B e1f28cee98efc754bcd8a97fb8833bdb077917e336f288badff70d007a25dcd29f2ea4e68a5b0ec8f651ea9e6e668a67445d40850c8c5e5267982f915094916c SHA512 b3c60b30fe868e3385532e75a3d37bedc6474e163ebf6bf937be582e8e13b9e308e20a062db1ae027410acafbed769ab7efbfe8339af539d16057ad2eee5d6c4 -EBUILD rex-9999.ebuild 6488 BLAKE2B e1f28cee98efc754bcd8a97fb8833bdb077917e336f288badff70d007a25dcd29f2ea4e68a5b0ec8f651ea9e6e668a67445d40850c8c5e5267982f915094916c SHA512 b3c60b30fe868e3385532e75a3d37bedc6474e163ebf6bf937be582e8e13b9e308e20a062db1ae027410acafbed769ab7efbfe8339af539d16057ad2eee5d6c4 +EBUILD rex-1.14.1.ebuild 6581 BLAKE2B f3f2a5147d2a1442a3f5e1132f389165d922f5c8184707b14dea42da4f778dc82cac27dfe336be896f7d8ed946c15ce973273e61583d79913ff2ee0248d3ec8b SHA512 622d15521937083446279af62df0d6b376b6f77fd1bf69b59a4eaf2b5d3561968b24aadb59d9400c074a7d2fd1b7e1510b0269f23f697659e2fdc60020af57b2 +EBUILD rex-9999.ebuild 6581 BLAKE2B f3f2a5147d2a1442a3f5e1132f389165d922f5c8184707b14dea42da4f778dc82cac27dfe336be896f7d8ed946c15ce973273e61583d79913ff2ee0248d3ec8b SHA512 622d15521937083446279af62df0d6b376b6f77fd1bf69b59a4eaf2b5d3561968b24aadb59d9400c074a7d2fd1b7e1510b0269f23f697659e2fdc60020af57b2 MISC metadata.xml 23997 BLAKE2B 1c0d4d5488171646c777d9d1099ae20abecde3d53fcab1a172a69f866e409c8b9c7db32e7944d48b3ad6a9fdfd4e083907bb891b084c6308585887ceccfeeb3b SHA512 e19019443dd2da2f30dd9a0bde7b3e242c1601bd776faf8312d0973afb05294bce6f22bb7a5657085c6b059f157ad9cd517b2e325b8de9a04db64159f63d698b diff --git a/app-admin/rex/rex-1.14.0-r1.ebuild b/app-admin/rex/rex-1.14.0-r1.ebuild deleted file mode 100644 index 8cbbbb057ec2..000000000000 --- a/app-admin/rex/rex-1.14.0-r1.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2023 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? ( - 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-1.450.0 - 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 -" -# 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? ( - dev-perl/File-LibMagic - ) - virtual/perl-File-Temp - dev-perl/Sub-Override - dev-perl/Test-Deep - dev-perl/Test-Exception - 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" - - # 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-1.14.1.ebuild b/app-admin/rex/rex-1.14.1.ebuild new file mode 100644 index 000000000000..c6c604f1e599 --- /dev/null +++ b/app-admin/rex/rex-1.14.1.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2023 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? ( + 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-1.450.0 + 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 + 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? ( + dev-perl/File-LibMagic + ) + 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 8cbbbb057ec2..c6c604f1e599 100644 --- a/app-admin/rex/rex-9999.ebuild +++ b/app-admin/rex/rex-9999.ebuild @@ -81,6 +81,7 @@ RDEPEND=" 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=" @@ -99,7 +100,9 @@ BDEPEND=" dev-perl/Test-Exception dev-perl/Test-Output dev-perl/Test-UseAllModules + dev-perl/Test-Warnings virtual/perl-autodie + virtual/perl-Module-Load-Conditional ) " -- cgit v1.2.3