eclass/sgml-catalog.eclass and app-text/docbook-dsssl-stylesheets: Bump to EAPI=6 #6238
Conversation
|
Pull Request assignment Areas affected: eclasses @gentoo/github Bugs linked: 497052 |
gentoo-repo-qa-bot
added
need assignment
waebbl
changed the title
jonasstein
added
the
maintainer-needed
|
I would apply for proxy maintaining the docbook-dsssl-stylesheets. Depending on how the gentoo team is handling this, I also like to apply for the sgml-catalog.eclass as a proxy maintainer. It seems fairly easy to understand, just moderate bash used, no higher-level bashism and additionally quite short. |
|
👍 All QA issues have been fixed! |
|
@akhuettel ping on the two weeks old review request. If you find the time, I'd be happy if you can follow the request. Thanks! |
eclass/sgml-catalog.eclass
Outdated
| @@ -8,7 +8,10 @@ | |||
| # Author Matthew Turk <satai@gentoo.org> | |||
| # @BLURB: Functions for installing SGML catalogs | |||
|
|
|||
| inherit base | |||
| case ${EAPI:-0} in | |||
| 1|2|3|4|5) inherit base ;; | |||
There was a problem hiding this comment.
I thought EAPI=0 is only implicitly assumed whenever EAPI is missing. I can add it.
Does it need some special care,, I.e. base eclass was not present in EAPI=0 or something?
waebbl
force-pushed
the
eapibumps
branch
2 times, most recently
from
67434df
to
122aa1c
Compare
|
Updated to include EAPI=0 in sgml-catalog.eclass |
|
|
||
| src_unpack() { | ||
| unpack ${A} | ||
| cd "${S}" |
| src_unpack() { | ||
| unpack ${A} | ||
| cd "${S}" | ||
| cp "${FILESDIR}/${PN}-1.79.Makefile" Makefile |
| emake \ | ||
| BINDIR="${ED}/usr/bin" \ | ||
| DESTDIR="${ED}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \ | ||
| install || die |
There was a problem hiding this comment.
remove || die (internal Gentoo command)
| dodir /usr/share/sgml/stylesheets/dsssl/ | ||
|
|
||
| if [ -d "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ] && | ||
| [ ! -L "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ] |
There was a problem hiding this comment.
please use bash [[ ]] and not POSIX [ ]
Only inherit base if EAPI <= 5 Closes: https://bugs.gentoo.org/497052
docbook-dsssl-stylesheets-1.79-r3: version bump * EAPI update * add DOCS and HTML_DOCS * use updated Makefile * change make to emake * install manpage * install docs using einstalldocs files/docbook-dsssl-stylesheets-1.79.Makefile: new patch * use install instead of cp * make dir hierarchy with one mkdir call * don't create test subdir, seems not needed Package-Manager: Portage-2.3.14, Repoman-2.3.6
|
Requested changes updated and pushed |
| @@ -8,7 +8,10 @@ | |||
| # Author Matthew Turk <satai@gentoo.org> | |||
| # @BLURB: Functions for installing SGML catalogs | |||
|
|
|||
| inherit base | |||
| case ${EAPI:-0} in | |||
| 0|1|2|3|4|5) inherit base ;; | |||
There was a problem hiding this comment.
[0-5]) inherit base ;; should work too
| sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \ | ||
| "/etc/sgml/dsssl-docbook-stylesheets.cat" | ||
|
|
||
| src_unpack() { |
|
|
||
| src_unpack() { | ||
| unpack ${A} | ||
| cd "${S}" || die "change directory failed" |
There was a problem hiding this comment.
nix these two lines and just call default
| inherit sgml-catalog | ||
|
|
||
| MY_P=${P/-stylesheets/} | ||
| S=${WORKDIR}/${MY_P} |
|
Ping. |
|
No activity in 60+ days. Please address any changes requested, rebase the branch, and re-open the pull request. |
Only
inherit baseifEAPI <= 5Closes: https://bugs.gentoo.org/497052
Sorry, this PR got recreated, I noticed I initially did this PR on my master branch, when I wanted to prepare a PR for a different package and had to back in time and reapply this on the correct branch.