--- /usr/portage/app-text/xhtml11/xhtml11-20101123.ebuild	2020-02-11 21:51:00.000000000 +0400
+++ /home/dab/work/bbgentoo_overlay/trunk/app-text/xhtml11/xhtml11-20101123-r9000.ebuild	2020-11-03 13:25:06.285104626 +0400
@@ -4,7 +4,7 @@
 EAPI=7
 inherit sgml-catalog-r1
 
-DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.1"
 HOMEPAGE="http://www.w3.org/TR/xhtml11/"
 SRC_URI="http://www.w3.org/TR/xhtml11/xhtml11.tgz -> ${P}.tar.gz"
 
@@ -42,9 +42,11 @@
 	sgml-catalog-r1_pkg_postinst
 
 	xml_catalog_setup || return
-	einfo "Installing xhtml11 in the global XML catalog"
+	einfo "Installing ${PN} in the global XML catalog"
 	"${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.1//EN' \
 		"${DTDDIR}"/xhtml11-flat.dtd "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'system' 'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd' \
+		"${DTDDIR}"/xhtml11-flat.dtd "${CATALOG}"
 	"${XMLTOOL}" --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml11/DTD' \
 		"${DTDDIR}" "${CATALOG}"
 	"${XMLTOOL}" --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml11/DTD' \
@@ -56,7 +58,8 @@
 
 	[[ -n ${REPLACED_BY_VERSION} ]] && return
 	xml_catalog_setup || return
-	einfo "Removing xhtml1 from the global XML catalog"
+	einfo "Removing ${PN} from the global XML catalog"
 	"${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.1//EN' "${CATALOG}"
+	"${XMLTOOL}" --noout --del 'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd' "${CATALOG}"
 	"${XMLTOOL}" --noout --del 'http://www.w3.org/TR/xhtml11/DTD' "${CATALOG}"
 }