app-text/docbook-mathml-dtd: Rewrite ebuild.

Since sgml-catalog.eclass has been removed, add a new ebuild
based on sgml-catalog-r1.

diff --git a/app-text/docbook-mathml-dtd/Manifest b/app-text/docbook-mathml-dtd/Manifest
index d6de95e04587eb414c88c077dfad46ce4ac7a7fd..2e28ae567f37e0636fac9d2103ca845dcc33b20e 100644 (file)
--- a/app-text/docbook-mathml-dtd/Manifest
+++ b/app-text/docbook-mathml-dtd/Manifest
@@ -1,2 +1,2 @@
-DIST dbmathml-1.1_rc1.dtd 3525 SHA256 70da7140035621330f1b5ab6926197c3c3af467f2207d55a41f6396d9ad96abd SHA512 031ad81e0fd873d2ed0fb78a074cc2de93ea7c937d85aac6cb2dc3023e3ba494a9a20f485b5355ce9060aea9adae192c9259b59139ac71273ca3fb858a240704 WHIRLPOOL fff4da1abccf69ebf42963f31571da7ba173008410c08b78e0983d6ca81bb16c6bb0cc5081c472ca842223ba598be5e5f1520df7a59b6466836343af7a28e8a5
-EBUILD docbook-mathml-dtd-1.1_rc1.ebuild 1799 SHA256 993e5e527cdbd7dd278e16ef598e87c49c2e377becd188a1566b622e615585e4 SHA512 854098ab6357b755b733312d1b01cd09d659b4321601fbf381d550c2756a3be4850827c016768430bcb1e7709da79bc346015745778b2e55c636c9841b5a1e01 WHIRLPOOL 2aad1a0c13a37d33380f3e8b964d9d57219ace09a3169963423421dfdbe71f5b3c79f5f5e3b7945c926799da0e9b3fcf21b450e5a9aa83e27bf75a5bcf5b5ee4
+DIST dbmathml-1.1_rc1.dtd 3525 BLAKE2B 7075ea787e279381253fdd4ce686346f90ead5be10a5803e2e166053f3cdea86ea4473ceb6ad880cf8e896fa5d06cc800268b9ecbb7cd7f87d99104ff7de4c6c SHA512 031ad81e0fd873d2ed0fb78a074cc2de93ea7c937d85aac6cb2dc3023e3ba494a9a20f485b5355ce9060aea9adae192c9259b59139ac71273ca3fb858a240704
+EBUILD docbook-mathml-dtd-1.1_rc1-r1.ebuild 1970 BLAKE2B 9a5d912a063a77b07bf504e650f933bdb950d29cde291b063da03bead4ac8b6e05b325bb3692fd41c179f6b95c9833fc72a800ef3e216126aeb8b2b5619e531b SHA512 478fd1cd145857c8e361267ad406e7faca69c83297933466b5b458e75a8e8b3629e3723c101a62f028d982ea5d3eab0e6943d0a9a860bc813898bf6eac7a091d

