Merge updates from master

40 files changed, 50 insertions, 39 deletions

diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
index f23f58c39b83..616c8e62c12f 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils python-single-r1
 
 DESCRIPTION="Summarizes the contents of a syslog log file"
 HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
index 7c61b49b0cbf..d6e65dce99c8 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
@@ -9,7 +9,7 @@ inherit python-single-r1
 
 DESCRIPTION="Summarizes the contents of a syslog log file"
 HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
index ec1cba73be8e..cee73863c913 100644
--- a/app-arch/unarj/unarj-2.65.ebuild
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Utility for opening arj archives"
 HOMEPAGE="http://www.arjsoftware.com/"
-SRC_URI="mirror://freebsd/ports/local-distfiles/ache/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="arj"
 SLOT="0"
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index c1daaf3bc888..23d4292bd7e2 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Replacement for 'emerge --search' with search-index"
 HOMEPAGE="https://github.com/fuzzyray/esearch"
-SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/fuzzyray/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
index c994aee322bb..03f69397bf47 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
@@ -13,7 +13,7 @@ inherit distutils-r1 eutils
 DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
 HOMEPAGE="https://github.com/rafaelmartins/g-octave"
 
-SRC_URI="mirror://github/rafaelmartins/${PN}/${P}.tar.gz
+SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
 	https://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} ->
 		${PN}-db-${DB_COMMIT:0:7}.tar.gz"
 
diff --git a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild
index 86efac961545..e3606e45f826 100644
--- a/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild
+++ b/dev-dotnet/dbus-sharp-glib/dbus-sharp-glib-0.5.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools mono-env
 
 DESCRIPTION="D-Bus for .NET: GLib integration module"
 HOMEPAGE="https://github.com/mono/dbus-sharp"
-SRC_URI="mirror://github/mono/dbus-sharp/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/mono/dbus-sharp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.0"
diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
index 9507e48260dc..47c4beea628e 100644
--- a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
+++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit autotools mono-env eutils
 
 DESCRIPTION="D-Bus for .NET"
 HOMEPAGE="https://github.com/mono/dbus-sharp"
-SRC_URI="mirror://github/mono/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/mono/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.0"
diff --git a/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild b/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
index ad72b64cda06..e1bdcddc459e 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils
 
 DESCRIPTION="Blind-ID library for user identification using RSA blind signatures"
 HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
-SRC_URI="mirror://github/divVerent/d0_blind_id/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/divVerent/d0_blind_id/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
index 7ff87779c0e7..6f6785d21d9e 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
 HOMEPAGE="http://www.signal11.us/oss/hidapi/"
 SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tgz"
 # When 0.8.0 is officially available the following link should be used.
-#SRC_URI="mirror://github/signal11/${PN}/${P}.zip"
+#SRC_URI="https://github.com/downloads/signal11/${PN}/${P}.zip"
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
diff --git a/dev-libs/libexecinfo/libexecinfo-1.1.ebuild b/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
index eba2bcf57e8c..09652b8528bc 100644
--- a/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
+++ b/dev-libs/libexecinfo/libexecinfo-1.1.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=0
@@ -7,7 +7,7 @@ inherit bsdmk freebsd multilib
 
 DESCRIPTION="A library for inspecting program's backtrace"
 HOMEPAGE="http://www.freebsdsoftware.org/devel/libexecinfo.html"
-SRC_URI="mirror://freebsd/distfiles/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
index f93c58976e06..f7a912d74fff 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild
@@ -6,7 +6,7 @@ inherit multilib toolchain-funcs
 
 DESCRIPTION="File System Library for the Lua Programming Language"
 HOMEPAGE="https://keplerproject.github.com/luafilesystem/"
-SRC_URI="mirror://github/keplerproject/luafilesystem/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
index 9995175daabd..20fe75740061 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
@@ -6,7 +6,7 @@ inherit multilib toolchain-funcs
 
 DESCRIPTION="File System Library for the Lua Programming Language"
 HOMEPAGE="https://keplerproject.github.com/luafilesystem/"
-SRC_URI="mirror://github/keplerproject/luafilesystem/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/keplerproject/luafilesystem/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
index 833bac790009..a75030b63b7d 100644
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
@@ -10,7 +10,7 @@ MY_P="tDOM-${PV}"
 DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
 HOMEPAGE="https://tdom.github.com/"
 #SRC_URI="https://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
-SRC_URI="mirror://github/tDOM/${PN}/${MY_P}.tgz"
+SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
diff --git a/dev-util/atomic-install/atomic-install-0.1.1.ebuild b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
index 6ee38de78ef3..7328e3d55b9f 100644
--- a/dev-util/atomic-install/atomic-install-0.1.1.ebuild
+++ b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils
 
 DESCRIPTION="A library and tool to atomically install sets of files"
 HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/atomic-install/atomic-install-9999.ebuild b/dev-util/atomic-install/atomic-install-9999.ebuild
