diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 55ac05b..d4cd856 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1 +1,2 @@
-DIST gentoo-bashcomp-20140911.tar.bz2 30258 SHA256 71d14492f9af8fe53e20bb130884fea36cf4ea643c8854713aa509b8602b7fb3 SHA512 cacd1c3353bce7e67d00758a714829860111932ab7addd0a84a06cae9218ff18aff4ea562e0682ca4db859408ca15817edd81548d54144223ed5016667549f7f WHIRLPOOL fb208cb268efa43dcb5a71a29c96c3ebe3731cbcb2cfa3d10776fa5ede20eadd496eab69d2c448346deaf367b49cca8ae92b77af40ceb4fac725249caffd6def
+DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
+DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
similarity index 69%
rename from app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
rename to app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index d0f6a2a..f615328 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1
 
 DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="*"
-IUSE=""
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
deleted file mode 100644
index d8ca523..0000000
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/gentoo-bashcomp-20140911.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0b39063e426ae93a03607ed65d2335b7
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
new file mode 100644
index 0000000..d8d0591
--- /dev/null
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
+EAPI=6
+HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/
+KEYWORDS=*
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20190211.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1f8b07add6bf825276c8cc7b287f0b78