[patch] Patch

x11.patch (text/plain), 24.40 KB, created by Arfrever Frehtes Taifersar Arahesis on 2019-03-25 03:44:18 UTC

From a0f84e30f7d580b1c951abfcddc0a3780f16f1c7 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 25 Mar 2019 04:37:51 +0100
Subject: [PATCH 1/3] x11-apps/*: Update HOMEPAGE and EGIT_REPO_URI.

Bug: https://bugs.gentoo.org/681708
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild | 6 +++---
 x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild | 4 ++--
 x11-apps/mesa-progs/mesa-progs-9999.ebuild  | 4 ++--
 x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild   | 2 +-
 x11-apps/transset/transset-1.0.1.ebuild     | 4 ++--
 x11-apps/transset/transset-1.0.2.ebuild     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
index 3888f77a892..fa5959248cd 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 MY_PN=${PN/progs/demos}
 MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -15,7 +15,7 @@ fi
 inherit base autotools toolchain-funcs ${GIT_ECLASS}
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
index a2a56e359cd..84d6850209c 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PN="${PN/progs/demos}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
 if [[ ${PV} = 9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 248a1db51fc..c0dc4af1460 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PN="${PN/progs/demos}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
 if [[ ${PV} = 9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
diff --git a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
index 106e3bb6bed..b6689f368a1 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="create an index of X font files in a directory"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/mkfontdir"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
index d0aa1d6e3b3..52eefdd0f0b 100644
--- a/x11-apps/transset/transset-1.0.1.ebuild
+++ b/x11-apps/transset/transset-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="An utility for setting opacity property"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xapps https://cgit.freedesktop.org/xorg/app/transset/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xapps https://gitlab.freedesktop.org/xorg/app/transset"
 
 LICENSE="SGI-B-2.0"
 KEYWORDS="amd64 x86"
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild
index d0aa1d6e3b3..52eefdd0f0b 100644
--- a/x11-apps/transset/transset-1.0.2.ebuild
+++ b/x11-apps/transset/transset-1.0.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit xorg-2
 
 DESCRIPTION="An utility for setting opacity property"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xapps https://cgit.freedesktop.org/xorg/app/transset/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xapps https://gitlab.freedesktop.org/xorg/app/transset"
 
 LICENSE="SGI-B-2.0"
 KEYWORDS="amd64 x86"
-- 
2.21.0


From 4d237f7b908847aa13e5be45d915f5a9da897675 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 25 Mar 2019 04:39:36 +0100
Subject: [PATCH 2/3] x11-base/*: Update HOMEPAGE and EGIT_REPO_URI.

Bug: https://bugs.gentoo.org/681708
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 x11-base/xcb-proto/xcb-proto-1.13.ebuild       | 6 +++---
 x11-base/xorg-proto/xorg-proto-2018.4.ebuild   | 4 ++--
 x11-base/xorg-proto/xorg-proto-9999.ebuild     | 6 +++---
 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 2 +-
 x11-base/xorg-server/xorg-server-1.20.4.ebuild | 2 +-
 x11-base/xorg-server/xorg-server-9999.ebuild   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
index 2140e995651..c7879409035 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ XORG_STATIC=no
 inherit python-r1 xorg-2
 
 DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/proto.git"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index a5b2a6dbded..7f883941f8f 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/xorg-/xorg}"
 MY_P="${MY_PN}-${PV}"
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -15,7 +15,7 @@ fi
 inherit ${GIT_ECLASS} meson
 
 DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
index d2b4b3d1186..9399dc7c97f 100644
--- a/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/xorg-/xorg}"
 MY_P="${MY_PN}-${PV}"
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -15,7 +15,7 @@ fi
 inherit ${GIT_ECLASS} meson
 
 DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index 45a9266a610..228ac01881d 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 XORG_DOC=doc
 inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
index 96600b70e5e..f6eb007ca3a 100644
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 XORG_DOC=doc
 XORG_EAUTORECONF="yes"
 inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 40361a76003..fa2165bade9 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 XORG_DOC=doc
 inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-- 
2.21.0


From 1c4132df4f16859a1f626710ae00e92e2a7f4b48 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 25 Mar 2019 04:40:33 +0100
Subject: [PATCH 3/3] x11-libs/*: Update HOMEPAGE and EGIT_REPO_URI.

Bug: https://bugs.gentoo.org/681708
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 x11-libs/cairo/cairo-1.16.0-r2.ebuild                       | 4 ++--
 x11-libs/cairo/cairo-9999.ebuild                            | 6 +++---
 x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild                | 1 +
 x11-libs/libXfont2/libXfont2-9999.ebuild                    | 4 ++--
 x11-libs/libXres/libXres-1.2.0-r1.ebuild                    | 1 -
 x11-libs/libdrm/libdrm-2.4.96.ebuild                        | 4 ++--
 x11-libs/libdrm/libdrm-2.4.97.ebuild                        | 4 ++--
 x11-libs/libdrm/libdrm-9999.ebuild                          | 4 ++--
 x11-libs/libva/libva-1.7.3.ebuild                           | 4 ++--
 x11-libs/libva/libva-1.8.3.ebuild                           | 4 ++--
 x11-libs/libxcb/libxcb-1.13.1.ebuild                        | 5 ++---
 x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild    | 4 ++--
 x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild      | 4 ++--
 x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild  | 4 ++--
 .../xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild | 4 ++--
 x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild            | 4 ++--
 x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild                  | 4 ++--
 17 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index f4962758523..33d36a60703 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 50f6c6a7649..2145909816d 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
diff --git a/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
index 213dbc54ea8..b58394e5019 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=5
 
+XORG_PACKAGE_NAME=libxfont
 XORG_DOC=doc
 inherit xorg-2
 
diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
index cbf9a115a36..9463d5e1310 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+XORG_PACKAGE_NAME=libxfont
 XORG_DOC=doc
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXfont.git"
 inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index e1881a43c52..f943dd0cebc 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=5
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXRes.git"
 DESCRIPTION="X.Org XRes library"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
diff --git a/x11-libs/libdrm/libdrm-2.4.96.ebuild b/x11-libs/libdrm/libdrm-2.4.96.ebuild
index 3a5364686a6..76499a8ff61 100644
--- a/x11-libs/libdrm/libdrm-2.4.96.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.96.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -12,7 +12,7 @@ fi
 inherit ${GIT_ECLASS} meson multilib-minimal
 
 DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-libs/libdrm/libdrm-2.4.97.ebuild b/x11-libs/libdrm/libdrm-2.4.97.ebuild
index f376bc40fae..29daf988738 100644
--- a/x11-libs/libdrm/libdrm-2.4.97.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.97.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -12,7 +12,7 @@ fi
 inherit ${GIT_ECLASS} meson multilib-minimal
 
 DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index f376bc40fae..29daf988738 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -12,7 +12,7 @@ fi
 inherit ${GIT_ECLASS} meson multilib-minimal
 
 DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
diff --git a/x11-libs/libva/libva-1.7.3.ebuild b/x11-libs/libva/libva-1.7.3.ebuild
index 11f0e32b0f5..442042222ed 100644
--- a/x11-libs/libva/libva-1.7.3.ebuild
+++ b/x11-libs/libva/libva-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-2
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+	EGIT_REPO_URI="https://github.com/intel/libva"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
diff --git a/x11-libs/libva/libva-1.8.3.ebuild b/x11-libs/libva/libva-1.8.3.ebuild
index 0e83286870d..46863705b68 100644
--- a/x11-libs/libva/libva-1.8.3.ebuild
+++ b/x11-libs/libva/libva-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-r3
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva"
+	EGIT_REPO_URI="https://github.com/intel/libva"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 9bbbd758b0a..2f4bf436ec4 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,8 +11,7 @@ XORG_MULTILIB=yes
 inherit python-any-r1 xorg-2
 
 DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 4755b277ab0..53b7223a8b1 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -9,11 +9,11 @@ XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor.git"
 EGIT_HAS_SUBMODULES=yes
 
 DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index cb19060a7ab..65e88314ce5 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -9,10 +9,10 @@ XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-image.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git"
 
 DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index 49c59d697aa..0390fce9d62 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -9,10 +9,10 @@ XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-keysyms.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git"
 
 DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index b47185293a8..1c2e9b8587d 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -9,11 +9,11 @@ XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-renderutil.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git"
 EGIT_HAS_SUBMODULES=yes
 
 DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index 1c7a904c46e..db1390311f0 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -9,11 +9,11 @@ XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-wm.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git"
 EGIT_HAS_SUBMODULES=yes
 
 DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index 335bbd9325f..019f7ed0350 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -9,10 +9,10 @@ XORG_DOC=doc
 XORG_MULTILIB=yes
 inherit xorg-2
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git"
 
 DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
-- 
2.21.0