index 824d3967cbff..c8ad8483d1af 100644
--- a/dev-util/atomic-install/atomic-install-9999.ebuild
+++ b/dev-util/atomic-install/atomic-install-9999.ebuild
@@ -14,7 +14,7 @@ inherit autotools-utils
 
 DESCRIPTION="A library and tool to atomically install sets of files"
 HOMEPAGE="https://github.com/mgorny/atomic-install/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 86a67fc24fd0..65d5e082967c 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -6,6 +6,7 @@
 # Ada team <ada@gentoo.org>
 # @AUTHOR:
 # Tupone Alfredo <tupone@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: An eclass for Ada packages
 # @DESCRIPTION:
 # This eclass set the IUSE and REQUIRED_USE to request the ADA_TARGET
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 84e657657952..309df084d156 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -6,6 +6,7 @@
 # java@gentoo.org
 # @AUTHOR:
 # Vlastimil Babka <caster@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Eclass for building dev-java/ant-* packages
 # @DESCRIPTION:
 # This eclass provides functionality and default ebuild variables for building
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 0addf76a92f6..06c79fd652a6 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -5,7 +5,7 @@
 # @MAINTAINER:
 # Maciej Mrozowski <reavertm@gentoo.org>
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 2 3 4 5
+# @SUPPORTED_EAPIS: 4 5
 # @BLURB: common ebuild functions for autotools-based packages
 # @DESCRIPTION:
 # autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper
diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index ce80ea185e9c..4eacb75776e4 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Jason Zaman
+# Copyright 1999-2019 Jason Zaman
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bazel.eclass
@@ -6,6 +6,7 @@
 # Jason Zaman <perfinion@gentoo.org>
 # @AUTHOR:
 # Jason Zaman <perfinion@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Utility functions for packages using Bazel Build
 # @DESCRIPTION:
 # A utility eclass providing functions to run the Bazel Build system.
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 7c89d953c4ba..420312b50833 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -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
 #
 # @MAINTAINER:
@@ -76,7 +76,7 @@ if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then
 	if [[ ${DL_PV} == ${MY_PV} ]]; then
 		DL_PV="${DL_PV}-RELEASE"
 	fi
-	SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz"
+	SRC_URI="mirror://gentoo/freebsd-src-${MY_PV}.tar.xz"
 fi
 
 IUSE="profile"
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9f71e428c54f..db9fc4427c71 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
 # kde@gentoo.org
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Support eclass for packages that follow KDE packaging conventions.
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index b2be715630af..dab2283fe0f4 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: savedconfig.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: common API for saving/restoring complex configuration files
 # @DESCRIPTION:
 # It is not uncommon to come across a package which has a very fine
diff --git a/eclass/sgml-catalog-r1.eclass b/eclass/sgml-catalog-r1.eclass
index 6dc870af629a..f466f97fdcce 100644
--- a/eclass/sgml-catalog-r1.eclass
+++ b/eclass/sgml-catalog-r1.eclass
@@ -6,6 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Functions for installing SGML catalogs
 # @DESCRIPTION:
 # This eclass regenerates /etc/sgml/catalog, /etc/sgml.{,c}env
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
index 45f81624b3e1..6e4749e79a26 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
@@ -6,7 +6,7 @@ inherit eutils fcaps flag-o-matic toolchain-funcs
 
 DESCRIPTION="Listen to network traffic and pick out images from TCP streams observed"
 HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
-SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm64 ppc -sparc x86"
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
index 609df1bb04e0..22cf099f37a2 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
@@ -6,7 +6,7 @@ inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
 HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
-SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc -sparc x86"
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
index 580ea00be4dc..7ab528bd27f6 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 DESCRIPTION="A small SSH Askpass replacement written with GTK2"
 HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen"
-SRC_URI="mirror://github/atj/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/atj/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/profiles/package.mask b/profiles/package.mask
index 0ef786518fc8..3f65e33aea8a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2019-09-15)
+# This was an attempt to provide more reliable package merging mechanism
+# for Portage.  However, it was never finished and with Portage's
+# concept of bug-by-bug neverending backwards compatibility it would
+# never be accepted anyway.
+# Removal in 30 days.  Bug #694514.
+dev-util/atomic-install
+
 # Fabian Groffen <grobian@gentoo.org> (2019-09-15)
 # Incorporated in >=app-portage/portage-utils-0.80 as qmanifest
 # Removal in 30 days.  Bug #694428
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index a374a8fd511f..1af2f3ed3d8e 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -4,10 +4,8 @@ cpan		http://cpan.metacpan.org http://search.cpan.org/CPAN http://www.cpan.org
 cran		http://cran.r-project.org http://cran.us.r-project.org
 debian		http://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
 fedora-dev	http://archives.fedoraproject.org/pub/archive/fedora/linux/
-freebsd		https://download.freebsd.org/ftp/
 gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
 gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ http://artfiles.org/gimp.org/pub/gimp/ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
