From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-795145-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 12341138CA2
	for <garchives@archives.gentoo.org>; Mon, 20 Apr 2015 22:30:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E2A86E086A;
	Mon, 20 Apr 2015 22:30:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 6133AE086A
	for <gentoo-commits@lists.gentoo.org>; Mon, 20 Apr 2015 22:30:39 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E499C340B89
	for <gentoo-commits@lists.gentoo.org>; Mon, 20 Apr 2015 22:30:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 54DED165CE
	for <gentoo-commits@lists.gentoo.org>; Mon, 20 Apr 2015 22:30:34 +0000 (UTC)
From: "Theo Chatzimichos" <tampakrap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Theo Chatzimichos" <tampakrap@gentoo.org>
Message-ID: <1429569019.ad282cba73ee25074048417f545df341f87b568d.tampakrap@gentoo>
Subject: [gentoo-commits] proj/api:master commit in: files/overlays/
X-VCS-Repository: proj/api
X-VCS-Files: files/overlays/repositories.xml
X-VCS-Directories: files/overlays/
X-VCS-Committer: tampakrap
X-VCS-Committer-Name: Theo Chatzimichos
X-VCS-Revision: ad282cba73ee25074048417f545df341f87b568d
X-VCS-Branch: master
Date: Mon, 20 Apr 2015 22:30:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ec21b09b-7a0d-4fe8-b2bf-b8ab84c503c9
X-Archives-Hash: eb872f9795361a11ec79f56815f743cf

commit:     ad282cba73ee25074048417f545df341f87b568d
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 22:30:19 2015 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 22:30:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/api.git/commit/?id=ad282cba

git.overlays.gentoo.org -> git.gentoo.org

 files/overlays/repositories.xml | 1858 +++++++++++++++++++--------------------
 1 file changed, 929 insertions(+), 929 deletions(-)

diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml
index 4b819f1..5ee8a2e 100644
--- a/files/overlays/repositories.xml
+++ b/files/overlays/repositories.xml
@@ -73,30 +73,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>activehome</name>
     <description lang="en"><![CDATA[Gentoo overlay for ebuilds related to 'hand-made' Active Home construction]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/activehome.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/activehome.git;a=summary</homepage>
     <owner type="person">
       <email>mva@mva.name</email>
       <name>Vadim A. Misbakh-Soloviov (mva)</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/activehome.git</source>
+    <source type="git">git://git.gentoo.org/user/activehome.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/activehome.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/activehome.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/activehome.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/activehome.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/activehome.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/activehome.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/activehome.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>ago</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/ago.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/ago.git;a=summary</homepage>
     <owner type="person">
       <email>ago@gentoo.org</email>
       <name>Agostino Sarubbo</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/ago.git</source>
+    <source type="git">git://git.gentoo.org/dev/ago.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/ago.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/ago.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ago.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ago.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/ago.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ago.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ago.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>aidecoe</name>
@@ -138,30 +138,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>alexcepoi</name>
     <description lang="en">Personal User Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/alexcepoi.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/alexcepoi.git;a=summary</homepage>
     <owner type="person">
       <email>alex.cepoi@gmail.com</email>
       <name>Alexandru Cepoi</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/alexcepoi.git</source>
+    <source type="git">git://git.gentoo.org/user/alexcepoi.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/alexcepoi.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/alexcepoi.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/alexcepoi.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/alexcepoi.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/alexcepoi.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/alexcepoi.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/alexcepoi.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>alexxy</name>
     <description>Some random work in progress stuff from alexxy</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/alexxy.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/alexxy.git</homepage>
     <owner>
       <email>alexxy@gentoo.org</email>
       <name>Alexey Shvetsov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/alexxy.git</source>
+    <source type="git">git://git.gentoo.org/dev/alexxy.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/alexxy.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/alexxy.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/alexxy.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/alexxy.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/alexxy.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/alexxy.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/alexxy.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>alice</name>
@@ -177,16 +177,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>aluco</name>
     <description lang="en">From drm-next to phoronix-test-suite ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/aluco.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/aluco.git;a=summary</homepage>
     <owner type="person">
       <email>anthoine.bourgeois@gmail.com</email>
       <name>Anthoine Bourgeois</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/aluco.git</source>
+    <source type="git">git://git.gentoo.org/user/aluco.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/aluco.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/aluco.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/aluco.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/aluco.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/aluco.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/aluco.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/aluco.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>alunduil</name>
@@ -215,30 +215,30 @@ FIN
   <repo quality="experimental" status="official">
     <name>anarchy</name>
     <description>Testing/Bug fixes, new ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/anarchy.git;a=summary</homepage>
     <owner>
       <email>anarchy@gentoo.org</email>
       <name>Jory Pratt</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/anarchy</source>
+    <source type="git">git://git.gentoo.org/dev/anarchy</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/anarchy.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/anarchy.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/anarchy.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/anarchy.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/anarchy.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>anaximander</name>
     <description lang="en"><![CDATA[anaximander's user overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/anaximander.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/anaximander.git;a=summary</homepage>
     <owner type="person">
       <email>dominik.kriegner@aol.at</email>
       <name>Dominik Kriegner</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/anaximander.git</source>
+    <source type="git">git://git.gentoo.org/user/anaximander.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/anaximander.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/anaximander.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/anaximander.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/anaximander.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/anaximander.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/anaximander.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/anaximander.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>and3k-sunrise</name>
@@ -268,30 +268,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>andy</name>
     <description lang="en">Miscellaneous ebuilds, unmaintaned but useful</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/andy.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/andy.git;a=summary</homepage>
     <owner type="person">
       <email>andy@mailbox.tu-berlin.de</email>
       <name>Andrew Karpow</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/andy.git</source>
+    <source type="git">git://git.gentoo.org/user/andy.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/andy.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/andy.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/andy.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/andy.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/andy.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/andy.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/andy.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>angelos</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/angelos.git;a=summary</homepage>
     <owner type="person">
       <email>angelos@gentoo.org</email>
       <name>Christoph Mende</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/angelos.git</source>
+    <source type="git">git://git.gentoo.org/dev/angelos.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/angelos.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/angelos.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/angelos.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/angelos.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/angelos.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>anyc</name>
@@ -321,16 +321,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>arc</name>
     <description lang="en">User Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/arc.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/arc.git;a=summary</homepage>
     <owner type="person">
       <email>arcriley@gmail.com</email>
       <name>Arc Riley</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/arc.git</source>
+    <source type="git">git://git.gentoo.org/user/arc.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/arc.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/arc.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/arc.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/arc.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/arc.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/arc.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/arc.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>archenroot</name>
@@ -355,16 +355,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>Armageddon</name>
     <description lang="en">User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/Armageddon.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/Armageddon.git;a=summary</homepage>
     <owner type="person">
       <email>ThyArmageddon+Gentoo@Gmail.com</email>
       <name>Elijah El Lazkani (Armageddon)</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/Armageddon.git</source>
+    <source type="git">git://git.gentoo.org/user/Armageddon.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/Armageddon.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/Armageddon.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/Armageddon.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/Armageddon.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/Armageddon.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/Armageddon.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/Armageddon.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>armagetron</name>
@@ -389,16 +389,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>AstroFloyd</name>
     <description lang="en"><![CDATA[AstroFloyd's Gentoo overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/AstroFloyd.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/AstroFloyd.git;a=summary</homepage>
     <owner type="person">
       <email>AstroFloyd@gmail.com</email>
       <name>AstroFloyd</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/AstroFloyd.git</source>
+    <source type="git">git://git.gentoo.org/user/AstroFloyd.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/AstroFloyd.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/AstroFloyd.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/AstroFloyd.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/AstroFloyd.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/AstroFloyd.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/AstroFloyd.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/AstroFloyd.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>asux</name>
@@ -424,30 +424,30 @@ FIN
   <repo quality="experimental" status="official">
     <name>axs</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/axs.git;a=summary</homepage>
     <owner type="person">
       <email>axs@gentoo.org</email>
       <name>Ian Stakenvicius</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/axs.git</source>
+    <source type="git">git://git.gentoo.org/dev/axs.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/axs.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/axs.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/axs.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/axs.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/axs.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>AzP</name>
     <description lang="en"><![CDATA[Peter's own software playground]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/AzP.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/AzP.git;a=summary</homepage>
     <owner type="person">
       <email>peter.azp@gmail.com</email>
       <name>Peter Asplund</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/AzP.git</source>
+    <source type="git">git://git.gentoo.org/user/AzP.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/AzP.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/AzP.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/AzP.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/AzP.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/AzP.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/AzP.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/AzP.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>barnowl</name>
@@ -514,30 +514,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>benf</name>
     <description lang="en"><![CDATA[ben's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/benf.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/benf.git;a=summary</homepage>
     <owner type="person">
       <email>benjaminfranzke@gmail.com</email>
       <name>Benjamin Franzke</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/benf.git</source>
+    <source type="git">git://git.gentoo.org/user/benf.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/benf.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/benf.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/benf.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/benf.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/benf.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/benf.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/benf.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>betagarden</name>
     <description lang="en">Joint beta-quality overlay effort to reduce overlay scatter. Any dev is welcome to join.</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/betagarden.git;a=summary</homepage>
     <owner type="project">
       <email>betagarden@gentoo.org</email>
       <name>Team Betagarden</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/betagarden.git</source>
+    <source type="git">git://git.gentoo.org/proj/betagarden.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/betagarden.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/betagarden.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/betagarden.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/betagarden.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/betagarden.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>betelgeuse</name>
@@ -547,53 +547,53 @@ FIN
       <email>betelgeuse@gentoo.org</email>
       <name><![CDATA[Petteri Räty]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/betelgeuse.git</source>
+    <source type="git">git://git.gentoo.org/dev/betelgeuse.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/betelgeuse.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/betelgeuse.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/betelgeuse.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/betelgeuse.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/betelgeuse.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/betelgeuse.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/betelgeuse.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>bibletime</name>
     <description lang="en">BibleTime overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/bibletime.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/bibletime.git;a=summary</homepage>
     <owner type="person">
       <email>ristioja@gmail.com</email>
       <name>Jaak Ristioja</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/bibletime.git</source>
+    <source type="git">git://git.gentoo.org/user/bibletime.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/bibletime.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/bibletime.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/bibletime.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/bibletime.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/bibletime.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/bibletime.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/bibletime.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>bicatali</name>
     <description>Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/xarthisius.git;a=summary</homepage>
     <owner>
       <email>bicatali@gentoo.org</email>
       <name>Sebastien Fabbro</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/bicatali</source>
+    <source type="git">git://git.gentoo.org/dev/bicatali</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/bicatali.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/bicatali.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/bicatali.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/bicatali.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/bicatali.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>bircoph</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/bircoph.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/bircoph.git;a=summary</homepage>
     <owner type="person">
       <email>bircoph@gentoo.org</email>
       <name>Andrew Savchenko</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/bircoph.git</source>
+    <source type="git">git://git.gentoo.org/dev/bircoph.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/bircoph.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/bircoph.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/bircoph.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/bircoph.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/bircoph.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/bircoph.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/bircoph.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>bitcoin</name>
@@ -643,30 +643,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>blueicefield</name>
     <description lang="en">Overlay for some packages specific to web servers (PECL, Mongo..)</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/blueicefield.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/blueicefield.git;a=summary</homepage>
     <owner type="person">
       <email>nassim.kacha@blueicefield.com</email>
       <name>Nassim KACHA</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/blueicefield.git</source>
+    <source type="git">git://git.gentoo.org/user/blueicefield.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/blueicefield.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/blueicefield.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/blueicefield.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/blueicefield.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/blueicefield.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/blueicefield.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/blueicefield.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>blueness</name>
     <description>Developer Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/blueness.git;a=summary</homepage>
     <owner>
       <email>blueness@gentoo.org</email>
       <name>Anthony G. Basile</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/blueness</source>
+    <source type="git">git://git.gentoo.org/dev/blueness</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/blueness.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/blueness.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/blueness.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/blueness.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/blueness.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>bobwya</name>
@@ -719,16 +719,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>c1pher</name>
     <description lang="en">Developer Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/c1pher.git;a=summary</homepage>
     <owner type="person">
       <email>c1pher@gentoo.org</email>
       <name>Dane Smith</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/c1pher.git</source>
+    <source type="git">git://git.gentoo.org/dev/c1pher.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/c1pher.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/c1pher.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/c1pher.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/c1pher.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/c1pher.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>c2p-overlay</name>
@@ -746,16 +746,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>caio</name>
     <description lang="en"><![CDATA[Claudio's experimental ebuilds]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/caio.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/caio.git;a=summary</homepage>
     <owner type="person">
       <email>elcaio@gmail.com</email>
       <name>Claudio Furrer</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/caio.git</source>
+    <source type="git">git://git.gentoo.org/user/caio.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/caio.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/caio.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/caio.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/caio.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/caio.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/caio.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/caio.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>calculate</name>
@@ -805,16 +805,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>chutzpah</name>
     <description><![CDATA[Random stuff I am working on which isn't ready for the tree for some reason]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/chutzpah.git;a=summary</homepage>
     <owner>
       <email>chutzpah@gentoo.org</email>
       <name>Patrick McLean</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/chutzpah</source>
+    <source type="git">git://git.gentoo.org/dev/chutzpah</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/chutzpah.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/chutzpah.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/chutzpah.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/chutzpah.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/chutzpah.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>cj-overlay</name>
@@ -841,16 +841,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>clickbeetle_tools</name>
     <description lang="en">Linux tools made by clickbeetle</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/clickbeetle_tools.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/clickbeetle_tools.git;a=summary</homepage>
     <owner type="person">
       <email>shrinidhi@clickbeetle.in</email>
       <name>Shrinidh Rao</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/clickbeetle_tools.git</source>
+    <source type="git">git://git.gentoo.org/user/clickbeetle_tools.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/clickbeetle_tools.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/clickbeetle_tools.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/clickbeetle_tools.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/clickbeetle_tools.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/clickbeetle_tools.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/clickbeetle_tools.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/clickbeetle_tools.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>crossdev</name>
@@ -913,16 +913,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>dawan</name>
     <description lang="en">OCaml and proof-search related ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/dawan.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/dawan.git;a=summary</homepage>
     <owner type="person">
       <email>dawan@melix.net</email>
       <name>Quentin Heath</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/dawan.git</source>
+    <source type="git">git://git.gentoo.org/user/dawan.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/dawan.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/dawan.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dawan.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dawan.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/dawan.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dawan.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dawan.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>dberkholz</name>
@@ -932,39 +932,39 @@ FIN
       <email>dberkholz@gentoo.org</email>
       <name>Donnie Berkholz</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/dberkholz</source>
+    <source type="git">git://git.gentoo.org/dev/dberkholz</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/dberkholz.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/dberkholz.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/dberkholz.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/dberkholz.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/dberkholz.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>darkside</name>
     <description><![CDATA[Jeremy Olexa's private developer overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/darkside.git;a=summary</homepage>
     <owner>
       <email>darkside@gentoo.org</email>
       <name>Jeremy Olexa</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/darkside.git</source>
+    <source type="git">git://git.gentoo.org/dev/darkside.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/darkside.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/darkside.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/darkside.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/darkside.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/darkside.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>deathwing00</name>
     <description><![CDATA[Experimental ebuilds from the private overlay of Ioannis
     Aslanidis [deathwing00@gentoo.org].]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/deathwing00.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/deathwing00.git;a=summary</homepage>
     <owner>
       <email>deathwing00@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/deathwing00.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/deathwing00.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/deathwing00.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/deathwing00.git;a=rss</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/deathwing00.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/dev/deathwing00.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/deathwing00.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/dev/deathwing00.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/deathwing00.git;a=rss</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/deathwing00.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>desktop-effects</name>
@@ -973,8 +973,8 @@ FIN
     <owner>
       <email>desktop-effects@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/desktop-effects.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/desktop-effects.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>deter</name>
@@ -992,58 +992,58 @@ FIN
   <repo quality="experimental" status="official">
     <name>dev-zero</name>
     <description>Dev-zeros personal developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/dev-zero.git;a=summary</homepage>
     <owner>
       <email>dev-zero@gentoo.org</email>
       <name>Tiziano Mueller</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/dev-zero</source>
+    <source type="git">git://git.gentoo.org/dev/dev-zero</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/dev-zero.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/dev-zero.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/dev-zero.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/dev-zero.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/dev-zero.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>dfreise</name>
     <description lang="en">ISDN, network and other stuff</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/dfreise.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/dfreise.git;a=summary</homepage>
     <owner type="person">
       <email>dennis.freise@final-frontier.org</email>
       <name>Dennis Freise</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/dfreise.git</source>
+    <source type="git">git://git.gentoo.org/user/dfreise.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/dfreise.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/dfreise.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dfreise.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dfreise.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/dfreise.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dfreise.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dfreise.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>dilfridge</name>
     <description lang="en"><![CDATA[Dilfridge overlay: experimental ebuilds and lab software]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/dilfridge.git;a=summary</homepage>
     <owner type="person">
       <email>dilfridge@gentoo.org</email>
       <name>Andreas K. Huettel (dilfridge)</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/dilfridge.git</source>
+    <source type="git">git://git.gentoo.org/dev/dilfridge.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/dilfridge.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/dilfridge.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/dilfridge.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/dilfridge.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/dilfridge.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>displacer</name>
     <description lang="en">Fixes and new unstable packages</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/displacer.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/displacer.git;a=summary</homepage>
     <owner type="person">
       <email>disinbox@gmail.com</email>
       <name>Igor Ulyanov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/displacer.git</source>
+    <source type="git">git://git.gentoo.org/user/displacer.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/displacer.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/displacer.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/displacer.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/displacer.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/displacer.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/displacer.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/displacer.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>distros</name>
@@ -1081,30 +1081,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>dMaggot</name>
     <description lang="en"><![CDATA[Overlay of David E. Narváez]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/dMaggot.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/dMaggot.git;a=summary</homepage>
     <owner type="person">
       <email>david.narvaez@computer.org</email>
       <name><![CDATA[David E. Narváez]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/dMaggot.git</source>
+    <source type="git">git://git.gentoo.org/user/dMaggot.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/dMaggot.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/dMaggot.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dMaggot.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dMaggot.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/dMaggot.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dMaggot.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dMaggot.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>dmol</name>
     <description lang="en">Overlay to store java-related ebuilds, for further reviewing</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/dmol.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/dmol.git;a=summary</homepage>
     <owner type="person">
       <email>the.dmol@gmail.com</email>
       <name>Ivan Baidakou</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/dmol.git</source>
+    <source type="git">git://git.gentoo.org/user/dmol.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/dmol.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/dmol.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dmol.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dmol.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/dmol.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dmol.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dmol.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>docd</name>
@@ -1140,10 +1140,10 @@ FIN
       <email>cynede@gentoo.org</email>
       <name>Heather</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/dotnet.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/dotnet.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/dotnet.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/dotnet.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/dotnet.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/dotnet.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/proj/dotnet.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/dotnet.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>drdim</name>
@@ -1161,57 +1161,57 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>drevilt</name>
     <description lang="en"><![CDATA[Daniel Nagy's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/drevilt.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/drevilt.git;a=summary</homepage>
     <owner type="person">
       <email>DanielNagy@gmx.de</email>
       <name>Daniel Nagy</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/drevilt.git</source>
+    <source type="git">git://git.gentoo.org/user/drevilt.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/drevilt.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/drevilt.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/drevilt.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/drevilt.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/drevilt.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/drevilt.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/drevilt.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>drizzt-overlay</name>
     <description><![CDATA[drizzt's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/drizzt.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/drizzt.git;a=summary</homepage>
     <owner>
       <email>drizzt@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/drizzt.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/drizzt.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/drizzt.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/drizzt.git;a=rss</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/drizzt.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/dev/drizzt.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/drizzt.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/dev/drizzt.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/drizzt.git;a=rss</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/drizzt.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>dswm</name>
     <description lang="en">Deep Space Window Manager - StumpWM-based windowmanager with better usability</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/dswm.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/dswm.git;a=summary</homepage>
     <owner type="person">
       <email>cosmonaut.ok@gmail.com</email>
       <name><![CDATA[Alexander aka 'CosmonauT' Vynnyk]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/dswm.git</source>
+    <source type="git">git://git.gentoo.org/user/dswm.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/dswm.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/dswm.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dswm.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/dswm.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/dswm.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dswm.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/dswm.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>DuPol</name>
     <description lang="en"><![CDATA[DuPol's own and modified portage ebuilds.]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/DuPol.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/DuPol.git;a=summary</homepage>
     <owner type="person">
       <email>DuPol@gmx.de</email>
       <name>Dustin Polke</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/DuPol.git</source>
+    <source type="git">git://git.gentoo.org/user/DuPol.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/DuPol.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/DuPol.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/DuPol.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/DuPol.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/DuPol.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/DuPol.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/DuPol.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>dustin</name>
@@ -1240,16 +1240,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>eatnumber1</name>
     <description lang="en"><![CDATA[Eatnumber1's personal overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/eatnumber1.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/eatnumber1.git;a=summary</homepage>
     <owner type="person">
       <email>russ@eatnumber1.com</email>
       <name>Russell Harmon</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/eatnumber1.git</source>
+    <source type="git">git://git.gentoo.org/user/eatnumber1.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/eatnumber1.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/eatnumber1.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/eatnumber1.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/eatnumber1.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/eatnumber1.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/eatnumber1.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/eatnumber1.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>edwtjo-ebuilds</name>
@@ -1265,15 +1265,15 @@ FIN
   <repo quality="experimental" status="official">
     <name>efika</name>
     <description>Temporary overlay for adding support for the EFIKA platform to Gentoo.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/efika.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/efika.git;a=summary</homepage>
     <owner>
       <email>wolf31o2@wolf31o2.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/efika.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/efika.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/efika.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/efika.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/efika.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/efika.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/efika.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/efika.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/efika.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/efika.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>eigenlay</name>
@@ -1318,25 +1318,25 @@ FIN
       <email>emacs@gentoo.org</email>
       <name>Gentoo Emacs team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/emacs.git</source>
+    <source type="git">git://git.gentoo.org/proj/emacs.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/emacs.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/emacs.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/emacs.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/emacs.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/emacs.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>embedded-cross</name>
     <description lang="en">Gentoo cross-compilation overlay for embedded devices</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/embedded-cross.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/embedded-cross.git;a=summary</homepage>
     <owner type="project">
       <email>armin76@gentoo.org</email>
       <name><![CDATA[Raúl Porcel]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/embedded-cross.git</source>
+    <source type="git">git://git.gentoo.org/proj/embedded-cross.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/embedded-cross.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/embedded-cross.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/embedded-cross.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/embedded-cross.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/embedded-cross.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/embedded-cross.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/embedded-cross.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>emc</name>
@@ -1353,28 +1353,28 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>emery</name>
     <description lang="en">Ebuild testing playground of Emery Hemingway</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/emery.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/emery.git;a=summary</homepage>
     <owner type="person">
       <email>emery@vfemail.net</email>
       <name>Emery Hemingway</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/emery.git</source>
+    <source type="git">git://git.gentoo.org/user/emery.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/emery.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/emery.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/emery.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/emery.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/emery.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/emery.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/emery.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>enlightenment</name>
     <description><![CDATA[Support for the Enlightenment project, most notably
     DR17/e17.]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/enlightenment.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/enlightenment.git;a=summary</homepage>
     <owner>
       <email>enlightenment@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/enlightenment.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/enlightenment.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/enlightenment.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/proj/enlightenment.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/enlightenment.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/enlightenment.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>erikmack</name>
@@ -1390,16 +1390,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>eroen</name>
     <description lang="en">Personal overlay of Erik Moen</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/eroen.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/eroen.git;a=summary</homepage>
     <owner type="person">
       <email>overlay@eroen.eu</email>
       <name>Erik Moen</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/eroen.git</source>
+    <source type="git">git://git.gentoo.org/user/eroen.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/eroen.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/eroen.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/eroen.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/eroen.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/eroen.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/eroen.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/eroen.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>espenaf</name>
@@ -1417,16 +1417,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>eva</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/eva.git;a=summary</homepage>
     <owner type="person">
       <email>eva@gentoo.org</email>
       <name>Gilles Dartiguelongue</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/eva.git</source>
+    <source type="git">git://git.gentoo.org/dev/eva.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/eva.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/eva.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/eva.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/eva.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/eva.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>eyolfson</name>
@@ -1453,16 +1453,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>ezod</name>
     <description lang="en"><![CDATA[Aaron Mavrinac's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/ezod.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/ezod.git;a=summary</homepage>
     <owner type="person">
       <email>mavrinac@gmail.com</email>
       <name>Aaron Mavrinac</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/ezod.git</source>
+    <source type="git">git://git.gentoo.org/user/ezod.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/ezod.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/ezod.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/ezod.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/ezod.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/ezod.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/ezod.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/ezod.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>farmboy0</name>
@@ -1529,11 +1529,11 @@ FIN
       <email>flameeyes@gmail.com</email>
       <name><![CDATA[Diego Pettenò]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/flameeyes.git</source>
+    <source type="git">git://git.gentoo.org/dev/flameeyes.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/flameeyes.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/flameeyes.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/flameeyes.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/flameeyes.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/flameeyes.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/flameeyes.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/flameeyes.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>flavour</name>
@@ -1592,16 +1592,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>fordfrog</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/fordfrog.git;a=summary</homepage>
     <owner type="person">
       <email>fordfrog@gentoo.org</email>
       <name><![CDATA[Miroslav Šulc]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/fordfrog.git</source>
+    <source type="git">git://git.gentoo.org/dev/fordfrog.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/fordfrog.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/fordfrog.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/fordfrog.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/fordfrog.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/fordfrog.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>fouxlay</name>
@@ -1723,16 +1723,16 @@ FIN
     <description><![CDATA[
     Gamers overlay for all various games. Not related with games team.
   ]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gamerlay.git</homepage>
     <owner>
       <email>mva@mva.name</email>
       <name>Vadim A. Misbakh-Soloviov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gamerlay.git</source>
+    <source type="git">git://git.gentoo.org/proj/gamerlay.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gamerlay.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gamerlay.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gamerlay.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gamerlay.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gamerlay.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>games-overlay</name>
@@ -1780,16 +1780,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>gentoo-bsd</name>
     <description>Gentoo/BSD Project Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gentoo-bsd.git</homepage>
     <owner>
       <email>welp@gentoo.org</email>
       <name>Peter Weller</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gentoo-bsd.git</source>
+    <source type="git">git://git.gentoo.org/proj/gentoo-bsd.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gentoo-bsd.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gentoo-bsd.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gentoo-bsd.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>gentoo-el</name>
@@ -1805,30 +1805,30 @@ FIN
   <repo quality="experimental" status="official">
     <name>gentoo-guis</name>
     <description lang="en">Experimental ebuilds for Gentoo specific guis and guis related projects</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=summary</homepage>
     <owner type="project">
       <email>gentoo-guis@gentoo.org</email>
       <name>Gentoo-guis team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gentoo-guis.git</source>
+    <source type="git">git://git.gentoo.org/proj/gentoo-guis.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gentoo-guis.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gentoo-guis.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gentoo-guis.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>gentoo-openbsd</name>
     <description lang="en">Gentoo/OpenBSD Project Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-openbsd.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gentoo-openbsd.git;a=summary</homepage>
     <owner type="project">
       <email>blueness@gentoo.org</email>
       <name>Anthony G. Basile</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gentoo-openbsd.git</source>
+    <source type="git">git://git.gentoo.org/proj/gentoo-openbsd.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gentoo-openbsd.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gentoo-openbsd.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-openbsd.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-openbsd.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gentoo-openbsd.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gentoo-openbsd.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gentoo-openbsd.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>gentoo-taiwan</name>
@@ -1894,54 +1894,54 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>gmt</name>
     <description>User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?=user/gmt.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?=user/gmt.git;a=summary</homepage>
     <owner type="project">
       <email>gmt@be-evil.net</email>
       <name>Greg Turner</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/gmt.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/gmt.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/user/gmt.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/gmt.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>gnome</name>
     <description>experimental gnome ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gnome.git;a=summary</homepage>
     <owner type="project">
       <email>gnome@gentoo.org</email>
       <name>GNOME team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gnome.git</source>
+    <source type="git">git://git.gentoo.org/proj/gnome.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gnome.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gnome.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gnome.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gnome.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gnome.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>gnome-live</name>
     <description>highly experimental gnome live ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome-live.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gnome-live.git;a=summary</homepage>
     <owner type="project">
       <email>gnome@gentoo.org</email>
       <name>GNOME team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gnome-live.git</source>
+    <source type="git">git://git.gentoo.org/proj/gnome-live.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gnome-live.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gnome-live.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome-live.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome-live.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gnome-live.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gnome-live.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gnome-live.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>gnustep</name>
     <description>Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/gnustep.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/gnustep.git;a=summary</homepage>
     <owner>
       <email>gnustep@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/gnustep.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/gnustep.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gnustep.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/gnustep.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/gnustep.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/gnustep.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/gnustep.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gnustep.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/gnustep.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/gnustep.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>godin</name>
@@ -1971,16 +1971,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>gpe</name>
     <description>experimental gpe ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gpe.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/gpe.git;a=summary</homepage>
     <owner>
       <email>gpe@gentoo.org</email>
       <name>Ned Ludd</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/gpe.git</source>
+    <source type="git">git://git.gentoo.org/proj/gpe.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/gpe.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gpe.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gpe.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gpe.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/gpe.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gpe.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/gpe.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>graaff</name>
@@ -1991,11 +1991,11 @@ FIN
       <email>graaff@gentoo.org</email>
       <name>Hans de Graaff</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/graaff.git</source>
+    <source type="git">git://git.gentoo.org/dev/graaff.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/graaff.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/graaff.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/graaff.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/graaff.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/graaff.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>graveyard</name>
@@ -2046,16 +2046,16 @@ FIN
     <description><![CDATA[Various packages, probably some toolchain stuff
     though]]></description>
     <homepage>
-    http://git.overlays.gentoo.org/gitweb/?p=dev/halcy0n.git;a=summary</homepage>
+    http://git.gentoo.org/gitweb/?p=dev/halcy0n.git;a=summary</homepage>
     <owner type="person">
       <email>halcy0n@gentoo.org</email>
       <name>Mark Loeser</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/halcy0n.git</source>
+    <source type="git">git://git.gentoo.org/dev/halcy0n.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/halcy0n.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/halcy0n.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/halcy0n.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/halcy0n.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/halcy0n.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/halcy0n.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/halcy0n.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>hamper-overlay</name>
@@ -2081,12 +2081,12 @@ FIN
   <repo quality="experimental" status="official">
     <name>hardened-development</name>
     <description>Development Overlay for Hardened Gcc 4.x Toolchain</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=summary</homepage>
     <owner type="project">
       <email>hardened@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/hardened-dev.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/hardened-dev.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>haskell</name>
@@ -2128,16 +2128,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>heroxbd</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/heroxbd.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/heroxbd.git;a=summary</homepage>
     <owner type="person">
       <email>heroxbd@gentoo.org</email>
       <name>Benda Xu</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/heroxbd.git</source>
+    <source type="git">git://git.gentoo.org/dev/heroxbd.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/heroxbd.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/heroxbd.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/heroxbd.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/heroxbd.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/heroxbd.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/heroxbd.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/heroxbd.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name><![CDATA[hhvm]]></name>
@@ -2154,16 +2154,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>hibiscus</name>
     <description lang="en">User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/hibiscus.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/hibiscus.git;a=summary</homepage>
     <owner type="person">
       <email>fabian.koester@posteo.de</email>
       <name>Fabian K&#246;ster</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/hibiscus.git</source>
+    <source type="git">git://git.gentoo.org/user/hibiscus.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/hibiscus.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/hibiscus.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/hibiscus.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/hibiscus.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/hibiscus.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/hibiscus.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/hibiscus.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>hnaparst</name>
@@ -2204,45 +2204,45 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>iElectric</name>
     <description><![CDATA[iElectric's personal overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/iElectric.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/iElectric.git</homepage>
     <owner>
       <email>domen@dev.si</email>
       <name><![CDATA[Domen Kožar]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/iElectric.git</source>
+    <source type="git">git://git.gentoo.org/user/iElectric.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/iElectric.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/iElectric.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/iElectric.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/iElectric.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/iElectric.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/iElectric.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/iElectric.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>ikelos</name>
     <description><![CDATA[Ikelos's hospice for broken and damaged ebuilds.]]></description>
     <homepage>
-    http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=summary</homepage>
+    http://git.gentoo.org/gitweb/?p=dev/ikelos.git;a=summary</homepage>
     <owner>
       <email>ikelos@gentoo.org</email>
       <name>Mike Auty</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/ikelos.git</source>
+    <source type="git">git://git.gentoo.org/dev/ikelos.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/ikelos.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/ikelos.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/ikelos.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ikelos.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ikelos.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>improvise</name>
     <description lang="en"><![CDATA[Patches and patched ebuilds; xen and python bugs && bumps]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/improvise.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/improvise.git;a=summary</homepage>
     <owner type="person">
       <email>della5@iinet.com.au</email>
       <name>Ian Delaney</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/improvise.git</source>
+    <source type="git">git://git.gentoo.org/user/improvise.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/improvise.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/improvise.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/improvise.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/improvise.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/improvise.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/improvise.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/improvise.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>init6</name>
@@ -2295,16 +2295,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>jamesbroadhead</name>
     <description lang="en"><![CDATA[James Broadhead's personal overlay and pre-sunrise testing ground]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/jamesbroadhead.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/jamesbroadhead.git;a=summary</homepage>
     <owner type="person">
       <email>jamesbroadhead@gmail.com</email>
       <name>James Broadhead</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/jamesbroadhead.git</source>
+    <source type="git">git://git.gentoo.org/user/jamesbroadhead.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/jamesbroadhead.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/jamesbroadhead.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jamesbroadhead.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jamesbroadhead.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/jamesbroadhead.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jamesbroadhead.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jamesbroadhead.git;a=rss</feed>
   </repo>
 
   <repo quality="experimental" status="unofficial">
@@ -2334,16 +2334,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>java</name>
     <description lang="en">Java overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/java.git;a=summary</homepage>
     <owner type="project">
       <email>java@gentoo.org</email>
       <name>Gentoo Java team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/java.git</source>
+    <source type="git">git://git.gentoo.org/proj/java.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/java.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/java.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/java.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/java.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/java.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>javer</name>
@@ -2361,29 +2361,29 @@ FIN
     <name>je_fro</name>
     <description><![CDATA[Helpful ebuilds for the macbook pro, and experimental
     gentoo-science packages.]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/je_fro.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/je_fro.git;a=summary</homepage>
     <owner>
       <email>je_fro@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/je_fro.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/je_fro.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/je_fro.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/je_fro.git;a=rss</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/je_fro.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/dev/je_fro.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/je_fro.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/dev/je_fro.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/je_fro.git;a=rss</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/je_fro.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>jensp</name>
     <description><![CDATA[jensp's user overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/jensp.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/jensp.git;a=summary</homepage>
     <owner>
       <email>jens@chaox.net</email>
       <name>Jens Pranaitis</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/jensp.git</source>
+    <source type="git">git://git.gentoo.org/user/jensp.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/jensp.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/jensp.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jensp.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jensp.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/jensp.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jensp.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jensp.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>jkolo</name>
@@ -2398,16 +2398,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>jmbsvicetto</name>
     <description>Jorge Manuel B. S. Vicetto developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/jmbsvicetto.git</homepage>
     <owner>
       <email>jmbsvicetto@gentoo.org</email>
       <name>Jorge Manuel B. S. Vicetto</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/jmbsvicetto.git</source>
+    <source type="git">git://git.gentoo.org/dev/jmbsvicetto.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/jmbsvicetto.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/jmbsvicetto.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>jmesmon</name>
@@ -2422,30 +2422,30 @@ FIN
   <repo quality="experimental" status="official">
     <name>johu</name>
     <description>Johannes Huber developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/johu.git</homepage>
     <owner>
       <email>johu@gentoo.org</email>
       <name>Johannes Huber</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/johu.git</source>
+    <source type="git">git://git.gentoo.org/dev/johu.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/johu.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/johu.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/johu.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/johu.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/johu.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>joinge</name>
     <description><![CDATA[joinge's user overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/joinge.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/joinge.git;a=summary</homepage>
     <owner>
       <email>joinge.dev@gmail.com</email>
       <name>Jo Inge Buskenes</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/joinge.git</source>
+    <source type="git">git://git.gentoo.org/user/joinge.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/joinge.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/joinge.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/joinge.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/joinge.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/joinge.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/joinge.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/joinge.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>jorgicio</name>
@@ -2463,44 +2463,44 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>jranvier</name>
     <description lang="en">Experimental cryptoanarchism-related ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/jranvier.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/jranvier.git;a=summary</homepage>
     <owner type="person">
       <email>justusranvier@tormail.org</email>
       <name>Justus Ranvier</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/jranvier.git</source>
+    <source type="git">git://git.gentoo.org/user/jranvier.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/jranvier.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/jranvier.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jranvier.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jranvier.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/jranvier.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jranvier.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jranvier.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>jtriley</name>
     <description lang="en">User overlay for jtriley</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/jtriley.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/jtriley.git;a=summary</homepage>
     <owner type="person">
       <email>jtriley@MIT.EDU</email>
       <name>Justin Riley</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/jtriley.git</source>
+    <source type="git">git://git.gentoo.org/user/jtriley.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/jtriley.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/jtriley.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jtriley.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jtriley.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/jtriley.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jtriley.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jtriley.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>jxh</name>
     <description lang="en">Collection of some usefull ebuilds not in portage tree</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/jxh.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/jxh.git;a=summary</homepage>
     <owner type="person">
       <email>jaroslav.hron@gmail.com</email>
       <name>Jaroslav Hron</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/jxh.git</source>
+    <source type="git">git://git.gentoo.org/user/jxh.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/jxh.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/jxh.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jxh.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/jxh.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/jxh.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jxh.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/jxh.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
       <name>k_f</name>
@@ -2532,55 +2532,55 @@ FIN
       <email>kde@gentoo.org</email>
       <name>KDE Team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/kde.git</source>
+    <source type="git">git://git.gentoo.org/proj/kde.git</source>
     <source type="git">https://github.com/gentoo/kde.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/kde.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/kde.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/kde.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/kde.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/kde.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>kde-sunset</name>
     <description><![CDATA[User-maintained overlay for old KDE packages removed from the tree, such as KDE3.
   Please do not file bug reports, but subscribe to the gentoo-desktop mailing list]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=summary</homepage>
     <owner type="project">
       <email>gentoo-desktop+subscribe@lists.gentoo.org</email>
       <name>gentoo-desktop mailing list</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/kde-sunset.git</source>
+    <source type="git">git://git.gentoo.org/proj/kde-sunset.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/kde-sunset.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/kde-sunset.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/kde-sunset.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>keruspe</name>
     <description lang="en"><![CDATA[Keruspe's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/keruspe.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/keruspe.git;a=summary</homepage>
     <owner type="person">
       <email>Marc-Antoine@Perennou.com</email>
       <name>Marc-Antoine Perennou</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/keruspe.git</source>
+    <source type="git">git://git.gentoo.org/user/keruspe.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/keruspe.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/keruspe.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/keruspe.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/keruspe.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/keruspe.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/keruspe.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/keruspe.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>klondike</name>
     <description lang="en">Ebuilds made and modified by klondike, mainly sound and virtualization</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/klondike.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/klondike.git;a=summary</homepage>
     <owner type="person">
       <email>klondike@xiscosoft.es</email>
       <name>Francisco Blas Izquierdo Riera</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/klondike.git</source>
+    <source type="git">git://git.gentoo.org/user/klondike.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/klondike.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/klondike.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/klondike.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/klondike.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/klondike.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/klondike.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/klondike.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>kolab</name>
@@ -2595,16 +2595,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>kork</name>
     <description lang="en">Cool, new, useful, and unmaintained packages</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/kork.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/kork.git;a=summary</homepage>
     <owner type="person">
       <email>hsggebhardt@googlemail.com</email>
       <name>Henry Gebhardt</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/kork.git</source>
+    <source type="git">git://git.gentoo.org/user/kork.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/kork.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/kork.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/kork.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/kork.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/kork.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/kork.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/kork.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>kormoc</name>
@@ -2679,28 +2679,28 @@ FIN
   <repo quality="experimental" status="official">
     <name>leio</name>
     <description>Mart Raudsepp developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/leio.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/leio.git</homepage>
     <owner>
       <email>leio@gentoo.org</email>
       <name>Mart Raudsepp</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/leio.git</source>
+    <source type="git">git://git.gentoo.org/dev/leio.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/leio.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/leio.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/leio.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/leio.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/leio.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/leio.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/leio.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>levenkov</name>
     <description>levenkov personal overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/levenkov.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/levenkov.git</homepage>
     <owner>
       <email>artem@levenkov.org</email>
       <name>Artem Levenkov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/levenkov.git</source>
+    <source type="git">git://git.gentoo.org/user/levenkov.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/levenkov.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/levenkov.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/user/levenkov.git</source>
   </repo>
   <repo quality="experimental" status="official">
     <name>libressl</name>
@@ -2743,15 +2743,15 @@ FIN
     <description><![CDATA[Common Lisp/Scheme development, recruitment and live overlay.
     Support and feedback in `#gentoo-lisp' and via
     `gentoo-lisp@lists.gentoo.org'.]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/lisp.git</homepage>
     <owner>
       <email>lisp@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/lisp.git</source>
+    <source type="git">git://git.gentoo.org/proj/lisp.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/lisp.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/lisp.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/lisp.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/lisp.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/lisp.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>lmiphay</name>
@@ -2766,44 +2766,44 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>logan</name>
     <description lang="en">Gentoo/Alt ebuilds for OSX</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/logan.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/logan.git;a=summary</homepage>
     <owner type="person">
       <email>gentoo@lakedaemon.net</email>
       <name>Jason Cooper</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/logan.git</source>
+    <source type="git">git://git.gentoo.org/user/logan.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/logan.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/logan.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/logan.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/logan.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/logan.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/logan.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/logan.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>loongson</name>
     <description>Gentoo loongson overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/loongson.git;a=summary</homepage>
     <owner>
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/loongson.git</source>
+    <source type="git">git://git.gentoo.org/proj/loongson.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/loongson.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/loongson.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/loongson.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/loongson.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/loongson.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>lootr</name>
     <description lang="en">dev-python/netzob and maybe some i3 hacks</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/lootr.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/lootr.git;a=summary</homepage>
     <owner type="person">
       <email>alex@freesenses.net</email>
       <name><![CDATA[Alexandre PIGNÉ]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/lootr.git</source>
+    <source type="git">git://git.gentoo.org/user/lootr.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/lootr.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/lootr.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/lootr.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/lootr.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/lootr.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/lootr.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/lootr.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>lordvan</name>
@@ -2813,11 +2813,11 @@ FIN
       <email>lordvan@gentoo.org</email>
       <name>Thomas Raschbacher</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/lordvan.git</source>
+    <source type="git">git://git.gentoo.org/dev/lordvan.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/lordvan.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/lordvan.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/lordvan.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/lordvan.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/lordvan.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/lordvan.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/lordvan.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>lorelei</name>
@@ -2834,44 +2834,44 @@ FIN
   <repo quality="experimental" status="official">
     <name>ltsp</name>
     <description>Linux Terminal Server Project overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/ltsp.git;a=summary</homepage>
     <owner>
       <email>dberkholz@gentoo.org</email>
       <name>Donnie Berkholz</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/ltsp.git</source>
+    <source type="git">git://git.gentoo.org/proj/ltsp.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/ltsp.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/ltsp.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/ltsp.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/ltsp.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/ltsp.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>lua</name>
     <description lang="en">Lua development overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/lua.git;a=summary</homepage>
     <owner type="project">
       <email>rafaelmartins@gentoo.org</email>
       <name>Rafael G. Martins</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/lua.git</source>
+    <source type="git">git://git.gentoo.org/proj/lua.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/lua.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/lua.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/lua.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/lua.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/lua.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>luman</name>
     <description lang="en"><![CDATA[ccube's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/luman.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/luman.git;a=summary</homepage>
     <owner type="person">
       <email>gentoobugzilla@ccube.de</email>
       <name>Lukas Elsner</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/luman.git</source>
+    <source type="git">git://git.gentoo.org/user/luman.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/luman.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/luman.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/luman.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/luman.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/luman.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/luman.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/luman.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>luke-jr</name>
@@ -2885,40 +2885,40 @@ FIN
   <repo quality="experimental" status="official">
     <name>m68k</name>
     <description>m68k team overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/m68k.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/m68k.git</homepage>
     <owner>
       <email>m68k@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/m68k.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/m68k.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/m68k.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/m68k.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>maekke</name>
     <description>Markus Meier developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/maekke.git</homepage>
     <owner>
       <email>maekke@gentoo.org</email>
       <name>Markus Meier</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/maekke.git</source>
+    <source type="git">git://git.gentoo.org/dev/maekke.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/maekke.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/maekke.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/maekke.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/maekke.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/maekke.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>maksbotan</name>
     <description lang="en">Overlay for testing my ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/maksbotan.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/maksbotan.git;a=summary</homepage>
     <owner type="person">
       <email>maksbotan@gentoo.org</email>
       <name>Maxim Koltsov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/maksbotan.git</source>
+    <source type="git">git://git.gentoo.org/dev/maksbotan.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/maksbotan.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/maksbotan.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/maksbotan.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/maksbotan.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/maksbotan.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/maksbotan.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/maksbotan.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>maggu2810-overlay</name>
@@ -2948,16 +2948,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>matsuu</name>
     <description>MATSUU Takuto developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/matsuu.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/matsuu.git</homepage>
     <owner>
       <email>matsuu@gentoo.org</email>
       <name>MATSUU Takuto</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/matsuu.git</source>
+    <source type="git">git://git.gentoo.org/dev/matsuu.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/matsuu.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/matsuu.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/matsuu.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/matsuu.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/matsuu.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/matsuu.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/matsuu.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>megacoffee</name>
@@ -2975,44 +2975,44 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>Menelkir</name>
     <description lang="en">This is my personal overlay for unmaintained packages and some other addittions.</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/menelkir.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/menelkir.git;a=summary</homepage>
     <owner type="person">
       <email>menelkir@itroll.org</email>
       <name>Daniel de Oliveira</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/menelkir.git</source>
+    <source type="git">git://git.gentoo.org/user/menelkir.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/menelkir.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/menelkir.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/menelkir.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/menelkir.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/menelkir.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/menelkir.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/menelkir.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>mgorny</name>
     <description><![CDATA[Michał Górny developer overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/mgorny.git</homepage>
     <owner>
       <email>mgorny@gentoo.org</email>
       <name><![CDATA[Michał Górny]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/mgorny.git</source>
+    <source type="git">git://git.gentoo.org/dev/mgorny.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/mgorny.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/mgorny.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/mgorny.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/mgorny.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/mgorny.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>mhammill</name>
     <description lang="en"><![CDATA[Mike's user overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/mhammill.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/mhammill.git;a=summary</homepage>
     <owner type="person">
       <email>michael@hammill.name</email>
       <name>Mike Hammill</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/mhammill.git</source>
+    <source type="git">git://git.gentoo.org/user/mhammill.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/mhammill.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/mhammill.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mhammill.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mhammill.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/mhammill.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mhammill.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mhammill.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>miramir</name>
@@ -3027,16 +3027,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>mistafunk</name>
     <description lang="en">Packages mostly related to graphics and multimedia</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/mistafunk.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/mistafunk.git;a=summary</homepage>
     <owner type="person">
       <email>simon.haegler@mistafunk.ch</email>
       <name>Simon Haegler</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/mistafunk.git</source>
+    <source type="git">git://git.gentoo.org/user/mistafunk.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/mistafunk.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/mistafunk.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mistafunk.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mistafunk.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/mistafunk.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mistafunk.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mistafunk.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>mkeyoverlay</name>
@@ -3084,26 +3084,26 @@ FIN
   <repo quality="experimental" status="official">
     <name>moult</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/moult.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/moult.git;a=summary</homepage>
     <owner type="person">
       <email>moult@gentoo.org</email>
       <name>Dion Moult</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/moult.git</source>
+    <source type="git">git://git.gentoo.org/dev/moult.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/moult.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/moult.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/moult.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/moult.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/moult.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/moult.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/moult.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>mozilla</name>
     <description>New mozilla development that is not yet in tree</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/mozilla.git</homepage>
     <owner type="project">
       <email>mozilla@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/mozilla.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/mozilla.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/mozilla.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>mpd</name>
@@ -3123,41 +3123,41 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>mrueg</name>
     <description lang="en">User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/mrueg.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/mrueg.git;a=summary</homepage>
     <owner type="person">
       <email>mrueg@gentoo.org</email>
       <name><![CDATA[Manuel Rüger (mrueg)]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/mrueg.git</source>
+    <source type="git">git://git.gentoo.org/user/mrueg.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/mrueg.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/mrueg.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/user/mrueg.git</source>
     <source type="git">https://github.com/mrueg/mrueg-overlay.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mrueg.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mrueg.git;a=rss</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mrueg.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mrueg.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>mschiff</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/mschiff.git;a=summary</homepage>
     <owner type="person">
       <email>mschiff@gentoo.org</email>
       <name>Marc Schiffbauer</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/mschiff.git</source>
+    <source type="git">git://git.gentoo.org/dev/mschiff.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/mschiff.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/mschiff.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/mschiff.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/mschiff.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/mschiff.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>multilib-portage</name>
     <description><![CDATA[multilib-overlay: emul-linux-x86 must die ;)]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=summary</homepage>
     <owner>
       <email>tommy@gentoo.org</email>
       <name>Thomas Sachau</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/multilib-portage.git</source>
+    <source type="git">git://git.gentoo.org/proj/multilib-portage.git</source>
   </repo>
   <repo quality="experimental" status="official">
     <name>multimedia</name>
@@ -3178,16 +3178,16 @@ FIN
     <description><![CDATA[Ebuilds for packages not in the Gentoo tree
         (lack of maintainer or too experimental) and live ebuilds
         or extensions/bugfixes for packages in the tree]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/mv.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/mv.git</homepage>
     <owner type="person">
       <email>vaeth@mathematik.uni-wuerzburg.de</email>
       <name><![CDATA[Martin Väth]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/mv.git</source>
+    <source type="git">git://git.gentoo.org/user/mv.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/mv.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/mv.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mv.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/mv.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/mv.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mv.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/mv.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>mva</name>
@@ -3203,16 +3203,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>mysql</name>
     <description lang="en">Gentoo MySQL overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/mysql.git;a=summary</homepage>
     <owner type="project">
       <email>mysql-bugs@gentoo.org</email>
       <name>MySQL Team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/mysql.git</source>
+    <source type="git">git://git.gentoo.org/proj/mysql.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/mysql.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/mysql.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/mysql.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/mysql.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/mysql.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>n4g</name>
@@ -3306,16 +3306,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>neurogeek</name>
     <description>Jesus Rivero developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/neurogeek.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/neurogeek.git</homepage>
     <owner>
       <email>neurogeek@gentoo.org</email>
       <name>Jesus Rivero</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/neurogeek.git</source>
+    <source type="git">git://git.gentoo.org/dev/neurogeek.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/neurogeek.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/neurogeek.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/neurogeek.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/neurogeek.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/neurogeek.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/neurogeek.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/neurogeek.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>nextoo</name>
@@ -3346,16 +3346,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>nico</name>
     <description lang="en">various ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/nico.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/nico.git;a=summary</homepage>
     <owner type="person">
       <email>nico@overninethousand.de</email>
       <name>Nico Suhl</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/nico.git</source>
+    <source type="git">git://git.gentoo.org/user/nico.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/nico.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/nico.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/nico.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/nico.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/nico.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/nico.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/nico.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>nigoro-fbsd</name>
@@ -3369,16 +3369,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>nikai</name>
     <description>nikai user overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/nikai.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/nikai.git</homepage>
     <owner>
       <email>nikai@nikai.net</email>
       <name>Nicolas Kaiser</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/nikai.git</source>
+    <source type="git">git://git.gentoo.org/user/nikai.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/nikai.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/nikai.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/nikai.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/nikai.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/nikai.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/nikai.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/nikai.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>nirvana</name>
@@ -3396,16 +3396,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>nixphoeni</name>
     <description lang="en"><![CDATA[Joe Sapp's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/nixphoeni.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/nixphoeni.git;a=summary</homepage>
     <owner type="person">
       <email>nixphoeni@gentoo.org</email>
       <name>Joe Sapp</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/nixphoeni.git</source>
+    <source type="git">git://git.gentoo.org/dev/nixphoeni.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/nixphoeni.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/nixphoeni.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/nixphoeni.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/nixphoeni.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/nixphoeni.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/nixphoeni.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/nixphoeni.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>njw</name>
@@ -3430,15 +3430,15 @@ FIN
   <repo quality="experimental" status="official">
     <name>nx</name>
     <description>Overlay for the NX/FreeNX packages for Gentoo.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/nx.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/nx.git;a=summary</homepage>
     <owner>
       <email>nx@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/nx.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/nx.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/nx.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/nx.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/nx.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/nx.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/nx.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/nx.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/nx.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/nx.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>o11c</name>
@@ -3563,55 +3563,55 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>palmer</name>
     <description lang="en">User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/palmer.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/palmer.git;a=summary</homepage>
     <owner type="person">
       <email>palmem@comcast.net</email>
       <name>Palmer Dabbelt</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/palmer.git</source>
+    <source type="git">git://git.gentoo.org/user/palmer.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/palmer.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/palmer.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/palmer.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/palmer.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/palmer.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/palmer.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/palmer.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>pandaboard</name>
     <description>Gentoo overlay for Pandaboard</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/pandaboard.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/pandaboard.git;a=summary</homepage>
     <owner>
       <email>armin76@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/pandaboard.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/pandaboard.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/pandaboard.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/proj/pandaboard.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/pandaboard.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/pandaboard.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>paragon</name>
     <description lang="en">Oldies, raries, ownies, get organized</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/paragon.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/paragon.git;a=summary</homepage>
     <owner type="person">
       <email>octavsly@gmail.com</email>
       <name>Octavian Petre</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/paragon.git</source>
+    <source type="git">git://git.gentoo.org/user/paragon.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/paragon.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/paragon.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/paragon.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/paragon.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/paragon.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/paragon.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/paragon.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>pchrist</name>
     <description>Panagiotis Christopoulos developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/pchrist.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/pchrist.git</homepage>
     <owner>
       <email>pchrist@gentoo.org</email>
       <name>Panagiotis Christopoulos</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/pchrist.git</source>
+    <source type="git">git://git.gentoo.org/dev/pchrist.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/pchrist.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/pchrist.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/pchrist.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/pchrist.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/pchrist.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/pchrist.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/pchrist.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>pcsx2</name>
@@ -3665,11 +3665,11 @@ FIN
       <email>perl@gentoo.org</email>
       <name>Perl Team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/perl-overlay.git</source>
+    <source type="git">git://git.gentoo.org/proj/perl-overlay.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/perl-overlay.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/perl-overlay.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/perl-overlay.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>perl-experimental-snapshots</name>
@@ -3722,30 +3722,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>piczu</name>
     <description lang="en"><![CDATA[piczu's user overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/piczu.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/piczu.git;a=summary</homepage>
     <owner type="person">
       <email>maciag.artur@gmail.com</email>
       <name>Artur Maciag</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/piczu.git</source>
+    <source type="git">git://git.gentoo.org/user/piczu.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/piczu.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/piczu.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/piczu.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/piczu.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/piczu.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/piczu.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/piczu.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>pigfoot</name>
     <description lang="en">Ebuilds for experimental packages and chinese patches</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/pigfoot.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/pigfoot.git;a=summary</homepage>
     <owner type="person">
       <email>pigfoot@gmail.com</email>
       <name>pigfoot</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/pigfoot.git</source>
+    <source type="git">git://git.gentoo.org/user/pigfoot.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/pigfoot.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/pigfoot.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/pigfoot.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/pigfoot.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/pigfoot.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/pigfoot.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/pigfoot.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>pinkbyte</name>
@@ -3762,16 +3762,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>plab</name>
     <description lang="en">Paul Labedan user overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/plab.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/plab.git;a=summary</homepage>
     <owner type="person">
       <email>plabedan@gmail.com</email>
       <name>Paul Labedan</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/plab.git</source>
+    <source type="git">git://git.gentoo.org/user/plab.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/plab.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/plab.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/plab.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/plab.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/plab.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/plab.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/plab.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>poly-c</name>
@@ -3810,41 +3810,41 @@ FIN
   <repo quality="experimental" status="official">
     <name>postgresql-experimental</name>
     <description>Development overlay for PostgreSQL, experimental branch.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/postgresql/experimental.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/postgresql/experimental.git;a=summary</homepage>
     <owner>
       <email>pgsql-bugs@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/postgresql/experimental.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/postgresql/experimental.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/postgresql/experimental.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/postgresql/experimental.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/postgresql/experimental.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/postgresql/experimental.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/postgresql/experimental.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/postgresql/experimental.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/postgresql/experimental.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/postgresql/experimental.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>postgresql-testing</name>
     <description>Development overlay for PostgreSQL, testing branch.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/postgresql/testing.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/postgresql/testing.git;a=summary</homepage>
     <owner>
       <email>pgsql-bugs@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/postgresql/testing.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/postgresql/testing.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/postgresql/testing.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/postgresql/testing.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/postgresql/testing.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/postgresql/testing.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/postgresql/testing.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/postgresql/testing.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/postgresql/testing.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/postgresql/testing.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>powerpc</name>
     <description>Support for PowerPC-based ebuilds that are not appropriate for the portage tree.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/powerpc.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/powerpc.git;a=summary</homepage>
     <owner>
       <email>ranger@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/powerpc.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/powerpc.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/powerpc.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/powerpc.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/powerpc.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/powerpc.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/powerpc.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/powerpc.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/powerpc.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/powerpc.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>powerman</name>
@@ -3859,16 +3859,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>printer-drivers</name>
     <description lang="en">User-submitted ebuilds for printer drivers</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/printer-drivers.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/printer-drivers.git;a=summary</homepage>
     <owner type="project">
       <email>printing@gentoo.org</email>
       <name>Gentoo printing team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/printer-drivers.git</source>
+    <source type="git">git://git.gentoo.org/proj/printer-drivers.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/printer-drivers.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/printer-drivers.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/printer-drivers.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/printer-drivers.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/printer-drivers.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/printer-drivers.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/printer-drivers.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>prism-overlay</name>
@@ -3884,16 +3884,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>prometheanfire</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=summary</homepage>
     <owner type="person">
       <email>prometheanfire@gentoo.org</email>
       <name>Matthew Thode</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/prometheanfire.git</source>
+    <source type="git">git://git.gentoo.org/dev/prometheanfire.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/prometheanfire.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/prometheanfire.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/prometheanfire.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>proaudio</name>
@@ -3918,16 +3918,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>pross</name>
     <description lang="en">Up to date ck-sources with gentoo patches.</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/pross.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/pross.git;a=summary</homepage>
     <owner type="person">
       <email>pross@pross.org.uk</email>
       <name>Simon Prosser</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/pross.git</source>
+    <source type="git">git://git.gentoo.org/user/pross.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/pross.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/pross.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/pross.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/pross.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/pross.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/pross.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/pross.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>psix-overlay</name>
@@ -3944,16 +3944,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>purak</name>
     <description lang="en"><![CDATA[purak's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/purak.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/purak.git;a=summary</homepage>
     <owner type="person">
       <email>bburaksezer@gmail.com</email>
       <name>Burak Sezer</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/purak.git</source>
+    <source type="git">git://git.gentoo.org/user/purak.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/purak.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/purak.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/purak.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/purak.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/purak.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/purak.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/purak.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>pypy_alice</name>
@@ -3971,16 +3971,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>qemu-init</name>
     <description lang="en">qemu init script and tools</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/qiaomuf.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/qiaomuf.git;a=summary</homepage>
     <owner type="person">
       <email>dolsen@gentoo.org</email>
       <name>Brian Dolbec</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/kvm-tools.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/kvm-tools.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/kvm-tools.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/kvm-tools.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/kvm-tools.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/proj/kvm-tools.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/kvm-tools.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/proj/kvm-tools.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/kvm-tools.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/kvm-tools.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>qwin-overlay</name>
@@ -4001,25 +4001,25 @@ FIN
       <email>qt@gentoo.org</email>
       <name>Qt Team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/qt.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/qt.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/qt.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/proj/qt.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/qt.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/proj/qt.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/qt.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/qt.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>quantumsummers</name>
     <description lang="en">Developer Overlay for Quantumsummers</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/quantumsummers.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/quantumsummers.git;a=summary</homepage>
     <owner type="person">
       <email>quantumsummers@gentoo.org</email>
       <name>Matthew Summers</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/quantumsummers.git</source>
+    <source type="git">git://git.gentoo.org/dev/quantumsummers.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/quantumsummers.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/quantumsummers.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/quantumsummers.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/quantumsummers.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/quantumsummers.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/quantumsummers.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/quantumsummers.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>quarks</name>
@@ -4126,30 +4126,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>rebutia</name>
     <description lang="en">Rebutia overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/rebutia.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/rebutia.git;a=summary</homepage>
     <owner type="person">
       <email>ps@twin.jikos.cz</email>
       <name>Pavel Sanda</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/rebutia.git</source>
+    <source type="git">git://git.gentoo.org/user/rebutia.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/rebutia.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/rebutia.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/rebutia.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/rebutia.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/rebutia.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/rebutia.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/rebutia.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>remi</name>
     <description>Remi Cardona developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/remi.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/remi.git</homepage>
     <owner>
       <email>remi@gentoo.org</email>
       <name><![CDATA[Rèmi Cardona]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/remi.git</source>
+    <source type="git">git://git.gentoo.org/dev/remi.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/remi.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/remi.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/remi.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/remi.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/remi.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/remi.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/remi.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>regina-gentoo</name>
@@ -4198,16 +4198,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>robbat2</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/robbat2.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/robbat2.git;a=summary</homepage>
     <owner type="person">
       <email>robbat2@gentoo.org</email>
       <name>Robin H. Johnson</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/robbat2.git</source>
+    <source type="git">git://git.gentoo.org/dev/robbat2.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/robbat2.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/robbat2.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/robbat2.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/robbat2.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/robbat2.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/robbat2.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/robbat2.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>ROKO__</name>
@@ -4245,7 +4245,7 @@ FIN
   <repo quality="experimental" status="official">
     <name>R_Overlay</name>
     <description>Gentoo overlay of R packages</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary</homepage>
     <owner type="project">
       <email>calchan@gentoo.org</email>
       <name>Denis Dupeyron</name>
@@ -4255,16 +4255,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>rubenqba</name>
     <description lang="en">User overlay with miscellaneous ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/rubenqba.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/rubenqba.git;a=summary</homepage>
     <owner type="person">
       <email>ruben.bressler@cerpamid.co.cu</email>
       <name><![CDATA[Rubén Bressler Camps]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/rubenqba.git</source>
+    <source type="git">git://git.gentoo.org/user/rubenqba.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/rubenqba.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/rubenqba.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/rubenqba.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/rubenqba.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/rubenqba.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/rubenqba.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/rubenqba.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>ruby</name>
@@ -4274,11 +4274,11 @@ FIN
       <email>ruby@gentoo.org</email>
       <name>Ruby Team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/ruby-overlay.git</source>
+    <source type="git">git://git.gentoo.org/proj/ruby-overlay.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/ruby-overlay.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/ruby-overlay.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/ruby-overlay.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>rust</name>
@@ -4296,16 +4296,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>rwald</name>
     <description lang="en">Personal overlay of Randall Wald</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/rwald.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/rwald.git;a=summary</homepage>
     <owner type="person">
       <email>rdwald@gmail.com</email>
       <name>Randall Wald</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/rwald.git</source>
+    <source type="git">git://git.gentoo.org/user/rwald.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/rwald.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/rwald.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/rwald.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/rwald.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/rwald.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/rwald.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/rwald.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sabayon</name>
@@ -4336,16 +4336,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>sabotageandi</name>
     <description lang="en"><![CDATA[SabotageAndi's ebuilds (uTouch, E17, ..)]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/sabotageandi.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/sabotageandi.git;a=summary</homepage>
     <owner type="person">
       <email>sabotageandi@gmail.com</email>
       <name>Andreas Willich</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/sabotageandi.git</source>
+    <source type="git">git://git.gentoo.org/user/sabotageandi.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/sabotageandi.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/sabotageandi.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sabotageandi.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sabotageandi.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/sabotageandi.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sabotageandi.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sabotageandi.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sage-on-gentoo</name>
@@ -4383,30 +4383,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>sardemff7</name>
     <description lang="en"><![CDATA[Sardem FF7's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/sardemff7.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/sardemff7.git;a=summary</homepage>
     <owner type="person">
       <email>sardemff7+gentoo@sardemff7.net</email>
       <name>Sardem FF7</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/sardemff7.git</source>
+    <source type="git">git://git.gentoo.org/user/sardemff7.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/sardemff7.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/sardemff7.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sardemff7.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sardemff7.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/sardemff7.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sardemff7.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sardemff7.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sattvik</name>
     <description lang="en"><![CDATA[sattvik's overlay with personalized bug fixes and tweaks]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/sattvik.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/sattvik.git;a=summary</homepage>
     <owner type="person">
       <email>gentoo@sattvik.com</email>
       <name>Daniel Solano Gomez</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/sattvik.git</source>
+    <source type="git">git://git.gentoo.org/user/sattvik.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/sattvik.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/sattvik.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sattvik.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sattvik.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/sattvik.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sattvik.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sattvik.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>science</name>
@@ -4422,14 +4422,14 @@ FIN
       <email>sci@gentoo.org</email>
       <name>sci</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/sci.git</source>
+    <source type="git">git://git.gentoo.org/proj/sci.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/sci.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/sci.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/sci.git</source>
     <source type="git">https://github.com/gentoo-science/sci.git</source>
     <source type="git">git://github.com/gentoo-science/sci.git</source>
     <source type="git">git@github.com:gentoo-science/sci.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=rss</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/sci.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/sci.git;a=rss</feed>
     <feed>https://github.com/gentoo-science/sci/commits/master.atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
@@ -4471,29 +4471,29 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>secondlife</name>
     <description>Matsuu's Second Life Overlay.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=dev/matsuu/secondlife.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=dev/matsuu/secondlife.git;a=summary</homepage>
     <owner>
       <email>matsuu@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/matsuu/secondlife.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/dev/matsuu/secondlife.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/matsuu/secondlife.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=dev/matsuu/secondlife.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=dev/matsuu/secondlife.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/matsuu/secondlife.git</source> -->
+    <source type="git">git://git.gentoo.org/dev/matsuu/secondlife.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/matsuu/secondlife.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=dev/matsuu/secondlife.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=dev/matsuu/secondlife.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>seden</name>
     <description lang="en">Experimental ebuilds that are still unmaintained</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/seden.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/seden.git;a=summary</homepage>
     <owner type="person">
       <email>yamakuzure@gmx.net</email>
       <name>Sven Eden</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/seden.git</source>
+    <source type="git">git://git.gentoo.org/user/seden.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/seden.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/seden.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/seden.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/seden.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/seden.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/seden.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/seden.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>seeds</name>
@@ -4510,29 +4510,29 @@ FIN
     <name>seemant</name>
     <description><![CDATA[Seemant's development overlay for django and other
     things.]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/seemant.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/seemant.git;a=summary</homepage>
     <owner>
       <email>seemant@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/seemant.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/seemant.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/seemant.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/seemant.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/seemant.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/dev/seemant.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/seemant.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/dev/seemant.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/seemant.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/seemant.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sekh</name>
     <description lang="en"><![CDATA[sekh's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/sekh.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/sekh.git;a=summary</homepage>
     <owner type="person">
       <email>wlallemand@gmail.com</email>
       <name>William Lallemand</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/sekh.git</source>
+    <source type="git">git://git.gentoo.org/user/sekh.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/sekh.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/sekh.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sekh.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/sekh.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/sekh.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sekh.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/sekh.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sekyfsr</name>
@@ -4549,16 +4549,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>sera</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/sera.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/sera.git;a=summary</homepage>
     <owner type="person">
       <email>sera@gentoo.org</email>
       <name>Ralph Sennhauser</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/sera.git</source>
+    <source type="git">git://git.gentoo.org/dev/sera.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/sera.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/sera.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/sera.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/sera.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/sera.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/sera.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/sera.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sft</name>
@@ -4584,16 +4584,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>silmano</name>
     <description lang="en"><![CDATA[Peter's personal overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/silmano.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/silmano.git;a=summary</homepage>
     <owner type="person">
       <email>silmano@gmail.com</email>
       <name>Pedro Arizmendi</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/silmano.git</source>
+    <source type="git">git://git.gentoo.org/user/silmano.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/silmano.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/silmano.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/silmano.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/silmano.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/silmano.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/silmano.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/silmano.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>sinustrom</name>
@@ -4622,16 +4622,16 @@ FIN
   <repo quality="experimental" status="official">
     <name>sochotnicky</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/sochotnicky.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/sochotnicky.git;a=summary</homepage>
     <owner type="person">
       <email>sochotnicky@gentoo.org</email>
       <name>Stanislav Ochotnicky</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/sochotnicky.git</source>
+    <source type="git">git://git.gentoo.org/dev/sochotnicky.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/sochotnicky.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/sochotnicky.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/sochotnicky.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/sochotnicky.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/sochotnicky.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/sochotnicky.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/sochotnicky.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>soehest</name>
@@ -4731,30 +4731,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>squeezebox</name>
     <description lang="en">Packages for the Squeezebox network audio player from Logitech</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/squeezebox.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/squeezebox.git;a=summary</homepage>
     <owner type="person">
       <email>stuart@hickinbottom.com</email>
       <name>Stuart Hickinbottom</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/squeezebox.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/user/squeezebox.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/squeezebox.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/squeezebox.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/squeezebox.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/user/squeezebox.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/user/squeezebox.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/user/squeezebox.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/squeezebox.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/squeezebox.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>srcshelton</name>
     <description lang="en">Out-of-tree ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/srcshelton.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/srcshelton.git;a=summary</homepage>
     <owner type="person">
       <email>srcshelton@gmail.com</email>
       <name>Stuart Shelton</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/srcshelton.git</source>
+    <source type="git">git://git.gentoo.org/user/srcshelton.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/srcshelton.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/srcshelton.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/srcshelton.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/srcshelton.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/srcshelton.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/srcshelton.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/srcshelton.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>steam-overlay</name>
@@ -4772,16 +4772,16 @@ FIN
   <repo quality="testing" status="official">
     <name>steev</name>
     <description><![CDATA[Steev Klimaszewski's Overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/steev.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/steev.git;a=summary</homepage>
     <owner>
       <email>steev@gentoo.org</email>
       <name>Stephen Klimaszewski</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/steev.git</source>
+    <source type="git">git://git.gentoo.org/dev/steev.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/steev.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/steev.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/steev.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/steev.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/steev.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/steev.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/steev.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>stefantalpalaru</name>
@@ -4856,16 +4856,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>systemd</name>
     <description lang="en">User collaboration on ebuilds for the systemd init system</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/systemd.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/systemd.git;a=summary</homepage>
     <owner type="person">
       <email>hsggebhardt@googlemail.com</email>
       <name>Henry Gebhardt</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/systemd.git</source>
+    <source type="git">git://git.gentoo.org/user/systemd.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/systemd.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/systemd.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/systemd.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/systemd.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/systemd.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/systemd.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/systemd.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>systemd-love</name>
@@ -4898,11 +4898,11 @@ FIN
     <owner type="project">
       <email>sunrise@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/sunrise-reviewed.git</source>
+    <source type="git">git://git.gentoo.org/proj/sunrise-reviewed.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/sunrise-reviewed.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/sunrise-reviewed.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/sunrise-reviewed.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/sunrise-reviewed.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/sunrise-reviewed.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/sunrise-reviewed.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/sunrise-reviewed.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>swegener</name>
@@ -4949,13 +4949,13 @@ FIN
   <repo quality="experimental" status="official">
     <name>tegra</name>
     <description>Gentoo overlay for NVIDIA Tegra2</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/tegra.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/tegra.git;a=summary</homepage>
     <owner>
       <email>armin76@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/tegra.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/tegra.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/tegra.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/proj/tegra.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/tegra.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/tegra.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>tf201</name>
@@ -5015,44 +5015,44 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>tocaro</name>
     <description lang="en">tocaro personnal o.g.o</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/tocaro.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/tocaro.git;a=summary</homepage>
     <owner type="person">
       <email>tocaro@thocar.org</email>
       <name><![CDATA[Thomas Carrié]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/tocaro.git</source>
+    <source type="git">git://git.gentoo.org/user/tocaro.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/tocaro.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/tocaro.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/tocaro.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/tocaro.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/tocaro.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/tocaro.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/tocaro.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>toolchain</name>
     <description><![CDATA[Toolchain ebuilds that are unsuitable for the tree. Snapshots,
     unstable versions, etc...]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/toolchain.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/toolchain.git;a=summary</homepage>
     <owner type="project">
       <email>toolchain@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/toolchain.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/toolchain.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/toolchain.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/toolchain.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/toolchain.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/proj/toolchain.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/toolchain.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/proj/toolchain.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/toolchain.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/toolchain.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>triquetra</name>
     <description lang="en">User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/triquetra.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/triquetra.git;a=summary</homepage>
     <owner type="person">
       <email>david@triquetradevelopment.com</email>
       <name>David Crandall</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/triquetra.git</source>
+    <source type="git">git://git.gentoo.org/user/triquetra.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/triquetra.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/triquetra.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/triquetra.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/triquetra.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/triquetra.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/triquetra.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/triquetra.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>tryton</name>
@@ -5067,44 +5067,44 @@ FIN
   <repo quality="experimental" status="official">
     <name>turbogears2</name>
     <description lang="en">TurboGears 2.x-related ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/turbogears2.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/turbogears2.git;a=summary</homepage>
     <owner type="project">
       <email>sping@gentoo.org</email>
       <name>Sebastian Pipping</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/turbogears2.git</source>
+    <source type="git">git://git.gentoo.org/proj/turbogears2.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/turbogears2.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/turbogears2.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/turbogears2.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/turbogears2.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/turbogears2.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/turbogears2.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/turbogears2.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>tjy1965</name>
     <description lang="en">User overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/tjy1965.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/tjy1965.git;a=summary</homepage>
     <owner type="person">
       <email>tjy1965@gmail.com</email>
       <name>Yamashita TAKAO</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/tjy1965.git</source>
+    <source type="git">git://git.gentoo.org/user/tjy1965.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/tjy1965.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/tjy1965.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/tjy1965.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/tjy1965.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/tjy1965.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/tjy1965.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/tjy1965.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>TomWij</name>
     <description lang="en">New, staging and experimental ebuilds</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/TomWij.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/TomWij.git;a=summary</homepage>
     <owner type="person">
       <email>tomwij@gentoo.org</email>
       <name>Tom Wijsman</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/TomWij.git</source>
+    <source type="git">git://git.gentoo.org/dev/TomWij.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/TomWij.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/TomWij.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/TomWij.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/TomWij.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/TomWij.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/TomWij.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/TomWij.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>torbrowser</name>
@@ -5197,44 +5197,44 @@ FIN
   <repo quality="experimental" status="official">
     <name>ulm</name>
     <description>Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/ulm.git;a=summary</homepage>
     <owner type="person">
       <email>ulm@gentoo.org</email>
       <name><![CDATA[Ulrich Müller]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/ulm.git</source>
+    <source type="git">git://git.gentoo.org/dev/ulm.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/ulm.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/ulm.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ulm.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/ulm.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ulm.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ulm.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>ultrabug</name>
     <description lang="en">Developer Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/ultrabug.git;a=summary</homepage>
     <owner type="project">
       <email>ultrabug@gentoo.org</email>
       <name>Alexys Jacob</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/ultrabug.git</source>
+    <source type="git">git://git.gentoo.org/dev/ultrabug.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/ultrabug.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/ultrabug.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/ultrabug.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ultrabug.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/ultrabug.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>underlay</name>
     <description lang="en">Miscellaneous admin and multimedia packages</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/underlay.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/underlay.git;a=summary</homepage>
     <owner type="person">
       <email>mail@mcgruff.plus.com</email>
       <name>Noel Darlow</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/underlay.git</source>
+    <source type="git">git://git.gentoo.org/user/underlay.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/underlay.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/underlay.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/underlay.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/underlay.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/underlay.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/underlay.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/underlay.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>undesktop</name>
@@ -5318,40 +5318,40 @@ FIN
     <name>vdr-devel</name>
     <description><![CDATA[Overlay for VDR, that contains ebuilds for development version
     of VDR, and specific plugins for that version.]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=summary</homepage>
     <owner type="project">
       <email>vdr@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/vdr/devel.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/vdr/devel.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/vdr/devel.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/vdr/devel.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/vdr/devel.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/proj/vdr/devel.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>vdr-testing</name>
     <description>Development overlay for VDR, testing branch.</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/vdr/testing.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/vdr/testing.git;a=summary</homepage>
     <owner type="project">
       <email>vdr@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/vdr/testing.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/vdr/testing.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/vdr/testing.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/vdr/testing.git;a=atom</feed>
+    <source type="git">git://git.gentoo.org/proj/vdr/testing.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/vdr/testing.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/proj/vdr/testing.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/vdr/testing.git;a=atom</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>venidera</name>
     <description lang="en">Custom overlay for use at Venidera, mostly for open cloud infrastructure (IaaS and PaaS) software from various sources</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/venidera.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/venidera.git;a=summary</homepage>
     <owner type="person">
       <email>leonardo@venidera.com</email>
       <name>Leonardo Martins</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/venidera.git</source>
+    <source type="git">git://git.gentoo.org/user/venidera.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/venidera.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/venidera.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/venidera.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/venidera.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/venidera.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/venidera.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/venidera.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>verlihub</name>
@@ -5380,30 +5380,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>vincent</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/vincent.git;a=summary</homepage>
     <owner>
       <email>vincent@gentoo.org</email>
       <name>Vicente Olivert Riera</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/vincent.git</source>
+    <source type="git">git://git.gentoo.org/dev/vincent.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/vincent.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/vincent.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/vincent.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/vincent.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/vincent.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>virtualization</name>
     <description lang="en">Experimental virtualization stuff</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/virtualization.git;a=summary</homepage>
     <owner type="project">
       <email>virtualization@gentoo.org</email>
       <name>Gentoo virtualization team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/virtualization.git</source>
+    <source type="git">git://git.gentoo.org/proj/virtualization.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/virtualization.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/virtualization.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/virtualization.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/virtualization.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/virtualization.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>viprea-overlay</name>
@@ -5420,30 +5420,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>vmacs</name>
     <description lang="en">VMACS Personal Gentoo Overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/vmacs.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/vmacs.git;a=summary</homepage>
     <owner type="person">
       <email>vance.m.allen@gmail.com</email>
       <name>Vance M. Allen</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/vmacs.git</source>
+    <source type="git">git://git.gentoo.org/user/vmacs.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/vmacs.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/vmacs.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/vmacs.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/vmacs.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/vmacs.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/vmacs.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/vmacs.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>vmalov</name>
     <description lang="en"><![CDATA[vmalov's gentoo overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/vmalov.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/vmalov.git;a=summary</homepage>
     <owner type="person">
       <email>malvikus@gmail.com</email>
       <name>Victor Malov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/vmalov.git</source>
+    <source type="git">git://git.gentoo.org/user/vmalov.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/vmalov.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/vmalov.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/vmalov.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/vmalov.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/vmalov.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/vmalov.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/vmalov.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>vmware</name>
@@ -5453,25 +5453,25 @@ FIN
       <email>vmware@gentoo.org</email>
       <name>Gentoo VMware team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/vmware.git</source>
+    <source type="git">git://git.gentoo.org/proj/vmware.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/vmware.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/vmware.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/vmware.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/vmware.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/vmware.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>voip</name>
     <description lang="en">Voice over IP related ebuilds.</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=proj/voip.git;a=summary</homepage>
     <owner type="project">
       <email>voip@gentoo.org</email>
       <name>Gentoo VoIP team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/voip.git</source>
+    <source type="git">git://git.gentoo.org/proj/voip.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/voip.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/voip.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/voip.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/voip.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/voip.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>vortex</name>
@@ -5520,43 +5520,43 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>wbrana</name>
     <description lang="en"><![CDATA[wbrana's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/wbrana.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/wbrana.git;a=summary</homepage>
     <owner type="person">
       <email>wbrana@gmail.com</email>
       <name>William Brana</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/wbrana.git</source>
+    <source type="git">git://git.gentoo.org/user/wbrana.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/wbrana.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/wbrana.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wbrana.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wbrana.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/wbrana.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wbrana.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wbrana.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>wdzierzan</name>
     <description lang="en"><![CDATA[Stuff I'd rather `emerge' than `stow']]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/wdzierzan.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/wdzierzan.git;a=summary</homepage>
     <owner type="person">
       <email>wojciech.dzierzanowski@gmail.com</email>
       <name><![CDATA[Wojciech Dzierżanowski]]></name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/wdzierzan.git</source>
+    <source type="git">git://git.gentoo.org/user/wdzierzan.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/wdzierzan.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/wdzierzan.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wdzierzan.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wdzierzan.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/wdzierzan.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wdzierzan.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wdzierzan.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>webapp-experimental</name>
     <description>This is the home of Gentoo's wider collection of ebuilds for web-based applications. This is where we collect all the ebuilds submitted to Bugzilla by our users, and make them available in an easy-to-use overlay for wider testing.</description>
-    <homepage>https://git.overlays.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=summary</homepage>
+    <homepage>https://git.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=summary</homepage>
     <owner>
       <email>web-apps@gentoo.org</email>
     </owner>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/proj/webapps-experimental.git</source> -->
-    <source type="git">git://git.overlays.gentoo.org/proj/webapps-experimental.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/webapps-experimental.git</source>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=atom</feed>
-    <feed>https://git.overlays.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=rss</feed>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/proj/webapps-experimental.git</source> -->
+    <source type="git">git://git.gentoo.org/proj/webapps-experimental.git</source>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/webapps-experimental.git</source>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=atom</feed>
+    <feed>https://git.gentoo.org/gitweb/?p=proj/webapps-experimental.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>webos</name>
@@ -5659,16 +5659,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>wish</name>
     <description lang="en">Experimental version bumps and fixes</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/wish.git;a=summary</homepage>
     <owner type="person">
       <email>iskren.s@gmail.com</email>
       <name>Iskren Slavov</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/wish.git</source>
+    <source type="git">git://git.gentoo.org/user/wish.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/wish.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/wish.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/wish.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wish.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wish.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>wolf31o2</name>
@@ -5682,30 +5682,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>write2David</name>
     <description lang="en"><![CDATA[David's Overlay for Misc Utils]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/write2David.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/write2David.git;a=summary</homepage>
     <owner type="person">
       <email>write2david@gmail.com</email>
       <name>David Phillips</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/write2David.git</source>
+    <source type="git">git://git.gentoo.org/user/write2David.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/write2David.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/write2David.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/write2David.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/write2David.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/write2David.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/write2David.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/write2David.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>wschlich</name>
     <description>A collection of ebuilds from Wolfram Schlich</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/wschlich.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/wschlich.git</homepage>
     <owner type="person">
       <email>wschlich@gentoo.org</email>
       <name>Wolfram Schlich</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/wschlich</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/wschlich.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/wschlich.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/wschlich.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/wschlich.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/dev/wschlich</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/wschlich.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/dev/wschlich.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/wschlich.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/wschlich.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>wtk</name>
@@ -5723,16 +5723,16 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>wuodan</name>
     <description lang="en">Personal overlay playground</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/wuodan.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/wuodan.git;a=summary</homepage>
     <owner type="person">
       <email>p_regius@gmx.ch</email>
       <name>Wuodan</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/wuodan.git</source>
+    <source type="git">git://git.gentoo.org/user/wuodan.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/wuodan.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/wuodan.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wuodan.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/wuodan.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/wuodan.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wuodan.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/wuodan.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>x11</name>
@@ -5742,25 +5742,25 @@ FIN
       <email>x11@gentoo.org</email>
       <name>Donnie Berkholz</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/x11</source>
+    <source type="git">git://git.gentoo.org/proj/x11</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/x11.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/x11.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/x11.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/x11.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/x11.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>xarthisius</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/xarthisius.git;a=summary</homepage>
     <owner type="person">
       <email>xarthisius@gentoo.org</email>
       <name>Kacper Kowalik</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/xarthisius.git</source>
+    <source type="git">git://git.gentoo.org/dev/xarthisius.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/xarthisius.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/xarthisius.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/xarthisius.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/xarthisius.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/xarthisius.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>xelnor</name>
@@ -5780,11 +5780,11 @@ FIN
       <email>xfce@gentoo.org</email>
       <name>XFCE team</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/xfce.git</source>
+    <source type="git">git://git.gentoo.org/proj/xfce.git</source>
     <source type="git">http://cgit.gentooexperimental.org/proj/xfce.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/xfce.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/proj/xfce.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/xfce.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=proj/xfce.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>xgr</name>
@@ -5799,30 +5799,30 @@ FIN
   <repo quality="experimental" status="unofficial">
     <name>xhub</name>
     <description lang="en"><![CDATA[xhub's overlay]]></description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/xhub.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/xhub.git;a=summary</homepage>
     <owner type="person">
       <email>olivier.huber@crans.org</email>
       <name>Olivier Huber</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/xhub.git</source>
+    <source type="git">git://git.gentoo.org/user/xhub.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/xhub.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/xhub.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/xhub.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/xhub.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/xhub.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/xhub.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/xhub.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>xmw</name>
     <description>Michael Weber developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/xmw.git</homepage>
     <owner>
       <email>xmw@gentoo.org</email>
       <name>Michael Weber</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/xmw.git</source>
+    <source type="git">git://git.gentoo.org/dev/xmw.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/xmw.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/xmw.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/xmw.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/xmw.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/xmw.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>xtreemfs</name>
@@ -5889,44 +5889,44 @@ FIN
   <repo quality="experimental" status="official">
     <name>yngwin</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/yngwin.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/yngwin.git;a=summary</homepage>
     <owner type="person">
       <email>yngwin@gentoo.org</email>
       <name>Ben de Groot</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/yngwin.git</source>
+    <source type="git">git://git.gentoo.org/dev/yngwin.git</source>
     <source type="git">http://cgit.gentooexperimental.org/dev/yngwin.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/yngwin.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/yngwin.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/yngwin.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/dev/yngwin.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/yngwin.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/yngwin.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>yoreek</name>
     <description lang="en">Ebuilds related to nginx webserver modules</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=user/yoreek.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=user/yoreek.git;a=summary</homepage>
     <owner type="person">
       <email>yoreek@yahoo.com</email>
       <name>Yuri U.</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/user/yoreek.git</source>
+    <source type="git">git://git.gentoo.org/user/yoreek.git</source>
     <source type="git">http://cgit.gentooexperimental.org/user/yoreek.git</source>
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/user/yoreek.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/yoreek.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=user/yoreek.git;a=rss</feed>
+    <source type="git">git+ssh://git@git.gentoo.org/user/yoreek.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=user/yoreek.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=user/yoreek.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="official">
     <name>zlogene</name>
     <description lang="en">Developer overlay</description>
-    <homepage>http://git.overlays.gentoo.org/gitweb/?p=dev/zlogene.git;a=summary</homepage>
+    <homepage>http://git.gentoo.org/gitweb/?p=dev/zlogene.git;a=summary</homepage>
     <owner type="person">
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/dev/zlogene.git</source>
-    <!-- <source type="git">https://git.overlays.gentoo.org/gitroot/dev/zlogene.git</source> -->
-    <source type="git">git+ssh://git@git.overlays.gentoo.org/dev/zlogene.git</source>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/zlogene.git;a=atom</feed>
-    <feed>http://git.overlays.gentoo.org/gitweb/?p=dev/zlogene.git;a=rss</feed>
+    <source type="git">git://git.gentoo.org/dev/zlogene.git</source>
+    <!-- <source type="git">https://git.gentoo.org/gitroot/dev/zlogene.git</source> -->
+    <source type="git">git+ssh://git@git.gentoo.org/dev/zlogene.git</source>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/zlogene.git;a=atom</feed>
+    <feed>http://git.gentoo.org/gitweb/?p=dev/zlogene.git;a=rss</feed>
   </repo>
   <repo quality="experimental" status="unofficial">
     <name>zoobab</name>