gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /app-emacs
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
132 files changed, 152 insertions, 234 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9e6c42f64f73..d7d26bae2b2e 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/bm/Manifest b/app-emacs/bm/Manifest
index 17bec3c4ba4a..2b0a981b2850 100644
--- a/app-emacs/bm/Manifest
+++ b/app-emacs/bm/Manifest
@@ -1,4 +1,4 @@
 AUX 50bm-gentoo.el 205 BLAKE2B 4c4921b1b7939a0d3cc831297c6c1bef596392c31c7eac3ad2826d55b9a0edee67c4d9cf4a6e2b46ba754850cfd2b8aaecb352ac83ff4f6d45c6fe51405b3552 SHA512 b5c80ab592a9b78a3441494f6211801d3e001f77985ea2e78b982541f534780b12ff26fb6dd7cf7cb371cb8d3fa2fdf01b55227e40980b94a7e07a45dd583a8a
 DIST bm-1.32_p20140214.tar.xz 11800 BLAKE2B 0c27f35a64dac09e5fff4391d6958ce5b2a2a6a8194a29500322137979e5fc0618fe1d47ca844bccba78d388d8a2569c5742f1a531c43c42a02845a31fb1f6c2 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4
-EBUILD bm-1.32_p20140214.ebuild 511 BLAKE2B 8a1fc36b6f9475c73af2cefb6663fcb6d914fe9f817eeb76e98223df76705f6546a3a8ee1f8ee31cd3c8f5d8b4bb47cc26648c2059a6ebb3b62e004563eac6ab SHA512 901ac6ec4cb1b41a328dacfc3e8ab66aba89b1748a3238f7e753429435efb2812035405c56038b92923dedf5aa309054fadadd3a2e1ee866291a90749d5bb061
+EBUILD bm-1.32_p20140214.ebuild 513 BLAKE2B f5707073b30788957727dd0f2ddee9da571dc0d1947fee8b2f97b1886909d322238fdd36719739f529c0022554e008e6b79b0dc65bd60addab653b19ae1281c3 SHA512 7be9d695de562bff41b7b80721376fc8c8faa717d3e3da9839c21d8b318e16f07891af24d50c4b183f17f4a35ae6de3c8173508a88a0212e849fd962a6999cc1
 MISC metadata.xml 422 BLAKE2B 355637378626ba2565f00b9f43e3835e81c680bc7d8cc99486b95140c935c694d33ea85b8a0b3488ed86a7585c06ebdc04c1e14223d05b6e14bd8087098ca0d2 SHA512 eeddd0b22eede45804e7a2f1554c1c8ad7c67a96295fdda98650d21cf62277f7cbb411cd938d7a58f9f1162b69efcc74635247a206e73acc173ccf44987a2955
diff --git a/app-emacs/bm/bm-1.32_p20140214.ebuild b/app-emacs/bm/bm-1.32_p20140214.ebuild
index 353004bf2c20..559611b49d1d 100644
--- a/app-emacs/bm/bm-1.32_p20140214.ebuild
+++ b/app-emacs/bm/bm-1.32_p20140214.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Visible bookmarks in buffer"
-HOMEPAGE="http://www.nongnu.org/bm/
-	http://www.emacswiki.org/emacs/VisibleBookmarks"
+HOMEPAGE="https://www.nongnu.org/bm/
+	https://www.emacswiki.org/emacs/VisibleBookmarks"
 # snapshot of https://github.com/joodland/bm.git
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
diff --git a/app-emacs/buffer-extension/Manifest b/app-emacs/buffer-extension/Manifest
index 2b751a647113..3071720bffb6 100644
--- a/app-emacs/buffer-extension/Manifest
+++ b/app-emacs/buffer-extension/Manifest
@@ -1,4 +1,4 @@
 AUX 50buffer-extension-gentoo.el 80 BLAKE2B 8329957627093470a42d5839e03cceafbd1e9639af9c6f2b3f08cb0c53705a23926cb9e7d0c22aee7a7e7f0280fd76e80162f4037d74f30442e991f2fbd82d70 SHA512 e3f1534344a9c1cca133f93fd03024a5dd9867823358bf83beb81cadece5488054bac378fbe947c9a1f71b085381254dacc6b7e7c3a18e8ad72cebdfd41fc2d9
 DIST buffer-extension-0.1.el.xz 2472 BLAKE2B 10e6cbbe3075871c79a90dd17cd20fad15c9a12f5778758f94e6c509fdf5bb96a17ca0069c1420f53a320041ec5634034ea199e7515c8aef2c0f4808c376b259 SHA512 fef6380a7455fab534563da44868cbab2a54a793e7c86142171940b6133c4e8a9d7008c7f1297568135071eb4f1936f67ec6eea4d2f0a450be5337d97cd0139c
-EBUILD buffer-extension-0.1.ebuild 588 BLAKE2B 97b244033d47dfe88f006f957b4507dcd2ff830c7a38a5197ebad57f24aaf485981d5ef312a187c85b04c0fedcf7b8a06afa00d04eb27c04f322666d27162d88 SHA512 099d16974743288f4b4f3b2253f415990736fbb3d69e643c6ea795118b795cff4e30570b746aeb6c2e2fa8bb31fe781750202ef4d6864efa9df21f44ae0e620a
+EBUILD buffer-extension-0.1.ebuild 589 BLAKE2B cf13c0b54bcebf874ca7fe058a56f3b3da5e19aa571731ff813c569e51adcfc6b7581e48bf3dce5a18df774b19cbbb5de5315fb2c7209e23dc5b5f16f9c23891 SHA512 ccb5c1256284b2def4b2cfd3f0e538c75e4b2249f1c1c4f4d693eb6cdea361564103bca1989a8e6ca77a1edd36b4a68d829367dc1430e39e9065f9825c3a157a
 MISC metadata.xml 502 BLAKE2B 4dac1605efd516c5f2022e7ce565c7506347c079ce0d5264b0f48afc117b047bacae04eab1c27eb7325ead526323adf68283ecd1ce81ebef3a0a810b6db7bf4d SHA512 f724d92a7f7175662bf579315df437eb9b220dfe58ace4a37f72d4705e84435248115a7a09c017b3b491464e69c7b9fc498a8bf9a004b2a5ffe9029746fc4eb7
diff --git a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
index 681419847dfe..639ac1fdc1ba 100644
--- a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
+++ b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit elisp
 
 DESCRIPTION="Some enhanced functions for buffer manipulate"
-HOMEPAGE="http://www.emacswiki.org/emacs/buffer-extension.el"
+HOMEPAGE="https://www.emacswiki.org/emacs/buffer-extension.el"
 # taken from https://www.emacswiki.org/emacs/download/buffer-extension.el
 SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
 
diff --git a/app-emacs/color-browser/Manifest b/app-emacs/color-browser/Manifest
index 3749bb8a916b..b7663e06e1ab 100644
--- a/app-emacs/color-browser/Manifest
+++ b/app-emacs/color-browser/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3-gentoo.patch 2448 BLAKE2B 853507e2c5929cf47635c1f7451a8a3b7d7e4889bd07dd078436d511b699b0884c010f7b76cdaad168139bdf756c7bb50f8f97f5b3ad24595a06e0720e7b853e SHA512 5ba03d5b240c8462e932b3eca044d4af8a17a7f737a66db6605037a5bbd1f9273c5ab424da65b5d2419815fc7b8e955963bbc9d909c07560e2f6ee392fcebe2a
 AUX 60color-browser-gentoo.el 228 BLAKE2B e729f35f0b5ba9c07e4fbfbfbcd9ab8d4a187c7e2a19d532f2268db2e7fd613f344ee101b199c4c0400a49f4556b25139bfe60b67ff7f6dd83f9c5c72e5b4e17 SHA512 69eafe2006964419f61e0e37c6d0a41aea0ee29efae2161e7789a7e5b37fb634dc55dda758cbf96923172c1efc10166d9b7051d8f88a838fc0407a9f547abe8e
 DIST color-browser-0.3.tar.gz 18685 BLAKE2B ffbce159134cb896e2c9b53fd8348e7e35171392238bbb3648ceebe28811046f4e53ba435740873aeb73c83dd793b12b2429053ca4e0d7c1957caf86c90eac36 SHA512 76648adbd1dd990ec513ad9a239e6ed5ba86ce29a689e74f669b943498dadf14d019eff81a416ca574e78f031dbf14ed9b1e467a3d197ff559f75b67033ca2d3
-EBUILD color-browser-0.3-r1.ebuild 461 BLAKE2B a7c24c99c8d53dd45abd3f1d73a6133d48cf8b0caf60ea6c6bd8396431bf5c3d265f68ee5813ef254ba5728458e64d77d59c7f1228c9e6881b0a91e7c963abd6 SHA512 2eeed39b24f537c5f41e0a57c11d76275403cc90672bd64e60c26d5605e5eb7a0d198690191e5dd23c682e1d60c8c70479b2f701d6509da475708f65305a5bd9
+EBUILD color-browser-0.3-r1.ebuild 462 BLAKE2B 09d1f0e80ddad89c62a72c377f05c0c7dd26e352f97fafd12fdc398da1fffcc2ae58d144d17323e07071a6c5f0560ab4734a6254cb2f52ba31487c1ccea62fb7 SHA512 44038386c64ca1212b2fbffa0cb7318625152701e67c974a44e00646cb372595738963c6a4484c291945a2b80fdc67c52a0631f840e9e6bfaddbed2c8eb2fc8d
 MISC metadata.xml 651 BLAKE2B dbaf92b4ba45b29d0022fe11035b16d081158515387bc9b70eac4b0d6da5eb25a5b4a636472539777eba6814c7794006c557f40039dd9880d16d2862871d5be6 SHA512 a42a91f79a42da4933fa0c9077c60ac8ec6586aadbd6760ac0439404516c6325eed37eee7ca2ae4914279f05d81164c4e08dfaf2e4b0690f77762a173e7a5571
diff --git a/app-emacs/color-browser/color-browser-0.3-r1.ebuild b/app-emacs/color-browser/color-browser-0.3-r1.ebuild
index e3c049e7b0fa..397f6862b0c4 100644
--- a/app-emacs/color-browser/color-browser-0.3-r1.ebuild
+++ b/app-emacs/color-browser/color-browser-0.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A utility for designing Emacs color themes"
-HOMEPAGE="http://www.emacswiki.org/emacs/KahlilHodgson"
+HOMEPAGE="https://www.emacswiki.org/emacs/KahlilHodgson"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/color-moccur/Manifest b/app-emacs/color-moccur/Manifest
index ed2ef840f76d..aaa49d22f879 100644
--- a/app-emacs/color-moccur/Manifest
+++ b/app-emacs/color-moccur/Manifest
@@ -1,4 +1,4 @@
 AUX 50color-moccur-gentoo.el 259 BLAKE2B d09a385a19d1b0f248cb9130007b0133da099900d86b5ff9c6e1a3fbdd87badcfa1710d7e47b023bc7c08bc1421edc08db8d74918936be514880c5b4f8d8a79c SHA512 f1a28440e2f671366dcaef04a10ae79d6df93c5b5b011d4df4316d25c3e03dec95015d54417872c76cf39457b1899202d16f192f69345f28367ba31615f3fd7a
 DIST color-moccur-2.73.el.xz 22252 BLAKE2B d7d6a1ff291c44cfe4ec2597ac0f27c63d7f953f807788eca00e74d8b50910cbffcce9076b136c27d7ebbb14a3743cab40367791e7607c439854a1b6baecea6c SHA512 15ce4c9776e5a5bb273c31b8552a8f434a2a4065e874ee558ef2b9dd19ccda6f5807430e7588c4e2e1add8d0d94dba3e19be2745138ea440d4ac2705efdbf528
-EBUILD color-moccur-2.73.ebuild 451 BLAKE2B 77ae2cdea35d5a9b6faa20d54bece33e76893c67c3d44d2a6c52f14ba16de8f55268ab5e1fa597cb79d249ae8f1b06263085790b5a7cf1102b308ce21ce8766b SHA512 3d5e818ddff6f1d9dfa3eede016ef5715234958f5afb763143c12565c7bd533b65befb8b6a1919255fc32098c992002d8df7d7cf410ef89491408c3939d66d8b
+EBUILD color-moccur-2.73.ebuild 452 BLAKE2B f546d02a6e62dd2ffa3f8d5ea43928cc42ef74dc31b35195c6d1c2fd2d46f0ab63d433b3a6a196a58880a577699ab03e8f86f2a57a24ed66cf1fed5169dd7f95 SHA512 6d8b3fe45dd5d9e9f7f3777ecf4dfb90dbb6118bbd37810ebfdd43dc7d99e9433cc7c11f2d023201906d636910582be44ae263ec89ce33d17a2daa33ba219e5a
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/color-moccur/color-moccur-2.73.ebuild b/app-emacs/color-moccur/color-moccur-2.73.ebuild
index 9eefb4eb377f..b8db1bfbe640 100644
--- a/app-emacs/color-moccur/color-moccur-2.73.ebuild
+++ b/app-emacs/color-moccur/color-moccur-2.73.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Major mode for color moccur"
 HOMEPAGE="http://www.bookshelf.jp/
-	http://www.emacswiki.org/emacs/SearchBuffers"
+	https://www.emacswiki.org/emacs/SearchBuffers"
 # taken from http://www.bookshelf.jp/elc/color-moccur.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/crypt++/Manifest b/app-emacs/crypt++/Manifest
index 418da2e0b3c3..f73b9a92d64e 100644
--- a/app-emacs/crypt++/Manifest
+++ b/app-emacs/crypt++/Manifest
@@ -1,6 +1,6 @@
 AUX 50crypt++-gentoo.el 57 BLAKE2B 5e62ba7f3832ceed74ecbc3680442bfe260f2a7244416016cbce58e6105aabe0d30747b57671804d8c38b75fa90fc53db3d0497108507f1859f265925c2492ab SHA512 3e7407aff3b5639f78eba1af624a370316488b33e824138a55965537eebbdeb929a4b65d8f9cef23f414fa8509abf19e951eb71b8f1ad2e9b809a5590c15fbfc
 DIST crypt++-2.94_pre20080430.el.bz2 28692 BLAKE2B 2b7f227b87b16fc6b3fdfdb62059a55c70ee95008a144bc7ec0e8c3f5699ec2ba14989b8ae2da3fa7c4bb56070eac7ea1755caddfd27e6c2a53e8a62068ca6cc SHA512 8e142840f8e2db4688e9ce4432ee14db4225899a88a35dea3e371f829ccfc24faa34c607517e344e7706bf75126d758b0490dd5324efa43d4649de127076a5ce
 DIST crypt++el_2.92.orig.tar.gz 34251 BLAKE2B 579d44269ec84a9548e9e4cb845601027be3862f2f56a2ab99b3c46155f6839c7e5b9426c97ea12ac936df62fb533f5424de8afc7df6983f339eb166b6df6486 SHA512 d3abf169f60c3d1a270149b800d96f7132ebeb99b6952858b81cb2c05ffdce30f6c46f75723490731c47e7eb44515554e012da98351bbd9f9127dcba8453e389
-EBUILD crypt++-2.92.ebuild 446 BLAKE2B dbf6eff167ff43045d5c697a534fbb51e347cb9c01d4b88f4cb4c517ce84f5438e1edc747a8900658e1fd7f69ffbe673405129ec15756325efaf774ef95ed01e SHA512 236d0c4dad986195bd3f1601d201a963e5a68cd8e9673feb44ebefffdcf2a6109bd9f8d0fe5d5afc731cacf5a7baba80aa0359e1fc6815fffef1194f7b7d9ad0
-EBUILD crypt++-2.94_pre20080430.ebuild 504 BLAKE2B f1d4817a3cc852d09add9393fe35700094c2b11e039ee48c937e05bb2d0e3282605ec0b22229ab1c1e2bcf28124831b92265c78df2882417920a4fd2a4b25e49 SHA512 da5ff4fbda78aa95c4c92395d0d077e34d89a4bdb53bf51e5f30854fc3ccdbfcdc36d0f0f7e00773cb1bb91f5df3e1164ccd52190784e07e9ecbe18214b9826b
+EBUILD crypt++-2.92.ebuild 447 BLAKE2B becd2bd3c43b622e13590a021252bca5ece53dfd1e0e3510f52f8977e094ef7b37fc3034d1b6e3e2270813a704473cb000e9901731dc0ae40d0af154089ba109 SHA512 c23ad4ce87ecf9954b93df6ab1d3cb8fa1a5c6c389867ec72f45b00d2c84bfcea4797ecb4b24345362083b4be8256cb51b4eef88cee267f988a754600f4cbaa9
+EBUILD crypt++-2.94_pre20080430.ebuild 505 BLAKE2B de2acd1603001914b78c43b906268b5085743918788c8eaaa7bae8d23ece9c32dc89002e3f2b873bdf296da0948b7b955417281d687d71df3856c9c44b8f560b SHA512 c7608028665138365b308a9d146f251f47bee2d82ea67ff6a324c8be8248796da1b8988c1e5670376088eb3dabb4a5aab00654ed1706feedd0faf2bee4b1992f
 MISC metadata.xml 736 BLAKE2B 445f8358f6952a0e6ff89cd41c45a8ca54b7926c8ca1fd277786471e85c83faab7a269ea102fae22642270c5479e29ef564f64591d83ad149a6ed3fcc2cf6304 SHA512 1752b40946cc5811f75c1e7397c7fc004aa5366ef9e7f547b95d613fd32cf76f9170207847feeb80df139d570c9bf2a30471a3c95e455a21158b82e0cc230699
diff --git a/app-emacs/crypt++/crypt++-2.92.ebuild b/app-emacs/crypt++/crypt++-2.92.ebuild
index 1e4c00682710..f28ba6418631 100644
--- a/app-emacs/crypt++/crypt++-2.92.ebuild
+++ b/app-emacs/crypt++/crypt++-2.92.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Handle all sorts of compressed and encrypted files"
-HOMEPAGE="http://www.emacswiki.org/emacs/CryptPlusPlus"
+HOMEPAGE="https://www.emacswiki.org/emacs/CryptPlusPlus"
 SRC_URI="mirror://debian/pool/main/c/crypt++el/crypt++el_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild b/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild
index f0cd28a558d3..b534e837c5d5 100644
--- a/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild
+++ b/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Handle all sorts of compressed and encrypted files"
-HOMEPAGE="http://www.emacswiki.org/emacs/CryptPlusPlus"
+HOMEPAGE="https://www.emacswiki.org/emacs/CryptPlusPlus"
 # snapshot from http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/os-utils/crypt.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
 
diff --git a/app-emacs/cycle-buffer/Manifest b/app-emacs/cycle-buffer/Manifest
index c5116b8c58ce..9eb124bb1b6d 100644
--- a/app-emacs/cycle-buffer/Manifest
+++ b/app-emacs/cycle-buffer/Manifest
@@ -1,4 +1,4 @@
 AUX 50cycle-buffer-gentoo.el 76 BLAKE2B 72fac6d037804f88aee631205aa0ee192c48cfe64a8efe5a90496b24b03429503d0010b9ee082181540d374c2ff9066425e35a3ef5fd6af9759264873a129527 SHA512 e19c819b054a961e3265c6bfc96f20bfc90ee9cfbdf78f30d86e211b168e4e4ccf94ed6ef8d52c08a37dee3202773eb1164f7d758572c943e3bb2de52fea3fbd
 DIST cycle-buffer-2.16.el.xz 5392 BLAKE2B 7d4b765da320109274605731bfc6910bf75ab4a0610f75d4dd4a4b45e03c7103a76bf0dedffbdb67831d0c8cb04f147f8c77757cb40b714c80a7bc69c9105b79 SHA512 344c07af9e2c9ff06dfa81ff44d02c1e8a9434381486c227a7af06c989e7c623b0f9bf547500b320e2ede7d181f0212725c03a84f53a43683ab3b8229b99a6c6
-EBUILD cycle-buffer-2.16.ebuild 519 BLAKE2B f138fc04c6397663047b500a4406cdd960499b6348f8cc82ac2bee382871ab873f7c8ee0e5b9362c24bc14b477a2dc22c63862c3a5a7b46ef494c8484fff8dc9 SHA512 8a6548e9184e7fbea6aced221dbae7bd7879a3bdde9aa3b9e8ad160bb0f23fcf9801447c593e91d014771cd170bfd6f6702cafbe85259126bb76f897e8eccecf
+EBUILD cycle-buffer-2.16.ebuild 520 BLAKE2B cb7e1cdcb7de409fadf3bb0e056207e6dd3c4c7373473c17d892ffb8ab264a9cbbcc63bc877114b37d32ffe7fbc1bfab6608772f9030b3b66c45c511e6b65537 SHA512 29003c5ff1d0ee68df8ca4b14aa406302eaf1764854f8694075e8a255fda26e9302bb9642560469ccd36c1427a8935815800513dee03d86dbbe3373b55524719
 MISC metadata.xml 502 BLAKE2B 4dac1605efd516c5f2022e7ce565c7506347c079ce0d5264b0f48afc117b047bacae04eab1c27eb7325ead526323adf68283ecd1ce81ebef3a0a810b6db7bf4d SHA512 f724d92a7f7175662bf579315df437eb9b220dfe58ace4a37f72d4705e84435248115a7a09c017b3b491464e69c7b9fc498a8bf9a004b2a5ffe9029746fc4eb7
diff --git a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
index c832d4dfef1f..9928f250bece 100644
--- a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
+++ b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit elisp
 
 DESCRIPTION="Select buffer by cycling through"
-HOMEPAGE="http://www.emacswiki.org/emacs/cycle-buffer.el"
+HOMEPAGE="https://www.emacswiki.org/emacs/cycle-buffer.el"
 # taken from https://www.emacswiki.org/emacs/download/cycle-buffer.el
 SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
 
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index a01d9eaebdb7..b318767fdf2a 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -1,5 +1,5 @@
 AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562758bcb7c3fce318ce6c72eef12201c9b332ea1309e4f4a20a6ea3051b8eab997413af08b4fc52fe1339 SHA512 12a89496192f10a221bf3be386339dd2494304f5e0e8c8ebca1d9e622b5304609b01370d64b009120f333794a41815fd73124114035e02ce53241f58e9968546
 AUX d-mode-2.0.6-emacs-24.4.patch 323 BLAKE2B b24721dbd61cd5fe330e81bdb44258ce3e25e54ebc0215ed3edd28e5fdf282100c860e811a70868090288d780df925561c252c1582be7b26ae71ba905662c19f SHA512 254fb7b91ad4e355d70ab83b4b597293935d2375d895a78adc03155a69a2288a0bce2b9dc48244dfdbecc63d95724db50622e99ebb0562ad41cd6e828a4ea314
 DIST d-mode-2.0.6.tar.gz 5465 BLAKE2B 4ccb9341ac25c4856c1dc3ce7a7acc68942fb7ce3dbb6818b2fab6de843b6f6757907e994d2e777d0590b8ae26fbf4483eaa7d1b5e0ab7d635047ced4a276c60 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2
-EBUILD d-mode-2.0.6.ebuild 542 BLAKE2B 8f86b812be53c78fcccea359fe40c969e99d04b729a66a98d956460c2cd6e479bf616ebe6c534ff91a6b3360d2a7dc6a2fd66d173e266ad3a0f07a16f6e559db SHA512 b93e3cad2977cb1c1dc34c55985d7db96049424a075a3e16a39ed1325547324eb240c63eed4f0826f1190dfc4f10473cdf3fcf42a66f6cb36e336da94b5f4d33
+EBUILD d-mode-2.0.6.ebuild 543 BLAKE2B 37d9237b49b518888045033fa09548dfddaca372b0420c9d73942bc40b89f830e35da76a0040b53ea90737fbe04d51ef1ccabd6ce034b6dc4e4d315d94a9cd6f SHA512 d01e8cf839d377eb7195af98aaeecf00bca0b65b6bc1f3500bda3342f4c362f8c30745bba52f6c672040ab515cc512c75e1b379ab6c13b453085e83d1c5e485b
 MISC metadata.xml 359 BLAKE2B 3d00312401c70d2a5052c340f3eeff027af7959f639c0ee5bd6b3413422097b37c6693c4bb9721c591d9387018ed15e4989b5e07b8d5312feea637a63cee337f SHA512 220534c27e069ac9b0740c33e0cd00545b61dddeb18fb9ef2575e977e00996e8644879c9caae63b67fed881953d6666047d280cec1fbb225861278e2e1d5a5ba
