diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest
index d75a4e329..7986c15dd 100644
--- a/dev-vcs/git-cvs/Manifest
+++ b/dev-vcs/git-cvs/Manifest
@@ -1,6 +1,6 @@
-DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
-DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
+DIST git-2.25.3.tar.xz 5878708 BLAKE2B b9e9ed205856a2d5cca57a539ab420e597e8de46624f1411f725c914cfd9f23c7129502b8511acef7eda0f2cd2322928843e54416df8b6f5a45a7b71a8a52a5a SHA512 1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471
 DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a
-DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
+DIST git-htmldocs-2.25.3.tar.xz 1296852 BLAKE2B aa54f8bcdd48f3d53749f8391340616feb965d466c4d7bb81050f2a17050335ca44984f56d0cbc1b6787b4aa6cf8b1ff521cafacae43f8e4e2401ba1a1d8e4a4 SHA512 df4bb00c20b5adba1d80e9afb75a9f4d63bad4ca46b317aa94949621979260f991d6efea473141760ec2e849ba90d87fbd9a8fbca73cf0e0a35462ad6621860e
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
+DIST git-manpages-2.25.3.tar.xz 459192 BLAKE2B 17bb4c6ab68b85efaca2e99469f601df029677e7b09e379e8b4bff23b54bf4cc3aedc5c16e0769d2bafef79ea2428db582accb1df78795d1d4c365dcee68daba SHA512 a6ae01129281e85fba8da1fd8cbe9bb2c33cce3075163af328aedb4ab721b9816b364cc18d87ae675b88af2baa5777acb0f874a6a172bdef3429d25d89f8f271
diff --git a/dev-vcs/git-cvs/git-cvs-2.23.0-r1.ebuild b/dev-vcs/git-cvs/git-cvs-2.25.3.ebuild
similarity index 95%
rename from dev-vcs/git-cvs/git-cvs-2.23.0-r1.ebuild
rename to dev-vcs/git-cvs/git-cvs-2.25.3.ebuild
index fdfc7447b..da2c72746 100644
--- a/dev-vcs/git-cvs/git-cvs-2.23.0-r1.ebuild
+++ b/dev-vcs/git-cvs/git-cvs-2.25.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -54,10 +54,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
 
 # Common to both DEPEND and RDEPEND
-CDEPEND="
+DEPEND="
 	~dev-vcs/git-${PV}[sab-split]
 	gnome-keyring? ( app-crypt/libsecret )
 	!libressl? ( dev-libs/openssl:0= )
