diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 25331a2f2d..1e1416abed 100644
--- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-single
 
@@ -17,11 +16,13 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
-RDEPEND=">=app-text/build-docbook-catalog-1.1
-	ruby? ( ${RUBY_DEPS} )"
+RDEPEND="
+	>=app-text/build-docbook-catalog-1.1
+	ruby? ( ${RUBY_DEPS} )
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -42,7 +43,7 @@ src_prepare() {
 		 -printf "removed %p\n" -delete || die
 
 	if ! use ruby; then
-	   rm -rv epub/ || die
+		rm -rv epub/ || die
 	fi
 }
 
@@ -83,19 +84,21 @@ src_install() {
 		# we can't use a symlink or it'll look for the library in the
 		# wrong path.
 		dodir /usr/bin
-		cat - > "${D}"/usr/bin/${cmd} <<EOF
+		cat - > "${ED%/}"/usr/bin/${cmd} <<EOF
 #!/usr/bin/env ruby
 
-load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
 EOF
 		fperms 0755 /usr/bin/${cmd}
 	fi
 }
 
 pkg_postinst() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/metadata.xml b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/metadata.xml
index cef0d5fef5..e170e24574 100644
--- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>