diff --git a/app-emacs/d-mode/d-mode-2.0.6.ebuild b/app-emacs/d-mode/d-mode-2.0.6.ebuild
index 721ade3bf710..04e0ae831af9 100644
--- a/app-emacs/d-mode/d-mode-2.0.6.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.6.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Emacs major mode for editing D code"
 HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
-	http://www.emacswiki.org/emacs/DMode"
+	https://www.emacswiki.org/emacs/DMode"
 SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/develock/Manifest b/app-emacs/develock/Manifest
index bc49d5bd8d67..096cb555dd15 100644
--- a/app-emacs/develock/Manifest
+++ b/app-emacs/develock/Manifest
@@ -1,4 +1,4 @@
 AUX 50develock-gentoo.el 141 BLAKE2B 01c017ba62c65d76dec01e4af0462bfb4030ff70f1cb085077263a19d96ac464684c3fa667822bb2d908f233857c49bc7eb66cd4bd470114ac1fa6841880b98c SHA512 8d6c1e118e4489ac2dfabe344f77491707bf3b9fbbe5a96dcd0f91a363d67200cd764c560c2722e857fc116cb89b404da75015e2086870690305419fd07dc2f3
 DIST develock-0.45.el.gz 13627 BLAKE2B 8c67a46ae7eba961fd64b202128ca19da54251d1079bb4c9091c2b99a6dd6d3f42f1273c5d7ffd371911af3fb3b64e723f6a6d0bd432a1c243701d8ad793bf64 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e
-EBUILD develock-0.45.ebuild 501 BLAKE2B ce5ed660c6226c5f4fd456e8a98fc29c03747e19dc389bde382861e6a748448aa2fdcfa7b28777d676ec492246365b5481e5fe2546246d68a616d41624f786c5 SHA512 413d7762684e485a1f9ab7123832c4e8f8bf15d9899dc272c38e4bf5f6feb999b510d742c3bf22e889711ab19114f882cd79c684a94ad12400c126788e10b549
+EBUILD develock-0.45.ebuild 503 BLAKE2B 2a858dbe5c9acb75ba808142b690cf530e42e9b95d1d1fc2e3aa53373b8c099757c5c99595701ffa25ff03c60babe06d9b4533e78feca004c6f6be55147d6ae8 SHA512 e01d26533631eab1c78f5f67118ed197c6d85430806cefcb61d87b8c69b4a885624255b141a42de694cd85d25742df8740c199d6f46e6a0bb2c6bfafe376f454
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/develock/develock-0.45.ebuild b/app-emacs/develock/develock-0.45.ebuild
index 95b70dbc454a..ba0d360dd591 100644
--- a/app-emacs/develock/develock-0.45.ebuild
+++ b/app-emacs/develock/develock-0.45.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="An Emacs minor mode for highlighting broken formatting rules"
-HOMEPAGE="http://www.jpl.org/ftp/pub/elisp/
-	http://www.emacswiki.org/emacs/DevelockMode"
+HOMEPAGE="https://www.jpl.org/ftp/pub/elisp/
+	https://www.emacswiki.org/emacs/DevelockMode"
 # taken from http://www.jpl.org/ftp/pub/elisp/${PN}.el.gz
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
 
diff --git a/app-emacs/df-mode/Manifest b/app-emacs/df-mode/Manifest
index 83325e436b45..2e34a4604bf1 100644
--- a/app-emacs/df-mode/Manifest
+++ b/app-emacs/df-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50df-mode-gentoo.el 74 BLAKE2B e822e639fc1c01f43c4e63b6c9856bcf2353b3251be008348b95be481370f167030fe1a05856bdbca7d146cb9f2656bbf32d3722958a2cd650870ef7d0a7588d SHA512 35de1cfcc792b7da1271bf2ff47b93c706b89aa32cfd77245ea4df15897b5797dfd529ba7c0e89b89acb7e89ac4d4651ba8de0f76badde8b64d45d622c1f4edc
 DIST df-mode-20050509.el.bz2 3867 BLAKE2B f5051cba3b14174017e20983d26cb847ee8daceaf011b0f37f246e4730dd12fef5ed67131a86909636af28f22780563e4c5ba8d282e0272bbf08d0a89cc308e5 SHA512 e4d248d7b1fa9c231bac7d8d478c65d796123234503372ca945f5b122e62d816676c9744d42f41b1c6de6716682ad4233eeb57801155760cf7e4d41dc0e7d535
-EBUILD df-mode-20050509.ebuild 544 BLAKE2B 8e63443135e1bfe5cdad9e249648048b9a88ac38bac15b100d7158487d6abf694b45a02fe5cfd51b0995c0923f8a544e2e4008a7be96350fb3961f241aab2d41 SHA512 d66d68991af54e4e50e608ba058da2f0726f9ebb2e0aa1c318c0d921f5ef5dd64384a53b839a9fe66a714ecec0ac8ab4a9e23db0c9d34ab7de0a065cc4cbffa2
+EBUILD df-mode-20050509.ebuild 545 BLAKE2B a7131dabc13d3687fa96eb5943e50141968f1bf6836cfa2ebdef163cae9449ef69dee8e9eb671fd3464491002da99e20eb267f5f379346e5dc606d1b388e2d1d SHA512 b6c10bc8055277a67b3d2f713c2ad554bbba85383eeb72b2b7a81b291bbc88beeb293f2fd738d353b8156152ccdeee2dab1d833cd47aea39599bdf09d0032242
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/df-mode/df-mode-20050509.ebuild b/app-emacs/df-mode/df-mode-20050509.ebuild
index c846e5b1cffb..c46eb76c2460 100644
--- a/app-emacs/df-mode/df-mode-20050509.ebuild
+++ b/app-emacs/df-mode/df-mode-20050509.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Minor mode to show space left on devices in the mode line"
 HOMEPAGE="https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html
-	http://www.emacswiki.org/emacs/DfMode"
+	https://www.emacswiki.org/emacs/DfMode"
 # taken from http://www.coli.uni-saarland.de/~fouvry/files/df-mode.el.gz
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
diff --git a/app-emacs/dired-sort-menu/Manifest b/app-emacs/dired-sort-menu/Manifest
index 4f922ab9d394..cb0d42e3319e 100644
--- a/app-emacs/dired-sort-menu/Manifest
+++ b/app-emacs/dired-sort-menu/Manifest
@@ -1,4 +1,4 @@
 AUX 50dired-sort-menu-gentoo.el 108 BLAKE2B 3c5c9399b4e005090445f758f6735ec2e0336ea823ad3148436455593b7b5db704d4d967267ccc4c019ef87e669e927e4c3ed81055a4f9c382a54842667cf834 SHA512 58400af888ca10b5865b993d1086174d8a79a19c4db6190ee3977b49579411108841dfdf86ae6ed781742bed5b931645a49f1a5ed8a5385f27b809c8a3ea1a43
 DIST dired-sort-menu-1.26.tar.gz 9770 BLAKE2B c594e8577ab78ca376056ff1f6afc23f61a5a6ce8b0ed914d71a91bdb9bfbb77e4cedf1e8db81bb9afc56e346305f587bdc83e8c6c3427377a3370bdf92f27a6 SHA512 aab746704636c01b7319574274786ce4bdb36e94b738a8cf2fdfd22aaddf8a68d9ac274a0f6c34caaed505f8ccfe8ad932a64f560d2e312ac161af528d63a577
-EBUILD dired-sort-menu-1.26.ebuild 394 BLAKE2B f168d54dd67327e8b1cb36ba6dc47f47b28d3a379ede019091a1d954101cfab1e8f8a1b26638a1c460d981592a3021f1cb8b819011ead0cdb47dae25edc4c8b5 SHA512 faa944d6714c23a28b22fb0eb197b19f751c6ba803f87b95d457e662714705cfb24bf4a39c0cf644bdd164495b2d8f1ff93b41d91f7a6c23357817e3cb3dc987
+EBUILD dired-sort-menu-1.26.ebuild 356 BLAKE2B 511613eaeda9c2066f3d55aa457cf035083b45458f03cdd965c093ddd01ff8da5463a65646ef9251dddb2b64cf92c551864f60aa238d44856b8332c44d8970f7 SHA512 1b901acf1b1a817dccb45538b788080460ff81ba3ac429eb02d1625839c44956efd900749974213bd9a7293f986cbe5afd6c89bcbbc78a7a67200f508ed8866e
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild b/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild
index bf769680d870..4f71b4366131 100644
--- a/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild
+++ b/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Sort entries in Dired mode"
-HOMEPAGE="http://centaur.maths.qmw.ac.uk/Emacs/
-	http://www.emacswiki.org/emacs/DiredSortMenu"
+HOMEPAGE="https://www.emacswiki.org/emacs/DiredSortMenu"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/dropdown-list/Manifest b/app-emacs/dropdown-list/Manifest
index 1eccfc536505..0a46b287c10b 100644
--- a/app-emacs/dropdown-list/Manifest
+++ b/app-emacs/dropdown-list/Manifest
@@ -1,5 +1,5 @@
 AUX 50dropdown-list-gentoo.el 80 BLAKE2B 1436cae45270d53081bdad97ccb4c013658e4d0464a99e2dd2a8a5d6a7aabaa9ab30e64cccf515980362db6355e1421629b018868d60f47164cb90462c0329ab SHA512 38187bab921b29bdcb2c9e585660f6fab519ab1ab286aa2e848b670e5087578d361d8edf81ac32391e98133583148cb830cd69f67dc7f1d1049cfdb636abb497
 AUX dropdown-list-20090814-selection-face.patch 382 BLAKE2B 9979e1246d15d07b9c10de7d2edde12d75af355519e419108560067276995c18534fafccaccb8c79f97ad7dae9b8975ccf996fbe0f5c33357b532fc6f9dad827 SHA512 197941c2aaf14862d1f6405836c577c9fb1aac32f7e6cd18b44aabbeaa0e84036f752fcd56c7324d922bfdd14684d355689d60d1b91140f758d080246acd6dcc
 DIST dropdown-list-20120329.el.xz 3104 BLAKE2B 37d240cad53bf2062b3877f4d6118c6f1fedd28da68f7e4d7ffb9d38492a5805f7e01c5d640770e40ab271fc007fd640fd9500d15c208f9c5af79c01c19b9330 SHA512 fac1139c1339cb94be6bfd2c0e6adddfd1851b55aaba6112e0c451e2666f22cc0fa9013d5cc03bb86c6adf3e4f076d90975ab8e59546956d753cd9613309919d
-EBUILD dropdown-list-20120329.ebuild 420 BLAKE2B 8358d90d0b6c03024e36c21ad5e0a2d0ec7343090899f695ff709c814052b3660e39e216de051b9e7ee6cf65304788f977f7983b080d9ad5d739c29ab57d6ea3 SHA512 bccea3da2f7107b011a93df56a2770b1a4c6e7949e33d85a8a2306688de2edeb3efb1f9ed0d0cb0b6cf35ffcadb2e68b760b6951dbacdd829e7d087fb565e310
+EBUILD dropdown-list-20120329.ebuild 421 BLAKE2B 82cd66e33c04192b497276a38a0e15fa6123e9e2b4b8333082c5609542058eb2c93ddcb50a9c4a60a4131e3154f13d911a7ae6129c0f5e109db60fa0b43aeacd SHA512 64a535a27df11f2b4246abd11d3f9bdfffd930d518817191079adecab5be77eee8244b540af0836ed7ae09973e888dd6821cef6535ccfbf58c8013138ef90c8f
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/dropdown-list/dropdown-list-20120329.ebuild b/app-emacs/dropdown-list/dropdown-list-20120329.ebuild
index f95ba8f7f3c6..0518265c4411 100644
--- a/app-emacs/dropdown-list/dropdown-list-20120329.ebuild
+++ b/app-emacs/dropdown-list/dropdown-list-20120329.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Drop-down menu interface"
-HOMEPAGE="http://www.emacswiki.org/emacs/dropdown-list.el"
+HOMEPAGE="https://www.emacswiki.org/emacs/dropdown-list.el"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/edb/Manifest b/app-emacs/edb/Manifest
index 62c4dac80fb0..95fb25da4d7c 100644
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@@ -2,6 +2,6 @@ AUX 50edb-gentoo.el 212 BLAKE2B a56c87b00e29d06901284a20f2458d32608d54f27737b9c6
 AUX edb-1.31-skram-path.patch 396 BLAKE2B 90969cc1acdff236a2494312fb536b1acb7e991e605dd698cb2e5f25405b3a8bf2866d868d7bdc49c09546660c1cefe09fea63bc09709ecd31d3c37194b56ec8 SHA512 f54d3b6c3483a4765dedf60f6cad6f3c1247845ff116f70be791e3ad2674e1352f204a5d865142d70d4bc9c82e25d42f7fccd2b1514aed46e6dbb391002eff8f
 DIST edb-1.31.tar.gz 585728 BLAKE2B ffe1ef3171724b1c608d347393955615a48737230f7493e22c48504134682d1c73397e1e559708f16ab2284a17b4b6baff7dbb15e255511b6ed5d07d6a22e249 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3
 DIST edb-1.32.tar.gz 692581 BLAKE2B 3f77d6f9d6550ce1c064dc0820fdc9a24293964900d4f390ad1456e79f42444d7c9512585cf230d742e66360011e2e314446748e23395bee1e7f8086c38853b7 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0
-EBUILD edb-1.31.ebuild 782 BLAKE2B 4b6c0c6d98b0524244c5a8eac8815649ea0b923908304a3d21fad11b57d3e5e79f8e4d55e4dc26afa069943732357b33e97f9f04c294e6e8887985edd4586bcf SHA512 5f71fd38270ea852387f5869fb3a192a3052d76676d06e2a34e9fc3b68cecba42aa2fe6673949ef366ff220697445d4a13df99d1980b68d2ec0d07bb0e6fea16
-EBUILD edb-1.32.ebuild 744 BLAKE2B b03b6d288db6a6aec104e29de7d14cf934776956a13f470ea6dc416617d60e5ed7bc7bc0a4c92d12ed0619e7db2b02487458b539cbaff5b456b38a6c9380c3c6 SHA512 490af965cdd4e8d8497c564b80922d886333025948fd2baab24dec5cb8c70a7a15ad7666c9f0a1a01bf534067896abd2fb1414f8828520b9c51148adab607845
+EBUILD edb-1.31.ebuild 783 BLAKE2B 788badf399ac23d39dd3a5494c24b74ccb663175220359cfffe44d336b601ecb34438423bde09cbe076e8d10399e30c317630c236198afcf2de743a7bff4d45a SHA512 030d7a4378f971e02de0fc4fd661c97c012b594ed164c37606c4f6e79bc4ec6c600cc4b0684c24e48f3509f9f5a05bab692077d4231f1f7f0e117a16363473d7
+EBUILD edb-1.32.ebuild 745 BLAKE2B 7414162ff1e3c34cbb3cb05db6e685c348e2700054b991056512135a06da06e0af0fca5b8f4603b41b6dae03ae462962e73ac95b2a981a4354027cba7599ebd6 SHA512 e2c8e63bef73b03eb1d4a8de56dd80c5f8799e559808a59acc8b90ca6297bb1884ffdad6ffd50eb6e4723ef8f4df2e76bdb24655b30615336682540bb4f8e9e4
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/edb/edb-1.31.ebuild b/app-emacs/edb/edb-1.31.ebuild
index db5282db439e..f635e268cc2b 100644
--- a/app-emacs/edb/edb-1.31.ebuild
+++ b/app-emacs/edb/edb-1.31.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="EDB, The Emacs Database"
 HOMEPAGE="http://www.gnuvola.org/software/edb/
-	http://www.emacswiki.org/emacs/EmacsDataBase"
+	https://www.emacswiki.org/emacs/EmacsDataBase"
 SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
 
 LICENSE="GPL-3+ Texinfo-manual"
diff --git a/app-emacs/edb/edb-1.32.ebuild b/app-emacs/edb/edb-1.32.ebuild
index 5d8388dc1c10..48f3028985d7 100644
--- a/app-emacs/edb/edb-1.32.ebuild
+++ b/app-emacs/edb/edb-1.32.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="EDB, The Emacs Database"
 HOMEPAGE="http://www.gnuvola.org/software/edb/
-	http://www.emacswiki.org/emacs/EmacsDataBase"
+	https://www.emacswiki.org/emacs/EmacsDataBase"
 SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
 
 LICENSE="GPL-3+ Texinfo-manual"
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index c0fbc54b7aee..167aa6fe2dba 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,4 +1,4 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r1.ebuild 3150 BLAKE2B aff10a23386c9d2cc3d356aa844dda5178b7973422793240f1eaf7250aa43ad69d1ab687abca10fb6d2971276cd88e15775cc7b3c526ebe5d01a1d667245ca5e SHA512 51a7e6afa09eee4f1b16c53117da37ff63512dea99506a412fb91a862002a06f872c1a18ba0d7451a931b3388ccd62e1082dcb763a1f27ce9e52e3fd97bfaaec
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2887 BLAKE2B cbbc4e8f0ef4e20dea5e990e55fd555061d81b8842b56d8122369f1eaf98588c16bff9d49ade3d9508d7a72ee23ea42b9d17aae3d1a1cde4e06d74b733c82859 SHA512 8dec173d096f8a6d654cfd964b04a31b3a48bd47037bba82c328cecae0ed3efceac2833f52b89d686a823f188e44427be27108e037a29f137ee941d702fe21dd
 EBUILD emacs-common-gentoo-1.6.ebuild 3150 BLAKE2B e98543f1db21c3f9aba5bf02e3363c2e935ab2b4b829d07abc77a39e1660b6da55c2d3ea2d1e6f0ea810bf443ffc50476a4a69b40f3be98e1a5cc280af36c96e SHA512 690be3a0a5daf9ba2d812e36db2be905c53d292e4cc9f8cefb9d31b03e49961b68603ee8ae1a3cb4e230697825dd2c3f40b3e2ab9c92f21f6a1984b34e4d1af1
 MISC metadata.xml 337 BLAKE2B 4eb067768aa32943a1e7c0cf4fe8444a64c41b05ce7397d088a2f38d60fc2a484d7df5d8b78761a836d647ad005babc7ee8404ea112f7884b8918863eea2b8c4 SHA512 4fca91d99b7d069ef8a7b1ca182f8eef738817b3ee9a2540549642f21574fefc70eee2f3e0e000c3ee860983a651470b5aecf1e126b2cc7465defd708e608ebd
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
index d9f2fb9b4503..5aa9b9586051 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-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
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"
@@ -87,13 +87,6 @@ pkg_preinst() {
 			chgrp gamestat "${ED}${f}" || die
 			chmod g+w "${ED}${f}" || die
 		done
-
-		if has 1.4-r1 ${REPLACING_VERSIONS} \
-				&& [[ -d ${EROOT}/var/games/emacs ]]; then
-			elog "Updating owner and permissions of score file directory."
-			chown 0:gamestat "${EROOT}"/var/games/emacs || die
-			chmod 775 "${EROOT}"/var/games/emacs || die
-		fi
 	fi
 }
 
diff --git a/app-emacs/emacs-jabber/Manifest b/app-emacs/emacs-jabber/Manifest
index 02538cee8bc0..dbfb73172a14 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -1,4 +1,4 @@
 AUX 50emacs-jabber-gentoo.el 206 BLAKE2B c94ea17b7cab171249f24a873af06ef38b586a25870a27557255902a072b5d0995e14141f7d6a9648d9ba5bbe3e7887a319de67ba2429c9b840b6d2d5b29c8e4 SHA512 44c94b318b547689788c60d41ceb8b93ffbb479099fe94933636a9a91505abaf62bfcbddb145d34cb509d35dec3c0f62b2dafc91477a723ce6585a69f45a9cb5
 DIST emacs-jabber-0.8.92.tar.xz 293948 BLAKE2B 0de6eacb0ae1487a080a241e9ef4c38a98d96647773b7d35857e958e06f35906963947f7de836d2ea80a1935f96ccbc79de83ab88ce307085017ba229679f0f0 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882
-EBUILD emacs-jabber-0.8.92.ebuild 514 BLAKE2B 666b80a950640a7b4f17f6c5905492a8254cc695ed2c9756397a1092ef4e148be396f1d639b3471d723d0df1e27a27129f5898b2a95459e1ef47eef1c2d4901a SHA512 458eff078f5b5832732341486f21e92bf971c9805cfe1571d471a17730ae2863b2961019430ce9eba1c6bcd5986c78dbb64c8854762a241311450429beb9f326
+EBUILD emacs-jabber-0.8.92.ebuild 519 BLAKE2B f2efe6a49fa5dea71c90eed98cc300ed4631f04408c65ba1e8500aaa72eb469802c23b5af4d0959f62a90b3fa0d3e42e29e87a29e6701bf4019890ee3c316e84 SHA512 6442899fa24a02ecb13aaa69861880d866e29ab9d30919db4b7e096a6456bb681ef243eb21ca621b0add0b6b1f05ff44d394f861b41f7af2c3f4de476b8a8364
 MISC metadata.xml 339 BLAKE2B 45bb1ca9c946bf50e9848e6bbab698a9a241db519838cda0946e284782c6f0826956a6bede535b6d9676c41989fb001364cbe2d0a8310ba661f063ac72423a17 SHA512 9c140e193d540e1ab7e8e04f97eda630891452af8e16a2abad6ff4f107465f47d23196a46846330583ba431a55c7f0394fdc0589db61aa9be9da0eedc329f47a
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
index a3eeab5123d7..5ca41241e8df 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="A Jabber client for Emacs"
 HOMEPAGE="http://emacs-jabber.sourceforge.net/
-	http://emacswiki.org/emacs/JabberEl"
+	https://www.emacswiki.org/emacs/JabberEl"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index c9e6e8c0e20b..fd5fdf855770 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -5,7 +5,7 @@ DIST emms-3.0.tar.gz 200838 BLAKE2B bca2f720abfa79d8ba460115169660ef1c52be895d9f
 DIST emms-4.1.tar.gz 283625 BLAKE2B 4ec32ca724f414024ef26db1f93f573f36605b32530ace833d2f3b1a7230f2da374c0cd3307082d44372c201ac6fd8b8eec9da0938db1699437b93236bda5cbe SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107
 DIST emms-4.3.tar.gz 287153 BLAKE2B 2b8dab4f18ea7a6eb4e0b982d795d5f16dcdbe39dc091e6f6fe056cf1143b11620ef8ee4fc83612224c6674978747b8c96575e797f0779b6fab71f46f921f918 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed
 DIST emms-4.4.tar.gz 288922 BLAKE2B d86cd9124f1d92d9d91aa96c45f7fd5e86776ff5f15cfa5e139eb40bc72e673f394b3d5209e64da62d3ab02ef18d6ac690e1d4e4273f3aad9c53b7e5ac4e7839 SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba
-EBUILD emms-3.0-r1.ebuild 1015 BLAKE2B 0dba656720dc45c8a03c404d5a006f04a9de859a662a825c63be3011f74070db505aa2d5dfdf3127e25216268e8b47b02220f95a5c3eb5b265d1a118c24f1a49 SHA512 1aeb482a49dab0a35825a3e382393a54fa98e86716ecd6fe0ab8cae28189570ca90e7ec99acb719d860cd3ec8e6479dd287e8f016dfed70cc69196f4c7cbf776
+EBUILD emms-3.0-r1.ebuild 1016 BLAKE2B 07a8af942d47ab48e633979f35a7c6375d0db9a06a5c497bcaf7a1a9b9603ab678f8c92b39455e7f8c175ce7044910d12d7d2ca2fce5cd93a9b71392c6cf0a8b SHA512 8e8e8705b576c990ed90e71ad16f458b74876ce6796b337b326fb0e2d99af681b02fd795df4a49b8282b91ddd64359b195b669977169b4ba57f8bf2c1a1bb4f8
 EBUILD emms-4.1.ebuild 950 BLAKE2B 487f4e0dc9e6691f03e5253cf73eba3b0b450e0b03f6eb229a71959033cd2706de53318613d3bfda38721ea808f038b27f08d8841eeec4c99d269a44d6cee862 SHA512 1fce44cd0519199ea6f70ee847906aedf527a23f537a0a4f8a55ba2a2db198c955b6fa226cfa35d312f548a1fff4c1fb20cd51aa3e02a51ffec98d45bc8c845e
 EBUILD emms-4.3.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
 EBUILD emms-4.4.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