diff --git a/app-text/docbook-mathml-dtd/docbook-mathml-dtd-1.1_rc1-r1.ebuild b/app-text/docbook-mathml-dtd/docbook-mathml-dtd-1.1_rc1-r1.ebuild
new file mode 100644 (file)
index 0000000..37188a6
--- /dev/null
+++ b/app-text/docbook-mathml-dtd/docbook-mathml-dtd-1.1_rc1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright © 2020 Nick Bowler
+# License GPLv3+: GNU General Public License version 3 or any later version.
+# This is free software: you are free to change and redistribute it.
+# There is NO WARRANTY, to the extent permitted by law.
+
+EAPI=7
+
+inherit sgml-catalog-r1
+
+DTDVER=${PV/_rc/CR}
+MY_PN=dbmathml
+MY_P=$MY_PN-$PV
+
+DESCRIPTION="DocBook MathML Module"
+HOMEPAGE="https://docbook.org/xml/mathml/"
+SRC_URI="https://docbook.org/xml/mathml/$DTDVER/$MY_PN.dtd -> $MY_P.dtd"
+
+LICENSE="docbook"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=$WORKDIR
+
+RDEPEND="dev-libs/libxml2
+       app-text/docbook-xml-dtd:4.3
+       app-text/mathml-xml-dtd"
+
+src_unpack () {
+       cp "$DISTDIR/$A" "$S" || die
+}
+
+src_install () {
+       local insdir="/usr/share/sgml/docbook/${P#docbook-}"
+
+       insinto "$insdir"
+       newins $MY_P.dtd $MY_PN.dtd
+
+       newins - catalog <<-EOF
+               PUBLIC "-//OASIS//DTD DocBook MathML Module V$DTDVER//EN" "$MY_PN.dtd"
+               SYSTEM "http://www.oasis-open.org/docbook/xml/mathml/$DTDVER/dbmathml.dtd" "dbmathml.dtd"
+       EOF
+
+       insinto /etc/sgml
+       newins - mathml-docbook-$PV.cat <<-EOF
+               CATALOG "${EPREFIX#/}$insdir/catalog"
+       EOF
+}
+
+update_catalog () {
+       local insdir="file://${EPREFIX#/}/usr/share/sgml/docbook/${P#docbook-}"
+       local xmlcatalog="${BROOT%/}/usr/bin/xmlcatalog"
+
+       local dtdpublic="-//OASIS//DTD DocBook MathML Module V$DTDVER//EN"
+       local dtduri="http://www.oasis-open.org/docbook/xml/mathml/$DTDVER"
+       local args=()
+
+       command -v "$xmlcatalog" >/dev/null || die
+
+       case $1 in
+       --add)
+               args=( --add public "$dtdpublic" "$insdir/$MY_PN.dtd"
+                          --add rewriteSystem "$dtduri" "$insdir"
+                          --add rewriteURI "$dtduri" "$insdir" )
+               ;;
+       --del)
+               args=( --del "$dtdpublic" --del "$dtduri" )
+               ;;
+       esac
+
+       xmlcatalog --noout "${args[@]}" "${EROOT%/}/etc/xml/docbook"
+}
+
+pkg_postinst () {
+       sgml-catalog-r1_pkg_postinst
+
+       einfo "Adding $P to docbook XML catalog"
+       update_catalog --add
+}
+
+pkg_postrm () {
+       sgml-catalog-r1_pkg_postinst
+
+       einfo "Removing $P from docbook XML catalog"
+       update_catalog --del
+}

diff --git a/app-text/docbook-mathml-dtd/docbook-mathml-dtd-1.1_rc1.ebuild b/app-text/docbook-mathml-dtd/docbook-mathml-dtd-1.1_rc1.ebuild
deleted file mode 100644 (file)
index e941b4f..0000000
--- a/app-text/docbook-mathml-dtd/docbook-mathml-dtd-1.1_rc1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit sgml-catalog
-
-MY_PV=${PV/_beta/b}
-MY_PV=${PV/_rc/CR}
-
-DESCRIPTION="Docbook DTD for MathML"
-HOMEPAGE="http://www.docbook.org/xml/mathml/"
-SRC_URI="http://www.docbook.org/xml/mathml/${MY_PV}/dbmathml.dtd -> dbmathml-${PV}.dtd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-text/mathml-xml-dtd"
-RDEPEND="dev-libs/libxml2
-       app-text/docbook-xml-dtd:4.3
-       >=app-text/build-docbook-catalog-1.6
-       ${DEPEND}"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/mathml-docbook-${PV}.cat" \
-       "/usr/share/sgml/docbook/${P#docbook-}/docbook.cat"
-
-src_unpack() {
-       cp "${DISTDIR}"/dbmathml-${PV}.dtd "${S}" || die
-}
-
-src_prepare() {
-       mv dbmathml-${PV}.dtd dbmathml.dtd || die
-       cat <<- EOF > docbook.cat || die
-               PUBLIC "-//OASIS//DTD DocBook MathML Module V${MY_PV}//EN" "dbmathml.dtd"
-               SYSTEM "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" "dbmathml.dtd"
-       EOF
-}
-
-src_install() {
-       insinto /usr/share/sgml/docbook/${P#docbook-}
-       doins *.cat *.dtd || die
-}
-
-pkg_postinst() {
-       build-docbook-catalog || die
-       sgml-catalog_pkg_postinst || die
-
-       xmlcatalog --noout \
-               --add public "-//OASIS//DTD DocBook MathML Module V${MV_PV}//EN" "file:///usr/share/sgml/docbook/${P#docbook-}/dbmathml.dtd" \
-               --add rewriteSystem "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1" "file:///usr/share/sgml/docbook/${P#docbook-}" \
-               "${EPREFIX}"/etc/xml/docbook \
-       || die
-}
-
-pkg_postrm() {
-       build-docbook-catalog || die
-       sgml-catalog_pkg_postrm || die
-
-       xmlcatalog --noout \
-               --del "-//OASIS//DTD DocBook MathML Module V${MV_PV}//EN" \
-               --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" \
-               "${EPREFIX}"/etc/xml/docbook \
-       || die
-}