diff --git a/dev-lang/ada-bootstrap/ada-bootstrap-11.ebuild b/dev-lang/ada-bootstrap/ada-bootstrap-11.ebuild
index cfd6e31bb5c35..464122c2a0f8f 100644
--- a/dev-lang/ada-bootstrap/ada-bootstrap-11.ebuild
+++ b/dev-lang/ada-bootstrap/ada-bootstrap-11.ebuild
@@ -24,40 +24,40 @@ DESCRIPTION="Binary bootstrap compiler for GNAT (Ada compiler)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Ada"
 SRC_URI="
 	alpha? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
 	)
 	amd64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
 	)
 	arm64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
 	)
 	arm? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
 	)
 	hppa? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
 	)
 	ppc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
 	)
 	ppc64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
 	)
 	riscv? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
 	)
 	sparc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
 	)
 	s390? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
 	)
 "
 S=${WORKDIR}
diff --git a/dev-lang/ada-bootstrap/ada-bootstrap-12.ebuild b/dev-lang/ada-bootstrap/ada-bootstrap-12.ebuild
index d3f37396c407b..4b73e5877e996 100644
--- a/dev-lang/ada-bootstrap/ada-bootstrap-12.ebuild
+++ b/dev-lang/ada-bootstrap/ada-bootstrap-12.ebuild
@@ -24,40 +24,40 @@ DESCRIPTION="Binary bootstrap compiler for GNAT (Ada compiler)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Ada"
 SRC_URI="
 	alpha? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
 	)
 	amd64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
 	)
 	arm64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
 	)
 	arm? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
 	)
 	hppa? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
 	)
 	ppc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
 	)
 	ppc64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
 	)
 	riscv? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
 	)
 	sparc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
 	)
 	s390? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
 	)
 "
 S=${WORKDIR}
diff --git a/dev-lang/ada-bootstrap/ada-bootstrap-13.ebuild b/dev-lang/ada-bootstrap/ada-bootstrap-13.ebuild
index d3f37396c407b..4b73e5877e996 100644
--- a/dev-lang/ada-bootstrap/ada-bootstrap-13.ebuild
+++ b/dev-lang/ada-bootstrap/ada-bootstrap-13.ebuild
@@ -24,40 +24,40 @@ DESCRIPTION="Binary bootstrap compiler for GNAT (Ada compiler)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Ada"
 SRC_URI="
 	alpha? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
 	)
 	amd64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
 	)
 	arm64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
 	)
 	arm? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
 	)
 	hppa? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
 	)
 	ppc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
 	)
 	ppc64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
 	)
 	riscv? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
 	)
 	sparc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
 	)
 	s390? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
 	)
 "
 S=${WORKDIR}
diff --git a/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild b/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild
index 6a2c328b2c1e4..29726723e041a 100644
--- a/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild
+++ b/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild
@@ -24,43 +24,43 @@ DESCRIPTION="Binary bootstrap compiler for GNAT (Ada compiler)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Ada"
 SRC_URI="
 	alpha? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-alpha-unknown-linux-gnu.gpkg.tar
 	)
 	amd64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-x86_64-pc-linux-gnu.gpkg.tar
 	)
 	arm64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-aarch64-unknown-linux-gnu.gpkg.tar
 	)
 	arm? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv6j-unknown-linux-gnueabihf.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-softfp-linux-gnueabi.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-armv7a-unknown-linux-gnueabihf.gpkg.tar
 	)
 	hppa? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa1.1-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-hppa2.0-unknown-linux-gnu.gpkg.tar
 	)
 	loong? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-loongarch64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-loongarch64-unknown-linux-gnu.gpkg.tar
 	)
 	ppc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc-unknown-linux-gnu.gpkg.tar
 	)
 	ppc64? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64le-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-powerpc64-unknown-linux-gnu.gpkg.tar
 	)
 	riscv? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-riscv64-unknown-linux-gnu.gpkg.tar
 	)
 	sparc? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-sparc64-unknown-linux-gnu.gpkg.tar
 	)
 	s390? (
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
-		https://distfiles.gentoo.org/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390-ibm-linux-gnu.gpkg.tar
+		https://distfiles.gentoo.org/pub/proj/toolchain/ada-bootstrap/${P}-s390x-ibm-linux-gnu.gpkg.tar
 	)
 "
 S=${WORKDIR}