diff --git a/app-emacs/emms/emms-3.0-r1.ebuild b/app-emacs/emms/emms-3.0-r1.ebuild
index 62f2daf63eb1..0b9f95372740 100644
--- a/app-emacs/emms/emms-3.0-r1.ebuild
+++ b/app-emacs/emms/emms-3.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit elisp toolchain-funcs
 
 DESCRIPTION="The Emacs Multimedia System"
 HOMEPAGE="https://www.gnu.org/software/emms/
-	http://www.emacswiki.org/emacs/EMMS"
+	https://www.emacswiki.org/emacs/EMMS"
 SRC_URI="https://www.gnu.org/software/emms/download/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.1+"
diff --git a/app-emacs/flashcard/Manifest b/app-emacs/flashcard/Manifest
index 96bd0f4c37d8..0643e0abe389 100644
--- a/app-emacs/flashcard/Manifest
+++ b/app-emacs/flashcard/Manifest
@@ -1,4 +1,4 @@
 AUX 50flashcard-gentoo.el 259 BLAKE2B ff1c7488a6fb49b2144562d56712f306c8b0c64968fbcb272821948e8dabf17cd3d028f0208286ecbfa2972006b3dfdca33b02c3a2657b7562fbbb51a7e1d5d5 SHA512 576dfbf72f7d0b01ce80eb3e7d673daf8ebe5d7109dd32838008fdb9f7fe667f018ff1c086c4b3a4b2ffd6f134750b59e0236b307a1d5f0d48d7927d2c4e1c7f
 DIST flashcard-2.3.3.tar.bz2 10048 BLAKE2B 86c02a9cfae15a55302d8733f97203bc3ddd526022f47308ac58b489fac13d1bba6d362b62ff67dee767bfd33a60cfbb39d3c84f7904cf53d68f41b3ccdf985f SHA512 30d18b488549c8aba1c6e9320d10b8b566e1ff162bd5a072bb2ba3602111744d7f21cdc26fd48f7b427727c264c9017b1a8534fc402d3990d1f9bb0e0f54877c
-EBUILD flashcard-2.3.3.ebuild 414 BLAKE2B 43104c138cf2cb8e10f571419d550e1aaa2353e246ce362d665cb52d80d5a136be3972609cba820e47db1854b7498887618e13f5aeb8669d2d79207e1878f0fe SHA512 b470191689f7f4ed429a2537bd6387f24c170e0349d9e28bd4390c71f6587bc5ca81ef289890f6ae53720936acd204cb487323168b6c37c51a12fc921f19d45d
+EBUILD flashcard-2.3.3.ebuild 386 BLAKE2B 801e244d61f470c3cdc35a9af4139876b1a94727e9a69b1e95486bb3df2906b70fe0d80d70dc412dc8883a99be0446b73b18adac752a393718a991d390f9cc22 SHA512 105e65057eb3aa575dfcc6578267865c99a066ec662d39b04e83f320b00ae524f0f3ff1b7768c6659930d30ca7f5f1eb35a3d7b761930797efd4824e4c101eb6
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/flashcard/flashcard-2.3.3.ebuild b/app-emacs/flashcard/flashcard-2.3.3.ebuild
index b64e8f9102c8..c8ee0405d764 100644
--- a/app-emacs/flashcard/flashcard-2.3.3.ebuild
+++ b/app-emacs/flashcard/flashcard-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="An Emacs Lisp package for drilling on questions and answers"
-HOMEPAGE="http://ichi2.net/flashcard/
-	http://www.emacswiki.org/emacs/FlashCard"
+HOMEPAGE="https://www.emacswiki.org/emacs/FlashCard"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/folding/Manifest b/app-emacs/folding/Manifest
index e8446c3ba394..ab89db567af8 100644
--- a/app-emacs/folding/Manifest
+++ b/app-emacs/folding/Manifest
@@ -1,6 +1,6 @@
 AUX 50folding-gentoo.el 221 BLAKE2B f0f0b88f59d0f493a468e9128028c525315b4d2f32bf000ac39838774c34c81bda4089e000d8b05ac151e42f6e2001f636b0e98bc02c3125e3ac46459c1cf777 SHA512 e5b9f16218988429da9fdf304967deba2fd76774b5c4eca9d372504cac225ab24de4c976dbca4203d335f06d2fe16043bb817c5a232e517c4c7416e1e9f52076
 DIST folding-2012.0226.1623.el.bz2 49503 BLAKE2B 6e364c9c93c92d4e9c322b5cc75b2525d95d63fe5a5b5916e054063fb2452f8ade4cce7e805243cb95a078157f33feff1bc9890b3a7d0de66813c63c74be0dbf SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9
 DIST folding-2013.0613.1821.el.xz 52164 BLAKE2B cb9dc74ab409ddeff8434191f53dadac5c53a15fdf4b8edb041daa156221e7271bd30bf66e60049ebd4ed761f16b1adfa113e05967cc70729f6b5c3f1dc71306 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53
-EBUILD folding-2012.0226.1623.ebuild 427 BLAKE2B d0443a19507bc2577668039087fedf481d2a66fb876581042872e91b16b1ef65c947d9db2b8d45d2a100d8f35805d6364f2a6249b358a53b923de902ae79bbf0 SHA512 7c17dca4caf46c2482b9e4cf71a5b78c4b74c3d4da1700b544fbe1eaaf20782c29446c87d98bfaed3859716994548b02d5c7093062ebd02946ecea2965f0eb1f
-EBUILD folding-2013.0613.1821.ebuild 448 BLAKE2B fbb1e34fb5f67addcd97f28819c77861f1e3c158b492744f25b9171d792e2caf214ff1941f433fd3b41c400adf36784af790d909aa2c7041e1406c26bf5b7c3a SHA512 54d6693e4244d7e731229a88effde7252adc8a71a1c6e79cc2a06c32a606b911178c3b2fd7314a34e01eb349b88e196b103e5d1607bde3979f12060af5bea7db
+EBUILD folding-2012.0226.1623.ebuild 428 BLAKE2B 2ff2269947afd5aa7154d6649ab7f0841e4cc8d9cbe7fca2b02ce503391e06ff64b4c771e65c8ee779dd15cb06aba44bfbeb6d8e98d855ee097ede5a0cf08d50 SHA512 024bab6af9cd050d0d2de7c073cdd4bdab352ea2334c4f4cd1d0ad71f593ede8c18d4a0dde6fee234624eb92d127bf0bb756c055a8d72f115a9f561f3a08fb28
+EBUILD folding-2013.0613.1821.ebuild 449 BLAKE2B a04b276e46658f15f653f34b1b2e410e306780427bb907e4dfdc1be1019bd34e5a5c224c993651f446738cd0bf19874b7e197553ff22cfbffa951f7fce55b69e SHA512 99fda30529093f20ae92f92f72c5c45e18b2e68315bf51a8c5b1eb78657c1e9d3131cb75a65cfa67cbba79faea24f789a598ce6e2ae00f910eeee5a2fee34817
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/folding/folding-2012.0226.1623.ebuild b/app-emacs/folding/folding-2012.0226.1623.ebuild
index 1f8e8d43a0f7..207beefa597c 100644
--- a/app-emacs/folding/folding-2012.0226.1623.ebuild
+++ b/app-emacs/folding/folding-2012.0226.1623.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A folding-editor-like Emacs minor mode"
-HOMEPAGE="http://www.emacswiki.org/emacs/FoldingMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
 # taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
diff --git a/app-emacs/folding/folding-2013.0613.1821.ebuild b/app-emacs/folding/folding-2013.0613.1821.ebuild
index 8b2c2acc62b2..d2888ffe7a38 100644
--- a/app-emacs/folding/folding-2013.0613.1821.ebuild
+++ b/app-emacs/folding/folding-2013.0613.1821.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A folding-editor-like Emacs minor mode"
-HOMEPAGE="http://www.emacswiki.org/emacs/FoldingMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
 # taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 3c5136aee6e9..07fb43439d89 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,6 +1,5 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
-EBUILD gnuserv-3.12.8-r2.ebuild 1765 BLAKE2B 59e4a4ce86ded0d90d629260bf259fb864d7005f437b62d34254ba00128181dc87fe241c3031f7dfa9b5c6ae98f41d69550494d5f1d09ae535fbb17fae0f1388 SHA512 53f7528b9eb3d07c1c5b4da048f0e1c32e98bfb495191fb8d66018df77112f52bf48304e7c0daf2c79c59c8102467c57dde25e3ff05bac6ba5d0a1ab693b4fd3
-EBUILD gnuserv-3.12.8-r3.ebuild 1520 BLAKE2B c4db1e1152fdbcde2a23fd0fb07275701dc5e991566c095addffeaf0c9479a9060980a08935be2bbbf2fc0ed00292fc46c327e8488f5d58215c6a3441a5aa5ec SHA512 8476dd1ff471c76d74cd9aeb494b8b37733c3555add9acb4c5a0f1c99c36476dd1fb6796439c7eb9c05fef3ec760cc1a47134254ce24c0dee8e2a0b0ef8b60fe
+EBUILD gnuserv-3.12.8-r3.ebuild 1519 BLAKE2B 4bd34511f83edfe948947dd71817031f178d9a7b5f1e9557b3085c64677cedcb05423e4d252c1817b821898c0299ca6be1a5d1fca1a6d713f7675941de0000fe SHA512 253290bb9f30f6eba50cb9f95ffd82b9376570fc6bfda2843b839112f2d588627cf2160a6db2dc69578067401202827dff9d49935b594be3b252d9f2bee33487
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
deleted file mode 100644
index 38b3c602b4da..000000000000
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp multilib desktop fdo-mime
-
-DESCRIPTION="Attach to an already running Emacs"
-HOMEPAGE="http://meltin.net/hacks/emacs/"
-SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
-IUSE="X"
-
-DEPEND=">=app-eselect/eselect-emacs-1.15
-	X? ( x11-libs/libXau )"
-RDEPEND="${DEPEND}
-	!!app-emacs/gnuserv-programs
-	!!<app-editors/xemacs-21.4.22-r3
-	!!~app-editors/xemacs-21.5.29 !!~app-editors/xemacs-21.5.30
-	!!~app-editors/xemacs-21.5.31 !!~app-editors/xemacs-21.5.33
-	!!=app-editors/xemacs-21.5.34 !!=app-editors/xemacs-21.5.34-r1"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
-}
-
-src_configure() {
-	econf $(use_enable X xauth) \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	exeinto /usr/libexec/emacs
-	doexe gnuserv
-	newbin gnuclient gnuclient-emacs
-	newbin gnudoit gnudoit-emacs
-	# Don't install gnuattach, it is not functional with FSF GNU Emacs
-
-	newman gnuserv.1 gnuserv-emacs.1
-	echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
-	echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
-
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ChangeLog README README.orig
-
-	if use X; then
-		domenu "${FILESDIR}"/gnuclient.desktop || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use X && fdo-mime_desktop_database_update
-	eselect gnuclient update ifunset
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use X && fdo-mime_desktop_database_update
-	eselect gnuclient update ifunset
-}
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
index e3f052adc7a1..fdecaef90eec 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
 IUSE="X"
 
 DEPEND=">=app-eselect/eselect-emacs-1.15
diff --git a/app-emacs/h4x0r/Manifest b/app-emacs/h4x0r/Manifest
index 26c6e18f325b..e037ecc07fb0 100644
--- a/app-emacs/h4x0r/Manifest
+++ b/app-emacs/h4x0r/Manifest
@@ -1,4 +1,4 @@
 AUX 50h4x0r-gentoo.el 225 BLAKE2B fe1736e93c5072273af42daa2da7242ce13b81cb48e45ee7a0a75c067ff83bb8ebcde299aea7cf1537f8e2f9f23e6b1d916f7690c01710894f353079d5c660dd SHA512 892f48aed2b4552b842c986c4c963d422f74c29f7b7a7106039d3c66be7bf70de2664fb4e2798db0e71d09bbedeac1f738e3c30a3361afd4616462a95f6f4fbe
 DIST h4x0r-0.13.tar.gz 2033 BLAKE2B 202279ba4dd1f49bfb7609b47e10369444ae40a6b0b46ab22370d2af44315b642266b64f29883742e0111f2e67d55c1e864687f7792048e9d937bd9bae4c3961 SHA512 9648410ffa13ea9056c3def84108ff99966b62b7ee13fb48d5596d5c90f5d5296ff43d1c3ee2f534b7a219603ce1cbcd2a917307ea57ee6c914f9a8843eab0aa
-EBUILD h4x0r-0.13-r1.ebuild 360 BLAKE2B 7b3ecfadceec8b87986ba2238125ad2b3ecd0a2f23ee07787cf4f31d35f4745020171245827147cdc1537edd2f0352c919d108f2dbb2ef2e979f2be0a1febbce SHA512 cbb4f1079e15e7ecab6b8b7026c0633c82c9fe337515e6aea764c89598af5a7d0a3b73dfc1c88713b38edb1b14b74a295fce70fd09968716ceb85e2300c39e55
+EBUILD h4x0r-0.13-r1.ebuild 361 BLAKE2B de16dc086e11e0a87fc5836160bebb9e9c14b43bca44ec3a3b81ea844acd8de8ec173c28d7b7a274b87aa0e579b13e37978a1db64558f8d883446e793516803d SHA512 6e074cc6073520695759124189274cd107de711a3036df54e8a9051ea71819dc1377e5ca39f86a041925ffe4dc55c51fba93d4047bedfd85e2dd4570f498da65
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild b/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild
index 23e7e1accaaf..4d9d96369ba7 100644
--- a/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild
+++ b/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Aid in writing like a script kiddie does"
-HOMEPAGE="http://www.emacswiki.org/emacs/EliteSpeech"
+HOMEPAGE="https://www.emacswiki.org/emacs/EliteSpeech"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/hexrgb/Manifest b/app-emacs/hexrgb/Manifest
index 482e302a0333..9de144ae4880 100644
--- a/app-emacs/hexrgb/Manifest
+++ b/app-emacs/hexrgb/Manifest
@@ -1,4 +1,4 @@
 AUX 50hexrgb-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST hexrgb-0_p957.el.xz 9620 BLAKE2B 6bcb432cce9a0981f19acd4beba785941148fa9ca8ebd2575b2ef4a39fe28c641160b5c27d6515220f122e66154d89807ba0075e41c2506d5c8aa1a6b291404c SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1
-EBUILD hexrgb-0_p957.ebuild 402 BLAKE2B 97c3dbc5ba2ffd7be5b1cc4f379ee7248b956ef840693e69653d4acead284a0a88cd89f6c906335381a5166a0ce243cb43c139fc1b5d9f6655b21004ab91eb09 SHA512 8af61273def0b03efd40f7ba84361d2705634f8d532deefbc5c1ba9a2b3559bed2dd58ab02c36deeb1d3a08cf055525a4696ccc02d8c5d4169b8722d3b925c5a
+EBUILD hexrgb-0_p957.ebuild 403 BLAKE2B 393babe59dfa2937f17184141283dfeacabe5b99bd4a5bc5f6b546ed301573641ac9e0c02908af03b0704afc01f8bfac2f0123a9bc725529b3b1ed1f37ed84e9 SHA512 4b60ecd175075104257653b916d5c99724f5ca7b7000f4cded86641f745f4612115b7820dc888a626e40f453bed621e41902092f6e9663998abe5bd6720782be
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/hexrgb/hexrgb-0_p957.ebuild b/app-emacs/hexrgb/hexrgb-0_p957.ebuild
index 599a4865c99c..0845e1e8af46 100644
--- a/app-emacs/hexrgb/hexrgb-0_p957.ebuild
+++ b/app-emacs/hexrgb/hexrgb-0_p957.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Functions to manipulate colors, including RGB hex strings"
-HOMEPAGE="http://www.emacswiki.org/emacs/hexrgb.el"
+HOMEPAGE="https://www.emacswiki.org/emacs/hexrgb.el"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/highline/Manifest b/app-emacs/highline/Manifest
index be28a922e93d..8669b4d368d5 100644
--- a/app-emacs/highline/Manifest
+++ b/app-emacs/highline/Manifest
@@ -1,4 +1,4 @@
 AUX 50highline-gentoo.el 72 BLAKE2B 0c0f641042009cc056675c7dc4c523821cdb71f641e6cc8ea4f5d8f2885f0c8796386822d172baea078f5f45aae02a58e76dbbc12f967526da50db7ae68b6a07 SHA512 e619a8d2dac5926c4e2d99237dc473949ecb5e4d6e80ee532e258a710b3597e0bdfefc33558b00a1b21276383ce7e3b8196e30548ed8daf8a66173d1a559cb99
 DIST highline-7.2.2.el.xz 8600 BLAKE2B e92007f6ee38e67441b8d9e7b029570e5ef2ecb888f971191f7e1fb919ffe0c58e2e5abc7d4615449e786b882f0e7b511ed37d85de6d3b98658d4ce5a1cb9253 SHA512 353fc034a823d0892c6266fbc48a22e2650c379f904f9a0be78bd2f11e5ac8333cf6070fa7ebc2225c57cc6a85f49c6db9322e31e33f87e481aa117b1290be87
-EBUILD highline-7.2.2.ebuild 522 BLAKE2B db95ba96e795f75aac639e8efc1011f7cf2c8e6f883ea841d2c995504d9464a5f2809c3bd35d959d173ef93574c3a8318ac8f6f310c1f6b3efb224821206e532 SHA512 6c2d469bad5e5c14c7db57ef9b02e83beca3f921697807e3131ef63b4b57ab80a6c4ab3ecaeeac71970723afb370d723fceb8109f56d8f1acc8f84b229470648
+EBUILD highline-7.2.2.ebuild 523 BLAKE2B 04404f321d0cecc70ae07287844fc27d257a56b37d4f73f7bed9188adc58944e7a97bc158eebd28c0b6794ae252cff5b3100c9d48111b7f690ca0113aa62a6d1 SHA512 de66f3d009b77fff62db8743292dff4767c893b2e4c89c1e0aaec4cdfe0cf9031dc64c8453e085dd56ae5009ec5418069b1ca4229dfebc983b1413e45a69b438
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/highline/highline-7.2.2.ebuild b/app-emacs/highline/highline-7.2.2.ebuild
index 88910bb89a8b..fdbbc896d752 100644
--- a/app-emacs/highline/highline-7.2.2.ebuild
+++ b/app-emacs/highline/highline-7.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Minor mode to highlight current line in buffer"
-HOMEPAGE="http://www.emacswiki.org/emacs/HighlineMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/HighlineMode"
 # taken from: http://www.emacswiki.org/emacs/download/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/htmlize/Manifest b/app-emacs/htmlize/Manifest
index 082e3ffc936f..e013f7ca752f 100644
--- a/app-emacs/htmlize/Manifest
+++ b/app-emacs/htmlize/Manifest
@@ -1,6 +1,6 @@
 AUX 50htmlize-gentoo.el 543 BLAKE2B 65ee2f1bd7aeb315827301a74582d9c04ceacf898a5cdd9a72f6783bcc2e4d1f97d681f67daeea24fa3489ae7a4db02875161c20a88330edaaa828a0c37b3bb5 SHA512 7bc9bc6cd113ec9090223b6bf3f373b25da1e4330039be37186904360a515ea102b51c2c6567e9e3fed7f78c4c29a0f80642e35878a2af61e83772b8a5bad99e
 DIST htmlize-1.43.el.bz2 21018 BLAKE2B ff07571bda31c3733e3a5ef703625ea485721080d13ad28f7e2be3f7470cae7f00ebf7f7a899a7351942643c5f3b854f01918b9fd3175b8f7ba0ae9237665d42 SHA512 cdef3f8478862e9743cad23697775111fbd64737daa6e0525923cff1ccc8dfd20ad554e5e92ec99281d87acf9ecd358474761858c8c6639c5459234bf79d4be9
 DIST htmlize-1.47.el.xz 21544 BLAKE2B c00222fa39bbd530fae89b6a71cc515dd37cce4d787267eca9d23eddd9f3054b932df8908712971c46c28fc89921a42ac613e826d73094b333aa977335077f54 SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f
-EBUILD htmlize-1.43.ebuild 394 BLAKE2B 2b11a2ba5f001c8b05fa5f417300c511c2026300955fd3aa826ce749083ad41cfa97cf0f153aaebdf09b594aa4f4d17ff75591aeb9f81ebfbac232ca5f076d9b SHA512 fd65eee0392cc03576f4cfbfe7f017c68e25b3532243412dfbfd1c59de1b626e60a232936f65afd4052b973264639b1befc77ea6ab4b0a73cf20551616238cf7
-EBUILD htmlize-1.47.ebuild 407 BLAKE2B 5c205865aa00382c8de289853c3e04fe95076d744057084ee9916afba0efcd94655308a7dfe1ff0e768d25cc1a66a0399064c3b442951c14b40fbbeef0f07e8f SHA512 82f6d1eac3db18fe3ddacdef9fe6f6d25bbd5e45668c79bc1414fec0375793e181c64ce05b207f1f0878adcb2ce73bfbae14e13e6694a1083a0ee296fd57b66d
+EBUILD htmlize-1.43.ebuild 399 BLAKE2B e5b22c1cd35481e4cd89200d42adcccd1ff6ab751e40927161b9095f938d9674b2646cfe6359153f97c4155e39f477785169e0b4442489a37934a663d3d6081e SHA512 f46ebc4c02904c46990d99fe860c7189dde0df5c74807d547809b7ef0207bfa1c152ec4c4701df7747f3bab0e6fbc5dd455b8aa8ec66cb39701f3f361266f33e
+EBUILD htmlize-1.47.ebuild 412 BLAKE2B e6ba52cf40a4941a1efa543d5d94bfc2fb521fbff3dfcf9086a89949c772634c44d566f8c4808badfa58c273a06107d6308f4bfd27ee6be7458186a0eed5d60f SHA512 0255f5a8d6b4d03f8ee3c502e59b719baf3842ceae9510254a2f533a8f08616d4a5e4d2ce747a3b567ad42864652e09f7f2504cf8d77d389e93caff3ad60019a
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/htmlize/htmlize-1.43.ebuild b/app-emacs/htmlize/htmlize-1.43.ebuild
index 148fec8a566d..e614aa73039a 100644
--- a/app-emacs/htmlize/htmlize-1.43.ebuild
+++ b/app-emacs/htmlize/htmlize-1.43.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit elisp
 
 DESCRIPTION="HTML-ize font-lock buffers in Emacs"
-HOMEPAGE="http://emacswiki.org/emacs/Htmlize
+HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
 	http://fly.srk.fer.hr/~hniksic/emacs/"
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
diff --git a/app-emacs/htmlize/htmlize-1.47.ebuild b/app-emacs/htmlize/htmlize-1.47.ebuild
index 4f72c0ee1c27..fa7ad085cc8a 100644
--- a/app-emacs/htmlize/htmlize-1.47.ebuild
+++ b/app-emacs/htmlize/htmlize-1.47.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="HTML-ize font-lock buffers in Emacs"
-HOMEPAGE="http://emacswiki.org/emacs/Htmlize
+HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
 	http://fly.srk.fer.hr/~hniksic/emacs/"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
index f89ac3ed14f6..e489a65c4284 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1,4 +1,4 @@
 AUX 50icicles-gentoo.el 112 BLAKE2B c4d0e44325f27cb725bce0aff0ac8186807295c9b20642f42fabfa956703836c65a23b3a71221e736d95aefa1e4e188834df53c9a275ddc0ec7389a810bd405f SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e
 DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
