app-admin/rex-1.5.0 has been released on 2017-03-01. I'm attaching an ebuild and metadata to bump the version and fix some bugs. Namely: - fix keywords for the new, combined live ebuild - extend metadata with upstream tracking information (bug 559178) Please review and give feedback, or merge.
Created attachment 468630 [details] rex-1.5.0.ebuild bump version
Created attachment 468632 [details] rex-9999.ebuild Fix KEYWORDS for both live and regular versions
Created attachment 468634 [details] metadata.xml extend metadata with upstream tracking information (bug 559178)
Old versions except maybe last one (1.4.1) can also be removed from the tree.
The -9999 version should probably have no keyword declaration at all in the 9999 branch. That way, after you copy the -9999 version to a stable release, ekeyword will modify the right variable ( it uses regex ). NB: I'm on the maintainer list now, so I can probably do this stuff :)
Thanks for the live ebuild, Kent! I've tried to ensure there's a single version of the ebuild to maintain, if possible. Other than that I think it only needs a single dependency to be added (which I'll fix in a moment). Also, your metadata.xml changes from bug 559178 has been added with the current list of installed modules, and github upstream was added too.
Created attachment 468648 [details] rex-1.5.0.ebuild - bump version - add dev-perl/Data-Validate-IP dependency
Created attachment 468650 [details] rex-9999.ebuild - fix KEYWORDS for both live and regular versions - add dev-perl/Data-Validate-IP dependency
(In reply to Ferenc Erki from comment #6) > Thanks for the live ebuild, Kent! I've tried to ensure there's a single > version of the ebuild to maintain, if possible. Other than that I think it > only needs a single dependency to be added (which I'll fix in a moment). > > Also, your metadata.xml changes from bug 559178 has been added with the > current list of installed modules, and github upstream was added too. To clarify what I said earlier, with the change as-is from your last -9999.ebuild: ekeyword ~ppc rex-9999.ebuild Does this: rex-9999: ~ppc rex-9999: ~amd64 ~ppc ~x86 --- a/app-admin/rex/rex-9999.ebuild +++ b/app-admin/rex/rex-9999.ebuild @@ -10,12 +10,14 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH="development-1.x" EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git" VCS_ECLASS="git-r3" + KEYWORDS="~ppc" 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=JFRIED DIST_NAME=Rex + KEYWORDS="~amd64 ~ppc ~x86" fi And it should never do that ( it marks the git version for ppc ... ) I would reduce your patch by one line to this: diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild index 9f36dfc5c2..d7c75b836f 100644 --- a/app-admin/rex/rex-9999.ebuild +++ b/app-admin/rex/rex-9999.ebuild @@ -16,6 +16,7 @@ else # Also prevents perl-module.eclass provisioning SRC_URI DIST_AUTHOR=JFRIED DIST_NAME=Rex + KEYWORDS="~amd64 ~x86" fi inherit perl-module ${VCS_ECLASS} @@ -23,7 +24,6 @@ inherit perl-module ${VCS_ECLASS} DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands" SLOT="0" -KEYWORDS="" IUSE="test" DZIL_DEPENDS=" @@ -37,6 +37,7 @@ DZIL_DEPENDS=" " RDEPEND=" + dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC That way, ekeyword continues to do the right thing.
Also, in your generated metadata, all the module names have one ":" instead of 2! :D Fortunately I have a tool I use that generates these by applying a little magic with Module::Metadata and the packlist :)
Thrown your changes + my suggested amendments to them into git, and here's a PR if you want to review it: https://github.com/gentoo/gentoo/pull/4331 Alternatively: git clone -b rex-1.5.0 https://github.com/kentfredric/gentoo.git Commits: e7fada30c0062118e63d10b07ff0bbe25d84d78c e6714bbabe77f00bc955f8ba5d27551e40f61074
commit: b8788bbe6e0eaef92f83ee61eef2707beeb52a3d author: 2017-03-30 18:06:06 +0000 Kent Fredric <kentnl@gentoo.org> commit: 2017-03-31 10:14:11 +0000 Kent Fredric <kentnl@gentoo.org> gpg-key: E854324B1366A820 app-admin/rex: Bump to version 1.5.0 Ebuild & metadata changes submitted by Ferenc Erki - Update metadata - Fix keywords - Add dep on Data-Validate-IP Bug: https://bugs.gentoo.org/614286 Bug: https://bugs.gentoo.org/559178 Package-Manager: Portage-2.3.4, Repoman-2.3.2 commit: 31c034e7539cc229aee0327f3be23c8ba6850754 author: 2017-03-30 16:59:32 +0000 Kent Fredric <kentnl@gentoo.org> commit: 2017-03-31 10:14:07 +0000 Kent Fredric <kentnl@gentoo.org> gpg-key: E854324B1366A820 app-admin/rex: fix keywording, add Data-Valdiate-IP dep Changes supplied by Ferenc Erki Bug: https://bugs.gentoo.org/614286 Package-Manager: Portage-2.3.4, Repoman-2.3.2
Thanks for your feedback and review, Kent! Your version to handle KEYWORDS is more correct indeed. Can you share or point me to the tool you use for generating the metadata bits, please? I just used an ad-hoc combination of equery/grep/cut/sed pipeline, and I made the typo in that for the wrong number of colons - I'd be happy to use the same tool as you do :) One more remark: github upstream is `RexOps/Rex` (note the uppercase letters). Otherwise it's fine to merge with me! EDIT: I was just a bit too late and commented this at the exact same time you merged, thanks!