-github		https://github.com/downloads
 gmt		ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
 gnu		https://ftp.gnu.org/gnu/ https://ftpmirror.gnu.org/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index c9572b8317bd..bbd0de3fcfac 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="DJ's Hex Calculator"
 HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc"
-SRC_URI="mirror://github/jlec/hcalc/${P}.tar.xz"
+SRC_URI="https://github.com/downloads/jlec/hcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
index f533643cb1d6..a372a683218f 100644
--- a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
+++ b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multilib
 
 DESCRIPTION="Toolkit and library for the analysis and manipulation of macromolecular models"
 HOMEPAGE="http://pymmlib.sourceforge.net/"
-SRC_URI="mirror://github/masci/mmLib/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/masci/mmLib/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
index b0ab73790564..09cbc7f4670b 100644
--- a/sci-visualization/g3data/g3data-1.5.4.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils eutils
 
 DESCRIPTION="Tool for extracting data from graphs"
 HOMEPAGE="https://github.com/pn2200/g3data"
-SRC_URI="mirror://github/pn2200/g3data/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/pn2200/g3data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/syslog-notify/syslog-notify-0.2.ebuild b/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
index 5f14dfa50ea5..35fc40806b20 100644
--- a/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
+++ b/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo
 
 DESCRIPTION="Notifications for syslog entries via libnotify"
 HOMEPAGE="https://jtniehof.github.com/syslog-notify/"
-SRC_URI="mirror://github/jtniehof/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/jtniehof/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-block/eject-bsd/eject-bsd-1.5.ebuild b/sys-block/eject-bsd/eject-bsd-1.5.ebuild
index 5e864c9ddf8a..f64583860f86 100644
--- a/sys-block/eject-bsd/eject-bsd-1.5.ebuild
+++ b/sys-block/eject-bsd/eject-bsd-1.5.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=0
@@ -11,8 +11,7 @@ DESCRIPTION="eject command for FreeBSD systems"
 HOMEPAGE="http://www.freshports.org/sysutils/eject/"
 SRC_URI="ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/OD/${MY_P}.tar.gz
 	ftp://ftp4.jp.FreeBSD.org/pub/FreeBSD-jp/OD/${MY_P}.tar.gz
-	ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/OD/${MY_P}.tar.gz
-	mirror://freebsd/ports/distfiles/${MY_P}.tar.gz"
+	ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/OD/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-fs/inotify-tools/inotify-tools-3.14.ebuild b/sys-fs/inotify-tools/inotify-tools-3.14.ebuild
index 8db9c3ff722f..7d5e3d4f8252 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.14.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.14.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
 HOMEPAGE="https://github.com/rvoicilas/inotify-tools/wiki"
-SRC_URI="mirror://github/rvoicilas/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/rvoicilas/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
index d4b7027c807f..a2641d8d82db 100644
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools-utils flag-o-matic
 
 DESCRIPTION="A generic touchscreen calibration program for X.Org"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
-SRC_URI="mirror://github/tias/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/tias/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
index d6b126f844bf..ec626e9d6266 100644
--- a/x11-libs/mx/mx-1.4.7-r2.ebuild
+++ b/x11-libs/mx/mx-1.4.7-r2.ebuild
@@ -8,7 +8,7 @@ inherit gnome2 eutils
 
 DESCRIPTION="A widget toolkit using Clutter"
 HOMEPAGE="http://clutter-project.org/"
-SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
+SRC_URI="https://github.com/downloads/clutter-project/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
diff --git a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
index aec50da5dd58..9038beb0ce04 100644
--- a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
+++ b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
@@ -6,7 +6,7 @@ inherit autotools gnome2
 
 DESCRIPTION="Gnome and XFCE applet for displaying XMonad log"
 HOMEPAGE="https://github.com/alexkay/xmonad-log-applet"
-SRC_URI="mirror://github/alexkay/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/alexkay/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
index d33df67594cb..e1bd36c2d6c6 100644
--- a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
+++ b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="Pidgin GPG/OpenPGP (XEP-0027) plugin"
 HOMEPAGE="https://github.com/segler-alex/Pidgin-GPG"
-SRC_URI="mirror://github/segler-alex/Pidgin-GPG/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/segler-alex/Pidgin-GPG/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
index 2b81415d2166..95abeb686964 100644
--- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
+++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="A Pidgin plugin that merges the Buddy List window with a conversation window"
 HOMEPAGE="https://github.com/dm0-/window_merge"
-SRC_URI="mirror://github/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
+SRC_URI="https://github.com/downloads/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
index dd3095f40dbf..a86daf5c3ab2 100644
--- a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
+++ b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="A collection of colour schemes for Geany"
 HOMEPAGE="https://github.com/codebrainz/geany-themes"
-SRC_URI="mirror://github/codebrainz/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/downloads/codebrainz/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1 BSD-2 MIT"
 SLOT="0"