[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, man/ru/, pym/portage/cache/, doc/config/, ...

[Mike Frysinger]

commit:     b5365341dad167e314023df95d2c5e0f955962f0
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 15:54:22 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 15:54:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b5365341

refresh many URIs in the code base

Use https where available, and update old links (like www.gentoo.org)
to point to the new location.

 RELEASE-NOTES                                        |  4 ++--
 bin/install-qa-check.d/10executable-issues           |  4 ++--
 bin/install-qa-check.d/80libraries                   |  2 +-
 bin/install-qa-check.d/90gcc-warnings                |  4 ++--
 cnf/make.conf.example                                |  2 +-
 cnf/make.conf.example.arm.diff                       |  2 +-
 cnf/make.conf.example.sh.diff                        |  2 +-
 cnf/make.conf.example.sparc.diff                     |  6 +++---
 doc/config/sets.docbook                              |  4 ++--
 doc/custom.xsl                                       |  2 +-
 doc/package/ebuild/eapi/4-python.docbook             |  2 +-
 doc/package/ebuild/eapi/5-progress.docbook           |  2 +-
 doc/portage.docbook                                  |  2 +-
 doc/qa.docbook                                       | 12 ++++++------
 man/color.map.5                                      |  2 +-
 man/dispatch-conf.1                                  |  2 +-
 man/ebuild.1                                         |  2 +-
 man/ebuild.5                                         | 10 +++++-----
 man/egencache.1                                      |  2 +-
 man/emaint.1                                         |  2 +-
 man/emerge.1                                         |  4 ++--
 man/emirrordist.1                                    |  2 +-
 man/env-update.1                                     |  2 +-
 man/etc-update.1                                     |  2 +-
 man/fixpackages.1                                    |  2 +-
 man/make.conf.5                                      | 20 +++++++++-----------
 man/portage.5                                        | 12 ++++++------
 man/quickpkg.1                                       |  2 +-
 man/ru/color.map.5                                   |  2 +-
 man/ru/dispatch-conf.1                               |  2 +-
 man/ru/ebuild.1                                      |  2 +-
 man/ru/env-update.1                                  |  2 +-
 man/ru/etc-update.1                                  |  2 +-
 man/ru/fixpackages.1                                 |  2 +-
 pym/_emerge/EbuildPhase.py                           |  2 +-
 pym/portage/__init__.py                              |  2 +-
 pym/portage/_emirrordist/FetchTask.py                |  2 +-
 pym/portage/cache/ebuild_xattr.py                    |  2 +-
 pym/portage/cache/mappings.py                        |  4 ++--
 pym/portage/data.py                                  |  2 +-
 pym/portage/dbapi/_SyncfsProcess.py                  |  2 +-
 pym/portage/dbapi/vartree.py                         |  4 ++--
 pym/portage/dispatch_conf.py                         |  2 +-
 pym/portage/package/ebuild/doebuild.py               |  4 ++--
 pym/portage/tests/ebuild/test_array_fromfile_eof.py  |  2 +-
 pym/portage/tests/process/test_poll.py               |  2 +-
 pym/portage/util/__init__.py                         |  2 +-
 pym/portage/util/_desktop_entry.py                   |  2 +-
 pym/portage/xml/metadata.py                          |  2 +-
 pym/portage/xpak.py                                  |  2 +-
 repoman/man/repoman.1                                |  2 +-
 repoman/pym/repoman/_subprocess.py                   |  4 ++--
 repoman/pym/repoman/checks/herds/herdbase.py         |  2 +-
 repoman/pym/repoman/gpg.py                           |  2 +-
 .../pym/repoman/modules/scan/metadata/pkgmetadata.py |  2 +-
 repoman/pym/repoman/tests/simple/test_simple.py      |  8 ++++----
 56 files changed, 92 insertions(+), 94 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bc36675..4b11a11 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -592,7 +592,7 @@ portage-2.1.7
   for the rationale behind this change.
 * If using python3, you may notice that some types of program output which
   require a tty device (like the wget progress bar) will be disabled. This
-  is due to an upstream python issue: http://bugs.python.org/issue5380. See
+  is due to an upstream python issue: https://bugs.python.org/issue5380. See
   bug #287648 for more information.
 * Licenses in the @EULA license group are now masked by the default
   ACCEPT_LICENSE setting. You can unmask all licenses by setting
@@ -625,7 +625,7 @@ portage-2.1.6
   updated accordingly, though links exist for backward compability.
 * -* support in package.keywords was changed as it was inconsistent with
   ACCEPT_KEYWORDS behavior (also see
-  http://dev.gentoo.org/~genone/docs/KEYWORDS.stupid).
+  https://dev.gentoo.org/~genone/docs/KEYWORDS.stupid).
   Previously having -* in package.keywords matched packages with KEYWORDS="-*",
   now it resets the ACCEPT_KEYWORDS list for the given atom like it does when
   used in ACCEPT_KEYWORDS.

diff --git a/bin/install-qa-check.d/10executable-issues b/bin/install-qa-check.d/10executable-issues
index b52cc93..24973fe 100644
--- a/bin/install-qa-check.d/10executable-issues
+++ b/bin/install-qa-check.d/10executable-issues
@@ -48,7 +48,7 @@ elf_check() {
 	if [[ -n ${f}${x} ]] ; then
 		__vecho -ne '\n'
 		eqawarn "QA Notice: The following files contain insecure RUNPATHs"
-		eqawarn " Please file a bug about this at http://bugs.gentoo.org/"
+		eqawarn " Please file a bug about this at https://bugs.gentoo.org/"
 		eqawarn " with the maintainer of the package."
 		eqawarn "${f}${f:+${x:+\n}}${x}"
 		__vecho -ne '\n'
@@ -121,7 +121,7 @@ elf_check() {
 		eqawarn "QA Notice: The following files contain writable and executable sections"
 		eqawarn " Files with such sections will not work properly (or at all!) on some"
 		eqawarn " architectures/operating systems.  A bug should be filed at"
-		eqawarn " http://bugs.gentoo.org/ to make sure the issue is fixed."
+		eqawarn " https://bugs.gentoo.org/ to make sure the issue is fixed."
 		eqawarn " For more information, see:"
 		eqawarn
 		eqawarn "   https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart"

diff --git a/bin/install-qa-check.d/80libraries b/bin/install-qa-check.d/80libraries
index 8257e5b..e891b2d 100644
--- a/bin/install-qa-check.d/80libraries
+++ b/bin/install-qa-check.d/80libraries
@@ -119,7 +119,7 @@ lib_check() {
 	# When installing static libraries into /usr/lib and shared libraries into
 	# /lib, we have to make sure we have a linker script in /usr/lib along side
 	# the static library, or gcc will utilize the static lib when linking :(.
-	# http://bugs.gentoo.org/4411
+	# https://bugs.gentoo.org/4411
 	local abort="no"
 	local a s
 	for a in "${ED}"usr/lib*/*.a ; do

diff --git a/bin/install-qa-check.d/90gcc-warnings b/bin/install-qa-check.d/90gcc-warnings
index a160436..bde198c 100644
--- a/bin/install-qa-check.d/90gcc-warnings
+++ b/bin/install-qa-check.d/90gcc-warnings
@@ -98,7 +98,7 @@ gcc_warn_check() {
 				eerror
 				eerror "${f}"
 				eerror
-				eerror " Please file a bug about this at http://bugs.gentoo.org/"
+				eerror " Please file a bug about this at https://bugs.gentoo.org/"
 				eerror " with the maintainer of the package."
 				eerror
 			else
@@ -136,7 +136,7 @@ gcc_warn_check() {
 				eerror
 				eerror "${f}"
 				eerror
-				eerror " Please file a bug about this at http://bugs.gentoo.org/"
+				eerror " Please file a bug about this at https://bugs.gentoo.org/"
 				eerror " with the maintainer of the package."
 				eerror
 			else

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index b897f02..1df3093 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -215,7 +215,7 @@
 #     one of them sync from the rotations above. The other boxes can then rsync
 #     from the local rsync server, reducing the load on the mirrors.
 #     Instructions for setting up a local rsync server are available here:
-#     http://www.gentoo.org/doc/en/rsync.xml
+#     https://wiki.gentoo.org/wiki/Local_Mirror
 #
 #SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 #

diff --git a/cnf/make.conf.example.arm.diff b/cnf/make.conf.example.arm.diff
index bb93563..e52d1bc 100644
--- a/cnf/make.conf.example.arm.diff
+++ b/cnf/make.conf.example.arm.diff
@@ -36,7 +36,7 @@
 +# -march=strongarm110 code will not run on a regular StrongARM).
 +#
 +# For a full listing of supported CPU models, please refer to the GCC website:
-+# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/ARM-Options.html
++# https://gcc.gnu.org/onlinedocs/gcc-4.9.3/gcc/ARM-Options.html
 +#
 +# Netwinder:
 +#CFLAGS="-mcpu=strongarm110 -O2 -pipe"

diff --git a/cnf/make.conf.example.sh.diff b/cnf/make.conf.example.sh.diff
index 9699a70..bfe9dc7 100644
--- a/cnf/make.conf.example.sh.diff
+++ b/cnf/make.conf.example.sh.diff
@@ -31,7 +31,7 @@
  #
 -#CFLAGS="-O2 -pipe"
 +# For a full listing of supported CPU models, please refer to the GCC website:
-+# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/SH-Options.html
++# https://gcc.gnu.org/onlinedocs/gcc-4.9.3/gcc/SH-Options.html
  #
 +#CFLAGS="-m4 -O2 -pipe"
 +

diff --git a/cnf/make.conf.example.sparc.diff b/cnf/make.conf.example.sparc.diff
index c68a95a..1055b4a 100644
--- a/cnf/make.conf.example.sparc.diff
+++ b/cnf/make.conf.example.sparc.diff
@@ -8,7 +8,7 @@
 +# ============
 +# This should be left to the default value of sparc-unknown-linux-gnu unless
 +# you are absolutely certain of the consequences.  In addition to potentially
-+# destroying your system, you will receive no support and your bugs will be 
++# destroying your system, you will receive no support and your bugs will be
 +# marked INVALID if you change this.
 +#
 +# CHOST="sparc-unknown-linux-gnu"
@@ -25,8 +25,8 @@
 -#CFLAGS="-O2 -pipe"
 -#
 +# Sparc specific cpu optimizatiobn flags can be found here:
-+# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/SPARC-Options.html#SPARC%20Options
-+# 
++# https://gcc.gnu.org/onlinedocs/gcc-4.9.3/gcc/SPARC-Options.html
++#
 +# -mcpu=<cpu-type> means optimize code for the particular type of CPU without
 +# breaking compatibility with other CPUs.
 +#

diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook
index 749b775..0fe50f2 100644
--- a/doc/config/sets.docbook
+++ b/doc/config/sets.docbook
@@ -32,7 +32,7 @@
 		uses Pythons <classname>ConfigParser</classname> module, which implements
 		the syntax usually found in .ini files. At its core it allows various
 		named sections that each can contain any number of key-value pairs, see
-		the <ulink url="http://doc.python.org/lib/module-ConfigParser.html" type="text/html">Python documentation</ulink>
+		the <ulink url="https://doc.python.org/lib/module-ConfigParser.html" type="text/html">Python documentation</ulink>
 		for the full details.
 		</para>
 		<para>
@@ -157,7 +157,7 @@
 		longer description than usual. So it 
 		needs more than one line.
 		
-		homepage: http://www.foobar.org
+		homepage: https://www.foobar.org/
 		
 		author: John Doe &lt;john@×××.com&gt;
 		</programlisting>

diff --git a/doc/custom.xsl b/doc/custom.xsl
index a7763ec..11a2b9e 100644
--- a/doc/custom.xsl
+++ b/doc/custom.xsl
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="https://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:param name="toc.section.depth" select="20"/>
 <xsl:param name="chunk.section.depth" select="2"/>
 <xsl:param name="generate.section.toc.level" select="2"/>

diff --git a/doc/package/ebuild/eapi/4-python.docbook b/doc/package/ebuild/eapi/4-python.docbook
index a61ac05..5fc6ea0 100644
--- a/doc/package/ebuild/eapi/4-python.docbook
+++ b/doc/package/ebuild/eapi/4-python.docbook
@@ -1,7 +1,7 @@
 <section id='package-ebuild-eapi-4-python'>
 	<title>EAPI 4-python</title>
 	<para>
-		Also see the <ulink url="http://people.apache.org/~Arfrever/EAPI_4-python_Specification">official EAPI 4-python Specification</ulink>.
+		Also see the <ulink url="https://people.apache.org/~Arfrever/EAPI_4-python_Specification">official EAPI 4-python Specification</ulink>.
 	</para>
 	<section id='package-ebuild-eapi-4-python-helpers'>
 		<title>Helpers</title>

diff --git a/doc/package/ebuild/eapi/5-progress.docbook b/doc/package/ebuild/eapi/5-progress.docbook
index 6493d7e..4d07be8 100644
--- a/doc/package/ebuild/eapi/5-progress.docbook
+++ b/doc/package/ebuild/eapi/5-progress.docbook
@@ -1,7 +1,7 @@
 <section id='package-ebuild-eapi-5-progress'>
 	<title>EAPI 5-progress</title>
 	<para>
-		Also see the <ulink url="http://people.apache.org/~Arfrever/EAPI_5-progress_Specification">official EAPI 5-progress Specification</ulink>.
+		Also see the <ulink url="https://people.apache.org/~Arfrever/EAPI_5-progress_Specification">official EAPI 5-progress Specification</ulink>.
 	</para>
 	<section id='package-ebuild-eapi-5-progress-helpers'>
 		<title>Helpers</title>

diff --git a/doc/portage.docbook b/doc/portage.docbook
index 811544f..f7d539a 100644
--- a/doc/portage.docbook
+++ b/doc/portage.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	"https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 	<!ENTITY date SYSTEM "fragment/date">
 	<!ENTITY version SYSTEM "fragment/version">

diff --git a/doc/qa.docbook b/doc/qa.docbook
index 6e25714..28ff6cf 100644
--- a/doc/qa.docbook
+++ b/doc/qa.docbook
@@ -5,7 +5,7 @@
  <para>
   Here we'll go over each QA notice and what you (as a developer) can do to fix
   the issue.  If you're a user, you should of course go 
-  <ulink url="http://bugs.gentoo.org/">file a bug</ulink>.  We'll only cover the
+  <ulink url="https://bugs.gentoo.org/">file a bug</ulink>.  We'll only cover the
   non-obvious notices here.
  </para>
  <para>
@@ -58,7 +58,7 @@
    </programlisting>
   </para>
   <para>
-   Please see the Gentoo Hardened <ulink url="http://hardened.gentoo.org/pic-fix-guide.xml">PIC Fix Guide</ulink>.
+   Please see the Gentoo Hardened <ulink url="https://wiki.gentoo.org/wiki/Hardened/Textrels_Guide">PIC Fix Guide</ulink>.
   </para>
  </sect1>
 
@@ -70,7 +70,7 @@
    </programlisting>
   </para>
   <para>
-   Please see the Gentoo Hardened <ulink url="http://www.gentoo.org/proj/en/hardened/gnu-stack.xml">GNU Stack Guide</ulink>.
+   Please see the Gentoo Hardened <ulink url="https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart">GNU Stack Guide</ulink>.
   </para>
  </sect1>
 
@@ -165,7 +165,7 @@
    to use the <command>gen_usr_ldscript</command> function found in the
    toolchain-funcs.eclass.  Refer to the
    man page for information on how to use it.  See this
-   <ulink url="http://bugs.gentoo.org/4411">bug report</ulink> for some history
+   <ulink url="https://bugs.gentoo.org/4411">bug report</ulink> for some history
    on this issue.
   </para>
  </sect1>
@@ -222,9 +222,9 @@
    up as the optimization was not turned on by default.  With gcc-4.1.x and
    newer though, the -O2 optimization level enables strict aliasing support.
    For information, please review these links:
-   <ulink url="http://mail-index.netbsd.org/tech-kern/2003/08/11/0001.html">NetBSD Explanation</ulink>,
+   <ulink url="https://mail-index.netbsd.org/tech-kern/2003/08/11/0001.html">NetBSD Explanation</ulink>,
    <ulink url="http://thread.gmane.org/gmane.linux.gentoo.devel/39495">Gentoo Dev Thread</ulink>,
-   <ulink url="http://gcc.gnu.org/bugs.html#nonbugs_c">GCC Docs</ulink>,
+   <ulink url="https://gcc.gnu.org/bugs.html#nonbugs_c">GCC Docs</ulink>,
    <ulink url="http://cellperformance.beyond3d.com/articles/2006/06/understanding-strict-aliasing.html">Practical examples</ulink>.
   </para>
   <para>

diff --git a/man/color.map.5 b/man/color.map.5
index 5543628..ee3fda9 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -186,7 +186,7 @@ Defines color used for warnings.
 .B invisible
 .RE
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Arfrever Frehtes Taifersar Arahesis <arfrever@××××××.org>

diff --git a/man/dispatch-conf.1 b/man/dispatch-conf.1
index 3a5264a..a3d233b 100644
--- a/man/dispatch-conf.1
+++ b/man/dispatch-conf.1
@@ -71,7 +71,7 @@ mentioned in the \fBci\fR(1) man page, users can control access
 to RCS files by setting the permissions of the directory
 containing the files.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Jeremy Wohl

diff --git a/man/ebuild.1 b/man/ebuild.1
index 29f88b0..1d48844 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -206,7 +206,7 @@ Do not use the \fIEBUILD_DEFAULT_OPTS\fR environment variable.
 .BR "\-\-skip\-manifest"
 Skip all manifest checks.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Achim Gottinger <achim@g.o>

diff --git a/man/ebuild.5 b/man/ebuild.5
index c9b5f4b..72b8b69 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -541,7 +541,7 @@ who uses the \fBebuild\fR(1) and \fBrepoman\fR(1) commands with this
 package will be required to have a version of portage that recognizes
 the EAPI to which this package conforms.
 .TP
-.B SRC_URI\fR = \fI"http://example.com/path/${P}.tar.gz"
+.B SRC_URI\fR = \fI"https://example.com/path/${P}.tar.gz"
 Contains a list of URIs for the required source files.  It can contain
 multiple URIs for a single source file.  The list is processed in order
 if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
@@ -550,7 +550,7 @@ customized with a "->" operator on the right hand side, followed by the
 desired output file name. All tokens, including the operator and output
 file name, should be separated by whitespace.
 .TP
-.B HOMEPAGE\fR = \fI"http://example.com/"
+.B HOMEPAGE\fR = \fI"https://example.com/"
 Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP
@@ -730,7 +730,7 @@ allows for packages to depend on \fIvirtual/jdk\fR rather than on blackdown
 or sun specifically.
 
 The \fBPROVIDE\fR variable has been deprecated. See
-\fIhttp://www.gentoo.org/proj/en/glep/glep-0037.html\fR for details.
+\fIhttps://wiki.gentoo.org/wiki/GLEP:37\fR for details.
 
 .TP
 .B DOCS
@@ -1538,7 +1538,7 @@ EAPI="5"
 inherit some_eclass another_eclass
 
 DESCRIPTION="Super\-useful stream editor (sed)"
-HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
+HOMEPAGE="https://www.gnu.org/software/sed/"
 SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL\-2"
@@ -1584,7 +1584,7 @@ Contains variables customizing colors.
 .BR color.map (5)
 
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 
 .SH "AUTHORS"
 .nf

diff --git a/man/egencache.1 b/man/egencache.1
index 7fd17c2..9c77029 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -156,7 +156,7 @@ This causes intermediate cache (in a different format that includes
 eclass state) to be generated inside the directory which is configurable
 via the \fB\-\-cache\-dir\fR option.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Zac Medico <zmedico@g.o>

diff --git a/man/emaint.1 b/man/emaint.1
index 7c7638f..cfdadc8 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -99,7 +99,7 @@ specified multiple times, in order to sync multiple submodules.
 Currently, this option has no effect for sync protocols other
 than rsync.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH AUTHORS
 .nf
 Pavel Kazakov <nullishzero@g.o>

diff --git a/man/emerge.1 b/man/emerge.1
index bfa2f73..75862d7 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -108,7 +108,7 @@ later updating.
 .BR \-\-check\-news
 Scan all repositories for relevant unread GLEP 42 news items, and display
 how many are found. See
-\fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
+\fIhttps://wiki.gentoo.org/wiki/GLEP:42\fR.
 .TP
 .BR \-\-clean
 Cleans up the system by examining the installed packages and removing older
@@ -1244,7 +1244,7 @@ auto\-merge trivial changes.
 .SH "REPORTING BUGS"
 Please report any bugs you encounter through our website:
 .LP
-\fBhttp://bugs.gentoo.org/\fR
+\fBhttps://bugs.gentoo.org/\fR
 .LP
 Please include the output of \fBemerge \-\-info\fR when you submit your
 bug report.

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index 6e6c508..cdd66cb 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -120,7 +120,7 @@ Specifies a file containing a list of files to whitelist, one per line,
 # prefixed lines ignored. Use this option multiple times in order to
 specify multiple whitelists.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "THANKS"
 Special thanks to Brian Harring, author of the mirror\-dist program from
 which emirrordist is derived.

diff --git a/man/env-update.1 b/man/env-update.1
index 9ceddab..f60945d 100644
--- a/man/env-update.1
+++ b/man/env-update.1
@@ -20,7 +20,7 @@ first.
 Do not run \fBldconfig\fR (and thus skip rebuilding the \fIld.so.cache\fR,
 etc...).
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 Daniel Robbins <drobbins@g.o>
 .SH "SEE ALSO"

diff --git a/man/etc-update.1 b/man/etc-update.1
index 71900da..fd6568a 100644
--- a/man/etc-update.1
+++ b/man/etc-update.1
@@ -36,7 +36,7 @@ Show settings and important decision info while running.
 Select one of the automatic merge modes.  Valid modes are: \-3 \-5 \-7 \-9.
 See the \fI\-\-help\fR text for more details.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Jochem Kossen and Leo Lipelis

diff --git a/man/fixpackages.1 b/man/fixpackages.1
index 3168327..4797810 100644
--- a/man/fixpackages.1
+++ b/man/fixpackages.1
@@ -7,7 +7,7 @@ fixpackages \- Perform package move updates for all packages
 The fixpackages program performs package move updates on configuration
 files, installed packages, and binary packages.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH AUTHORS
 Zac Medico <zmedico@g.o>
 .SH "SEE ALSO"

diff --git a/man/make.conf.5 b/man/make.conf.5
index 26bbf06..aea189e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -12,7 +12,7 @@ simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
 keyword and variable substitution, but not some of the more advanced BASH
 features like arrays and special parameter expansions. For more details, see
 the Simple lexical analysis documentation:
-\fLhttp://docs.python.org/3/library/shlex.html\fR. Note that if you source
+\fLhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source
 files, they need to be in the same shlex syntax for portage to read them.
 If make.conf is a directory, then all the files in that directory will
 be sorted in ascending alphabetical order by file name and summed
@@ -62,7 +62,7 @@ with the '@' symbol. License groups are defined in the \fIlicense_groups\fR
 file (see \fBportage\fR(5)). In addition to license and group names, the
 \fI*\fR and \fI-*\fR wildcard tokens are also supported. Refer to GLEP 23
 for further information:
-\fIhttp://www.gentoo.org/proj/en/glep/glep-0023.html\fR.
+\fIhttps://wiki.gentoo.org/wiki/GLEP:23\fR.
 .br
 Defaults to the value of * -@EULA.
 .br
@@ -136,7 +136,7 @@ compile/run if the optimizations are too extreme.
 
 For more information, see the \fIInvoking GCC\fR section of the gcc manual:
 .br
-http://gcc.gnu.org/onlinedocs/
+https://gcc.gnu.org/onlinedocs/
 .TP
 .B CHOST
 This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
@@ -144,13 +144,11 @@ step as \fI\-\-host=${CHOST}\fR.  This way you can force the build\-host.
 
 For more information:
 .br
-http://gcc.gnu.org/onlinedocs/gcc\-4.1.1/gcc/Submodel\-Options.html
+https://gcc.gnu.org/onlinedocs/gcc\-6.1.0/gcc/Submodel\-Options.html
 .br
-http://gcc.gnu.org/onlinedocs/gcc\-3.3/gcc/Submodel\-Options.html
+https://gcc.gnu.org/onlinedocs/gcc\-5.4.0/gcc/Submodel\-Options.html
 .br
-http://gcc.gnu.org/onlinedocs/gcc\-3.2/gcc/Submodel\-Options.html
-.br
-http://gcc.gnu.org/onlinedocs/gcc\-2.95.3/gcc_2.html
+https://gcc.gnu.org/onlinedocs/gcc\-4.9.3/gcc/Submodel\-Options.html
 .TP
 \fBCLEAN_DELAY\fR = \fIinteger\fR
 Determines how long the countdown delay will be after running
@@ -480,7 +478,7 @@ configures new enough distcc to use the proxy.
 .TP
 .B news
 Enable GLEP 42 news support. See
-\fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
+\fIhttps://wiki.gentoo.org/wiki/GLEP:42\fR.
 .TP
 .B noauto
 When utilizing \fBebuild\fR(1), only run the function requested. Also, forces
@@ -688,7 +686,7 @@ more modern build systems.
 
 For more information, see the \fIInvoking GCC\fR section of the gcc manual:
 .br
-http://gcc.gnu.org/onlinedocs/
+https://gcc.gnu.org/onlinedocs/
 .TP
 \fBGENTOO_MIRRORS\fR = \fI[URIs]\fR
 Insert your space\-separated list of local mirrors here.  These
@@ -1150,7 +1148,7 @@ USE from the environment variables, such as LINGUAS, defined by files in
 .RE
 
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Daniel Robbins <drobbins@g.o>

diff --git a/man/portage.5 b/man/portage.5
index 7c2a8f7..963f49d 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -9,7 +9,7 @@ is a reference only for files which do not already have a man page.
 
 All files in the make.profile directory may be tweaked via parent profiles
 when using cascading profiles.  For more info, please see
-http://www.gentoo.org/proj/en/releng/docs/cascading-profiles.xml
+https://wiki.gentoo.org/wiki/Profile_(Portage)
 .IP Note:
 If you are looking for information on how to emerge something, please see
 .BR emerge (1).
@@ -1091,7 +1091,7 @@ auto\-sync = yes
 [voip]
 location = /var/lib/layman/voip
 sync\-type = laymanator
-sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
+sync\-uri = git://anongit.gentoo.org/proj/voip.git
 auto\-sync = yes
 .fi
 .RE
@@ -1375,7 +1375,7 @@ A list of all the variables which will be displayed when you run `emerge info`.
 This contains groups of licenses that may be specifed in the
 \fBACCEPT_LICENSE\fR variable (see \fBmake.conf\fR(5)). Refer
 to GLEP 23 for further information:
-\fIhttp://www.gentoo.org/proj/en/glep/glep-0023.html\fR.
+\fIhttps://wiki.gentoo.org/wiki/GLEP:23\fR.
 
 .I Format:
 .nf
@@ -1485,7 +1485,7 @@ http://unc.dl.sourceforge.net/sourceforge
 gentoo http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/ \
 ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo/distfiles
 
-kernel http://www.kernel.org/pub http://www.us.kernel.org/pub
+kernel https://www.kernel.org/pub https://www.us.kernel.org/pub
 .fi
 .TP
 .BR use.desc
@@ -1509,7 +1509,7 @@ All local USE flags are listed here along with the package and a
 description. This file is automatically generated from the
 metadata.xml files that are included with each individual package.
 Refer to GLEP 56 for further information:
-\fIhttp://www.gentoo.org/proj/en/glep/glep-0056.html\fR.
+\fIhttps://wiki.gentoo.org/wiki/GLEP:56\fR.
 
 .nf
 .I Format:
@@ -1642,7 +1642,7 @@ packages sets which always begin with the \fB@\fR character. Use
 .fi
 .RE
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Marius Mauch <genone@g.o>

diff --git a/man/quickpkg.1 b/man/quickpkg.1
index a3f6165..06a1f0b 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -58,7 +58,7 @@ planeshift
 .B quickpkg
 @system
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH AUTHORS
 .nf
 Terry Chan (original author)

diff --git a/man/ru/color.map.5 b/man/ru/color.map.5
index f7e65e3..804e719 100644
--- a/man/ru/color.map.5
+++ b/man/ru/color.map.5
@@ -189,7 +189,7 @@ color.map \- пользовательские настройки цвета в P
 .B invisible - невидимый
 .RE
 .SH "БАГТРЕКЕР"
-Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
+Об обнаруженных ошибках сообщайте на https://bugs.gentoo.org/
 .SH "АВТОРЫ"
 .nf
 Arfrever Frehtes Taifersar Arahesis <arfrever@××××××.org>

diff --git a/man/ru/dispatch-conf.1 b/man/ru/dispatch-conf.1
index a511e97..99ab069 100644
--- a/man/ru/dispatch-conf.1
+++ b/man/ru/dispatch-conf.1
@@ -76,7 +76,7 @@ dispatch\-conf \- безопасное обновление конфигурац
 управлять доступом к RCS\-файлам, изменив права на доступ к
 каталогу, в котором они лежат.
 .SH "БАГТРЕКЕР"
-Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
+Об обнаруженных ошибках сообщайте на https://bugs.gentoo.org/
 .SH "АВТОРЫ"
 .nf
 Jeremy Wohl

diff --git a/man/ru/ebuild.1 b/man/ru/ebuild.1
index 98d4b5a..8767811 100644
--- a/man/ru/ebuild.1
+++ b/man/ru/ebuild.1
@@ -214,7 +214,7 @@ SRC_URI, будет использована стандартная src_unpack()
 .BR "\-\-skip\-manifest"
 Пропустить проверку Manifest-файлов.
 .SH "БАГТРЕКЕР"
-Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
+Об обнаруженных ошибках сообщайте на https://bugs.gentoo.org/
 .SH "АВТОРЫ"
 .nf
 Achim Gottinger <achim@g.o>

diff --git a/man/ru/env-update.1 b/man/ru/env-update.1
index 9e0775e..e1e584c 100644
--- a/man/ru/env-update.1
+++ b/man/ru/env-update.1
@@ -21,7 +21,7 @@ env\-update \- автоматическое обновление настрое
 Не запускать \fBldconfig\fR (и, тем самым, опустить пересборку
 кэша \fIld.so.cache\fR и т.д.).
 .SH "БАГТРЕКЕР"
-Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
+Об обнаруженных ошибках сообщайте на https://bugs.gentoo.org/
 .SH "АВТОРЫ"
 Daniel Robbins <drobbins@g.o>
 .SH "СМОТРИ ТАКЖЕ"

diff --git a/man/ru/etc-update.1 b/man/ru/etc-update.1
index f799317..dcc641f 100644
--- a/man/ru/etc-update.1
+++ b/man/ru/etc-update.1
@@ -41,7 +41,7 @@ etc\-update \- обработка изменений конфигурацион
 режимы работы это \-3, \-5, \-7, \-9. Для более подробной
 информации смотри текст, выдаваемый опцией \fI\-\-help\fR.
 .SH "БАГТРЕКЕР"
-Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
+Об обнаруженных ошибках сообщайте на https://bugs.gentoo.org/
 .SH "АВТОРЫ"
 .nf
 Jochem Kossen and Leo Lipelis

diff --git a/man/ru/fixpackages.1 b/man/ru/fixpackages.1
index 41eb284..606e285 100644
--- a/man/ru/fixpackages.1
+++ b/man/ru/fixpackages.1
@@ -9,7 +9,7 @@ fixpackages \- выполняет переносы пакетов при обн
 для конфигурационных файлов, установленных пакетов и двоичных
 пакетов.
 .SH "БАГТРЕКЕР"
-Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
+Об обнаруженных ошибках сообщайте на https://bugs.gentoo.org/
 .SH "АВТОРЫ"
 Zac Medico <zmedico@g.o>
 .SH "СМОТРИ ТАКЖЕ"

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index b1f7c21..fc185fc 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -20,7 +20,7 @@ except (SystemExit, KeyboardInterrupt):
 	raise
 except (ImportError, SystemError, RuntimeError, Exception):
 	# broken or missing xml support
-	# http://bugs.python.org/issue14988
+	# https://bugs.python.org/issue14988
 	MetaDataXML = None
 
 import portage

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0612e22..427f79b 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -432,7 +432,7 @@ if platform.system() in ('FreeBSD',):
 
 			if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000:
 				# Python 3.1 _execvp throws TypeError for non-absolute executable
-				# path passed as bytes (see http://bugs.python.org/issue8513).
+				# path passed as bytes (see https://bugs.python.org/issue8513).
 				fullname = process.find_binary(cmd[0])
 				if fullname is None:
 					raise exception.CommandNotFound(cmd[0])

diff --git a/pym/portage/_emirrordist/FetchTask.py b/pym/portage/_emirrordist/FetchTask.py
index 307c5bd..64de675 100644
--- a/pym/portage/_emirrordist/FetchTask.py
+++ b/pym/portage/_emirrordist/FetchTask.py
@@ -436,7 +436,7 @@ class FetchTask(CompositeTask):
 		if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
 			not os.path.isabs(args[0]):
 			# Python 3.1 _execvp throws TypeError for non-absolute executable
-			# path passed as bytes (see http://bugs.python.org/issue8513).
+			# path passed as bytes (see https://bugs.python.org/issue8513).
 			fullname = portage.process.find_binary(args[0])
 			if fullname is None:
 				raise portage.exception.CommandNotFound(args[0])

diff --git a/pym/portage/cache/ebuild_xattr.py b/pym/portage/cache/ebuild_xattr.py
index db6e177..cc6b062 100644
--- a/pym/portage/cache/ebuild_xattr.py
+++ b/pym/portage/cache/ebuild_xattr.py
@@ -59,7 +59,7 @@ class database(fs_template.FsBased):
 				s+=hundred
 		except IOError as e:
 			# ext based give wrong errno
-			# http://bugzilla.kernel.org/show_bug.cgi?id=12793
+			# https://bugzilla.kernel.org/show_bug.cgi?id=12793
 			if e.errno in (errno.E2BIG, errno.ENOSPC):
 				result = len(s)-100
 			else:

diff --git a/pym/portage/cache/mappings.py b/pym/portage/cache/mappings.py
index cd39a6e..921fdaf 100644
--- a/pym/portage/cache/mappings.py
+++ b/pym/portage/cache/mappings.py
@@ -14,7 +14,7 @@ class Mapping(object):
 	Mapping and MutableMapping from the collections module, but 2to3
 	doesn't currently account for this change:
 
-	    http://bugs.python.org/issue2876
+	    https://bugs.python.org/issue2876
 
 	As a workaround for the above issue, use this class as a substitute
 	for UserDict.DictMixin so that code converted via 2to3 will run.
@@ -140,7 +140,7 @@ class UserDict(MutableMapping):
 	Use this class as a substitute for UserDict.UserDict so that
 	code converted via 2to3 will run:
 
-	     http://bugs.python.org/issue2876
+	     https://bugs.python.org/issue2876
 	"""
 
 	__slots__ = ('data',)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 2c99548..28d6eb7 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -197,7 +197,7 @@ def _get_global(k):
 
 			if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000:
 				# Python 3.1 _execvp throws TypeError for non-absolute executable
-				# path passed as bytes (see http://bugs.python.org/issue8513).
+				# path passed as bytes (see https://bugs.python.org/issue8513).
 				fullname = portage.process.find_binary(cmd[0])
 				if fullname is None:
 					globals()[k] = v

diff --git a/pym/portage/dbapi/_SyncfsProcess.py b/pym/portage/dbapi/_SyncfsProcess.py
index 7518214..767dc20 100644
--- a/pym/portage/dbapi/_SyncfsProcess.py
+++ b/pym/portage/dbapi/_SyncfsProcess.py
@@ -10,7 +10,7 @@ class SyncfsProcess(ForkProcess):
 	Isolate ctypes usage in a subprocess, in order to avoid
 	potential problems with stale cached libraries as
 	described in bug #448858, comment #14 (also see
-	http://bugs.python.org/issue14597).
+	https://bugs.python.org/issue14597).
 	"""
 
 	__slots__ = ('paths',)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 28ae584..2cb96ea 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4091,9 +4091,9 @@ class dblink(object):
 				" should simply ignore the collision since there is not"
 				" enough information to determine if a real problem"
 				" exists. Please do NOT file a bug report at"
-				" http://bugs.gentoo.org unless you report exactly which"
+				" https://bugs.gentoo.org/ unless you report exactly which"
 				" two packages install the same file(s). See"
-				" http://wiki.gentoo.org/wiki/Knowledge_Base:Blockers"
+				" https://wiki.gentoo.org/wiki/Knowledge_Base:Blockers"
 				" for tips on how to solve the problem. And once again,"
 				" please do NOT file a bug report unless you have"
 				" completely understood the above message.")

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index ed9a64a..eaea593 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -44,7 +44,7 @@ def diffstatusoutput(cmd, file1, file2):
 	if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
 		not os.path.isabs(args[0]):
 		# Python 3.1 _execvp throws TypeError for non-absolute executable
-		# path passed as bytes (see http://bugs.python.org/issue8513).
+		# path passed as bytes (see https://bugs.python.org/issue8513).
 		fullname = portage.process.find_binary(args[0])
 		if fullname is None:
 			raise portage.exception.CommandNotFound(args[0])

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 26e6123..26ecc75 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1867,8 +1867,8 @@ def _check_build_log(mysettings, out=None):
 			"are limited to system packages "
 			"for which it is impossible to run "
 			"autotools during stage building. "
-			"See http://www.gentoo.org/p"
-			"roj/en/qa/autofailure.xml for more information."),
+			"See https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Autotools_failures"
+            " for more information."),
 			wrap_width))
 		_eqawarn(msg)
 

diff --git a/pym/portage/tests/ebuild/test_array_fromfile_eof.py b/pym/portage/tests/ebuild/test_array_fromfile_eof.py
index efcd915..1f2a1ab 100644
--- a/pym/portage/tests/ebuild/test_array_fromfile_eof.py
+++ b/pym/portage/tests/ebuild/test_array_fromfile_eof.py
@@ -13,7 +13,7 @@ class ArrayFromfileEofTestCase(TestCase):
 	def testArrayFromfileEof(self):
 		# This tests if the following python issue is fixed
 		# in the currently running version of python:
-		#   http://bugs.python.org/issue5334
+		#   https://bugs.python.org/issue5334
 
 		input_data = "an arbitrary string"
 		input_bytes = _unicode_encode(input_data,

diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/process/test_poll.py
index 8c57c23..596ea30 100644
--- a/pym/portage/tests/process/test_poll.py
+++ b/pym/portage/tests/process/test_poll.py
@@ -78,7 +78,7 @@ class PipeReaderArrayTestCase(PipeReaderTestCase):
 
 	def __init__(self, *args, **kwargs):
 		super(PipeReaderArrayTestCase, self).__init__(*args, **kwargs)
-		# http://bugs.python.org/issue5380
+		# https://bugs.python.org/issue5380
 		# https://bugs.pypy.org/issue956
 		self.todo = True
 

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index c6d6a84..2309d04 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1793,7 +1793,7 @@ def find_updated_config_files(target_root, config_protect):
 
 			if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000:
 				# Python 3.1 _execvp throws TypeError for non-absolute executable
-				# path passed as bytes (see http://bugs.python.org/issue8513).
+				# path passed as bytes (see https://bugs.python.org/issue8513).
 				fullname = portage.process.find_binary(cmd[0])
 				if fullname is None:
 					raise portage.exception.CommandNotFound(cmd[0])

diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py
index 4fe4194..4594921 100644
--- a/pym/portage/util/_desktop_entry.py
+++ b/pym/portage/util/_desktop_entry.py
@@ -44,7 +44,7 @@ def validate_desktop_entry(path):
 
 	if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000:
 		# Python 3.1 _execvp throws TypeError for non-absolute executable
-		# path passed as bytes (see http://bugs.python.org/issue8513).
+		# path passed as bytes (see https://bugs.python.org/issue8513).
 		fullname = portage.process.find_binary(args[0])
 		if fullname is None:
 			raise portage.exception.CommandNotFound(args[0])

diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index 42f0982..4940bfb 100644
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -48,7 +48,7 @@ else:
 		raise
 	except (ImportError, SystemError, RuntimeError, Exception):
 		# broken or missing xml support
-		# http://bugs.python.org/issue14988
+		# https://bugs.python.org/issue14988
 		import xml.etree.ElementTree as etree
 
 try:

diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index b4567be..e11f26e 100644
--- a/pym/portage/xpak.py
+++ b/pym/portage/xpak.py
@@ -321,7 +321,7 @@ class tbz2(object):
 			to break them. This makes it safe to use hardlinks to create
 			cheap snapshots of the repository, which is useful for solving
 			race conditions on binhosts as described here:
-			http://code.google.com/p/chromium-os/issues/detail?id=3225.
+			https://crbug.com/185031
 			Default is True.
 		"""
 		self.scan() # Don't care about condition... We'll rewrite the data anyway.

diff --git a/repoman/man/repoman.1 b/repoman/man/repoman.1
index e2b9c66..4a9122e 100644
--- a/repoman/man/repoman.1
+++ b/repoman/man/repoman.1
@@ -399,7 +399,7 @@ not directly.
 Ebuild DEPENDs on x11-libs/wxGTK without inheriting wxwidgets.eclass. Refer to
 bug #305469 for more information.
 .SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
+Please report bugs via https://bugs.gentoo.org/
 .SH AUTHORS
 .nf
 Daniel Robbins <drobbins@g.o>

diff --git a/repoman/pym/repoman/_subprocess.py b/repoman/pym/repoman/_subprocess.py
index dcdc985..b6c19bd 100644
--- a/repoman/pym/repoman/_subprocess.py
+++ b/repoman/pym/repoman/_subprocess.py
@@ -23,7 +23,7 @@ def repoman_getstatusoutput(cmd):
 	if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
 		not os.path.isabs(args[0]):
 		# Python 3.1 _execvp throws TypeError for non-absolute executable
-		# path passed as bytes (see http://bugs.python.org/issue8513).
+		# path passed as bytes (see https://bugs.python.org/issue8513).
 		fullname = find_binary(args[0])
 		if fullname is None:
 			raise portage.exception.CommandNotFound(args[0])
@@ -56,7 +56,7 @@ class repoman_popen(portage.proxy.objectproxy.ObjectProxy):
 		if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
 			not os.path.isabs(args[0]):
 			# Python 3.1 _execvp throws TypeError for non-absolute executable
-			# path passed as bytes (see http://bugs.python.org/issue8513).
+			# path passed as bytes (see https://bugs.python.org/issue8513).
 			fullname = find_binary(args[0])
 			if fullname is None:
 				raise portage.exception.CommandNotFound(args[0])

diff --git a/repoman/pym/repoman/checks/herds/herdbase.py b/repoman/pym/repoman/checks/herds/herdbase.py
index d38d2e3..ebe6a19 100644
--- a/repoman/pym/repoman/checks/herds/herdbase.py
+++ b/repoman/pym/repoman/checks/herds/herdbase.py
@@ -13,7 +13,7 @@ except (SystemExit, KeyboardInterrupt):
 	raise
 except (ImportError, SystemError, RuntimeError, Exception):
 	# broken or missing xml support
-	# http://bugs.python.org/issue14988
+	# https://bugs.python.org/issue14988
 	# This means that python is built without xml support.
 	# We tolerate global scope import failures for optional
 	# modules, so that ImportModulesTestCase can succeed (or

diff --git a/repoman/pym/repoman/gpg.py b/repoman/pym/repoman/gpg.py
index 26e2432..a3c12b3 100644
--- a/repoman/pym/repoman/gpg.py
+++ b/repoman/pym/repoman/gpg.py
@@ -53,7 +53,7 @@ def gpgsign(filename, repoman_settings, options):
 		if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
 			not os.path.isabs(gpgcmd[0]):
 			# Python 3.1 _execvp throws TypeError for non-absolute executable
-			# path passed as bytes (see http://bugs.python.org/issue8513).
+			# path passed as bytes (see https://bugs.python.org/issue8513).
 			fullname = find_binary(gpgcmd[0])
 			if fullname is None:
 				raise portage.exception.CommandNotFound(gpgcmd[0])

diff --git a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
index 5235249..9e4d6cb 100644
--- a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -13,7 +13,7 @@ except (SystemExit, KeyboardInterrupt):
 	raise
 except (ImportError, SystemError, RuntimeError, Exception):
 	# broken or missing xml support
-	# http://bugs.python.org/issue14988
+	# https://bugs.python.org/issue14988
 	msg = ["Please emerge dev-python/lxml in order to use repoman."]
 	from portage.output import EOutput
 	out = EOutput()

diff --git a/repoman/pym/repoman/tests/simple/test_simple.py b/repoman/pym/repoman/tests/simple/test_simple.py
index 817d124..114656e 100644
--- a/repoman/pym/repoman/tests/simple/test_simple.py
+++ b/repoman/pym/repoman/tests/simple/test_simple.py
@@ -91,7 +91,7 @@ class SimpleRepomanTestCase(TestCase):
 				"COPYRIGHT_HEADER" : copyright_header,
 				"DESCRIPTION" : "Desc goes here",
 				"EAPI" : "5",
-				"HOMEPAGE" : "http://example.com",
+				"HOMEPAGE" : "https://example.com",
 				"IUSE" : "flag",
 				"KEYWORDS": "x86",
 				"LICENSE": "GPL-2",
@@ -101,7 +101,7 @@ class SimpleRepomanTestCase(TestCase):
 				"COPYRIGHT_HEADER" : copyright_header,
 				"DESCRIPTION" : "Desc goes here",
 				"EAPI" : "4",
-				"HOMEPAGE" : "http://example.com",
+				"HOMEPAGE" : "https://example.com",
 				"IUSE" : "flag",
 				"KEYWORDS": "~x86",
 				"LICENSE": "GPL-2",
@@ -111,7 +111,7 @@ class SimpleRepomanTestCase(TestCase):
 				"COPYRIGHT_HEADER" : copyright_header,
 				"DESCRIPTION" : "Desc goes here",
 				"EAPI" : "4",
-				"HOMEPAGE" : "http://example.com",
+				"HOMEPAGE" : "https://example.com",
 				"IUSE" : "flag",
 				"KEYWORDS": "~x86",
 				"LICENSE": "GPL-2",
@@ -120,7 +120,7 @@ class SimpleRepomanTestCase(TestCase):
 				"COPYRIGHT_HEADER" : copyright_header,
 				"DESCRIPTION" : "Desc goes here",
 				"EAPI" : "4",
-				"HOMEPAGE" : "http://example.com",
+				"HOMEPAGE" : "https://example.com",
 				"IUSE" : "flag",
 				# must be unstable, since dev-libs/A[flag] is stable masked
 				"KEYWORDS": "~x86",