@@ -73,11 +73,11 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	gpg? ( app-crypt/gnupg )
 	perl? (
 		dev-perl/Error
@@ -110,7 +110,7 @@ RDEPEND="${CDEPEND}
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
+BDEPEND="
 	sab-split? ( dev-util/dirstr )
 	doc? (
 		app-text/asciidoc
@@ -119,11 +119,12 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 	)
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
+	test? (	app-crypt/gnupg	)
+"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		app-text/asciidoc"
 fi
 
@@ -154,8 +155,6 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-
-	"${FILESDIR}"/${P/-cvs}-avoid_empty_remote_line.patch #698384
 )
 
 pkg_setup() {
@@ -172,7 +171,9 @@ pkg_setup() {
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
-	local myopts=(
+	local extlibs myopts
+
+	myopts=(
 		ASCIIDOC_NO_ROFF=YesPlease
 		$(usex cvs '' NO_CVS=YesPlease)
 		$(usex elibc_musl NO_REGEX=YesPlease '')
@@ -249,12 +250,14 @@ exportmakeopts() {
 			NEEDS_LIBICONV=YesPlease
 			HAVE_CLOCK_MONOTONIC=1
 		)
-		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
 			myopts+=( HAVE_GETDELIM=1 )
+		fi
 	fi
 
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=( ASCIIDOC8=YesPlease )
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
 
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
@@ -479,7 +482,7 @@ src_install() {
 		#elisp-install ${MY_PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${ED%/}${SITELISP}/${MY_PN}/compat/.nosearch"
+		touch "${ED}${SITELISP}/${MY_PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
@@ -568,7 +571,7 @@ src_install() {
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
-			"${ED%/}"/usr/share/${MY_PN}/contrib \
+			"${ED}"/usr/share/${MY_PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 
@@ -577,26 +580,26 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${MY_PN}/gitweb
+		dosym ../gitweb /usr/share/${MY_PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 
-		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
 			if test -d "${d}" ; then find "${d}" \
 				-name .packlist \
 				-delete || die
 			fi
 		done
 	else
-		rm -rf "${ED%/}"/usr/share/gitweb
+		rm -rf "${ED}"/usr/share/gitweb
 	fi
 
 	if ! use subversion ; then
-		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
-			"${ED%/}"/usr/share/man/man1/git-svn.1*
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 
 	if use xinetd ; then
@@ -617,8 +620,8 @@ src_install() {
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
-		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
@@ -738,7 +741,7 @@ src_test() {
 	nonfatal git_emake aggregate-results
 
 	# And bail if there was a problem
-	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
 }
 
 showpkgdeps() {
diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest
index d75a4e329..7986c15dd 100644
--- a/dev-vcs/git-gui-tools/Manifest
+++ b/dev-vcs/git-gui-tools/Manifest
@@ -1,6 +1,6 @@
-DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
-DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
+DIST git-2.25.3.tar.xz 5878708 BLAKE2B b9e9ed205856a2d5cca57a539ab420e597e8de46624f1411f725c914cfd9f23c7129502b8511acef7eda0f2cd2322928843e54416df8b6f5a45a7b71a8a52a5a SHA512 1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471
 DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a
-DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
+DIST git-htmldocs-2.25.3.tar.xz 1296852 BLAKE2B aa54f8bcdd48f3d53749f8391340616feb965d466c4d7bb81050f2a17050335ca44984f56d0cbc1b6787b4aa6cf8b1ff521cafacae43f8e4e2401ba1a1d8e4a4 SHA512 df4bb00c20b5adba1d80e9afb75a9f4d63bad4ca46b317aa94949621979260f991d6efea473141760ec2e849ba90d87fbd9a8fbca73cf0e0a35462ad6621860e
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
+DIST git-manpages-2.25.3.tar.xz 459192 BLAKE2B 17bb4c6ab68b85efaca2e99469f601df029677e7b09e379e8b4bff23b54bf4cc3aedc5c16e0769d2bafef79ea2428db582accb1df78795d1d4c365dcee68daba SHA512 a6ae01129281e85fba8da1fd8cbe9bb2c33cce3075163af328aedb4ab721b9816b364cc18d87ae675b88af2baa5777acb0f874a6a172bdef3429d25d89f8f271
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.23.0-r1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.25.3.ebuild
similarity index 95%
rename from dev-vcs/git-gui-tools/git-gui-tools-2.23.0-r1.ebuild
rename to dev-vcs/git-gui-tools/git-gui-tools-2.25.3.ebuild
index ea67be7f0..436d45f18 100644
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.23.0-r1.ebuild
+++ b/dev-vcs/git-gui-tools/git-gui-tools-2.25.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 # split ebuild providing only gitk, gitview, git-gui, git-citool
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -55,10 +55,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
 
 # Common to both DEPEND and RDEPEND
-CDEPEND="
+DEPEND="
 	~dev-vcs/git-${PV}[sab-split]
 	gnome-keyring? ( app-crypt/libsecret )
 	!libressl? ( dev-libs/openssl:0= )
@@ -74,11 +74,11 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	gpg? ( app-crypt/gnupg )
 	perl? (
 		dev-perl/Error
@@ -111,7 +111,7 @@ RDEPEND="${CDEPEND}
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
+BDEPEND="
 	sab-split? ( dev-util/dirstr )
 	doc? (
 		app-text/asciidoc
@@ -120,11 +120,12 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 	)
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
+	test? (	app-crypt/gnupg	)
+"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		app-text/asciidoc"
 fi
 
@@ -155,8 +156,6 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-
-	"${FILESDIR}"/${P/-gui-tools}-avoid_empty_remote_line.patch #698384
 )
 
 pkg_setup() {
@@ -173,7 +172,9 @@ pkg_setup() {
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
-	local myopts=(
+	local extlibs myopts
+
+	myopts=(
 		ASCIIDOC_NO_ROFF=YesPlease
 		$(usex cvs '' NO_CVS=YesPlease)
 		$(usex elibc_musl NO_REGEX=YesPlease '')
@@ -250,12 +251,14 @@ exportmakeopts() {
 			NEEDS_LIBICONV=YesPlease
 			HAVE_CLOCK_MONOTONIC=1
 		)
-		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
 			myopts+=( HAVE_GETDELIM=1 )
+		fi
 	fi
 
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=( ASCIIDOC8=YesPlease )
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
 
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
@@ -480,7 +483,7 @@ src_install() {
 		#elisp-install ${MY_PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${ED%/}${SITELISP}/${MY_PN}/compat/.nosearch"
+		touch "${ED}${SITELISP}/${MY_PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
@@ -569,7 +572,7 @@ src_install() {
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
-			"${ED%/}"/usr/share/${MY_PN}/contrib \
+			"${ED}"/usr/share/${MY_PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 
@@ -578,26 +581,26 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${MY_PN}/gitweb
+		dosym ../gitweb /usr/share/${MY_PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 
-		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
 			if test -d "${d}" ; then find "${d}" \
 				-name .packlist \
 				-delete || die
 			fi
 		done
 	else
-		rm -rf "${ED%/}"/usr/share/gitweb
+		rm -rf "${ED}"/usr/share/gitweb
 	fi
 
 	if ! use subversion ; then
-		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
-			"${ED%/}"/usr/share/man/man1/git-svn.1*
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 
 	if use xinetd ; then
@@ -618,8 +621,8 @@ src_install() {
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
-		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
@@ -739,7 +742,7 @@ src_test() {
 	nonfatal git_emake aggregate-results
 
 	# And bail if there was a problem
-	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
 }
 
 showpkgdeps() {
diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest
index d75a4e329..7986c15dd 100644
--- a/dev-vcs/git-subversion/Manifest
+++ b/dev-vcs/git-subversion/Manifest
@@ -1,6 +1,6 @@
-DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
-DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
+DIST git-2.25.3.tar.xz 5878708 BLAKE2B b9e9ed205856a2d5cca57a539ab420e597e8de46624f1411f725c914cfd9f23c7129502b8511acef7eda0f2cd2322928843e54416df8b6f5a45a7b71a8a52a5a SHA512 1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471
 DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a
-DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
+DIST git-htmldocs-2.25.3.tar.xz 1296852 BLAKE2B aa54f8bcdd48f3d53749f8391340616feb965d466c4d7bb81050f2a17050335ca44984f56d0cbc1b6787b4aa6cf8b1ff521cafacae43f8e4e2401ba1a1d8e4a4 SHA512 df4bb00c20b5adba1d80e9afb75a9f4d63bad4ca46b317aa94949621979260f991d6efea473141760ec2e849ba90d87fbd9a8fbca73cf0e0a35462ad6621860e
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
+DIST git-manpages-2.25.3.tar.xz 459192 BLAKE2B 17bb4c6ab68b85efaca2e99469f601df029677e7b09e379e8b4bff23b54bf4cc3aedc5c16e0769d2bafef79ea2428db582accb1df78795d1d4c365dcee68daba SHA512 a6ae01129281e85fba8da1fd8cbe9bb2c33cce3075163af328aedb4ab721b9816b364cc18d87ae675b88af2baa5777acb0f874a6a172bdef3429d25d89f8f271
diff --git a/dev-vcs/git-subversion/git-subversion-2.23.0-r1.ebuild b/dev-vcs/git-subversion/git-subversion-2.25.3.ebuild
similarity index 95%
rename from dev-vcs/git-subversion/git-subversion-2.23.0-r1.ebuild
rename to dev-vcs/git-subversion/git-subversion-2.25.3.ebuild
index c80102b26..3207a86e1 100644
--- a/dev-vcs/git-subversion/git-subversion-2.23.0-r1.ebuild
+++ b/dev-vcs/git-subversion/git-subversion-2.25.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -54,10 +54,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
 
 # Common to both DEPEND and RDEPEND
-CDEPEND="
+DEPEND="
 	~dev-vcs/git-${PV}[sab-split]
 	gnome-keyring? ( app-crypt/libsecret )
 	!libressl? ( dev-libs/openssl:0= )
@@ -73,11 +73,11 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	gpg? ( app-crypt/gnupg )
 	perl? (
 		dev-perl/Error
@@ -110,7 +110,7 @@ RDEPEND="${CDEPEND}
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
+BDEPEND="
 	sab-split? ( dev-util/dirstr )
 	doc? (
 		app-text/asciidoc
@@ -119,11 +119,12 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 	)
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
+	test? (	app-crypt/gnupg	)
+"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		app-text/asciidoc"
 fi
 
@@ -154,8 +155,6 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-
-	"${FILESDIR}"/${P/-subversion}-avoid_empty_remote_line.patch #698384
 )
 
 pkg_setup() {
@@ -172,7 +171,9 @@ pkg_setup() {
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
-	local myopts=(
+	local extlibs myopts
+
+	myopts=(
 		ASCIIDOC_NO_ROFF=YesPlease
 		$(usex cvs '' NO_CVS=YesPlease)
 		$(usex elibc_musl NO_REGEX=YesPlease '')
@@ -249,12 +250,14 @@ exportmakeopts() {
 			NEEDS_LIBICONV=YesPlease
 			HAVE_CLOCK_MONOTONIC=1
 		)
-		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
 			myopts+=( HAVE_GETDELIM=1 )
+		fi
 	fi
 
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=( ASCIIDOC8=YesPlease )
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
 
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
@@ -479,7 +482,7 @@ src_install() {
 		#elisp-install ${MY_PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${ED%/}${SITELISP}/${MY_PN}/compat/.nosearch"
+		touch "${ED}${SITELISP}/${MY_PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
@@ -568,7 +571,7 @@ src_install() {
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
-			"${ED%/}"/usr/share/${MY_PN}/contrib \
+			"${ED}"/usr/share/${MY_PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 
@@ -577,26 +580,26 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${MY_PN}/gitweb
+		dosym ../gitweb /usr/share/${MY_PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 
-		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
 			if test -d "${d}" ; then find "${d}" \
 				-name .packlist \
 				-delete || die
 			fi
 		done
 	else
-		rm -rf "${ED%/}"/usr/share/gitweb
+		rm -rf "${ED}"/usr/share/gitweb
 	fi
 
 	if ! use subversion ; then
-		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
-			"${ED%/}"/usr/share/man/man1/git-svn.1*
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 
 	if use xinetd ; then
@@ -617,8 +620,8 @@ src_install() {
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
-		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
@@ -738,7 +741,7 @@ src_test() {
 	nonfatal git_emake aggregate-results
 
 	# And bail if there was a problem
-	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
 }
 
 showpkgdeps() {
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index d75a4e329..7986c15dd 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,6 +1,6 @@
-DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
-DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
+DIST git-2.25.3.tar.xz 5878708 BLAKE2B b9e9ed205856a2d5cca57a539ab420e597e8de46624f1411f725c914cfd9f23c7129502b8511acef7eda0f2cd2322928843e54416df8b6f5a45a7b71a8a52a5a SHA512 1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471
 DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a
-DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
+DIST git-htmldocs-2.25.3.tar.xz 1296852 BLAKE2B aa54f8bcdd48f3d53749f8391340616feb965d466c4d7bb81050f2a17050335ca44984f56d0cbc1b6787b4aa6cf8b1ff521cafacae43f8e4e2401ba1a1d8e4a4 SHA512 df4bb00c20b5adba1d80e9afb75a9f4d63bad4ca46b317aa94949621979260f991d6efea473141760ec2e849ba90d87fbd9a8fbca73cf0e0a35462ad6621860e
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
+DIST git-manpages-2.25.3.tar.xz 459192 BLAKE2B 17bb4c6ab68b85efaca2e99469f601df029677e7b09e379e8b4bff23b54bf4cc3aedc5c16e0769d2bafef79ea2428db582accb1df78795d1d4c365dcee68daba SHA512 a6ae01129281e85fba8da1fd8cbe9bb2c33cce3075163af328aedb4ab721b9816b364cc18d87ae675b88af2baa5777acb0f874a6a172bdef3429d25d89f8f271
diff --git a/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch b/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch
deleted file mode 100644
index f2bc3fd63..000000000
--- a/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From bbf47568ad7e91ab0962b314c054a2da03232c72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= <szeder.dev@gmail.com>
-Date: Mon, 16 Sep 2019 22:54:11 +0200
-Subject: [PATCH] Revert "progress: use term_clear_line()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 5b12e3123b (progress: use term_clear_line(),
-2019-06-24), because covering up the entire last line while refreshing
-the progress line caused unexpected problems during 'git
-clone/fetch/push':
-
-  $ git clone ssh://localhost/home/szeder/src/tmp/linux.git/
-  Cloning into 'linux'...
-  remote:
-  remote:
-  remote:
-  remote: Enumerating objects: 999295
-
-The length of the progress bar line can shorten when it includes
-throughput and the unit changes, or when its length exceeds the width
-of the terminal and is broken into two lines.  In these cases the
-previously displayed longer progress line should be covered up,
-because otherwise the leftover characters from the previous progress
-line make the output look weird [1].  term_clear_line() makes this
-quite simple, as it covers up the entire last line either by using an
-ANSI control sequence or by printing a terminal width worth of space
-characters, depending on whether the terminal is smart or dumb.
-
-Unfortunately, when accessing a remote repository via any non-local
-protocol the remote 'git receive-pack/upload-pack' processes can't
-possibly have any idea about the local terminal (smart of dumb? how
-wide?) their progress will end up on.  Consequently, they assume the
-worst, i.e. standard-width dumb terminal, and print 80 spaces to cover
-up the previously displayed progress line.  The local 'git
-clone/fetch/push' processes then display the remote's progress,
-including these coverup spaces, with the 'remote: ' prefix, resulting
-in a total line length of 88 characters.  If the local terminal is
-narrower than that, then the coverup gets line-wrapped, and after that
-the CR at the end doesn't return to the beginning of the progress
-line, but to the first column of its last line, resulting in those
-repeated 'remote: <many-spaces>' lines.
-
-By reverting 5b12e3123b (progress: use term_clear_line(),
-2019-06-24) we won't cover up the entire last line, but go back to
-comparing the length of the current progress bar line with the
-previous one, and cover up as many characters as needed.
-
-[1] See commits 545dc345eb (progress: break too long progress bar
-    lines, 2019-04-12) and 9f1fd84e15 (progress: clear previous
-    progress update dynamically, 2019-04-12).
-
-Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
----
- progress.c                 | 29 ++++++++++++++++++-----------
- t/t5541-http-push-smart.sh |  6 +++---
- 2 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/progress.c b/progress.c
-index 277db8afa2..0eddf1804d 100644
---- a/progress.c
-+++ b/progress.c
-@@ -88,6 +88,7 @@ static void display(struct progress *progress, uint64_t n, const char *done)
- 	const char *tp;
- 	struct strbuf *counters_sb = &progress->counters_sb;
- 	int show_update = 0;
-+	int last_count_len = counters_sb->len;
- 
- 	if (progress->delay && (!progress_update || --progress->delay))
- 		return;
-@@ -115,21 +116,27 @@ static void display(struct progress *progress, uint64_t n, const char *done)
- 	if (show_update) {
- 		if (is_foreground_fd(fileno(stderr)) || done) {
- 			const char *eol = done ? done : "\r";
-+			size_t clear_len = counters_sb->len < last_count_len ?
-+					last_count_len - counters_sb->len + 1 :
-+					0;
-+			/* The "+ 2" accounts for the ": ". */
-+			size_t progress_line_len = progress->title_len +
-+						counters_sb->len + 2;
-+			int cols = term_columns();
- 
--			term_clear_line();
- 			if (progress->split) {
--				fprintf(stderr, "  %s%s", counters_sb->buf,
--					eol);
--			} else if (!done &&
--				   /* The "+ 2" accounts for the ": ". */
--				   term_columns() < progress->title_len +
--						    counters_sb->len + 2) {
--				fprintf(stderr, "%s:\n  %s%s",
--					progress->title, counters_sb->buf, eol);
-+				fprintf(stderr, "  %s%*s", counters_sb->buf,
-+					(int) clear_len, eol);
-+			} else if (!done && cols < progress_line_len) {
-+				clear_len = progress->title_len + 1 < cols ?
-+					    cols - progress->title_len - 1 : 0;
-+				fprintf(stderr, "%s:%*s\n  %s%s",
-+					progress->title, (int) clear_len, "",
-+					counters_sb->buf, eol);
- 				progress->split = 1;
- 			} else {
--				fprintf(stderr, "%s: %s%s", progress->title,
--					counters_sb->buf, eol);
-+				fprintf(stderr, "%s: %s%*s", progress->title,
-+					counters_sb->buf, (int) clear_len, eol);
- 			}
- 			fflush(stderr);
- 		}
-diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
-index b86ddb60f2..92bac43257 100755
---- a/t/t5541-http-push-smart.sh
-+++ b/t/t5541-http-push-smart.sh
-@@ -262,7 +262,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
- 	cd "$ROOT_PATH"/test_repo_clone &&
- 	test_commit noisy &&
- 	test_terminal git push >output 2>&1 &&
--	test_i18ngrep "Writing objects" output
-+	test_i18ngrep "^Writing objects" output
- '
- 
- test_expect_success TTY 'push --quiet silences status and progress' '
-@@ -277,7 +277,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
- 	test_commit no-progress &&
- 	test_terminal git push --no-progress >output 2>&1 &&
- 	test_i18ngrep "^To http" output &&
--	test_i18ngrep ! "Writing objects" output
-+	test_i18ngrep ! "^Writing objects" output
- '
- 
- test_expect_success 'push --progress shows progress to non-tty' '
-@@ -285,7 +285,7 @@ test_expect_success 'push --progress shows progress to non-tty' '
- 	test_commit progress &&
- 	git push --progress >output 2>&1 &&
- 	test_i18ngrep "^To http" output &&
--	test_i18ngrep "Writing objects" output
-+	test_i18ngrep "^Writing objects" output
- '
- 
- test_expect_success 'http push gives sane defaults to reflog' '
--- 
-2.24.0.rc1
-
diff --git a/dev-vcs/git/files/git-2.23.0-spec b/dev-vcs/git/files/git-2.25.3-spec
similarity index 96%
rename from dev-vcs/git/files/git-2.23.0-spec
rename to dev-vcs/git/files/git-2.25.3-spec
index 7bf6cc7cf..fe2c039f2 100644
--- a/dev-vcs/git/files/git-2.23.0-spec
+++ b/dev-vcs/git/files/git-2.25.3-spec
@@ -4,6 +4,7 @@ git-gui-tools ./usr/share/gitk/lib/msgs/ca.msg
 git-gui-tools ./usr/share/gitk/lib/msgs/sv.msg
 git-gui-tools ./usr/share/gitk/lib/msgs/it.msg
 git-gui-tools ./usr/share/gitk/lib/msgs/vi.msg
+git-gui-tools ./usr/share/gitk/lib/msgs/zh_cn.msg
 git-gui-tools ./usr/share/gitk/lib/msgs/pt_pt.msg
 git-gui-tools ./usr/share/gitk/lib/msgs/bg.msg
 git-gui-tools ./usr/share/gitk/lib/msgs/fr.msg
@@ -63,6 +64,9 @@ git ./usr/share/locale/de
 git ./usr/share/locale/el/LC_MESSAGES/git.mo
 git ./usr/share/locale/el/LC_MESSAGES
 git ./usr/share/locale/el
+git ./usr/share/locale/zh_TW/LC_MESSAGES/git.mo
+git ./usr/share/locale/zh_TW/LC_MESSAGES
+git ./usr/share/locale/zh_TW
 git ./usr/share/locale
 git ./usr/share/man/man5/gitmodules.5
 git ./usr/share/man/man5/gitrepository-layout.5
@@ -136,6 +140,7 @@ git ./usr/share/man/man1/git-cat-file.1
 git ./usr/share/man/man1/git-remote-fd.1
 git ./usr/share/man/man1/git-count-objects.1
 git ./usr/share/man/man1/git-fetch.1
+git ./usr/share/man/man1/git-sparse-checkout.1
 git ./usr/share/man/man1/git-column.1
 git ./usr/share/man/man1/git-show-ref.1
 git ./usr/share/man/man1/git-diff.1
@@ -298,6 +303,7 @@ git ./usr/share/git-core/templates/hooks/pre-applypatch.sample
 git ./usr/share/git-core/templates/hooks/post-update.sample
 git ./usr/share/git-core/templates/hooks/prepare-commit-msg.sample
 git ./usr/share/git-core/templates/hooks/pre-commit.sample
+git ./usr/share/git-core/templates/hooks/pre-merge-commit.sample
 git ./usr/share/git-core/templates/hooks/commit-msg.sample
 git ./usr/share/git-core/templates/hooks/fsmonitor-watchman.sample
 git ./usr/share/git-core/templates/hooks/pre-receive.sample
@@ -326,6 +332,7 @@ git ./usr/share/doc/@git-doc@-@git-ver@/revisions.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-checkout-index.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-credential-cache.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-merge-tree.txt
+git ./usr/share/doc/@git-doc@-@git-ver@/git-sparse-checkout.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-merge-base.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/config.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-hash-object.txt
@@ -362,6 +369,7 @@ git ./usr/share/doc/@git-doc@-@git-ver@/git-p4.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/date-formats.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-credential.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-apply.txt
+git ./usr/share/doc/@git-doc@-@git-ver@/MyFirstObjectWalk.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-checkout.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-credential-store.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/gitrepository-layout.txt
@@ -506,56 +514,35 @@ git ./usr/share/doc/@git-doc@-@git-ver@/README.md
 git ./usr/share/doc/@git-doc@-@git-ver@/gitweb.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-jump.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-ls-files.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-object-access.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-credentials.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/trivial-merge.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/send-pack-pipeline.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-parse-options.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-directory-listing.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-gitattributes.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-run-command.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-allocation-growing.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-error-handling.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-remote.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-quote.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/repository-version.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/rerere.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/http-protocol.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-setup.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/pack-protocol.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-trace.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-argv-array.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-merge.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/bitmap-format.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/commit-graph-format.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/commit-graph.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/directory-rename-detection.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-tree-walking.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/protocol-capabilities.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/racy-git.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-oid-array.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/partial-clone.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-grep.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-xdiff-interface.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/index-format.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/shallow.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-diff.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/protocol-common.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/protocol-v2.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-submodule-config.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-ref-iteration.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/pack-heuristics.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-history-graph.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/hash-function-transition.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/pack-format.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/multi-pack-index.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-revision-walking.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/signature-format.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-config.txt
-git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-sigchain.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-index-skel.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/long-running-process-protocol.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical/api-trace2.txt
+git ./usr/share/doc/@git-doc@-@git-ver@/technical/bundle-format.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/technical
 git ./usr/share/doc/@git-doc@-@git-ver@/git-check-ignore.txt
 git ./usr/share/doc/@git-doc@-@git-ver@/git-cherry.txt
@@ -653,6 +640,7 @@ git-gui-tools ./usr/share/git-gui/lib/search.tcl
 git-gui-tools ./usr/share/git-gui/lib/tclIndex
 git-gui-tools ./usr/share/git-gui/lib/tools.tcl
 git-gui-tools ./usr/share/git-gui/lib/choose_font.tcl
+git-gui-tools ./usr/share/git-gui/lib/chord.tcl
 git-gui-tools ./usr/share/git-gui/lib
 git-gui-tools ./usr/share/git-gui
 git ./usr/share
@@ -754,6 +742,7 @@ git ./usr/libexec/git-core/git-rerere
 git ./usr/libexec/git-core/git-rev-parse
 git ./usr/libexec/git-core/git-merge-ours
 git ./usr/libexec/git-core/git-merge-subtree
+git ./usr/libexec/git-core/git-sparse-checkout
 git ./usr/libexec/git-core/git-unpack-file
 git ./usr/libexec/git-core/git-remote-ftps
 git ./usr/libexec/git-core/git-gc
diff --git a/dev-vcs/git/git-2.23.0-r1.ebuild b/dev-vcs/git/git-2.25.3.ebuild
similarity index 95%
rename from dev-vcs/git/git-2.23.0-r1.ebuild
rename to dev-vcs/git/git-2.25.3.ebuild
index fcf8e4c23..6a8d536dd 100644
--- a/dev-vcs/git/git-2.23.0-r1.ebuild
+++ b/dev-vcs/git/git-2.25.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -53,10 +53,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
 
 # Common to both DEPEND and RDEPEND
-CDEPEND="
+DEPEND="
 	gnome-keyring? ( app-crypt/libsecret )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
@@ -71,11 +71,11 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	gpg? ( app-crypt/gnupg )
 	perl? (
 		dev-perl/Error
@@ -108,7 +108,7 @@ RDEPEND="${CDEPEND}
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
+BDEPEND="
 	sab-split? ( dev-util/dirstr )
 	doc? (
 		app-text/asciidoc
@@ -117,11 +117,12 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 	)
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
+	test? (	app-crypt/gnupg	)
+"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		app-text/asciidoc"
 fi
 
@@ -152,8 +153,6 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-
-	"${FILESDIR}"/${P}-avoid_empty_remote_line.patch #698384
 )
 
 pkg_setup() {
@@ -170,7 +169,9 @@ pkg_setup() {
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
-	local myopts=(
+	local extlibs myopts
+
+	myopts=(
 		ASCIIDOC_NO_ROFF=YesPlease
 		$(usex cvs '' NO_CVS=YesPlease)
 		$(usex elibc_musl NO_REGEX=YesPlease '')
@@ -247,12 +248,14 @@ exportmakeopts() {
 			NEEDS_LIBICONV=YesPlease
 			HAVE_CLOCK_MONOTONIC=1
 		)
-		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
 			myopts+=( HAVE_GETDELIM=1 )
+		fi
 	fi
 
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=( ASCIIDOC8=YesPlease )
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
 
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
@@ -478,7 +481,7 @@ src_install() {
 		#elisp-install ${MY_PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${ED%/}${SITELISP}/${MY_PN}/compat/.nosearch"
+		touch "${ED}${SITELISP}/${MY_PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
@@ -567,7 +570,7 @@ src_install() {
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
-			"${ED%/}"/usr/share/${MY_PN}/contrib \
+			"${ED}"/usr/share/${MY_PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 
@@ -576,26 +579,26 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${MY_PN}/gitweb
+		dosym ../gitweb /usr/share/${MY_PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 
-		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
 			if test -d "${d}" ; then find "${d}" \
 				-name .packlist \
 				-delete || die
 			fi
 		done
 	else
-		rm -rf "${ED%/}"/usr/share/gitweb
+		rm -rf "${ED}"/usr/share/gitweb
 	fi
 
 	if ! use subversion ; then
-		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
-			"${ED%/}"/usr/share/man/man1/git-svn.1*
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 
 	if use xinetd ; then
@@ -616,8 +619,8 @@ src_install() {
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
-		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
@@ -737,7 +740,7 @@ src_test() {
 	nonfatal git_emake aggregate-results
 
 	# And bail if there was a problem
-	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
 }
 
 showpkgdeps() {
diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest
index d75a4e329..7986c15dd 100644
--- a/www-apps/gitweb/Manifest
+++ b/www-apps/gitweb/Manifest
@@ -1,6 +1,6 @@
-DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7
-DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
+DIST git-2.25.3.tar.xz 5878708 BLAKE2B b9e9ed205856a2d5cca57a539ab420e597e8de46624f1411f725c914cfd9f23c7129502b8511acef7eda0f2cd2322928843e54416df8b6f5a45a7b71a8a52a5a SHA512 1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471
 DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a
-DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
+DIST git-htmldocs-2.25.3.tar.xz 1296852 BLAKE2B aa54f8bcdd48f3d53749f8391340616feb965d466c4d7bb81050f2a17050335ca44984f56d0cbc1b6787b4aa6cf8b1ff521cafacae43f8e4e2401ba1a1d8e4a4 SHA512 df4bb00c20b5adba1d80e9afb75a9f4d63bad4ca46b317aa94949621979260f991d6efea473141760ec2e849ba90d87fbd9a8fbca73cf0e0a35462ad6621860e
 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90
+DIST git-manpages-2.25.3.tar.xz 459192 BLAKE2B 17bb4c6ab68b85efaca2e99469f601df029677e7b09e379e8b4bff23b54bf4cc3aedc5c16e0769d2bafef79ea2428db582accb1df78795d1d4c365dcee68daba SHA512 a6ae01129281e85fba8da1fd8cbe9bb2c33cce3075163af328aedb4ab721b9816b364cc18d87ae675b88af2baa5777acb0f874a6a172bdef3429d25d89f8f271
diff --git a/www-apps/gitweb/gitweb-2.23.0-r1.ebuild b/www-apps/gitweb/gitweb-2.25.3.ebuild
similarity index 95%
rename from www-apps/gitweb/gitweb-2.23.0-r1.ebuild
rename to www-apps/gitweb/gitweb-2.25.3.ebuild
index cd8d682c3..41da6a484 100644
--- a/www-apps/gitweb/gitweb-2.23.0-r1.ebuild
+++ b/www-apps/gitweb/gitweb-2.25.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -54,10 +54,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test sab-split"
 
 # Common to both DEPEND and RDEPEND
-CDEPEND="
+DEPEND="
 	~dev-vcs/git-${PV}[sab-split]
 	gnome-keyring? ( app-crypt/libsecret )
 	!libressl? ( dev-libs/openssl:0= )
@@ -73,11 +73,11 @@ CDEPEND="
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	iconv? ( virtual/libiconv )
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	gpg? ( app-crypt/gnupg )
 	perl? (
 		dev-perl/Error
@@ -110,7 +110,7 @@ RDEPEND="${CDEPEND}
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
+BDEPEND="
 	sab-split? ( dev-util/dirstr )
 	doc? (
 		app-text/asciidoc
@@ -119,11 +119,12 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 	)
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
+	test? (	app-crypt/gnupg	)
+"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		app-text/asciidoc"
 fi
 
@@ -154,8 +155,6 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-
-	"${FILESDIR}"/git-${PV}-avoid_empty_remote_line.patch #698384
 )
 
 pkg_setup() {
@@ -172,7 +171,9 @@ pkg_setup() {
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
-	local myopts=(
+	local extlibs myopts
+
+	myopts=(
 		ASCIIDOC_NO_ROFF=YesPlease
 		$(usex cvs '' NO_CVS=YesPlease)
 		$(usex elibc_musl NO_REGEX=YesPlease '')
@@ -249,12 +250,14 @@ exportmakeopts() {
 			NEEDS_LIBICONV=YesPlease
 			HAVE_CLOCK_MONOTONIC=1
 		)
-		grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
 			myopts+=( HAVE_GETDELIM=1 )
+		fi
 	fi
 
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=( ASCIIDOC8=YesPlease )
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
 
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
@@ -479,7 +482,7 @@ src_install() {
 		#elisp-install ${MY_PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${ED%/}${SITELISP}/${MY_PN}/compat/.nosearch"
+		touch "${ED}${SITELISP}/${MY_PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
@@ -568,7 +571,7 @@ src_install() {
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
-			"${ED%/}"/usr/share/${MY_PN}/contrib \
+			"${ED}"/usr/share/${MY_PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 
@@ -577,7 +580,7 @@ src_install() {
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
-		dosym /usr/share/gitweb /usr/share/${MY_PN}/gitweb
+		dosym ../gitweb /usr/share/${MY_PN}/gitweb
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
@@ -587,7 +590,7 @@ src_install() {
 		# Conditional because otherwise sab-src_install_cleanup breaks
 		# on it (and it's controlled by the spec files).
 		if ! use sab-split; then
-			for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			for d in "${ED}"/usr/lib{,64}/perl5/ ; do
 				if test -d "${d}" ; then find "${d}" \
 					-name .packlist \
 					-delete || die
@@ -595,12 +598,12 @@ src_install() {
 			done
 		fi
 	else
-		rm -rf "${ED%/}"/usr/share/gitweb
+		rm -rf "${ED}"/usr/share/gitweb
 	fi
 
 	if ! use subversion ; then
-		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
-			"${ED%/}"/usr/share/man/man1/git-svn.1*
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 
 	if use xinetd ; then
@@ -621,8 +624,8 @@ src_install() {
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
-		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
@@ -742,7 +745,7 @@ src_test() {
 	nonfatal git_emake aggregate-results
 
 	# And bail if there was a problem
-	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
 }
 
 showpkgdeps() {