Merge updates from master

25 files changed, 55 insertions, 43 deletions

diff --git a/app-emacs/yc/files/yc-5.2.1-emacs-26.patch b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
new file mode 100644
index 000000000000..19925c65c454
--- /dev/null
+++ b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
@@ -0,0 +1,11 @@
+--- a/yc.el
++++ b/yc.el
+@@ -2071,7 +2071,7 @@
+ ;; $BJ8@a$r;XDj$7$J$$>l9g!"8=:_$NJ8@a$,BP>]$H$J$k(B
+ ;; $BFI$_$r<hF@$7$?J8@a$O$=$NFI$_$r%-%c%C%7%e$9$k(B
+ ;; cut $B$,(B $BHs(Bnil $B$N>l9g!";XDjJ8@a0J9_$NFI$_$r:o=|$9$k(B
+-(defun yc-yomi (&optional idx &optional cut)
++(defun yc-yomi (&optional idx cut)
+   (if (integerp idx)
+       (yc-put-bunsetsu-yomi idx (yc-get-bunsetsu-yomi idx cut) cut)
+     (yc-put-bunsetsu-yomi yc-mark (yc-get-bunsetsu-yomi yc-mark cut) cut)))
diff --git a/app-emacs/yc/yc-5.2.1.ebuild b/app-emacs/yc/yc-5.2.1.ebuild
index eb6992a1aa20..22ccd0a32304 100644
--- a/app-emacs/yc/yc-5.2.1.ebuild
+++ b/app-emacs/yc/yc-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,6 +16,7 @@ IUSE=""
 
 RDEPEND="app-i18n/canna"
 
+ELISP_PATCHES="${P}-emacs-26.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_install() {
diff --git a/dev-lang/coffee-script/coffee-script-1.12.5.ebuild b/dev-lang/coffee-script/coffee-script-1.12.5.ebuild
index e1b9a4e081a3..6029b25ed394 100644
--- a/dev-lang/coffee-script/coffee-script-1.12.5.ebuild
+++ b/dev-lang/coffee-script/coffee-script-1.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="coffeescript"
 
 DESCRIPTION="A little language that compiles into javascript"
-HOMEPAGE="http://coffeescript.org/"
+HOMEPAGE="https://coffeescript.org/"
 SRC_URI="https://github.com/jashkenas/${MY_PN}/archive/${PV}.tar.gz
 	-> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild b/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild
index 49e3c04aa16b..941e12267f0a 100644
--- a/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild
+++ b/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit multilib
 MY_PN="coffeescript"
 
 DESCRIPTION="A little language that compiles into javascript"
-HOMEPAGE="http://coffeescript.org/"
+HOMEPAGE="https://coffeescript.org/"
 
 # The tests are missing from the npm registry package, so use Github
 # instead.
diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20131017.ebuild
index ebba60bd6799..aa8ccecb430e 100644
--- a/dev-lang/mmix/mmix-20131017.ebuild
+++ b/dev-lang/mmix/mmix-20131017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
-HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
+HOMEPAGE="https://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
 SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
 
 DEPEND="virtual/tex-base
diff --git a/dev-lang/mmix/mmix-20160804.ebuild b/dev-lang/mmix/mmix-20160804.ebuild
index 4ff619b3fabd..b1cbaa53f456 100644
--- a/dev-lang/mmix/mmix-20160804.ebuild
+++ b/dev-lang/mmix/mmix-20160804.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
-HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
+HOMEPAGE="https://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
 SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
 
 DEPEND="virtual/tex-base
diff --git a/games-board/stockfish/stockfish-8.ebuild b/games-board/stockfish/stockfish-8.ebuild
index 857f59d38752..c908d406a8cd 100644
--- a/games-board/stockfish/stockfish-8.ebuild
+++ b/games-board/stockfish/stockfish-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
-HOMEPAGE="http://stockfishchess.org/"
+HOMEPAGE="https://stockfishchess.org/"
 
 SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
 LICENSE="GPL-3"
diff --git a/games-board/stockfish/stockfish-9.ebuild b/games-board/stockfish/stockfish-9.ebuild
index da7db78dbf0a..dc5c8779f356 100644
--- a/games-board/stockfish/stockfish-9.ebuild
+++ b/games-board/stockfish/stockfish-9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
-HOMEPAGE="http://stockfishchess.org/"
+HOMEPAGE="https://stockfishchess.org/"
 
 SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
 LICENSE="GPL-3"
diff --git a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
index 7aea37bf8281..8ba2db39ab46 100644
--- a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
+HOMEPAGE="https://www.claws-mail.org/"
 
-SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
diff --git a/mail-client/claws-mail/claws-mail-3.15.1.ebuild b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
index 519cd735f964..8a2d2a097e6b 100644
--- a/mail-client/claws-mail/claws-mail-3.15.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
+HOMEPAGE="https://www.claws-mail.org/"
 
-SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
diff --git a/mail-client/claws-mail/claws-mail-3.16.0.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
index 34bad07efdfb..db659cadd4a8 100644
--- a/mail-client/claws-mail/claws-mail-3.16.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
+HOMEPAGE="https://www.claws-mail.org/"
 
-SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 065ab0571e88..a7c026c215a2 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -7,13 +7,13 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
+HOMEPAGE="https://www.claws-mail.org/"
 
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
-	SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
index 515322c7481c..06ad6320317a 100644
--- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit depend.apache eutils multilib toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index 7acee4a50aa9..7e952737c4d0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 553186b60646..5773285f59b5 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 122423ab1055..5bd7da55c5f0 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs user
 
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 # The name of the directory into which our Gentoo icons will be
 # extracted, and also the basename of the archive containing it.
diff --git a/net-analyzer/nagios/nagios-4.3.1.ebuild b/net-analyzer/nagios/nagios-4.3.1.ebuild
index e2be13acf415..2c40afdab198 100644
--- a/net-analyzer/nagios/nagios-4.3.1.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
index e2be13acf415..2c40afdab198 100644
--- a/net-analyzer/nagios/nagios-4.3.3.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.3.4.ebuild
index 56f21be590af..a29da55bee71 100644
--- a/net-analyzer/nagios/nagios-4.3.4.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="http://www.nagios.org/"
+HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/iax/iax-0.2.2.ebuild b/net-libs/iax/iax-0.2.2.ebuild
index fb399568f11d..cb1e120a2c5a 100644
--- a/net-libs/iax/iax-0.2.2.ebuild
+++ b/net-libs/iax/iax-0.2.2.ebuild
@@ -6,12 +6,12 @@ EAPI=0
 IUSE=""
 
 DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="http://www.digium.com/"
+HOMEPAGE="https://www.digium.com/"
 LICENSE="LGPL-2"
 DEPEND=""
 RDEPEND=""
 SLOT="0"
-SRC_URI="http://www.digium.com/pub/libiax/${P}.tar.gz"
+SRC_URI="https://www.digium.com/pub/libiax/${P}.tar.gz"
 
 D_PREFIX=/usr
 
diff --git a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
index 2099a68e4200..6f5258ae80f7 100644
--- a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
+++ b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib eutils versionator
 
 DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="http://www.citrix.com/"
+HOMEPAGE="https://www.citrix.com/"
 SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 	x86? ( linuxx86-${PV}.tar.gz )"
 
diff --git a/net-misc/icaclient/icaclient-13.9.1.6.ebuild b/net-misc/icaclient/icaclient-13.9.1.6.ebuild
index 6fc5413c637f..43759820b120 100644
--- a/net-misc/icaclient/icaclient-13.9.1.6.ebuild
+++ b/net-misc/icaclient/icaclient-13.9.1.6.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit desktop eutils multilib versionator xdg-utils
 
 DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="http://www.citrix.com/"
+HOMEPAGE="https://www.citrix.com/"
 SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 	x86? ( linuxx86-${PV}.tar.gz )"
 
diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild
index 3e45c4921241..2f15c2e0e766 100644
--- a/net-misc/openr2/openr2-1.3.0.ebuild
+++ b/net-misc/openr2/openr2-1.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol"
-HOMEPAGE="http://libopenr2.org/"
+HOMEPAGE="https://libopenr2.org/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sci-chemistry/modeller/modeller-9.20.ebuild b/sci-chemistry/modeller/modeller-9.20.ebuild
index 0d29c3843f29..e7e80937b7fc 100644
--- a/sci-chemistry/modeller/modeller-9.20.ebuild
+++ b/sci-chemistry/modeller/modeller-9.20.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils multilib versionator
 
 DESCRIPTION="Homology or comparative modeling of protein three-dimensional structures"
-HOMEPAGE="http://salilab.org/modeller/"
-SRC_URI="http://salilab.org/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="https://salilab.org/modeller/"
+SRC_URI="https://salilab.org/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="modeller"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/sci-chemistry/xdsstat-bin/xdsstat-bin-171217.ebuild b/sci-chemistry/xdsstat-bin/xdsstat-bin-171217.ebuild
index e21153211331..0c144d9b28e2 100644
--- a/sci-chemistry/xdsstat-bin/xdsstat-bin-171217.ebuild
+++ b/sci-chemistry/xdsstat-bin/xdsstat-bin-171217.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/-bin}"
 
 DESCRIPTION="Prints various statistics (that are not available from XDS itself)"
-HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/XDSSTAT"
+HOMEPAGE="https://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/XDSSTAT"
 SRC_URI="
 	amd64? ( ftp://turn5.biologie.uni-konstanz.de/pub/${MY_PN}-linux64.bz2 )
 	x86? ( ftp://turn5.biologie.uni-konstanz.de/pub/${MY_PN}-linux32.bz2 )