Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SGML/DocBook revamp #12858

Closed
wants to merge 25 commits into from
Closed

SGML/DocBook revamp #12858

wants to merge 25 commits into from

Conversation

mgorny
Copy link
Member

@mgorny mgorny commented Sep 3, 2019

I figured it's time to move those ebuilds to EAPI 7. While at it, I've noticed that sgml-catalog.eclass is ugly, so here's an attempt to make it nicer.

The main idea is that we no longer want to magically write a lot of files in postinst/postrm/prerm. Instead:

  1. Files that are written only by one package are installed in src_install(), i.e. most of /etc/sgml/*.cat.
  2. /etc/sgml/catalog is created from all installed /etc/sgml/*.cat files on the system, instead of 'installing' and 'uninstalling' stuff in every package.

I'm going to take over more SGML/DocBook packages here and make one big change before posting it to -dev.

@SoapGentoo, @akhuettel

@mgorny mgorny added assigned PR successfully assigned to the package maintainer(s). work in progress The PR is not yet ready to be merged. labels Sep 3, 2019
@mgorny mgorny removed the assigned PR successfully assigned to the package maintainer(s). label Sep 4, 2019
@gentoo-bot gentoo-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. no signoff One or more commits do not indicate GCO sign-off. labels Sep 4, 2019
@mgorny
sgml-catalog-r1.eclass: New eclass to handle SGML catalogs
3ba2db1 
Create a new, simpler eclass to handle SGML catalog installation.
Rather than relying on external tool to add/remove catalogs
in postinst/postrm, let ebuilds install interim catalogs and just
register all installed catalogs.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/sgml-common: Take ownership
7a5e823 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/sgml-common: EAPI 7, major cleanup
06de26d 
Bump to EAPI 7.  Remove old catalog cleanup code, and switch
to sgml-catalog-r1 for regen.  Correct LICENSE.  Own /etc/sgml/catalog.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml: Take ownership
8c80e7b 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml: Correct LICENSE to metapackage
1eb7aa6 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml: Sort deps
1030951 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml-dtd: Take ownership
c3ca635 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml-dtd: Bump to EAPI 7, use sgml-catalog-r1
9ed0f46 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-xml-dtd: Take ownership
dedeee6 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-xml-dtd: Bump to EAPI 7, use sgml-catalog-r1
f670649 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-xml-simple-dtd: Take ownership
9e5f7ed 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-xml-simple-dtd: Bump to EAPI 7, use sgml-catalog-r1
747ee69 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/html401: Take ownership
0680ab3 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/html401: Bump to EAPI 7, use sgml-catalog-r1
ca145fa 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/xhtml1: Take ownership
832e5c0 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/xhtml1: Bump to EAPI 7, use sgml-catalog-r1
efc9a63 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/linuxdoc-tools: Bump to EAPI 7, use sgml-catalog-r1
2abbd2e 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/sgmltools-lite: Take ownership
4d5a470 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/sgmltools-lite: Bump to EAPI 7, use sgml-catalog-r1
5a19faf 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-dsssl-stylesheets: Take ownership
c7cca91 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-dsssl-stylesheets: Bump to EAPI 7, use sgml-catalog-r1
4c7b91b 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/openjade: Take ownership
611687f 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/openjade: Use sgml-catalog-r1, cleanup
2054008 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml-utils: Take ownership
af01c1f 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@mgorny
app-text/docbook-sgml-utils: Bump to EAPI 7
5bce393 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2019-09-05 11:56 UTC
Newest commit scanned: 5bce393
Status: ✅ good

No issues found

@mgorny mgorny removed assigned PR successfully assigned to the package maintainer(s). maintainer-needed There is at least one affected package with no maintainer. Review it if you can. no signoff One or more commits do not indicate GCO sign-off. work in progress The PR is not yet ready to be merged. labels Sep 11, 2019
@mgorny mgorny changed the title [WIP] SGML/DocBook revamp SGML/DocBook revamp Sep 11, 2019
@gentoo-bot
Copy link

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Submitter: @mgorny
Areas affected: ebuilds, eclasses
Packages affected: app-text/docbook-dsssl-stylesheets, app-text/docbook-sgml, app-text/docbook-sgml-dtd, app-text/docbook-sgml-utils, app-text/docbook-xml-dtd...

app-text/docbook-dsssl-stylesheets: @gentoo/proxy-maint (maintainer needed)
app-text/docbook-sgml: @gentoo/proxy-maint (maintainer needed)
app-text/docbook-sgml-dtd: @gentoo/proxy-maint (maintainer needed)
app-text/docbook-sgml-utils: @gentoo/proxy-maint (maintainer needed)
app-text/docbook-xml-dtd: @gentoo/proxy-maint (maintainer needed)
app-text/docbook-xml-simple-dtd: @gentoo/proxy-maint (maintainer needed)
app-text/html401: @gentoo/proxy-maint (maintainer needed)
app-text/linuxdoc-tools: @Coacher, @gentoo/proxy-maint
app-text/openjade: @gentoo/proxy-maint (maintainer needed)
app-text/sgml-common: @gentoo/proxy-maint (maintainer needed)
app-text/sgmltools-lite: @gentoo/proxy-maint (maintainer needed)
app-text/xhtml1: @gentoo/proxy-maint (maintainer needed)

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

@gentoo-bot gentoo-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. and removed no bug found No Bug/Closes found in the commits. labels Sep 11, 2019
@mgorny
Copy link
Member Author

mgorny commented Sep 11, 2019

Merged.

@mgorny mgorny closed this Sep 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
assigned PR successfully assigned to the package maintainer(s). maintainer-needed There is at least one affected package with no maintainer. Review it if you can. no bug found No Bug/Closes found in the commits.
Projects
None yet
Milestone
No milestone
3 participants
@mgorny @gentoo-repo-qa-bot @gentoo-bot