-EBUILD icicles-2013.04.23.23400.ebuild 400 BLAKE2B 27b86963d5139c925577b9bee8438cc43fa21a256e107603bdefaae95734accd875609d1f34cbce98fcc2a4a08709907b7e77d977eedfb67628e0cd7fbcbfd5c SHA512 15dffc5c98dc08895d6ad866a14900127a85ba6127b755e633375435d5a8040d3e1ee6b6addd6ac34e7db179c5782a453d326fb3ed9ffbdc7b84c00ed41ec45a
+EBUILD icicles-2013.04.23.23400.ebuild 401 BLAKE2B deae89002a1509b6087b034c18b9f4ec560e5cc39308948d5f92123410ca287cc9d1effc7e479e6194009affed126a1fc6d98581c6e1d20b169f568e7b970409 SHA512 3d697cbed9b5e35db6bc370eea722a8d5c5ada439bcfddc14498740a02ff81bc4065628dd11e5002b3c2e796877e1fd079638f2468551083ac893ba16091cfd8
 MISC metadata.xml 341 BLAKE2B f358671ac8ca5a8aac6a6fb365c67c02b4cd65ead725be504866bb47ff2e2e792a3787985a1d672623fce4fea302f316482270a7ce7141db4695956113d18b13 SHA512 6ae47225ce001e28b8f49fbab8be2949aa74b6e7a4daa99330ce1b24c3dcb7519cc886516f34f38b49e50a188068b63e426ef116a63956344e8723bfc9524a10
diff --git a/app-emacs/icicles/icicles-2013.04.23.23400.ebuild b/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
index cdbb94901ca9..341a08fa8d7b 100644
--- a/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
+++ b/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Minibuffer input completion and cycling"
-HOMEPAGE="http://www.emacswiki.org/emacs/Icicles"
+HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
 SRC_URI="https://github.com/emacsmirror/icicles/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/igrep/Manifest b/app-emacs/igrep/Manifest
index c86541d6bd93..c3ae18350c2f 100644
--- a/app-emacs/igrep/Manifest
+++ b/app-emacs/igrep/Manifest
@@ -1,4 +1,4 @@
 AUX 50igrep-gentoo.el 1173 BLAKE2B 681d9a26295a34f20707b776792e77eb97015a661d06957390a6c6c5aebf4bd5babadc238b1923bfe22adb12aa75e20e4bced88669e09fd22c34b6f9a877e8c8 SHA512 404abf4e786145b276c6dddfefc1d335e4f941e7f8b77fae3668bd7028330f4ee3a19e8940c94e0a7a32cd90813787bcc3317011f1430f084698f2b97f465f7f
 DIST igrep-2.113.tar.bz2 10662 BLAKE2B fa854e1975548e037f33ce97988b9e4abf8182c13f6cce804a8b305e03282fc7990cccc2061aa3ed829279721f13610b89e2a4125b637d0584ccfd28ba628d0b SHA512 60ca8fa09cb2aa02ec7178afc7d8a2a6d98ebd98b951b29c9c7150588d5ca0dbf01e23e77c6524e2ce510466bd17aba607a172efde1fb4bc56e8478a752d5ff1
-EBUILD igrep-2.113.ebuild 361 BLAKE2B 9ea425f7908e5b7e002ea13559a97396dbcae1cc47c51a8a42e45536772073fd09725fd6cc57f3009b8a623a3f7bd1046f60424b2c4f8749e388a2b1122ab336 SHA512 077a441dd2f051715db312e01a44cd267e4e77e0ed0e211f36f54171e70fa39690dfaa4179a5e6142a69e222784e9796b9ca8e691fff318c2a5b6529820c3975
+EBUILD igrep-2.113.ebuild 362 BLAKE2B 6b3313b4a34c99ef34b2eb9c28a2ff7b6433a5e69df9b2d7f7031a5672fa0bc21b5017ffcf18e9de7bfd31f8306a7f0dc2d2105b9d8298159c0b30919890b39d SHA512 c0ca991c1a657beabb0f098e5ea3f70a446af9487947b2e9c16503bdba9673a03e46e04e614eb56439a3657a8a1078881fe472b3a59b2418f21d85784032482d
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/igrep/igrep-2.113.ebuild b/app-emacs/igrep/igrep-2.113.ebuild
index 8ce8c562b10b..132d1f208cd0 100644
--- a/app-emacs/igrep/igrep-2.113.ebuild
+++ b/app-emacs/igrep/igrep-2.113.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION='An improved interface to "grep" and "find"'
-HOMEPAGE="http://www.emacswiki.org/emacs/GrepMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/GrepMode"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/inform-mode/Manifest b/app-emacs/inform-mode/Manifest
index 98945794e8c1..2c4bdf330970 100644
--- a/app-emacs/inform-mode/Manifest
+++ b/app-emacs/inform-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50inform-mode-gentoo.el 303 BLAKE2B f6146e84023b468b4ed32ede21673a1e1c1cce4057c00811f8aced3440e0fb3e91cac9dc62ae7a3eed654d7781ddc8d9ac028b53dc6bc5e0c43750224c3238f2 SHA512 e3a9b79ce99c8d0a6d9e67430610b12fd90d081f99c4066f46044359f06bf429cea6899ef99f9ef10d04799adc0338a983fdc344caf1f208d5c505f1ed163606
 DIST inform-mode-1.5.8.tar.bz2 14734 BLAKE2B 9ffae6571786109ae324e6d1336c453b279f5ef7d8b8be7561fd062cbe71f106c0d2b3e1065fadb7a153942fd5ad9db9d763652912a021cfc66ff2a0a16da3ed SHA512 edf073d1c4f60ec9eb186a68cafff22ad67a32f40f21bd89584f3a02eada6d073935892e761a6a2f2726e90f59cf0c1a77c2cd59b8b4e85a17374f47997265d8
 DIST inform-mode-1.6.2.tar.gz 33359 BLAKE2B 5ea2a31443db436e3230b61d4f8cf6a724f0103857ce98b41becf2271956e1aba2dbacc73b47be20ca347314c1be186d99a1884d11ce14a7cbce6944096ad588 SHA512 41ab2353942a5d605ec848aed87aa731282a43305cd739fe76d9e6ddd333c84594455f0fb72d95ed02fbcfa9f78f11b16ea8bb579504d1ed29244cbe50e444ee
-EBUILD inform-mode-1.5.8.ebuild 424 BLAKE2B bd3f5749760391d17de5cf6138a767cb116add166357d3e69b5a838cc6f853cc74318bcf9a196ab77c1ffc09e3d3e6028c4815b1d5ee9c2b65c9e8521082dbd2 SHA512 972194c7f995e3d77c5d2bca7ae844dc4696e5afc7b7b959d5cb02ea6edaf67db5100e8bc19694f770526efbb1bb5ccfad659006145bb99b6a899d0433a107b4
-EBUILD inform-mode-1.6.2.ebuild 455 BLAKE2B cb583fe79f245410db9163dbc416b0de1d97c91cd804e49c05266991563540117d80f297a4ecda0378539d766dab336e9d838aae912ddcd596cf9ec97b271a5b SHA512 4887189906c2e0f710fb6643ea4005b2ecfdb5651b56a6b12f3bdd03b1c768ea3042f33a7eb8061c4e58450e923e79a8d476af6dda926ec657f0eb49ba5895ca
+EBUILD inform-mode-1.5.8.ebuild 430 BLAKE2B 6a939a2f2e5a02408c9762e82aae3dc4ab4b9ec0ada4d586a50c926b71ca9b806683edfbea6ff0eaf8f91cc9b5ee0e1974f8b20dcb287aa8d08eab8416e74a28 SHA512 902e367bdae123204b63e42c1cbaccf9527a5d46f400967accf0d9771fbefe462b1154982e318ad19f13a71c997e53a93d60cfff30f493d4c7142729cac11308
+EBUILD inform-mode-1.6.2.ebuild 461 BLAKE2B a0527399bd3efa43169dfb557d55211c436b79a51c688c4fb867505004d6eb3430fb19fb34caaa2a74509805c4d031eb22573f0d406f486caf9929cffae40f5a SHA512 efe9e22e0aa93561b3a4285f7b734526ebe1f602c265e63d74c98ca88d6e64a91e805173c42527828cdc0f2e43511681dc4d259ad3ab3704ce98dc16ccb8e309
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/inform-mode/inform-mode-1.5.8.ebuild b/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
index 88bd8250a0a5..d4a55833934d 100644
--- a/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
+++ b/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A major mode for editing Inform programs"
-HOMEPAGE="http://rupert-lane.org/inform-mode/
-	http://www.emacswiki.org/emacs/InformMode"
+HOMEPAGE="https://www.rupert-lane.org/inform-mode/
+	https://www.emacswiki.org/emacs/InformMode"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/inform-mode/inform-mode-1.6.2.ebuild b/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
index 12b023cdde2b..748c923a19a3 100644
--- a/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
+++ b/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A major mode for editing Inform programs"
-HOMEPAGE="http://rupert-lane.org/inform-mode/
-	http://www.emacswiki.org/emacs/InformMode"
+HOMEPAGE="https://www.rupert-lane.org/inform-mode/
+	https://www.emacswiki.org/emacs/InformMode"
 SRC_URI="http://rupert-lane.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/initsplit/Manifest b/app-emacs/initsplit/Manifest
index 483d5b9b44d4..a5acd979d5ec 100644
--- a/app-emacs/initsplit/Manifest
+++ b/app-emacs/initsplit/Manifest
@@ -1,4 +1,4 @@
 AUX 50initsplit-gentoo.el 91 BLAKE2B 7948d846c2baf3d9b7ef84ebce76ff2088545a1a7452bee7f80316a72fda6551a99108b07e650332e504bd457dbe144212f9e138f32322ebde24e86d9794d093 SHA512 531d0f480c3787453b182be3b9fe145fffd9752155b2c26df3fdf0b497cd058f5978687df53e43046c1f44f4908679783756377998f49dc407a6e18956bc34b1
 DIST initsplit-1.7_pre20140203.el.xz 4792 BLAKE2B eb853870e9d159129e22e48dd5704b83fe8877933ab68f75127e4c82000b7a2a3b87ccd779f16f2ed2b0407ed6574694e42310fd6195152adb099bfd5c592187 SHA512 f2c894bb9d0359b5e95760541feb83f465950de732266059b9498b7ee7361ebb843e0d900fec92fa5e9c37547ea160836b9fc24f64c56083e3ea4416b4b52e50
-EBUILD initsplit-1.7_pre20140203.ebuild 751 BLAKE2B 35a85091db01f998c39c16dd39ca08647eae85a43b2e67461b72ad413b45e636d4c24670eb1afce19ee50d8a17e4378d17e61e928f00b0a2bb16e9b836857727 SHA512 4cb1d928e7e134bc02562a1ed660963c7b06ce3f59dc62d4b48e9d0730db15e9a2390379995c53c86cf153b708ef84236e73ddd89b1566db66c5006b2c9e7fbf
+EBUILD initsplit-1.7_pre20140203.ebuild 752 BLAKE2B 66ad22ef605d5be57f68ee0a88cc84c238391b2290fda63d4260646708b5f349fd50d72e1d3ace914764c1c8419d5ac993444db775e792e1a9b7728abf286048 SHA512 36b7489e6f7e71eff22dfcd55776d1fda82bae3acbcd2cf2d7a3b01d51c4c6b81da5bad31ee3dc52485543569eccb075a9a93d321197b3d588d67666892cfd5c
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild b/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
index ec90513104ad..9638e25e032e 100644
--- a/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
+++ b/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit readme.gentoo elisp
 
 DESCRIPTION="Split customizations into different files"
-HOMEPAGE="http://www.emacswiki.org/emacs/InitSplit"
+HOMEPAGE="https://www.emacswiki.org/emacs/InitSplit"
 # taken from https://github.com/dabrahams/${PN}
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 7fdd5619126e..5d23934658a5 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -4,5 +4,5 @@ DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c
 DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
 EBUILD magit-2.10.3.ebuild 781 BLAKE2B eed9d6c038a6a6cc69819a665487d39d13198b507bdfb0a1487928c2c4731b289885034e5eb536aad8ec3bcf6538802374bdae32ff3578904e44a793a60170e8 SHA512 500e8eacb213c63566d3f1b300199443ed5f88a5526b617d39d394165117cad082b3249ad7ee086b3c0b2648aebc970c454be885cc8c566ca617f3b67f6d1a42
 EBUILD magit-2.11.0.ebuild 780 BLAKE2B a58e4c563246229c6e4af405cdaf2ab942a0db2668448e901587ddde4147a6534b2cc5858bf2808ec7241ea6564984680b05f928ce3b94483277d5d7d0eb9b24 SHA512 57ed8420a3975533c6129552ef47b659a198d70c5e243ad61494b3063c1d44473e537359703e07eebf2ca156864f62968d701523edafe71c0c81c2d6a58f9fa5
-EBUILD magit-2.9.0.ebuild 777 BLAKE2B 3066d0e3371b223b9c35f9b2c7a0f8308c3161bb73366c17efdd8acb7e34758d39fcb85c06b1891b381568967786dc14daf24be1ef7e6fcc265afceda3f47755 SHA512 aea7c664589a504e34c74c04e670e246eebab93c737427161e1c58efb3a7567a64c02677e81d8ae71a773157c81a874b0668dc01126cf75063dc3c5e55e74fda
+EBUILD magit-2.9.0.ebuild 778 BLAKE2B 7063541fafed02cade386a4bd478ce701cde7a81ef05a8b754d5505a17f499e64e2eb5d22ead97cfa4ef034aff548b066492688a8cf692bda39cef66409cb415 SHA512 fe3858a40518be189a482b9ee146cb3154c98ab053379c38aa00528a4908a25a4e48a182af22b8c604497fcbd6fa1e508e05826c55e596686a1a1f2bbe6f262c
 MISC metadata.xml 788 BLAKE2B 32b9faec3bea7c347dae0d2da1246c43ac234b865fa26738a64736fea6a8e3107fbd7d1615b5ab28985cf1b78ee3d008c3cbbc461cf251dd4a3da5e893e81277 SHA512 ae77f9b917a135d4b9d39f7c0428a6e0a616cccce613cc17a6672e7bb0515709deef76889982640efca7fd9014801d7b951ddc5fde4eeb0134b3e568ea076396
diff --git a/app-emacs/magit/magit-2.9.0.ebuild b/app-emacs/magit/magit-2.9.0.ebuild
index 9dc73e6f09a9..e14b89b7735f 100644
--- a/app-emacs/magit/magit-2.9.0.ebuild
+++ b/app-emacs/magit/magit-2.9.0.ebuild
@@ -7,7 +7,7 @@ NEED_EMACS=24
 inherit elisp
 
 DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="http://magit.vc/"
+HOMEPAGE="https://magit.vc/"
 SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index 9060e479fa49..cc01e5cca76a 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -3,7 +3,7 @@ AUX markdown-mode-2.1-text-auto-mode.patch 833 BLAKE2B fb0eade55f75123e1166fdc4b
 DIST markdown-mode-1.8.1.el.xz 18152 BLAKE2B 38d41ffc9fa22db0b31a0f6fa9eeeeb8beab5ac519a737f2e0de926f736a40c6570d3a98097a90b347b16569e2d191cb1cd9e630bf1a9071fa7939a0f88f2c5c SHA512 1e679a409fa5a7f6f622e4a554d74ea1820ba1e82eb77d3ce6b33d5494350232a2b165c9f002a076d4ce97138584381938d5c2ccac4161131ffba82da5091946
 DIST markdown-mode-2.0.el.xz 39508 BLAKE2B 723d3762584a9723851f7dda63f172a5d495bd8c967538bbf9f2b3b2dacebc31ee3369dde1d8bfc288419a585e9f3a66382fc3e35de143618cdfd5e5cd77010f SHA512 eaad1561c5a84f47cd07318f0c80454d28a59becc0372453ec1412511879335a5717d1531895fe969c5d2fe7a4aac5a9e55ee727dcee621ba203737ca9182f3d
 DIST markdown-mode-2.1.el.xz 50484 BLAKE2B 12ae664f0680a420727148c2ed78275ab7dcdc8ae742a0152f82dc25150cea9bd5d880b9244351792354ac1d64789267163512e55c2b83f64855bbc0ab0ac33e SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253
-EBUILD markdown-mode-1.8.1-r1.ebuild 602 BLAKE2B 732931df5d8d477067cfdd50f219dde14973e2d90b0804acf2b4c100e3f940c799c77609fd72a3699469b24690a0eb2277bf85c15f145ef30502844a83f25f34 SHA512 52235a4037c44117119e597c6a56058251a62b6bb99fc99f2ef6d8c774662251f2b6cca1392b09909bd981914775c077aa9650ee34cd3568ecb0bc410fc4961d
-EBUILD markdown-mode-2.0.ebuild 613 BLAKE2B f5661cc9c88f60d1d2eabf3282cb27f96f9bf5e91025ecce78175cb721a1e4e9cc175bc37eb5c42a17e4c6f5808ce76d4b7d4897477b75421d7c54486a7fc7d7 SHA512 8406ec4fcccd60591e668b8eec2558f5c79435e518f3492c350c14f69f5017b1898a476484fc6ff5d7840950255acd77c6f2aac18d194b0d639387dec0704599
-EBUILD markdown-mode-2.1.ebuild 655 BLAKE2B b755f700d8b6f3b0abf61cb9750e1554f60954e602b5fd9fc4527ec40e8335fc0aa69b28c42bd115a7a15d6774de5b86267d5aa06ccf23f2e37c6d8a19665432 SHA512 17f157dd207b97985227fbdb806f30cd188d52fd557f1eb2d4ddede22d50aed47e9e02493490eb9895a592788bdaa2c5c033d9ad7f6a9bc51604e87953d4138f
+EBUILD markdown-mode-1.8.1-r1.ebuild 603 BLAKE2B 53bf4a034f1597970bcaa2924f1c485c6d5ea590158094e4258752fb7152496ea1fc7b0c7dbcfcd4f19c56143a7af27710ef7d716e89adea43b53cf667a702af SHA512 8a7b5183622c69b9bc74c0ac4365b1d44bcdcd14abf5f0b0f98934d1e92e38ddfda2326d233b649664363204f47bac02f1d4034fb1d645af0700482079806a92
+EBUILD markdown-mode-2.0.ebuild 614 BLAKE2B 165da6cd3842ab9b2aff35ff478f4b5d5a613d89a30c40178610e12d1fcd0cf2beb8f4a5309f46ff6a42e22a5bed986689673a1ca50459e51d14437d0b76fdd1 SHA512 da6d14eb173ca8e285f74f41ca37e51d4df99d96e4bd4b09fc9d2a0b5229acfa42a97a4fb35c167d36fc7a56070e284a14ac78c47aa8f7ddbae0839f9d27eb7d
+EBUILD markdown-mode-2.1.ebuild 656 BLAKE2B b9f8506be2cf90606894ac35871114b1da8b4efd9d21a187f6812d33a0f7a6161440d6781a30cdfba8b15c8d3532296c2276f702c82b342f0c2a348fe2b76647 SHA512 5da9fda79af6213b5afa30ac58dfc0664f438ac027b840d0481a5637e5b72750b461e57f8f3ecddbe68391f279b1745982b6981003238090a8422c3a088e88ae
 MISC metadata.xml 334 BLAKE2B 4abd21d2b0abe4bbda4124cc1b01958f9f2f6827c4c314ff65af0d5e8a30225ee3833ba4280e1aa751c34877761d2766ef19da87d66aad55477feb408b757f31 SHA512 ecfc070c0dff8968e5f2e5249df488fabdc76efc0493bfa8c6dfa9f4a296ddf0785ba23ef2a36a0093cdd39d225fb38da18d574b6a929c29752328c6b66a62ed
diff --git a/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild b/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild
index 5a4952059c3f..d41dcd70957e 100644
--- a/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-1.8.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit elisp
 
 DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="http://jblevins.org/projects/markdown-mode/"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
 # Cannot use this url because its hash differ about every five minutes
 # SRC_URI="http://jblevins.org/git/markdown-mode.git/snapshot/${P}.tar.gz"
 SRC_URI="mirror://gentoo/${P}.el.xz"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.0.ebuild b/app-emacs/markdown-mode/markdown-mode-2.0.ebuild
index d184b196c9bb..3880042fb2d6 100644
--- a/app-emacs/markdown-mode/markdown-mode-2.0.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="http://jblevins.org/projects/markdown-mode/"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
 # Cannot use this url because its hash differ about every five minutes
 # SRC_URI="http://jblevins.org/git/${PN}.git/snapshot/${P}.tar.gz"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.1.ebuild b/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
index 7139d6eb6af0..571a3cbe3b7c 100644
--- a/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="http://jblevins.org/projects/markdown-mode/"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
 # Cannot use this url because its hash differ about every five minutes
 # SRC_URI="http://jblevins.org/git/${PN}.git/snapshot/${P}.tar.gz"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
diff --git a/app-emacs/mic-paren/Manifest b/app-emacs/mic-paren/Manifest
index 158b5479dc46..6633b3223a1e 100644
--- a/app-emacs/mic-paren/Manifest
+++ b/app-emacs/mic-paren/Manifest
@@ -1,4 +1,4 @@
 AUX 50mic-paren-gentoo.el 518 BLAKE2B 8d51d848689e272dabdb882851e4920dab94a17e9dc9096aaf9a7dcc25035966a9b1886d2ddd8d3b3dd5a734fed3615d4d7b5a59620a46924470c732ecd32ae4 SHA512 a49520fe38aa5ad7e7d479bcdeb8391bc0aa982c59769dc264daae700ece7fa1fbc02ce574fde2f2c3e170467d7633965c4e36f4fe995c8b112a6ebef690ab07
 DIST mic-paren-3.11.el.xz 13992 BLAKE2B 05b99123f32248eb20611c1889e26af34c42f7f3a37753eda59bfb0e499befd698644b283cbd491925e7a766293e0fe2172dc1da9a36eb94be94e17a6b9cd46d SHA512 ac896c425330935c0d6ae86eb65232c8fb6c463f6cf259c4bfd79023c3e25243d6b998e9f0ea5393ef1491ab0bf1d6fe5dd33278fec93ec3231603bb6e910b77
-EBUILD mic-paren-3.11.ebuild 473 BLAKE2B 96b3ccdfda09d3f2a2835ec7d50960bc4e22ec25c40725c1a9beeb248c4148b33240678f87eaaeca2c824ca1eca25dbb6048cf9f76d157d34f8edf6e46fd247d SHA512 4c1b0dfe8c9a28b97be9f10bcf8e8e311d9fc804abd8eb8fce13a6848eb3f31efadedc90a3f3b57de661cb7587e05c46c7df0a0faf1b204ad30d486973c50b87
+EBUILD mic-paren-3.11.ebuild 474 BLAKE2B 226ea32c19504b7542f51d9d537c12a795325f0eb5b38d0b192ec276484db3fd21a7c59dfa7ab99f6a18d2d37e16251e3a02e3cfb622d7d103f8f39e5d602fb7 SHA512 fc5c3a036da3fef773fbb12b59e104fd9253e14f344d3387b4cec9ffb651c9da000a3129dff7f24e2a7c81712ad800618fd1819dc179ac3129c733b5986f9486
 MISC metadata.xml 670 BLAKE2B cedeed5cf12153f1127d6aa320c46d500a4ee48d2d70edd27046bc448f6d56da170754c6e19482e826b12d86e7c8ceb263ac972ccecd057efffed71ba83a8bdf SHA512 7498ab798206556323782a82515452a3943ed8e94583210a3b2410cd5108eea639b56f4c603d9314ca288666d43922df845d75b601c14940432a83321596f184
diff --git a/app-emacs/mic-paren/mic-paren-3.11.ebuild b/app-emacs/mic-paren/mic-paren-3.11.ebuild
index 86e87fa381ab..e876870415ef 100644
--- a/app-emacs/mic-paren/mic-paren-3.11.ebuild
+++ b/app-emacs/mic-paren/mic-paren-3.11.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Advanced highlighting of matching parentheses"
 HOMEPAGE="http://www.gnuvola.org/software/j/mic-paren/
-	http://www.emacswiki.org/emacs/MicParen"
+	https://www.emacswiki.org/emacs/MicParen"
 # taken from http://www.gnuvola.org/software/j/mic-paren/mic-paren.el
 SRC_URI="mirror://gentoo/${P}.el.xz"
 
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index 02e1419387c7..e69b178de8f9 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -2,5 +2,5 @@ AUX 50mldonkey-gentoo.el 604 BLAKE2B 52632176ed6adc1cb0c871bfc94b2c01d5ec26b1950
 AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20649087c95153f8ce92323dd977d7878475c8709057a3725ed78cbf3d777fb7b5ae00c6a911da75869232ae228edffc4 SHA512 f00edaf33d8d182e7c7e432cfcf4f0ac9b6a8f6f68d44266e9dbed53657c00bc5db5b1f6c5e190988c217711de5dcfdaef091de2581425be7bce2a44b8a0c9d6
 AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
 DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
-EBUILD mldonkey-0.0.4b-r1.ebuild 925 BLAKE2B be4cc55f7da8c04d6dc654f194261517e6962f5f3af553a1d249f70c18306be265f6f9966b5b891085bcbd8e3c37a6eaa8a0e99990ed564f4c653a7f44e0f2b3 SHA512 72d79f6ce9e36c0f4e6a9d6f6e9d9401276ff2a00cac3b14018e35a66289ce108370053f5a924d3ee6afbc8aca67714ff8644c6d2788d4eb57486f8a56ffd189
+EBUILD mldonkey-0.0.4b-r1.ebuild 926 BLAKE2B 442018577f992d42349d97f58dffeb5749229011602e6117ef3001a211b076409705e9c503bf2cf485eda552e90110f41cf3a472673e20adb31e52b20fdb99e9 SHA512 9a85aadc2beeeceebc925cb14683331528d728758873d73aa04e180af93e4f469a0a74b55c230af13411d6e1a816e3effaac65e37e46b2487731f176cdebee83
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
index 5c38394b6e95..12ed071cfa32 100644
--- a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 MY_P="${PN}-el-${PV}"
 DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
-HOMEPAGE="http://www.emacswiki.org/emacs/MlDonkey
+HOMEPAGE="https://www.emacswiki.org/emacs/MlDonkey
 	http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
 SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
 
diff --git a/app-emacs/mode-compile/Manifest b/app-emacs/mode-compile/Manifest
index 6bcdbc42e457..1de6bc274503 100644
--- a/app-emacs/mode-compile/Manifest
+++ b/app-emacs/mode-compile/Manifest
@@ -1,4 +1,4 @@
 AUX 50mode-compile-gentoo.el 255 BLAKE2B e460d21b72893ea9e5252dfeedbf37346b19744e43ab53b555b25b069af1eaa0de82412dd8d7b3fc444c16076aa62093c31bb85dad98605c650147584c9a2e65 SHA512 4214eb678ef2ee902bce458f906d19cc90f2d2f793e34e45b98393dc0d6eddd29334bfbdf1983793aa840f827654b093519686bf643a9593df9b0cd5783d4241
 DIST mode-compile-2.29.1.tar.gz 22924 BLAKE2B 7ef71f958ffd5022ddcc64c07ef60822af5bc4a1f5deac5c4e57ce63cd9596d5f612d73eb9cdac627ecfef59e893d795afbeaa19b380b0cc4291bb4dc23fc05c SHA512 bc43d9cae411f5177ce70c736041db74c6db1dc5b766b22b92227e9e1324d304276bd104d8e3cac9ff5a877fc48b6da5b904e1acdb6cca7396fc7c26cc572815
-EBUILD mode-compile-2.29.1.ebuild 465 BLAKE2B abc5bedd19a704512ec193171ecd9d6fd877e7d23dde0bddaf4facafbfd2f318c01e7c876af4460d85e07f6c64c5d9444810cab11ed895de141161df3112035f SHA512 59e76a700cac1f4a955a2de9ae287d8c5987ac3a4b1b48e88744afd73c65ffe6bfa046d0b8067d311a275c7d5ce9fd703b2d4184ecbcb4aa3bcfdc582434cc9d
+EBUILD mode-compile-2.29.1.ebuild 466 BLAKE2B b04ecade92aa4d1c5a2ff0b92c94997d1c01bceb5854974d58469106043a3f30755311fb7ffbf69578820a90f63de6cf7fa9f1f13befedf3ae3994df475fea99 SHA512 f1914be874deb0c3348a5e9fc2bcd071bb29bb2a5de4d82823bf777115ec6586bc129a5559df83872802ef87228da6a2bc2fc9e647d7edfc3396c61794749f88
 MISC metadata.xml 346 BLAKE2B 27da5dee0741feb4adf5c6a0ab37fc455997c01937511d82d364a7a99b76c49487f0a1958a456713412f41a4ef11a98232f97451f497f3667135b073e4b12977 SHA512 ecc1d6e4c3d88e34bee72530fc1bebcebec1f952c05cd0b0d423f7bfec40ba48e4325690a3c27abc1f474271f692273d6b3bb19e0590def83e33fd5d7bd79b5d
diff --git a/app-emacs/mode-compile/mode-compile-2.29.1.ebuild b/app-emacs/mode-compile/mode-compile-2.29.1.ebuild
index 157a8699665c..9f05df6283b4 100644
--- a/app-emacs/mode-compile/mode-compile-2.29.1.ebuild
+++ b/app-emacs/mode-compile/mode-compile-2.29.1.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Smart command for compiling files according to major-mode"
 HOMEPAGE="https://github.com/emacsmirror/mode-compile
-	http://www.emacswiki.org/emacs/ModeCompile"
+	https://www.emacswiki.org/emacs/ModeCompile"
 SRC_URI="https://github.com/emacsmirror/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/multi-term/Manifest b/app-emacs/multi-term/Manifest
index 9f09be269cb9..f0a3be244415 100644
--- a/app-emacs/multi-term/Manifest
+++ b/app-emacs/multi-term/Manifest
@@ -1,4 +1,4 @@
 AUX 50multi-term-gentoo.el 333 BLAKE2B a1b7110690bae34b2ce2f951490f9a614c19adf570efeb1658d71c8bdca620929012ed628613497a04b082fe123c2bdf2df0921bec0252870c05c78b175cf77a SHA512 ec802e28ed8ff19b34eb394be23c5eec1e8a68542574669062048315106d8a814ce3cd6a38713c53b193f5bb66def03c4397e4c606d4380a2be7525e2f348953
 DIST multi-term-1.3.el.xz 7968 BLAKE2B 6cb9a8bec0f2e1ef18229ecbec78a856808f6b3cab3eecc4ba2c78f91adcd687fcca870307c808cc1d0e6c2de71d42effdd0cdf38fc1b97b19511da7aad2be84 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361
-EBUILD multi-term-1.3.ebuild 438 BLAKE2B 3af7f442e6836a716110ef900f04d6962f2e15fe9338d96b6dd68d6612985375d6e48884a15d0b78dfe6a1331751a5ce3c4a835da9dedd64ad66b67e5dbb552e SHA512 537dab920a7ab7589461d388e4d8ca97c67eee15c6e901de378629e4ca36771343306437c9010b1dcb7ac3f42dd32cdf4b3738788f57c871f076490d86afd13f
+EBUILD multi-term-1.3.ebuild 439 BLAKE2B 9eafdf4a915629858ae46b41900ea24e07ee8a2c3b735714544b59f27e6308aebed978c0c9bb0973a153c344eccf5b5c826a5261aceb141827a24a7a07c3dde4 SHA512 4eca3e3a42688bb83131e71931b859e6d263d0fea9734d13c4f56c84d77b95a14986efef7ee13ff413494a4965a990acc59ba1604a226341dfc560e508dfc9d4
 MISC metadata.xml 332 BLAKE2B f09a26bb4c15390d13de56943ef7be9846439a73d4b1903201819f32c85d1318584a9bb2ad0f7ed38efbcf507c770448962e1377aefa2bc8cbb1833c43d62e8a SHA512 fab883d6c5a31c0d6fe8eb841f083cf7659fc80b1eddda6c1ccd219e48195aaa9ee67e0a47240ad98ed3c0ea979bf8f8214e3b8e29cb808187a981adece8e29a
diff --git a/app-emacs/multi-term/multi-term-1.3.ebuild b/app-emacs/multi-term/multi-term-1.3.ebuild
index cafa340e21d9..c6c77f56ca03 100644
--- a/app-emacs/multi-term/multi-term-1.3.ebuild
+++ b/app-emacs/multi-term/multi-term-1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit elisp
 
 DESCRIPTION="Manage multiple terminal buffers in Emacs"
-HOMEPAGE="http://www.emacswiki.org/emacs/MultiTerm"
+HOMEPAGE="https://www.emacswiki.org/emacs/MultiTerm"
 # Taken from http://www.emacswiki.org/emacs/download/${PN}.el
 SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index e978ca3e27a0..55d0541c4ad2 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -3,8 +3,8 @@ DIST org-8.2.6.tar.gz 4221803 BLAKE2B 78adcafdc2a9020a71ef9efe4699f6c2ae20b77486
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
 DIST org-9.0.1.tar.gz 4439964 BLAKE2B 20f921fbcc3a45180395ec5158a6ab055e1ae7a318a5c2dcbbd8de9460a2639da222f89169f4289a2e9b4a5cd4c7928a5d4edb8997ef24fc8f41abbc919b1e52 SHA512 c0a88372787c5b71ec1523fcf58b3cbf80678835c7b0bfe3b2406290da6fc88b977121ca3b35b47abf2c32ef40c0bfb6733170f225ea35ba24f2e801bb634afe
 DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245fa1103fe6b5509a5bb0d0aa471e9414b8f6293c3d5720c7b307a77e0f03ad6a9b590bf2469da5d54ddedfaf SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0
-EBUILD org-mode-8.2.6.ebuild 1486 BLAKE2B c60c8d5efef2706987a951bb574f4cb120d2204d3c72f16b91b162a1e95b62b618c276478bf0c33cfa535b9fbe4ce1752b4d0a8444ee595dc252f5a373c2be73 SHA512 e39f08494a6c50bfcdb103a40b5fbd5ba55c65a85b536c16c264c4d539fe3b6c731926803d6a02306d8eefa30c47c88d3a866fd915ed55507e10cc6ccffa4f51
-EBUILD org-mode-8.3.2-r1.ebuild 1776 BLAKE2B 1563fa52597aca59e631838e86c7849edd8082e3a14c0bd50386e6c93826dabcc708edabc53a8056f5ec29a89b4c8878f207869a51515dd5466ee0071d8c6bee SHA512 f7d28b056516e744d13ae22016b00dc3e67941e628adfb248a83e95dfd78ef5a48b0c852627be3aae4ae9acb323426b000e1e9fcbe6b4b0304dbed2efecf21e8
-EBUILD org-mode-9.0.1.ebuild 1777 BLAKE2B ce313ab21e502d28b13439d57f88c7ddded5ee2d33f0d592dd78af15ebc858db53438712c6013289f914b5b178999dfa270c12d14fc71648d20f16b2319f9e4e SHA512 8a171f964ea3bdf7b20262f43b32de4b1fa8b14c435988fdb410bea13f68260c2e65ee60c1a4d1b6f80b426a6bb274cb60bc5b9868009ad6d40d96c9e287875f
-EBUILD org-mode-9.0.4.ebuild 1777 BLAKE2B ce313ab21e502d28b13439d57f88c7ddded5ee2d33f0d592dd78af15ebc858db53438712c6013289f914b5b178999dfa270c12d14fc71648d20f16b2319f9e4e SHA512 8a171f964ea3bdf7b20262f43b32de4b1fa8b14c435988fdb410bea13f68260c2e65ee60c1a4d1b6f80b426a6bb274cb60bc5b9868009ad6d40d96c9e287875f
+EBUILD org-mode-8.2.6.ebuild 1487 BLAKE2B 1a2b5947d23943f9556dfd3eb1312b77e92787885b53f8cafa2c7651df084bd8d8dffd56215d9e5542ff1f3e4a3b8a7881fc9ddba6207a3e9bd080019fc91b7f SHA512 8a848d4793163f0823c3bb3c0ace062172d57f91027bf717f1f560fdeff2c0a0aab77cebe0fc083214547bd0556f0bab501e8253ba69ad4626d04c4b71334a93
+EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
+EBUILD org-mode-9.0.1.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
+EBUILD org-mode-9.0.4.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
 MISC metadata.xml 1345 BLAKE2B c8db96b28bc6bdf137fe1a5084319f2b24d1cd26ccb7f8071aa3fbaab940d929889d68f41fa0a0c5e3e38686241ec869000ed54f7f95813be4547f7d523e096f SHA512 97bc0caf88697766a311ea2e92d689a17f8668164f6d4309f4f6ac850a910efc7d39bd135a48c6b636d1b5af968de8f440cfcbfd5dcc266b7bb4ce195d67786a
diff --git a/app-emacs/org-mode/org-mode-8.2.6.ebuild b/app-emacs/org-mode/org-mode-8.2.6.ebuild
index 4c423ad889fb..407e6a953ed4 100644
--- a/app-emacs/org-mode/org-mode-8.2.6.ebuild
+++ b/app-emacs/org-mode/org-mode-8.2.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
+HOMEPAGE="https://www.orgmode.org/"
 SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
index 1e2a87ef607e..54ca7f39f1a8 100644
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp readme.gentoo-r1
 
 DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
+HOMEPAGE="https://www.orgmode.org/"
 SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
diff --git a/app-emacs/org-mode/org-mode-9.0.1.ebuild b/app-emacs/org-mode/org-mode-9.0.1.ebuild
index 50fccd9ca860..4ff2e904df26 100644
--- a/app-emacs/org-mode/org-mode-9.0.1.ebuild
+++ b/app-emacs/org-mode/org-mode-9.0.1.ebuild
@@ -7,7 +7,7 @@ NEED_EMACS=24
 inherit elisp readme.gentoo-r1
 
 DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
+HOMEPAGE="https://www.orgmode.org/"
 SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
diff --git a/app-emacs/org-mode/org-mode-9.0.4.ebuild b/app-emacs/org-mode/org-mode-9.0.4.ebuild
index 50fccd9ca860..4ff2e904df26 100644
--- a/app-emacs/org-mode/org-mode-9.0.4.ebuild
+++ b/app-emacs/org-mode/org-mode-9.0.4.ebuild
@@ -7,7 +7,7 @@ NEED_EMACS=24
 inherit elisp readme.gentoo-r1
 
 DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
+HOMEPAGE="https://www.orgmode.org/"
 SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
diff --git a/app-emacs/outline-magic/Manifest b/app-emacs/outline-magic/Manifest
index e2d8176bfb8d..497fe6882997 100644
--- a/app-emacs/outline-magic/Manifest
+++ b/app-emacs/outline-magic/Manifest
@@ -1,4 +1,4 @@
 AUX 50outline-magic-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST outline-magic-0.9.el.bz2 6823 BLAKE2B bcdada425fb8a1e7121d8592dcbf078a95ec7c9fe67cdb4f982e7e58cf16e969de62a6a025dcde2aad23164d23e131c73dc4a0abcd40b87d406f7b236cc23a09 SHA512 46c404954642cb88da4bfe82432e4d45b9c05671d81333dd6bfd422a5311c1fd76daf1893be3875044e68ce43bb8b70928017a420715a7e08da76d366d969a49
-EBUILD outline-magic-0.9.ebuild 389 BLAKE2B 96ad923a66a6b44f0c1c1beb14ace461f9952e018af206dbb2fea3f78530a2e8a706a62bf47cd7bf5795b1523b2b27cbacdee9b4e569aa8670969a688bb19641 SHA512 ab263f209099a3036b9569c2ad5ce62e5c55fa8fa372655d8e832396bb666b8e8203528f8d2e7dc600d04985c4f7dc7c474ba8b201fc5fc121b7242c3a745c75
+EBUILD outline-magic-0.9.ebuild 390 BLAKE2B 6097068fdd6406a418fcfe0f26322f5eb3dc8de5f814405d0d14fef5e9f4105bb18956a83b7a4121ff7d202700b783add279d177002e72910ab15561fdeaca25 SHA512 c34edbcfe1d768d5177bee111907a8c22eb87dcd861dfa3ca19405cfb091f54d33ee0adddf24a3fc59d291f6d196e616327f53568b1f2c88ea98e4db560ead93
 MISC metadata.xml 340 BLAKE2B 3434f02575c1cd30ddd666139b6655b12f9ce67be47db13295c8a2cc8563b91cd2c3c81ae98eb02c3d736ec0b9da5d64c20acb06033c8e7ede32210ef1ecd15c SHA512 3b38e45253a2574fbcffb0eab4bd886caa1093953a43de1bc264486a76d49b5d7ab91b11dfd65f395b6fa8afb7f72125d05e6cddfad04f2581151904b79b5e57
diff --git a/app-emacs/outline-magic/outline-magic-0.9.ebuild b/app-emacs/outline-magic/outline-magic-0.9.ebuild
index 5f49fa1e1e21..27f65c51fc44 100644
--- a/app-emacs/outline-magic/outline-magic-0.9.ebuild
+++ b/app-emacs/outline-magic/outline-magic-0.9.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Outline mode extensions for Emacs"
 HOMEPAGE="https://github.com/tj64/outline-magic
-	http://www.emacswiki.org/emacs/OutlineMagic"
+	https://www.emacswiki.org/emacs/OutlineMagic"
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index a58b8c33b14b..87cad721838c 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -1,4 +1,4 @@
 AUX 50paredit-gentoo.el 503 BLAKE2B f08ba9965af5d555de5539b017eb230c9e5eb296f0ea9f98fb2f46a4a7c665e5757cc7b135df7282118f16e6b96a926e8e8952b926917a7cb5e0266d4d751a93 SHA512 4635fa54babe7df170356f4d74d9419bfbe185301a37110d5a12620b1c6ab4654b66c2062814cacf64e480c5079e3da82354ff78db6e600e4dac68e0ba13451c
 DIST paredit-23.tar.xz 24204 BLAKE2B 1bb1f9466a4c418800ca66a6e0ac76f8d2324d27e27a6f2ac1aa0be576dc8fede6392bde919ed489b14f4ddd3e26fab102e722803d3e9dc5874c5321bd269d35 SHA512 33ae10d95d3b2d8fe2466fba20d6aa0abac56684807fb381ab0db2798e99e2358c6dca71794b95768b53be661b9181f458e932bb37c31ba7ebba155a57f1bb01
-EBUILD paredit-23-r1.ebuild 533 BLAKE2B b99da2f39e65c983d1e594b7afda0868890f1592d082669253d556637506821ed2e9b64acd1942badfa8eb9bc1ad434f772ba18f7ba67eddd47706e87f3e369e SHA512 88902c3e554f3ca7802d2b877bf14b9f100d1c45794fe826c970236a1a0472548ec9e20d1c31f7235b7aae7b494fdbdf332dcef76641afd5fc38cffac6645e06
+EBUILD paredit-23-r1.ebuild 535 BLAKE2B e962729e43e16116eebdb5b76cccd0600f901b5d29cf169bfa03212d60d453dc48cc4a758e1ec0ef34e20c7b22d3d49e85b3e477b8fd622406faf2d5a2a473a6 SHA512 d8cfd451a27104afca26c97cf0a0a849d5a5495848b3a54c3348c122cb8ab545daca0b52885d31680a72fe294e3982323c4be4339df620ab3485d11434379fb6
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/paredit/paredit-23-r1.ebuild b/app-emacs/paredit/paredit-23-r1.ebuild
index 3665f48ab70c..274c44114d7b 100644
--- a/app-emacs/paredit/paredit-23-r1.ebuild
+++ b/app-emacs/paredit/paredit-23-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Minor mode for performing structured editing of S-expressions"
-HOMEPAGE="http://mumble.net/~campbell/emacs/
-	http://www.emacswiki.org/emacs/ParEdit"
+HOMEPAGE="https://mumble.net/~campbell/emacs/
+	https://www.emacswiki.org/emacs/ParEdit"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/planner/Manifest b/app-emacs/planner/Manifest
index 2a90828c68a9..f3f2d7606885 100644
--- a/app-emacs/planner/Manifest
+++ b/app-emacs/planner/Manifest
@@ -1,4 +1,4 @@
 AUX 80planner-gentoo.el 203 BLAKE2B ad8a347e66386f3eebea0d605396dcf4e2bebf5ba3e001578019f5f94d3baa68ee6bdd58f39fa990289f16e6e9dcf1368b48ff43ab2bcdad080ac0587feed4ab SHA512 60ac1a86188a07e4d1de7024fab965d2f7772dbb175aa987fa035748944ae28fa99dfca128ed3151c1c02218d19d435708587b64a991ce56b0b0d4a966b2ccfe
 DIST planner-3.42.tar.gz 412086 BLAKE2B a9cc8db317d51b2c885f5bb186f367c4778a9175dfc93d8cdfea38014c4964214c27d023bf99ee452dee0e7322f1f2c397d024ef95fd33254f4a19d2ccd40281 SHA512 6c0674a1b780005c37850f25ec8b20c72b3d34b6f4e8ad463392e887e498807567af41c0c6ef0f4141230e2d3bf8c702acebae869efc37f72b1e984519c23b3e
-EBUILD planner-3.42.ebuild 656 BLAKE2B 9c1b0028616804c78aec0f2635c98929938b132a7a46bca28860bdfb78cf70b1d47dcab32c1d91bfe126126e7ccdf9893ff454f64d1b32c0f667781da34ebedb SHA512 9126b0e0e7042c1be2e69be92e88123a8621cc82601334dd015d2f179e8801aef5cac7aac1181eea9f034312ffaa5001b789201047aa847a9531a0c005fb4b73
+EBUILD planner-3.42.ebuild 657 BLAKE2B 7b710a4d49a36328000a4445a3c96477c5ab0a954afa47319ca865a893b118e5ac52acc9b2ed931c2d4b8d9097eddef11def5afd550546839d0fa2949b1499da SHA512 85be47f04dc32917c1c5b1ede83d5cfc935e6e79c996a6a40d1c0c5ce4cd0c4d45feb8354b6393c1c689a98fbb09c8c3fd925c19457509aac0d6e6c1a417fe9f
 MISC metadata.xml 539 BLAKE2B db62ad5c3dc5f3e1a12d6c51ddd6a3241b1b1c3e24ce6077e0a4577ce95c1e65dc2d455b4ac323730b9cc60a5371909f897e473451f149f51af178ad5a3d3784 SHA512 b08ff136c2e95d3b57b6f166f55b72f2dbb1e5be74ebdc4cd3b675884510765bbad6d6e109e2dfbe322e8f70c7f89dd35d1fcabf6db957263cf003929afdd9bb
diff --git a/app-emacs/planner/planner-3.42.ebuild b/app-emacs/planner/planner-3.42.ebuild
index 40fedb422d26..7eddd75fd4c2 100644
--- a/app-emacs/planner/planner-3.42.ebuild
+++ b/app-emacs/planner/planner-3.42.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Maintain a local Wiki using Emacs-friendly markup"
-HOMEPAGE="http://www.emacswiki.org/emacs/PlannerMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/PlannerMode"
 SRC_URI="http://download.gna.org/planner-el/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/protbuf/Manifest b/app-emacs/protbuf/Manifest
index ec8f707dcdac..b6129ccee48e 100644
--- a/app-emacs/protbuf/Manifest
+++ b/app-emacs/protbuf/Manifest
@@ -1,4 +1,4 @@
 AUX 50protbuf-gentoo.el 529 BLAKE2B 49ab3c50c3093fa9895f3adfd9084143eb395e700f0b30c4fe36e73436e368475142d4f0a0e458f54d36a468f60cfebe56491c2618aeec8c68ecfd6cf3289020 SHA512 f1cd37bdeb9568cbff9ffb989334237213b8c1bc50704195708fcac4848cc3c128c8121422a0ea42af8c2ee94647e325cd293e4b29c513ad8cdeb37d33fd3f4c
 DIST protbuf-1.7.tar.bz2 2270 BLAKE2B fa840549e785dcccbca53e4ddad7b6572f6da0191d3b82544ed562a4e1d6e6a28e1cc44aaf81498a0f6c8f9ef6d37451104b6552bb0c8469029d0589489d03e5 SHA512 9dad81784b71234812ac35be695895c3063e5337dddbed73b28fde800d12110cec6bb9faa42b6ed74d9a2d4f12da96b8e692d193edfc775fd33a7922a019b8b2
-EBUILD protbuf-1.7-r1.ebuild 427 BLAKE2B e7e66295ddb2c4e1556d53549c3acb08d6e6b48df387284315959fbca4cdad793cd7da3193caf71a194507d261aada8a45eddc722f3a53a847751498a6117017 SHA512 be43e7577cb700c3b0b9b59e8ac21e53d5548eb19c80f85692b175ff44ce15eab36b40f2dc5199fe99ad4aace97fd2c9cdc4a5391f8968ef9e82aea96b91c941
+EBUILD protbuf-1.7-r1.ebuild 428 BLAKE2B 54a1b73625827ac00432da8c06462e4521ae13efc8e46fa6d8c3d6d4d12af38de88c9af7d9e04b19c5431abcf717eefb703ded174440357454cb71db825aa84f SHA512 d7f3a6edbf92e455f4cee976b53b202c50e77801e9aa3c5494286417d7f9fe3908ab40c4db0365b99d429d46c51677781e04aa1354357b24fd21f45a6cba269b
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/protbuf/protbuf-1.7-r1.ebuild b/app-emacs/protbuf/protbuf-1.7-r1.ebuild
index 52f17d641ebf..f175a542b6b0 100644
--- a/app-emacs/protbuf/protbuf-1.7-r1.ebuild
+++ b/app-emacs/protbuf/protbuf-1.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Protect Emacs buffers from accidental killing"
 HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/
-	http://www.emacswiki.org/emacs/ProtectingBuffers"
+	https://www.emacswiki.org/emacs/ProtectingBuffers"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/psgml/Manifest b/app-emacs/psgml/Manifest
index 65a4a7a26dcb..75a61acba50b 100644
--- a/app-emacs/psgml/Manifest
+++ b/app-emacs/psgml/Manifest
@@ -1,4 +1,4 @@
 AUX 50psgml-gentoo.el 295 BLAKE2B d2276bb66871f2dfeec692358fd49fa226c7141ff3b9e0020c05b7d873cf65fa1d4f117724ff3baf2ea3520bf85cdccd90129bf54da815bb44de19c279e0cddf SHA512 ecb9a8c544e0b5e287771d6538d36ab67076d0fc68b55bbc5428aa99b9c5f773f01499dad6f2d624d99648ddbb30518522da3f39d244fe30b4d884567114daa1
 DIST psgml-1.4.0.tar.gz 262246 BLAKE2B e888e7e13b39108efd19bbce41f3630015556ca9e5250665456866173302b5388add506694f28a6fa7e4e4572ce4596eec66762650f7203a14d84fcfbcd8ac7f SHA512 99bab6440a0f437009edff6371412c16f47d48c6b1eaa5b894523130e3a8d604ea79dc81f1895ceecd4283d0c7fd908d4e5bdeace63e54b9ac048a80fc0f6f44
-EBUILD psgml-1.4.0.ebuild 826 BLAKE2B a1aa70d559eb38fdf4718350b80cd620383a4365384e8c7af74fe78fcfc5118c42d3b26271b6da2a54d877c871e0128790c903ef7945a03e69dbf0e910d5fee3 SHA512 a7ac0453d8b9e84c4b19eb625fbc5b42fefe7a6aaff30c93102c8ce412b227327d2ff6d988b0f1cc780d993e922acc67c567617468e2ac1397f6f9fe88f9c033
+EBUILD psgml-1.4.0.ebuild 827 BLAKE2B e8425bab4b9f39686ba920f5c771a1a25565105cd1370ec6d7f2e5ea0587b5a3c0e3b614610d31e0bac5a82dae7b1142268fbfdb1fd0126d183358b5d02561ae SHA512 2e1778fa2efb8596b991314cfa0a3f43df0a9471aa3a4b44c8d8631d92479f3c14f3ab10b3dc911d27b46ee076c91c448e68ce621608b5c7463b3b7d664ef4a3
 MISC metadata.xml 332 BLAKE2B e2e7064775006e7ab47f98bc70baa5b0df29d03227fe6687240808d541f1102aa2c942fef6e79d078260dda86ab2b792b1a9c851a8f96fec61d1db2a89075402 SHA512 3a1a05ba993164e6d231a82e2df549bc9435262b8578e6bfedb4e1de09b25a0a5d46e9b10f7c0a0229aac7154b784679855ed5e7cf08a69667c0ca4340e0d1de
diff --git a/app-emacs/psgml/psgml-1.4.0.ebuild b/app-emacs/psgml/psgml-1.4.0.ebuild
index a0ce8152ae71..4d38464f5803 100644
--- a/app-emacs/psgml/psgml-1.4.0.ebuild
+++ b/app-emacs/psgml/psgml-1.4.0.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="A GNU Emacs Major Mode for editing SGML and XML coded documents"
 HOMEPAGE="https://sourceforge.net/projects/psgml/
-	http://www.emacswiki.org/emacs/PsgmlMode"
+	https://www.emacswiki.org/emacs/PsgmlMode"
 SRC_URI="http://www.fsavigny.de/gpled-software/${P}.tar.gz"
 
 LICENSE="GPL-2+ Texinfo-manual"
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index e049aad2b522..e1cd1971cc1f 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,4 +1,4 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
 DIST pymacs-0.25.tar.gz 120597 BLAKE2B 837c67d862c11d2a9d74cb55a055f60627834a50717d5386ec604db70a62270aa2ad3e56942602dc10a5f997ab3ce6d7f91e29a8c5b959144286182ad861b3bb SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0
-EBUILD pymacs-0.25-r2.ebuild 1278 BLAKE2B b997db95f65357a77ce89f82fa4462b3c409592e7f90ee442bf9719a417875c4db2280f7463e79e50dc26e71244c6015e1ba1a89f59c976cfa068a69ff44309c SHA512 64dc02edc53cbfa57ba8f77ee1d592d0ca20e1dbabe79c8aa8a479e217984c59f89498f59b6f04ae7e0db96ff38aa27b973ec027f36cbbd5f4d5f8d8fb627cb0
+EBUILD pymacs-0.25-r2.ebuild 1279 BLAKE2B bb728892bc5a2386f9ec663a137666f1c9c46632c4d9d086ddfdff2b0f1797e997ddef54a3a35c0cc02c86db9616ad687d357a5997e012eb7251db3b89f597d3 SHA512 30c8a587a138564a9a2def942b83be10ee6f55e776dbd90199461b28669e13a705316fef347c4b68947b9e0a53273215dd9bb59c6baa2bd6ea7ee05e7a41fe2d
 MISC metadata.xml 434 BLAKE2B 11fe7bc8c9fa32f4762237f30e93ae5281b73b10a99e389d6cad284f6ba649b7f732fd07aefec8f50d7175af301e021ad34cfac65adfbfb7dc6133184725cbb2 SHA512 899211703ed0824e0b2dd26018e46854ab970d76ee12f169b99bc3a49f9e3bfb1d42757c35ac1ac21268b90b8536737aab61cf9dd4f7297b4e5360f1fe73f821
diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
index 0addbbfa34d1..edc51a95f82d 100644
--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit elisp distutils-r1 vcs-snapshot
 
 DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
-HOMEPAGE="http://www.emacswiki.org/emacs/PyMacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
 SRC_URI="https://github.com/pinard/Pymacs/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/redo+/Manifest b/app-emacs/redo+/Manifest
index b4c0ef000f89..6d9a16575bc6 100644
--- a/app-emacs/redo+/Manifest
+++ b/app-emacs/redo+/Manifest
@@ -1,4 +1,4 @@
 AUX 50redo+-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST redo+-1.19.el.xz 4160 BLAKE2B e595fa0c5dc7d2b7da5bef77815b9c6bfe1372db37a2b7dbf6d3c84e7b8243fa9003f6c76d1175df2805a72fd9eab3c1f0245b42435cd3513311fc708d9cb7eb SHA512 e6e436b3e11d90b637e66328f2f1bfeffe0c7fe4e4f1778825e95cdb2bdf934797e9ed5563f8d83bef4fcdbf5fa4f4ab4d85bcd35b967615fdd5bce45ba39d95
-EBUILD redo+-1.19.ebuild 573 BLAKE2B 4dbfda5b03e8d9e0c70d401a9dc7689f25b66f5a50a320e2a79b3beaeef6078d4b46a5e6302b9d918193744812a6c1358e69f7338b17727cd65a6f52d8c846f4 SHA512 e1488005d137598408b1346868f13ae68eacd1119eae584470981b1bef97a70591bc567cbfbd0d6257b22b2c40af1531189780ac6a9a9de688cf270c5a302863
+EBUILD redo+-1.19.ebuild 575 BLAKE2B a188c843497c70123291b5d9d8f97e6c8cf3402dd78df2641d6cb1b917e19fded1960c2a83347bdc91342ab7dfd3149c47de882f83336070acec89af63744524 SHA512 e5009eb1d0191e298b56ac6a2cb2f8a358eee473ea76604f50a2df0de118b806db05d89ed993d8be26bfbf6679f0d8e4529dcbe9218c6a2a52bc7abf875f4924
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/redo+/redo+-1.19.ebuild b/app-emacs/redo+/redo+-1.19.ebuild
index 9223b9eccfb5..2a45fa52a8b4 100644
--- a/app-emacs/redo+/redo+-1.19.ebuild
+++ b/app-emacs/redo+/redo+-1.19.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit readme.gentoo elisp
 
 DESCRIPTION="Redo/undo system for Emacs"
-HOMEPAGE="http://www.emacswiki.org/emacs/RedoPlus
-	http://www11.atwiki.jp/s-irie/pages/18.html"
+HOMEPAGE="https://www.emacswiki.org/emacs/RedoPlus
+	https://www11.atwiki.jp/s-irie/pages/18.html"
 # taken from http://www.emacswiki.org/emacs/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/regress/Manifest b/app-emacs/regress/Manifest
index 057c0140c896..85c84953f31a 100644
--- a/app-emacs/regress/Manifest
+++ b/app-emacs/regress/Manifest
@@ -1,5 +1,5 @@
 AUX 1.5.1-regress.el-gentoo.patch 444 BLAKE2B 1ea48b62e5c85ee52db6561603d3301f284f76fe276c33933229185829b703b71af0e7603be0537f84a2f54851d5eca0a1f066b588123dae7eaaea0b0d354a7c SHA512 e8ab5b3163dd8ff3aba0e3d8032e1f76fbb4c456fca254ff7018c01acd0c56fda880fcf68a8e974f97e009d331b3bfc833d820b936e8149a7ca5e877114ad1ab
 AUX 50regress-gentoo.el 214 BLAKE2B 45b67c27b25470c8e47c155fbe3677aa9f9c5b9ff297a2876dd9dd95808afb5bbc1eef4ffa8ed337517a0245d45e89aebb822ba38bb58d39911e5adb79e1f6fc SHA512 8d007e54dd017076cd061c0c05e0e935fe70f07b99e36e52df09d3d84d4a67b15b39d8076011c8ab25bb5e2803ceacd2b9b43ca246743e82f189cb3bff4565a6
 DIST regress-1.5.1.tar.gz 8633 BLAKE2B c399da64c802d261690bc7d513d9ca1dc5a1c76968273f50f933cd6ae8e04ec716ad4b1b7e598a7983ce8fb77daae3d21eb24f3c80629dfbbb2df5415f2ad756 SHA512 8718d44fc8cd62b9f02f53e59b0843f23cd9f1852c8f3c3038a3009b72f65efff94ac0fa9a18356d5efe7dde593e4643ed17fb54b5cc602f60c730cbb5cbd64a
-EBUILD regress-1.5.1.ebuild 425 BLAKE2B 0eb2bc3b40315e71483b087d9076737a0bafb5488a388b0994e2571977ec4ede3ca46e00202e5a056f359ff06051d1e5a4a3690722376c786da646d447647d2e SHA512 e683e46877511ca3c12ffca0fe3bae3f6c36a4c24f2805d7288300f00163e217a79740f916151df931fd52ec35e6659f8d1fa04eff89061f6675e907a5844d02
+EBUILD regress-1.5.1.ebuild 426 BLAKE2B bbcd5bdcd909af900fd4558bab914e1e5aed90548d9f04d92e476c14b37df4c7722d1f7101c4841ef46df87e444f85b10d50be8d78b5f923f93d0457fcc3f73b SHA512 4b0a0dd228a3cc0ae587bdcc936b48ac118e605ee4643744531ee3c907a0cbf91f444419a616e9677ea6219901254c8e1a28fa9bff2200c23e1c1791d088e323
 MISC metadata.xml 393 BLAKE2B 88b3a94242106218d3c031bdc5ef0bc8a6a854c6c2eb5826bbac5a09a43fe82836def5be9c39adcd2cee641bb1f69be5390e127a0b56b976a37eda2aeb1b8162 SHA512 58f2e13b718205ddf1a9c9fec1e8ecdea28693cafe84f284b94aa32464f7c6de97131e454afa7798a28e4c7bb748beff5afe22dab17df847d3a18489b26a48ab
diff --git a/app-emacs/regress/regress-1.5.1.ebuild b/app-emacs/regress/regress-1.5.1.ebuild
index 8fffa621d0bd..bcaf45eae24b 100644
--- a/app-emacs/regress/regress-1.5.1.ebuild
+++ b/app-emacs/regress/regress-1.5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Regression test harness for Emacs Lisp code"
-HOMEPAGE="http://www.emacswiki.org/emacs/WikifiedEmacsLispList"
+HOMEPAGE="https://www.emacswiki.org/emacs/WikifiedEmacsLispList"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-1+"
diff --git a/app-emacs/remember/Manifest b/app-emacs/remember/Manifest
index 2f49b3a55585..a6a37dce2bf3 100644
--- a/app-emacs/remember/Manifest
+++ b/app-emacs/remember/Manifest
@@ -1,5 +1,5 @@
 AUX 50remember-gentoo.el 376 BLAKE2B 1dd3ebb7584b0a98c3897ad3e6b7cdaa2f7ca27099c82eb42c5a9fe44bc1dfb60bcb4a19d16b452722dc72e29f5718ea6ca952f65ed699190e3e9b9ec0b3c948 SHA512 b1424526d7ae0fdea157a123a2030ff47700addbdec3c6d8ae42b0587e3eb028c54cf27a3d5b9298fbac04b4e3216fec0d189df29d3c4076fcaeb64cd9b1edd6
 AUX remember-1.9-make-elc.patch 320 BLAKE2B 65d0f4a1df9b7bbf09ad39830fc20faefd4fd554783758139c4351ce64e4444bc8884f7fe3c4e6a46b029c3543418c24ec050485d079049f8e9e2cf9a5726b82 SHA512 1050d5dea089a7732d8310f6131c2d95037cdc98150ef8cc6113a5a31c16cf0fd730a0d11ff6f3909ad1835419a47e384cc490f529ef38a5b000b6f27bc6112e
 DIST remember-2.0.tar.gz 48096 BLAKE2B 7296760b561ab3c626a4c356aeaf02f9783d0ce84fb2e1bfbcfd46f392a5128bc956e378f646394645589ca6dd2a9bf1ff364ade25787ffa58f580d4decc485f SHA512 c5d1a55904699565af6375d19e88924a31364cf6f9b09b6e5510ac3e65c9bddbb2e0a5aa668dfd6e541ea6572209cad8af68694b7376b1bfe964032d247e5e01
-EBUILD remember-2.0.ebuild 871 BLAKE2B ec6ea23a61574ab432607ba156057978ddbdf8f38da95c79f01aca33ac3d6e18586625cbfaaeee35124f22d27fa4cd9644af9ab948d1ff8909d0950b4370e021 SHA512 bb99196b0ee2b5eccf44349bb982212459174ea1cc5ea25dff44ef274539a6cfdee28c939c4cad5b77ddd15f44916ada7955c704fd8b6dc4f180b627af1b6085
+EBUILD remember-2.0.ebuild 872 BLAKE2B 4bf3450e5fab7cc1794bfcdbb62747d909ed3a43c9f232c39dd08e0baacf8efdd2d83b442dba8cbc9d19af0f7d1199f4ef6154105fb9383f08a2f381f758528d SHA512 0ca05efbc9508dfc2eae5f289f5f465233e9837cca748025781167092adfd54704c3fbf7c5cef7962819daef571afbd651c8ab3d55b02f4533667041e01b45e0
 MISC metadata.xml 997 BLAKE2B 233ba3fa2758a620c98b5c424b6fcd03cb65c8b62ee50dc92bacd337aef45559940d967e31e12e55cd9b53abad807a16f3ad2e5cdee0da39031af58a65a462f7 SHA512 facb0462e8c41e4c461c535996c807b1edaaabb712139106ef99bc485d9bee886201f0a8ba98109cd6564cf3cf1f9bc10a4f52a3a49d2d3b19990139ef0a83b5
diff --git a/app-emacs/remember/remember-2.0.ebuild b/app-emacs/remember/remember-2.0.ebuild
index 02a1ce5cf433..3774e1a0f620 100644
--- a/app-emacs/remember/remember-2.0.ebuild
+++ b/app-emacs/remember/remember-2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Simplify writing short notes in emacs"
-HOMEPAGE="http://www.emacswiki.org/emacs/RememberMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/RememberMode"
 SRC_URI="http://download.gna.org/${PN}-el/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.2+"
diff --git a/app-emacs/rfcview/Manifest b/app-emacs/rfcview/Manifest
index 83f23dc63b5c..0effb5c36486 100644
--- a/app-emacs/rfcview/Manifest
+++ b/app-emacs/rfcview/Manifest
@@ -1,4 +1,4 @@
 AUX 50rfcview-gentoo.el 168 BLAKE2B 8cb9470bb4d06caaf5345344d3b2608d47cbe8ac9a1ed325528c84b05db696577e6b332993207aaa4d485c303caab3a67bf866457aaa270c6e28a5e0f38d7303 SHA512 ed6bec3e4368d4d7e193c5b6ee0493d6c497bce90ec834376371898777a7c3601288bda59232c1ec4920ca20bbcdf4d01ae3d2ea617da55a31568a5824179637
 DIST rfcview-0.13.el.xz 8836 BLAKE2B a71f7bfcee9170330f30b7087e37723fff1081b146141d26d1c0ae60a98060a069f4018ff252808dbe27b4d5d78d053da36a420657ba137b91d37820d055cfa3 SHA512 84cda45b5e941808e2ddc50d5f03d7b2d3831208d08dddd2fe2121a20ddcbb7d24b148b2ec2ba07e0b9a04da81ae4d14269d0062955961679ac5c7532de1e6e5
-EBUILD rfcview-0.13.ebuild 487 BLAKE2B 3c7faceb316977a518d4ce13de99fd1146f187159ceddb1eefc40dff1215893d5377e48d054438a8e4e703b7ce7dd739648f055fafca4607134eb728fbfbf556 SHA512 0f63f7b921ce481d7b4ba869aa6ebe932c36287209753e20be7a03d7c8cfe71648a5452ff3a936316235f66c14a27bfa61e20550fe1d0a06a71d7f54e3e56981
+EBUILD rfcview-0.13.ebuild 488 BLAKE2B 40606a05de10e3666b37dc161f3732193e25154f28eaed8322148b4ff49944f13535b7e18cae3425c36bdeb51e4d227aea9349a154d6c87b0dbb4227da81c823 SHA512 beed40b9a9cf5e33fe1acf69d5e1e1aa3732bf1481d74c785b394d0dbb0ef7ab057a85d00e4b4d3425c564dcc5c1f3bcadd219ebf742908dc73f95f89f5bd57e
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/rfcview/rfcview-0.13.ebuild b/app-emacs/rfcview/rfcview-0.13.ebuild
index 480e9d836ca8..9c609a16ed29 100644
--- a/app-emacs/rfcview/rfcview-0.13.ebuild
+++ b/app-emacs/rfcview/rfcview-0.13.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="An Emacs mode that reformats IETF RFCs for display"
 HOMEPAGE="http://www.loveshack.ukfsn.org/emacs/
-	http://www.emacswiki.org/emacs/RfcView"
+	https://www.emacswiki.org/emacs/RfcView"
 # taken from http://www.loveshack.ukfsn.org/emacs/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/rpm-spec-mode/Manifest b/app-emacs/rpm-spec-mode/Manifest
index c683b5d8a184..b7c434b083a7 100644
--- a/app-emacs/rpm-spec-mode/Manifest
+++ b/app-emacs/rpm-spec-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50rpm-spec-mode-gentoo.el 188 BLAKE2B 03ce71a3d7383b4a34eca735a312c4d974c1494471bc038cc3a77ca4fd5d11832c2daa56ce2d9f77ccd3dad589173a446d285cb37a302d1d8f0df5f6bc570ab5 SHA512 60a6c11f7ef2c0043c9c2f502d0cf1d2976a5e33eb47735b00a0b4b99cded6f635386a5ad5680b0eac7604e00aee8f508df53a79263bb0dfe82c076ca5fa4657
 DIST rpm-spec-mode-0.15.el.xz 11176 BLAKE2B 209720693ab1d749187ce923534db18ecc57daabf83bd9051988a2ae660df8482370f33aae3730152f99c1267ad366848ba6b7df72ad9a8c7b195ea94313b224 SHA512 cd2f1dc1d3b7bc18512d14bdbc8b73183b0d917e93911aa5c88bd847cbf24f090480cdac46f9f8a82336085ea801abbbed567fce19498cc70661d051dfa287dc
-EBUILD rpm-spec-mode-0.15.ebuild 458 BLAKE2B 76f10b60273c11ffebe3c9fe9ae4ba873903d34e4e14f2cc9d73d6953a9ab312b826839f50af97187cc7a140ff1d76df9b2b9adfce370606d888f0f21e9ca6ca SHA512 e29aa7378e2708213a35da743c3dc32c9ff72fb98681038bba4a7e59bea9d0707ccaf13a3692be9d94f5cdec4b69488b3ba49220f2404089cff0dcf907b4700d
+EBUILD rpm-spec-mode-0.15.ebuild 459 BLAKE2B 8b57ab69cae009589b579125b9f98405f1d35cf7fc002d5740dcf502badd6d687c4c553e5e031a9b7fe7788b2aa968f2f5919e8d4281a2d4dfa931703c5edc36 SHA512 8e97a340671f65e63d5f0cbef8ad89c167250c15fe7fbfe8af90b66c5f54559deb0756bb62e93a3547bdd0f51f2f3720909b2facc64d5307b6690e651addc197
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
index 182daa5a1e3c..0f7ca5284d9b 100644
--- a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
+++ b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Emacs mode to ease editing of RPM spec files"
-HOMEPAGE="http://www.emacswiki.org/emacs/RpmSpecMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/RpmSpecMode"
 # taken from http://www.tihlde.org/~stigb/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index e6b4996f6d7a..1d4bdd5002f1 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -11,7 +11,7 @@ DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 EBUILD ruby-mode-2.0.0_p247.ebuild 568 BLAKE2B 24b39cf684d204d000ccee421c8d06186e36c7bf444790e36ffa6987ba6a2b5d1927b527ee47af55cf0cfccf8990692dcb31ab584d3d1befc811afe96a8a19bc SHA512 69a1c4bcecb6a545b5a9c871152f5917524b158df8fdf507989f53f0968830613a86986e82c62771f3632979e4129c0fc1b70ed262ce193fb7730484590b0a6b
 EBUILD ruby-mode-2.2.2.ebuild 496 BLAKE2B 7227da6ffc85192d2c13ac6e1a172e26f40892f0dfb39e11020584d5e4dca28bea31f864b26fdb429e9633bf2c40b8e55a3ed9f1078d459032fa7ee767f33212 SHA512 5dd65768c7b7d51f1bff2b4ac12918fbb4178f876fa1ef8ade21623fa51bdb36496c4e247b40a3dc27c6f8e2786276f73c77fa7287fd8d8534213606b986b374
-EBUILD ruby-mode-2.3.0.ebuild 500 BLAKE2B ca7d66e47421a5efc8510ab841109286c8b59f39c107e8c43688d6be7710d30569d332e3aa34414459f04f8b6facf360f9f08d647a56df2da2800c24803daf14 SHA512 1777a948b8c36cededed450f6bbde323720cddbae3b5cb03e37548a4005602751db955dfacd203dde8eb88d6c3d79f05594a5fbd3a5620f1f9c845fb488f9f61
+EBUILD ruby-mode-2.3.0.ebuild 499 BLAKE2B c1dd743b36411b2b3727305b165a807ba3cd822e51ba23e61391a6cf53d6812bac8b3cadbc4d0821a17ed4ad562735cf04aa12d2675fdfc5e7653e64cbda31de SHA512 53ef990a7f48228dae56b1c9598eb2b082ca115b32be12661fd7426ec5fe5906c460c45af8aac9643d2b2f93303d5a5a64d6bc15d82a99f6d2c93373ec403eb6
 EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
index 56f3a56dc091..5771316d00db 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emacs/rudel/Manifest b/app-emacs/rudel/Manifest
index 3b107db7ef0d..5a1b7b3f998e 100644
--- a/app-emacs/rudel/Manifest
+++ b/app-emacs/rudel/Manifest
@@ -1,5 +1,5 @@
 AUX 60rudel-gentoo.el 542 BLAKE2B 2b1e1df77779d5de74db60b434e9a66b9a85a9fddbf2139b7b4f56bb04d1837b77d0b64d126b932a4d3441bbc9dec4039f729c3452ed79e77a98853fb8a2d29b SHA512 8b553141f8ade7c93e5d30298fe921b420a84d005450092473589a91e7e8ce5a0ad76ce7beaf8be1cb8233bb3f1693a4a6d055d034b903d46e5883f1d35386d0
 AUX rudel-0.3_pre20110721-emacs25.patch 9309 BLAKE2B 4cb32e198519de82bee48bc0b3b6ffa32f5efc25afa34a201c43ea0ce23c22be38cb455afe17ad94ebd8b8121396908f3aef0a26b4ba1800a8d04c1f2c1dc8c8 SHA512 6f5d8b6cadf527ea7c8410519d07b2f831e13da10812a5180142ca381d47ee14072ed59251a048d250c5a582998e9fb8205f050f034d7aa21a336b98255b9bc0
 DIST rudel-0.3_pre20110721.tar.xz 416060 BLAKE2B 813ec0dc034a0893c0cc540118d9471fcb353c232ce37b70816183ebc99ff82c16e80eddf015f5d5663c7380a93c29b153871bb1ca58f37f06d4e09bddd87912 SHA512 abf6c8eb4fcaf4acafb9bed7cafff5d3c8e19e3fecd2aa779065bfb11ce5cb198ef14cc9deed360ac895166ea159a821e24dc92dbeda4f5481d1bb3bc2f8c023
-EBUILD rudel-0.3_pre20110721-r1.ebuild 1198 BLAKE2B d2e9fe779f210d535110cea80a0cb1003a1b4f0096da441449027819215750217b190cd23e52d98f940f365ab93d472412e836582842a20a6924a98be29cbb2a SHA512 6f9ab298be4e340c8f2aa334345f58f3361b39ae8b790495cffb3c59675c4d9bf0f8b0bbe6982229d32833bdddbe50321b9f73a94ba45a8491e19e81675c3389
+EBUILD rudel-0.3_pre20110721-r1.ebuild 1199 BLAKE2B 420d1983b029be02199dfe4bd3f1d3d090aa33b28917e2d31abd222b23b84ba6b371eb41910666df00443d0b93fc8f288ca4e6b3fdf2913a82424ab877cb25ff SHA512 6f7ebe1ed408b7c2524085fd4af4ecc274f7da04ce03a0127ce8f8015ddd6b3670f41a1eff8bd0d73176de38a3ef69075c3843d5c3ff6f61b04302cde2a1c961
 MISC metadata.xml 758 BLAKE2B 4d64059880ba7e9033e9e8501975332eb9dd1607f265bc2755df8261e260c7a75de12d3dbc2dd130293206a56acafd1da6d3e689d6b032e9386530c282ab0309 SHA512 0e13853ba328d3416efc78d4a2943e6577f6a95574af149fc4d8e82312d53d1b56a771cd60a3d3d277c1342fe338647672d83ef6fb225c97818185c19c759178
diff --git a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild b/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild
index da2b0d29a4c7..a1d42fd45fb9 100644
--- a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild
+++ b/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild
@@ -8,7 +8,7 @@ inherit readme.gentoo-r1 elisp
 
 DESCRIPTION="Collaborative editing environment for GNU Emacs"
 HOMEPAGE="http://rudel.sourceforge.net/
-	http://www.emacswiki.org/emacs/Rudel"
+	https://www.emacswiki.org/emacs/Rudel"
 # snapshot of bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
index 5851352f4f7e..604eab207589 100644
--- a/app-emacs/rust-mode/Manifest
+++ b/app-emacs/rust-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50rust-mode-gentoo.el 135 BLAKE2B 083a273140a659c1a76c05178990ffe4b0f3ae2ede81878ce8cfaab451df4a5169cea46fa4600e57ea77a9a7d55571cb7c862098e5ee76677dd73213e6a30036 SHA512 bd6f7579408d26900d40e674ff75bac2d1989c9bd068dae4bd4c54271e7b04cfcdf4d7d3622955f949cb60496a0d055f5f436084975bb624415b46ddb330f0fe
 DIST rust-mode-1_beta20150411.tar.gz 18155 BLAKE2B 140cad8709f742216822b3933cac64dc7d136fe9fbf0ddec523b395cb148cd8935587a590be41187c4cdfce43b64a72ede9a67a2e77fa7b11b9562e20ae729da SHA512 fc9fe74ba4924cf54664f37c5a88d86b38e17e4ad5e0d4d924afd7f3c8428764dece81cfbe40397460685859f34c3eb841b2c83aef8f34526f4ed3f065cc504e
-EBUILD rust-mode-1_beta20150411.ebuild 389 BLAKE2B 77c50caa1c6a8fd2014ff2e1033ad8cad84eaaad5debb73bcda31fb24e9d1df9897a8bab9aab1ec30e5640c7dddf1860e3978f71bdc309dd94ba3b7cc890a43d SHA512 0c1280a4acffb24d8bc106c20d1d8faeed26780019c00fab9db354f2d8694d74378c13494db7ff5c605efce4e898d4ae71e7f52c5c5ddcbc697bc49723e8df5e
+EBUILD rust-mode-1_beta20150411.ebuild 390 BLAKE2B e8a113bbd26def8a25028137a014fbece7162b796487019f126d762feaf02580c1b9990a674ff16e42504eef163db756bc81eed47ab413e1fae08749866bef7b SHA512 67338f49c3425fee73dff8ab4de618ca049857b331f38d7fe1d43b8eb20a08fdd801c0c8351932f012ae0a0c4724601007823cb5708325de8dd1a4363b80bc81
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/rust-mode/rust-mode-1_beta20150411.ebuild b/app-emacs/rust-mode/rust-mode-1_beta20150411.ebuild
index f3c2bbb17b10..0f82021b1ab1 100644
--- a/app-emacs/rust-mode/rust-mode-1_beta20150411.ebuild
+++ b/app-emacs/rust-mode/rust-mode-1_beta20150411.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A major emacs mode for editing Rust source code"
-HOMEPAGE="http://www.rust-lang.org/"
+HOMEPAGE="https://www.rust-lang.org/"
 SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
diff --git a/app-emacs/setnu/Manifest b/app-emacs/setnu/Manifest
index f8892264933d..eff49f4b2b86 100644
--- a/app-emacs/setnu/Manifest
+++ b/app-emacs/setnu/Manifest
@@ -1,4 +1,4 @@
 AUX 50setnu-gentoo.el 157 BLAKE2B 88991e40d47f1b27deb2bfd8afe20611489052c439f4f2cceef3be7b93c0be955a0f835171e173f3e4367d11f926da4bd52b5a5a768bceeb1c154938c7ac51e7 SHA512 f94345c009d3120f7d879abbceb949dd506b677228a7b40af69751398867290ff27b8b287aac1c06f4a25cbd7d3ea68b1460fdcf08fc31f3df3fcb3ed7e64ec5
 DIST setnu-1.06.tar.gz 4488 BLAKE2B a549e5e43c47276b5110059002609a1de36198e7b2f53f101689f3b4df952190197b9b77602eb78ceb6b19d3386043aade8b214bdae656a487eea51f95495c0f SHA512 84ff5ba3da8c8d1c205f251ac408ff1f5b1368d5a418826dbe55e86e26e8dd9ea9a65d89c3432d45126adc2b4e6ed7b210b2c1bfe6abe38d77aba76a85d2792e
-EBUILD setnu-1.06.ebuild 387 BLAKE2B 1d4d22fc1c568f1df9e235317c3d0365ddea21cf252f87e01dc42441da609ecfafa3911764442b845cfc65d72a56bce107900105bb44ca579ea865d4ccc5143f SHA512 f836c563a5427f6ec8936d4d199814333ee43b45fa8078e38b840cad5415e974e6f65327e42c2f678da7dd32fc32d3c6a138ed9abcb19eb62a7dd62d8d4e8d80
+EBUILD setnu-1.06.ebuild 388 BLAKE2B 7aa5723ce4f95c261fd0657aa5ea3207172611200e52e977bbb5ef1851b03559322b98e82d04d4a3583bd0de44b317c1d77efead8a8ee4d4214ea18fe61c63a4 SHA512 9d97380bac204e4daf8d39d49a0bd1c4a0f35d1f27d1bf12b0b82b635a5b1851c85ab657a046b02d810d870f3da0816900b7f7e4c6c4588ac47cae799d630e96
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/setnu/setnu-1.06.ebuild b/app-emacs/setnu/setnu-1.06.ebuild
index 6f254f62524a..2e24e4a69655 100644
--- a/app-emacs/setnu/setnu-1.06.ebuild
+++ b/app-emacs/setnu/setnu-1.06.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Display line numbers in Emacs buffers"
 HOMEPAGE="http://www.wonderworks.com/
-	http://www.emacswiki.org/emacs/LineNumbers"
+	https://www.emacswiki.org/emacs/LineNumbers"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index ca656274a1a2..602bf4cb6ea4 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -15,5 +15,5 @@ DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0b
 EBUILD slime-2.0_p20101103.ebuild 2480 BLAKE2B 06f060012843d2c297259ede049db9b3ca5f77cdbc314538feab393d41a53bad8cd8199c70eb160f27d45e79e9931afcf9ed1d2c31f8ec7b3900020c6dc61dfc SHA512 a3e0034f3758b83bd56a90944251e06571e59eda1fd9e0b040372972865720effe46c0f6a56911be705b5e4cabb710d1e6adebb5facb88393ac1c35897fe244f
 EBUILD slime-2.11.ebuild 3830 BLAKE2B 5b9e1a0ebc372006440e83b415e8d041eb2fc65927dae16b9b24d584b2751023ffe2f38daa0c8ce481252158e354ec6609b5153a0e0c3e4e296f07d7164e53c1 SHA512 d6a7a7dfd111983bc323233d16b7b477432a33a45787600ae5e30ae224c087675a9ff3565bf772910947dd0bd83e3e4de7d0421626a77767fc7574de318288a9
 EBUILD slime-2.12.ebuild 3830 BLAKE2B 5b9e1a0ebc372006440e83b415e8d041eb2fc65927dae16b9b24d584b2751023ffe2f38daa0c8ce481252158e354ec6609b5153a0e0c3e4e296f07d7164e53c1 SHA512 d6a7a7dfd111983bc323233d16b7b477432a33a45787600ae5e30ae224c087675a9ff3565bf772910947dd0bd83e3e4de7d0421626a77767fc7574de318288a9
-EBUILD slime-2.15.ebuild 3830 BLAKE2B 5b9e1a0ebc372006440e83b415e8d041eb2fc65927dae16b9b24d584b2751023ffe2f38daa0c8ce481252158e354ec6609b5153a0e0c3e4e296f07d7164e53c1 SHA512 d6a7a7dfd111983bc323233d16b7b477432a33a45787600ae5e30ae224c087675a9ff3565bf772910947dd0bd83e3e4de7d0421626a77767fc7574de318288a9
+EBUILD slime-2.15.ebuild 3832 BLAKE2B 475dfcff1d70eaf7a2eb6c7cc6a2e04bef515645c04970bd51daf64c7ea75498b5dab0a80a4470ad543183914b35c35437b7e71bba71050b8f6d6d0506c4957b SHA512 824c1ddb3ad9dc7a8cb0679a824cd654c63e3d43d58697b9719e6ed3e500c1a80ff6fdb1fd2b7e6aca48ce3355d24ac9d78d475c2c1775ce26d3f3707b9b20e8
 MISC metadata.xml 1658 BLAKE2B 8ee9c10524fff6691e0025e7fee60b2fcc92a685dbc55d2abfca2d06591bab471f529e6edd6621d8128a09bd57cab51b73006d951440ea2842312cb5509025a1 SHA512 8147f1f31e699a4de10274a27f8c86427f9245050f2297d11804281f12ed9f7bbc1ae0ca615ffb009e7ce4a57b0c0395e4bc95cc5b043f0e24290660fe65b89a
diff --git a/app-emacs/slime/slime-2.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
index bcab613a5c75..367f357aff3f 100644
--- a/app-emacs/slime/slime-2.15.ebuild
+++ b/app-emacs/slime/slime-2.15.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
@@ -16,9 +16,9 @@ fi
 LICENSE="GPL-2 xref? ( xref.lisp )"
 SLOT="0"
 if [[ ${PV} == *9999* ]]; then
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~ppc ~sparc x86"
 fi
 IUSE="doc xref"
 RESTRICT=test # tests fail to contact sbcl
diff --git a/app-emacs/stripes/Manifest b/app-emacs/stripes/Manifest
index 71e38fb69e3a..01af2560d9e9 100644
--- a/app-emacs/stripes/Manifest
+++ b/app-emacs/stripes/Manifest
@@ -1,4 +1,4 @@
 AUX 50stripes-gentoo.el 186 BLAKE2B 0b68c4b1fd826097f21f7c14546d7ebe3331c3b13a73e04fddcc8d1c5eff010a4f5781e2f9717d58e3eda88eabdfaf6b8c478bbf9bf64e243fd97070135447fd SHA512 878ef4a745a46b9e5d053b521ad6e7a5340223e929a2a75dadb4e5f7d9917f9e044454e6a4f02316e145568b0a80daf4925bee26523b257606e18a4fedf6e7e6
 DIST stripes-0.2.tar.gz 2203 BLAKE2B 4daec93d681bd2cb7187b427c13b27990e03bdb34b6131cda3b8d88bd48cdece57d53dd9f124c0f65e2869045e69ca8c98e39cc03b3a6c75f5b1ca359a12582f SHA512 c0e0d7c16f6d593221573268e8ec30f30374a6c4ad6e34458139de90f5cde12cdb02b81e91f40176ea10a9e411921bdeb324eb0bc6aa5f2874602bf38bdf9521
-EBUILD stripes-0.2-r1.ebuild 381 BLAKE2B 20393ddad2f9405a716e794425092751ab1748514cc0f5f7faf1a3224eb692770fb3109cd81b6d114474830abb97f39111bd6586d61f9ead54d63e3e102f8d2c SHA512 bb9c3553c37a4a04d94b784e77c9ca625c24140f6768536840c8138b0a86dbb084771ed4c5d808a4f88e4cc9914cbdf009740e3b67b980ad5bb791c29f47551a
+EBUILD stripes-0.2-r1.ebuild 382 BLAKE2B b4f841db7250a1c2814d1c256dffa7dd16b458251e2e61739c7cec1db6d969dfd1f2b0cce9dfe5f9bedd8bcf51bb4d8e69f35dd5c8d8a0136a3cfd45aafcee50 SHA512 cfa39ee5034080cd8af1408962145148cc946b68954d033cecb822d4db7553b648bf99fd81e60fb9e44ff93e81c400141239e29a8cf42cc11925ab59d9124a56
 MISC metadata.xml 467 BLAKE2B 961ce1982481d61e47a322c1ab863ae7d996104cacf67891edf7d8e6f3f6c8d1d08fb08046f5e6533c8218ec20a00b2511dc66a56130ce5dc950adf6bad860f1 SHA512 b2bfdbf5113b55eb9e07176e029ffc8f33dd417d2fbe351c72046eed0e1814f4bfaeaeb0ed821aa37106355aa8ab5e4986efb160770b6cca580cbf69c17f054c
diff --git a/app-emacs/stripes/stripes-0.2-r1.ebuild b/app-emacs/stripes/stripes-0.2-r1.ebuild
index 6b4d14b9aa01..9092c334ea81 100644
--- a/app-emacs/stripes/stripes-0.2-r1.ebuild
+++ b/app-emacs/stripes/stripes-0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="An Emacs mode that alternates the background color of lines"
-HOMEPAGE="http://www.emacswiki.org/emacs/StripesMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/StripesMode"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/teco/Manifest b/app-emacs/teco/Manifest
index c321e6b16000..34ec39dcd232 100644
--- a/app-emacs/teco/Manifest
+++ b/app-emacs/teco/Manifest
@@ -2,5 +2,5 @@ AUX 50teco-gentoo.el 257 BLAKE2B 4abde23767cfa240b27e735158997eee8f91ea71893d398
 AUX teco-7-emacs-24.patch 1350 BLAKE2B b5dd024ce4bfa4db7f7108756772ac3d7faf074260749af2254bff429cd4ac82c18b840f70e41f28e4ba0a2f342831374372695d4ea6c0f0030663e6aa6546f0 SHA512 71afdf37ab38e76181e1a7ce90a73ad31a625039d784b9334f79a8642a45c7922022f74231e8cf70cb6bcad023012412262d6ef840ac611a182e3eb48ee0f4e5
 AUX teco-7-minibuffer-prompt.patch 2574 BLAKE2B 93f031a0d59b7887251b5642d031a83ecf7f94a481e55804530fec5c2f6b8a80c16fecb53a3b1560c38c1f2c8de583c11cac3a721d3d84d04a083f1a1fd859eb SHA512 df67994df08353757cf7be3d8ebf0c0d6c048d8e195360d9f7afaa29ca44cd3ccbe95885d9c790a29c1965c3d291136e195fa076bf9a0a42304c46267ebb1446
 DIST teco-7.el.bz2 16372 BLAKE2B c5608c1546262b9dcb52e0c5f1e41c87e94f142a96e8ce1262201b00672d810c925c20090c36edc596e0fb362265e72861f4bc214cb13ed94fa71b586bc4f45d SHA512 7fb050d2d12aadeccc18d852b4191493be301c90ac5426ee4f985a89eba62f9b57d263a2156d5252e88d06bbe68508aca2bebeca65402ff9e8f00937f5189feb
-EBUILD teco-7-r1.ebuild 700 BLAKE2B 944b77c7c7725341a83bf8ee1527562dbc0c5fe0554a05550e902e9658c2ca73ae0e1c8cc261010e7316e4e888af3ee13ad847f19493f84987ae3dd9d0604737 SHA512 0e0f5484690d0acffe4fd8e70934921edaeb7e3b05f66b5da43020d1f450a80f8283b6532ed781197f6443a72f9f01ea44b517e9ff507bdfd24e8fb2ac3241ff
+EBUILD teco-7-r1.ebuild 701 BLAKE2B 4a5416ad5446deb45609d0a530cee937b3ad480dd4e06b7f9b2085b68c7acfdedcf0aab5ef8806947a43298a904da3830deb02df70d6e19856be6442f0af4804 SHA512 c19c94c05c2e10d145e7a43ae2a900849950ec6a001fb09f2d1bb46a6b097e9c3212869a63e2ce614747ab6ed9a2f4b12058cf8a2c92b0352f3c453b7bd587a2
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/teco/teco-7-r1.ebuild b/app-emacs/teco/teco-7-r1.ebuild
index abbf3fcbed06..ef2a0ac6508f 100644
--- a/app-emacs/teco/teco-7-r1.ebuild
+++ b/app-emacs/teco/teco-7-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit readme.gentoo elisp
 
 DESCRIPTION="TECO interpreter for GNU Emacs"
-HOMEPAGE="http://www.emacswiki.org/emacs/TECO"
+HOMEPAGE="https://www.emacswiki.org/emacs/TECO"
 # taken from: http://www.emacswiki.org/emacs/teco.el
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
diff --git a/app-emacs/tempo-snippets/Manifest b/app-emacs/tempo-snippets/Manifest
index 6ae2545455ea..08ea7a53e6c0 100644
--- a/app-emacs/tempo-snippets/Manifest
+++ b/app-emacs/tempo-snippets/Manifest
@@ -1,4 +1,4 @@
 AUX 50tempo-snippets-gentoo.el 88 BLAKE2B 4d62db9046a7412ab12728cb64a7c0afdbdaf1aeb35d209b977584046e1c7b97b1da834eaffa960a529f78e9b0ca366d70b55b729f3057ce78d911a2941fcfe2 SHA512 aaeaf81327283a4f482c08b6bf78f0e60154e76ec2df15aafb213b5d25d54778a26e204e0c5cc7816aa4a82add11e6291332cd1f6130c77be92b72406994e88e
 DIST tempo-snippets-0.1.5.el.bz2 5369 BLAKE2B d58073b1cd6585b76388f89470a0e5272e1f686a456ca7a7b7ae69e4a8aba81414c70c443be209eacd3b1404b21227330618e74c9f2f0056ba11b22933b6744c SHA512 77b739d3c9def0abc422daee372cdf5602ed79b7cb154125a0aa3ca99e24b025c070fbb8439638ce35849243efadc9cddf187debc53905242ab417ec79acacec
-EBUILD tempo-snippets-0.1.5.ebuild 421 BLAKE2B 323040ae30a0b81a3a064382e5003a5df2356a2a3d08705c2d19dbe08fbf4bf0ad3a5f60443c29af0b3040392bebd3691b5a1c71ddef047086582c985cbba8c0 SHA512 ac7a4b72851e656c1ee44ff0826bf296d3e139ba275edca483572cd7ef9956f97e133f3b1444d71a2ac76a70c266d1f0f45cf837f22558a829ba8ed7fe195d83
+EBUILD tempo-snippets-0.1.5.ebuild 423 BLAKE2B cadec630196ffbc48b3af61a4683e57ff7c8418f2a38a25200f21e4465f724ce11c937087370fa9171af13b3872320655e52e5f6d4b56816748d56d3dca2e2a9 SHA512 f63c8655904c44a518a3363290b2267b7592a751bbe95d4251e07d68750327b7be349163eebb025824e615f90c992be9531e02642841087ec8713ae325c57248
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild b/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild
index 834e176b7562..1442e9fd6e58 100644
--- a/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild
+++ b/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Visual insertion of tempo templates"
-HOMEPAGE="http://nschum.de/src/emacs/tempo-snippets/
-	http://www.emacswiki.org/emacs/TempoSnippets"
+HOMEPAGE="https://nschum.de/src/emacs/tempo-snippets/
+	https://www.emacswiki.org/emacs/TempoSnippets"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/thumbs/Manifest b/app-emacs/thumbs/Manifest
index 846076c9eca5..39988354c568 100644
--- a/app-emacs/thumbs/Manifest
+++ b/app-emacs/thumbs/Manifest
@@ -1,4 +1,4 @@
 AUX 50thumbs-gentoo.el 583 BLAKE2B 52d510b9eaf45096d2f19dfdfddd1c8be31fa4edc698d5525ed8b2a0c2f9af258ecad323ca781a318c462319f6c31a113c486bd230dc208c489a720022af053a SHA512 dc608706b845acaa68c7a3ae62495adb43d918523d9e68c521173a6b28962cc438359147b7918e001d68d6d9e11365c1e9d3557464497a258ab168adc28e993e
 DIST thumbs-2.0.el.bz2 6521 BLAKE2B f37154658fdc660698a28ac01d0b266ff6cc4f86f30d93a9e0929e565a6666ccd168d861122d5ff893073f9aaa4a3c7412a3f96758b044faad11f13ec7000533 SHA512 d4bca861ed5db620a2319659e255bef14241a68067be994402d2d36bb7fe34ab5a22b6b76dea5631aa5288d03caadb3a8163a8ecf439144d8d50cc410cfe078d
-EBUILD thumbs-2.0-r1.ebuild 411 BLAKE2B b458e920c67fed331fba574b48f0d37d7717ff072dad5e7cf1cbda54ad33d1ff4e856f9848c32c85294d53ca97491c3169a1c56397ecdf50fa22451863d77feb SHA512 ec712ab826b7f1917a2233652875ad8063b3c086cd0bbb956c2a7e19fd1ef22f7aba637c6bc3a08d1393bb1562b5785dbc1bf68148e4fa2b6c0bfc7a1fe44356
+EBUILD thumbs-2.0-r1.ebuild 412 BLAKE2B 7f5023ce0234efb6ca2d8702c2f3827e8900b6ceeee57dd46f09a57c121a0cbc44b9a80eccb63d1b7722f5237335f45d3ac1d0de0b8d90cd8aabdeee72d48153 SHA512 02317700e3d1a2f18532b03666e93150d2e33dd12eb2d2c3186c42a7f0ad9f4c9c93b7675b37f31bc3492ce26412ec892d553f3d9be84eb18010084eadb51ebf
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/thumbs/thumbs-2.0-r1.ebuild b/app-emacs/thumbs/thumbs-2.0-r1.ebuild
index 9d927c99e677..85ffa7643736 100644
--- a/app-emacs/thumbs/thumbs-2.0-r1.ebuild
+++ b/app-emacs/thumbs/thumbs-2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit elisp
 
 DESCRIPTION="Emacs thumbnail previewer for image files"
-HOMEPAGE="http://www.emacswiki.org/emacs/ThumbsMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/ThumbsMode"
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-emacs/typing/Manifest b/app-emacs/typing/Manifest
index b9161c5bdde0..df9ebf28f550 100644
--- a/app-emacs/typing/Manifest
+++ b/app-emacs/typing/Manifest
@@ -1,4 +1,4 @@
 AUX 50typing-gentoo.el 114 BLAKE2B 0e859757e9608b619a5e28594562d5f8e55590c81b3949a5a25cbaa47b684430091fc6d1c377cdec85acae1e79556a74fca7ed34d626a79c5df9a2662f0adaef SHA512 05981cefaa046c00c1ca4c06af0c7be2a1b7bec87c7626f12f87ea5be7eb6df778e2559ddcbffcc8760224845a24d2f5e9887f8b7e53565881ff9c8632923371
 DIST typing-1.1.4.el.xz 5092 BLAKE2B 4126cc2ff0666688cdd80b4ed83675a62ed089fa69fb7a780ee58485d1832d8cbf039b0dec2d1ebcae5f71b156a5fb485c930452dcc5b27d6513c10155ed99b2 SHA512 9033b4ca2d23de98f8721796c708392b97d49b6719544ad4ee6d73f11ef253600d9c2a0d2b8ea89ef58355d1bfa36244ccd527994170ae0f43404c6ac19b62f3
-EBUILD typing-1.1.4.ebuild 423 BLAKE2B a113f0d0937bb13bcb68c16bbf86b880b8a628cb316af7b7a3570e570f2cb4a7668cef7e898b70172cbae259161585114b91fb48ee03282ab645017efb47c636 SHA512 11b28c71e63b876f0d1d3f14c6ba25d3e36ec8bcd6258da909c5398e6f48b927568738ccfd49225a76a49001c9e01c974b2f076515448fa984df36f4eb74f791
+EBUILD typing-1.1.4.ebuild 424 BLAKE2B 7c2e9e4b4c8c375065bb0052ce8f2ba0906daa3e983ddf2c057c23f8a9d62c7ef7fc856dc096960d7535ba4d57651a6e65a6ed20680fbce22a62a8694dd8c97d SHA512 8edb7f3c1d111eccb1f8a8e0187fe238d779f9ccd398934cc2822f4a4a77ad47af27cb51cca37998bfafe78bb2db717fd8f92e4ebe7d7d90e8589410ff66b03f
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/typing/typing-1.1.4.ebuild b/app-emacs/typing/typing-1.1.4.ebuild
index 4e3b9cc963c7..601df8fc80ba 100644
--- a/app-emacs/typing/typing-1.1.4.ebuild
+++ b/app-emacs/typing/typing-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="The Typing of Emacs -- an Elisp parody of The Typing of the Dead for Dreamcast"
-HOMEPAGE="http://www.emacswiki.org/emacs/TypingOfEmacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/TypingOfEmacs"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/visual-basic-mode/Manifest b/app-emacs/visual-basic-mode/Manifest
index c2baa43dadc6..4db696716699 100644
--- a/app-emacs/visual-basic-mode/Manifest
+++ b/app-emacs/visual-basic-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50visual-basic-mode-gentoo.el 228 BLAKE2B 2f92aeab71b89c7d0c00e925dc8775e102a482f354988a7d2b3a99cc76fcc0ad9b9284fb198d81f0c31eabe50cc6ad5d2009177351465263a32e3522681a3335 SHA512 61a40524cfdd2045fb5fd4022fb5a9c85859741f0eb310c12066f7574243779633f2a436bc9cea4a32883f78e01f256d4da1d649d8910c06ea26b7ae9e2bcd81
 DIST visual-basic-mode-1.4.12.el.xz 16872 BLAKE2B 849a639dc54bf595541256424e26b6a157f2b75ab3c9fab8c6d7000d9abda6b9b979b51d06e81ff6a276353709aec5f4608e9806233560fcd4cdbdeff2e359f6 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca
-EBUILD visual-basic-mode-1.4.12.ebuild 434 BLAKE2B d4b9e07eb2774df18d8fa274c601e9e2963ad4a4cd0e0e433809ecb4a5a8e0af97f8a905957b32d6e0ffc2f360b4bc0ca39298c520810582e900259429b12cd8 SHA512 f02a2831f3caadd5986d1b69ebc38ee758a05a98f2e2a3af61e83470b2d666ada6a1679bc0774738dcb6e5b8fb82c97592662cf43c1d5da07832788aedd1b10b
+EBUILD visual-basic-mode-1.4.12.ebuild 435 BLAKE2B 3f5a036a44bf019d60213aba79f1e0d69f8360369ce3d3a2f1f58f74f37f11405a50215c040427507f868140d1cedede666eb267b9e98bb71e5d7a173d8f3a5c SHA512 74b142d4f789d30dc0111e01e27dc7221eaf082c9079d1c83be90ac3267e6fde8d194b4da9e54140751a6e32d117feee4a34cc38c839493f95fd912a96c71d94
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
index 5af19fff5134..44361f052a39 100644
--- a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A mode for editing Visual Basic programs"
-HOMEPAGE="http://www.emacswiki.org/emacs/VisualBasicMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/VisualBasicMode"
 # taken from http://www.emacswiki.org/emacs/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 96a59035e278..0e6d42244a3f 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -5,5 +5,5 @@ DIST wanderlust-2.14.0-20050405.patch.gz 3926 BLAKE2B 0986f743e512cc7216554585c1
 DIST wanderlust-2.15.9_p20130619.tar.xz 818124 BLAKE2B b6bbd6f63d862f81a5a0c194f0fe1b276303f75f8ffde29c844f1f7d2d8ef55f1c211ac1d0b6c3357c2507b2abe73ba1c4c8f5fc65e067d93eb6bf23fd8490a6 SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0
 DIST wl-2.14.0.tar.gz 1101505 BLAKE2B 5ceb3a8e294b230d48d50134e3dc07b9e19a9470907a488a2e41e53da54a8826a50cb53c06c5f3f1a5bdd1b5760bc6acd6cc75a25e63d092f1a9b80b3f073ed5 SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2
 EBUILD wanderlust-2.14.0-r6.ebuild 1424 BLAKE2B 0219b71a6101f9e0c1de504fbcd90e1abde1f16349307b0c55c2010e8461f8a42f9f05c162c91dd0161d45d7dd17223e81cbdad3e9ef383ca225e47da6d19602 SHA512 6bf2c20f0aea275049dbb05d49b441c5a6214a8f81d9a47ea2891e150d1a70a51700c1b9189392d6aa55dd64acab4cdf9607d574094b5ab49139f12655131c24
-EBUILD wanderlust-2.15.9_p20130619.ebuild 1286 BLAKE2B f6c07b37a7de08264163e29b4d6fe0d7acadd3271ec01fab56900f370aa343e2476220cf3fad2e58fad207ad6c8d41e2f60a94d2632ee866cb07f8046175e9c7 SHA512 9fdebbe1fe3462b83e6e0729479b71e7d08dc358034fb342744a882d2523a776382e75d78879b56b89264d627ba1245760971f1a7b41260d42df487f95ddfa61
+EBUILD wanderlust-2.15.9_p20130619.ebuild 1291 BLAKE2B 106e6e86713dd6577613e43e9c92610229e6f369564f38e130dbe001afd536f1eb037e6befd8ac68b57d7bcd395df5b06c9efff5501f0f2d601b1f51eaac0c5f SHA512 99dda215ebb42ab815073df27e7f0717e22eff119aa694425aaaaa26ed6a33ff0588412b10d2b0296f3349140e6008e40ec4f49fd5cb2919fbe39d2138468642
 MISC metadata.xml 532 BLAKE2B e9b1e7ce82c764155fd333d7cbe6a8d2e3765e7895e7fd90bdb0bc14fbccd880c7d6023fd6db58b6d4faa1814ef166c6e7ac0cbdc2271c949c426192bfd08a2f SHA512 2b28d5224e05e65f17cb35829bff705f3871665a381cb55a31e8faa0186249a835c2484b7d1633e8f97631aa7d2b2b369d8675751fcd9fc46baba97fd25ee3fd
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
index 867fbaacad02..2f035471caad 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Yet Another Message Interface on Emacsen"
 HOMEPAGE="https://github.com/wanderlust/wanderlust
-	http://emacswiki.org/emacs/WanderLust"
+	https://www.emacswiki.org/emacs/WanderLust"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/whine/Manifest b/app-emacs/whine/Manifest
index fc916bef27bb..cd81b492f734 100644
--- a/app-emacs/whine/Manifest
+++ b/app-emacs/whine/Manifest
@@ -1,4 +1,4 @@
 AUX 50whine-gentoo.el 158 BLAKE2B adf739f5dcd9eb718c5c6bd086090040ab6f1729bd6a7688988956a94480d90446197a99c761e61fe8d6cdc1dffe74cbb058041d39a6a34f87097719db9b7e08 SHA512 9ff30ec934a18a5b2338b15fbcc2d9e802e6b6c642d06f907ec43528fb71e6aab4a972648ac3d3a4fc493c936908fe44d2a63bf4dfe8899bcc6ed66bf1faf519
 DIST whine-20091222.tar.bz2 4452 BLAKE2B e2148ddbd06853a1bcd3aa9cd017f97e97b7fcc25b87e05017b7860d604880b48dd45e0e8c0affa07fd10ea5aac2cfecda01221fc9b297a83af1957ebb636e7a SHA512 74d02753a991140d5298f111f08fa346f458723bd1e5a46d2b67dc262fb53f513d5b39ff87eab167f37b0f2be1458ad8d0bc92479f6f9a329eb5dbf79f87fc4d
-EBUILD whine-20091222.ebuild 373 BLAKE2B 4523fa5b9db288130d03a33b10c412ae804df4d99d6fd3decfed8a7031f0b7402eed9babb14443d0a29dff327cad264da61d6cca86831c1760561dac88ef4a58 SHA512 b57e54a23a4027ed70a9e74ead48f44652ed4adede3519bbc5f3a974131215d830027b781a4178d715d51c97db08dd172f04e2c4ff48427dcffa023378dbc737
+EBUILD whine-20091222.ebuild 374 BLAKE2B 3b20d9955105b712644d6361850db25f46666633886e75f35573f384b3f1a437e299dd43a090a6fa40660dc4b5a05988c413120a3167511211333ff549fa53df SHA512 9d6bab0dd9f93c67f50990afd2351c8d24245be5593e39da33729a4f61431f5cbc72b5e87e2eb99e23aa6690a35553149415eb20db60088abbf5adc4ffc251d1
 MISC metadata.xml 680 BLAKE2B e1c1de8a4e9a119ce977542299cfb79dbe9439545ec90ef3c50b5415e1b9cd76e29be10a034e2e1eaf43230db7e134416625b8d21b6912772c95176c0921b389 SHA512 9afc1f9831eb469efb6360f28abebb8866e4948e95de8c80012975f7735e0187fe9891fcec5380e754680ae08902ee868af7814e5018e47c8ee72e6c7dd30b63
diff --git a/app-emacs/whine/whine-20091222.ebuild b/app-emacs/whine/whine-20091222.ebuild
index 65b7d3ed59e5..78f91982e0e3 100644
--- a/app-emacs/whine/whine-20091222.ebuild
+++ b/app-emacs/whine/whine-20091222.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="Complaint generator for GNU Emacs"
-HOMEPAGE="http://www.emacswiki.org/emacs/Whine"
+HOMEPAGE="https://www.emacswiki.org/emacs/Whine"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
 
 LICENSE="public-domain"
diff --git a/app-emacs/wikipedia-mode/Manifest b/app-emacs/wikipedia-mode/Manifest
index 50d63a6e4dec..f0fc95d7cd58 100644
--- a/app-emacs/wikipedia-mode/Manifest
+++ b/app-emacs/wikipedia-mode/Manifest
@@ -1,5 +1,5 @@
 AUX 50wikipedia-mode-gentoo.el 287 BLAKE2B e47da9e98a8927dd34992b5e92fcd9a8d4c16bd74d80ce182fb9628b50dd5d8dd18895b519d208d93ba64201df51737608f614dceb0a36b27328d0251ae88cb3 SHA512 21fa3d8c7d1d33f61d1b8309a3b30dba79c8742bbfb41c31b75e959e15ebda8dc855d3c96f71c5ec078ccd5a96aace612490584d5a9b9f3fd32ced1781dfd305
 AUX wikipedia-mode-0.5-require-outline-magic.patch 116 BLAKE2B e04f3a458dcb2997575a2313f9cd9443c86b24fc66965151efdce53f381f03f944f732197e5182b0e452c459687ee4ddaf71c39b7086e154dedfb46a80b1eade SHA512 58b1e9474d90621f5fc1574c37b1e17be6081b6b96547e2a2e6c26571fa04a9ca015cc9dd25657edf23235c017e7d4258cd1963ebeffdbe3bf42c5cfd2fba863
 DIST wikipedia-mode-0.5.el.bz2 14243 BLAKE2B 1824548c647141bce6bce4de02d42c933b512e132e80752a13c08851dd65d5750006a59880ff55ae663747f0d1ddbb158eae60ee9c610b23c2721ad2f9798c6e SHA512 d10ddfb13e45fae347fe286df919bd9840ea0c2b38e903b451a9c3b6b6ab768566021d12b898bdc7236d034a89ba582dc8d22827bd3b4d80a0363ab323bd045d
-EBUILD wikipedia-mode-0.5-r1.ebuild 558 BLAKE2B 30dc3f9979fdff5ae318258280b5e3070ee9df51a235db5f0c723569cb697b14ba06d3aac7201437bf014e2ffaf96f768e48ac23b57c609832ad8d0b8a13b408 SHA512 0dd5c05aab9276421e4c4f436f78f64aa2b9e5cb7ee15c8f4f52647efa6a99b0cb738de2f87b5cbd79d991f3a93f16df8eb85db29302fc35488be5a5f6621025
+EBUILD wikipedia-mode-0.5-r1.ebuild 559 BLAKE2B 8485da5cc7f5ae67f3f2d5ef1ecbdb834f3f111f90fbde2a62ce4f68a89bde3ea38e9e504558753c750cd007f667192ead1a681f408939926ab3ae429dbb500c SHA512 a3d48619fc185450f2357e5a95bf27ae98ef4fc5904e0df82472148c67553c52e18b8177ac52089accb1b28ebb16bd8f82dbb1cafe01c13d1ec30a5f54478342
 MISC metadata.xml 718 BLAKE2B 8f19c32f9ac64fd48f6f6e2e14714036a8e492c549bd82dd8c0fcac695b1ce5366d549bb0a060b291d5ea5e25cd3f189afa99a56f63ec1048ef56b0f2ce87ea1 SHA512 caeeecb3dfc10492aa2ccf0917bf8222c760fe374403fd0ef06e9355e5c8281993793a7c1ce4c3a2a188d6c26f91e030ae919d7a85211b8292444e924c2d935e
diff --git a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
index 5db42348d3be..89c4f20828bb 100644
--- a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
+++ b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit elisp eutils
 
 DESCRIPTION="Mode for editing Wikipedia articles off-line"
-HOMEPAGE="http://www.emacswiki.org/emacs/WikipediaMode"
+HOMEPAGE="https://www.emacswiki.org/emacs/WikipediaMode"
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 859f04c5c50b..b6c818a80b1b 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -3,6 +3,6 @@ DIST with-editor-2.5.10.tar.gz 28081 BLAKE2B 6e5b0478509022669ecada46a26dc74d427
 DIST with-editor-2.5.8.tar.gz 27978 BLAKE2B a14db76077ec2254f79856c018ea4aed277997b3b35d0cdd1992ded2a5715a13dc2fd909041eafb69150e5bfbc7441e6d5b1549a20e0937aac2a59413cbcd01f SHA512 abd42a096e3318cc25576b240df1ed670de327afabe675d3df12780c392779f33b88e7a76d125f31cf37e3b22eda88391329c73d21ccc834e611893e759ea3e0
 DIST with-editor-2.6.0.tar.gz 28124 BLAKE2B b727fc645cba8c85e0ff688ffbb7fd165feeb3e2fe5033475d9f9b333435cdbb4bc6e0c05f862021c1cd32dcdf1c813a0d3a8fb6221a757c7cf4ee4853d40272 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c
 EBUILD with-editor-2.5.10.ebuild 673 BLAKE2B 28e76191273b926fa2ff32e8a2649081a6f1fe825c3b544b7fdbf2d32d24a731db60d0233c84effd5cb488ed1b3d81bc1cee7cfda5535eaef4a52b8a10b8230f SHA512 de1f447911eab432ea9efc4c6a0dfd6e669bada47c797160592aa446ab26240a303bb887a605e282b5864e32e5f272006713d331bf644367fb0d2bae2fd88c5f
-EBUILD with-editor-2.5.8.ebuild 670 BLAKE2B d61b13426fb25a5454df43f5dbaa434e06e6d08b89320b540b932f2ca77658147181fbdc0b2d1a44294d712e9bc967e6a476e8f13803541e7d9e3751847226dd SHA512 07fdbf7fd8a8453a7b633e7843c8730b4573d2b3a3969fe654bbb5e391f22e007ff1670cc4a48d4356b30b711791b0faf49888d5b3f839156189c1ab95dc0db9
+EBUILD with-editor-2.5.8.ebuild 672 BLAKE2B c4975e572dd90ba5f559c4f055b5761428fe1d1948e35328f26c0c33b4e1bc89078888ecf42fcd8d4bc35816279c377b22d2de0d9ae624a4a9fde5264524faf2 SHA512 b05314fa3013b5e0772dfce3755b97dafeb89549faf91768367b3581506b1c760edec1b9244aa6bd2845ffb62d6bcc054bf648f08fac3901bc28cba3ad88c9d5
 EBUILD with-editor-2.6.0.ebuild 650 BLAKE2B f48f97a175c0c3530348926a6d213837d604224f6ddcf320f3cf8116b58e3671e807b28346c81130ab810fbbad8600229554d3a3df052737a30dbf9a868b889e SHA512 67de51aef7529f56ae3ad2ad1f5a013ed8946ad4c5370c7c7ad3675cd4b3ae6bff7c7f9fce870f463f9c756b8c127df8732007b678267ac67f1bb9ab568efc1a
 MISC metadata.xml 684 BLAKE2B 8deeae00b1046056120a352a462a4c93039275356dd5731edbb0975883f745b0a2b49f4109c89ef0535f97d29a095b803b8e91834ef95a67b479a0baaf518de8 SHA512 9c5cc636acec025b66df91e9a2500a9f5beeefeab3be42f2eb291d3a221151ca1748e80709b3bfac68a800c34cfd954339f1edbb2c9247ac85b4efe47c29621a
diff --git a/app-emacs/with-editor/with-editor-2.5.8.ebuild b/app-emacs/with-editor/with-editor-2.5.8.ebuild
index a14b20738cb4..667dac00cbf7 100644
--- a/app-emacs/with-editor/with-editor-2.5.8.ebuild
+++ b/app-emacs/with-editor/with-editor-2.5.8.ebuild
@@ -7,7 +7,7 @@ NEED_EMACS=24
 inherit elisp
 
 DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="http://magit.vc/manual/with-editor"
+HOMEPAGE="https://magit.vc/manual/with-editor/"
 SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/xrdb-mode/Manifest b/app-emacs/xrdb-mode/Manifest
index 681a7ed66564..840f59a86dc4 100644
--- a/app-emacs/xrdb-mode/Manifest
+++ b/app-emacs/xrdb-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50xrdb-mode-gentoo.el 223 BLAKE2B 2d2d85455f676760bcce88965406a226528da07d29f34b409c35f539e2dafe6750a35e6472194c0969fec7dda3a04abb65ded5dd6b1be3ea0a0cd63fa9a2f03d SHA512 324609b05517c26d58759bf3c4445b690bb8c8ab00361f3157b06964458f9ca777d8963ac9c5e49df6c75d4d8eb27ea7754639bbbb8d1550b96fdbc954b3ed5b
 DIST xrdb-mode-3.0.el.xz 5448 BLAKE2B 32ce6b427ab2338d66a52c722ae3c69e1966c53cd63be15c35e218b17cb2c7476da5d5c1e49df3df1114b97382724f273f2f302abaef5995b5aa53824673867a SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290
-EBUILD xrdb-mode-3.0.ebuild 504 BLAKE2B 5c63d149376b8d5851dc46513c53abc40528766ceccd6e0ae32b2069fae2d4d92ed8dea76c8225407d6521055c2b99b5555bf0a46bb771820e8fb97eeebb1f8a SHA512 3cc9b20d2111ac1225ea5b10de3479177a338d34da373d52f5427aec3281b2fb84eefb7b29089c158c03faac877dc84b5e3e792bf99395bc66b6cabfa1d2daae
+EBUILD xrdb-mode-3.0.ebuild 505 BLAKE2B bf3d1f240e3be4d56e1315cad7bf5c14d962196d7f55f74720e5cd7a8ef2519aeea2f9b04d9bfcf444b2b90afa7bd22eb128b0d9e52027a6a1917ff27a44c503 SHA512 6da052641466348b40dd059761a3591dbe69bc7750650088367fe14034d5e7b799aaa7f33087fca4277d287128b33ae53fa5fbd89230aa2641c8e36c2236b82c
 MISC metadata.xml 334 BLAKE2B e11965f4965c9eb139ae57508bf31a18d0ad9ec1914e78720c4ecc3c5dafdc32ad6c8bb1f2d31b3ae780042498afc9cd8b05eda7495539232ad5616ffa98ebb8 SHA512 31d0c4f6c75ba9ca7ad5d1fa1e43741a428d3af536ae6a4c5896e6a015c28fbbf1549aa95da863066d2efbe95710b2ed808ae4f47bb886797c6fb8ad0af997a5
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
index 4721d1dba71b..1405fd18bf3e 100644
--- a/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="An Emacs major mode for editing X resource database files"
 HOMEPAGE="https://launchpad.net/xrdb-mode
-	http://www.emacswiki.org/emacs/ResourceFiles"
+	https://www.emacswiki.org/emacs/ResourceFiles"
 # taken from https://launchpad.net/${PN}/trunk/3.0/+download/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /app-emacs
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)