diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.1.ebuild
index 182ab5b3a3..30d30860bd 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.1.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perfo
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.50.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.50.1.ebuild
index c890d82170..59eec62eb1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.50.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.50.1.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perfo
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.0.ebuild
index b4bac67aea..9a2e92d89e 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.0.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.1.ebuild
index a5192104c3..c4c40fbed1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.1.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.2-r1.ebuild
index 8f8c753210..3de51238c4 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.2-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.51.2-r1.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild
index 8f8c753210..68a5ad083c 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
@@ -245,6 +245,7 @@ src_configure() {
 	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
+			-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		)
 	fi
 
@@ -334,11 +335,6 @@ src_test() {
 src_install() {
 	meson_src_install
 
-	if use doc ; then
-		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
-		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
-	fi
-
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild
index 8f8c753210..68a5ad083c 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
@@ -245,6 +245,7 @@ src_configure() {
 	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
+			-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		)
 	fi
 
@@ -334,11 +335,6 @@ src_test() {
 src_install() {
 	meson_src_install
 
-	if use doc ; then
-		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
-		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
-	fi
-
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild
index 8f8c753210..68a5ad083c 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
@@ -245,6 +245,7 @@ src_configure() {
 	if [[ ${PV} == *9999 ]] || use doc ; then
 		emesonargs+=(
 			-Ddocs="man$(usev doc ',html')"
+			-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		)
 	fi
 
@@ -334,11 +335,6 @@ src_test() {
 src_install() {
 	meson_src_install
 
-	if use doc ; then
-		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
-		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
-	fi
-
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild
index 8f8c753210..3de51238c4 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild
@@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
 # Common to both DEPEND and RDEPEND
 DEPEND="
 	dev-libs/openssl:=
-	sys-libs/zlib
+	virtual/zlib:=
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )