gentoo resync : 08.06.2019

21 files changed, 83 insertions, 110 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3162da9aee32..b96c96a9020f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 53bab499cf94..a711911bcea5 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -7,6 +7,6 @@ DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
 EBUILD dmenu-4.8.ebuild 1337 BLAKE2B 3982faa7c70a14d9af9172da682a27c40a631a001ec46cfa1f4a6b413a4db033f27f21b1ba9dad630bc726bfbcf2150826edada2e270e5aebf037e8b17f88059 SHA512 2c891ac9e9c21df2787f337a7bf8139e1c0efaeadaeccd9720f7bdf21c15ff23b0963029cebf1f38056ad5b8e124d16c346b9644085344de23b3f36781b24b2e
-EBUILD dmenu-4.9.ebuild 1417 BLAKE2B d2f8afa1e4ca55a0e6856e3b689e898fbd0bb3909d2a4a6db7cbea56717987159672ad6204c7f3b8e78c43de89768febbeb0d81a5a4108536e4889fd9200899c SHA512 9b7f90974a4ded07a37fa6f7c241b7954cd621176dc7ad3e552662f5f21e44d67b8473bc7b6ade8c8ecf1f1571a5dbbfcc2c8af321014d8bbe74b42dfb9e438b
+EBUILD dmenu-4.9.ebuild 1424 BLAKE2B 3318e050fc27188448df4875d8f76bc2343fe83a6fb075e26ae712a1337aee3a0b3d2f0306bde2b4095f44ef83e4c5d954e5342e1fbf325bb0887d17041709ca SHA512 eeb74f5a268a799972f6d7b41d5ff8fd7dda864735e58a516c8d1ab6193f30f5b1502a6e9fce93c38b3d430261ed39a9519bc4ee085e1b26bbc139a384caef4d
 EBUILD dmenu-9999.ebuild 1370 BLAKE2B 158e394bd5b609af85717452f913921291556333224d07bd82b5b75d7e70a01d4be7ce17014d41a4647904715e97c004c700bc516f34b3ba0385489d7b3cb293 SHA512 71a19ebfb39776e2de6cdee238c59461ae2f95e24278ef6d3c84ad54c681e7deb39edddc7007d31b2135062912f40b9681716bc8a71eac4d242e2cd20a127dde
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index dafe23ddeda1..c8171c859d8b 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 4f43397266dd..4300e92cdee7 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
-EBUILD j4-dmenu-desktop-2.17.ebuild 807 BLAKE2B 0bcdf7380a4b4305327d066cf8c10ad069e8e9e1c25177742f42fa2b04aacc13c6350d1b5c2c42f714e262004e5fd52dfd7de7e9ec1827b30be63578d2ae693c SHA512 d7a413ff8a273f80fa24cce11c5d3d867709bff55fee9d7a8345c17986c35d6f398a47ae794de0bce58fe3f146d7f8e0d093e72adbaa35cda0096186edeeb55c
+EBUILD j4-dmenu-desktop-2.17.ebuild 806 BLAKE2B 33cfa76df58b02cac721b34532768a71a9c883912181eff6fded7cf25c01a67a1a7acde5a7718ab70574356a0d9ad25674c75dc58b55045e8bc3d41d4780299d SHA512 0719a768fc80a6f3bc542a417e10a5a73d83e46b36ebf68dc920fdc35a1ea976e701b814a88a06af8dec9274ac85469605a6e5a756d3c8edbd8fe767091b9247
 MISC metadata.xml 818 BLAKE2B b7c476e13a8de66b8f828895f478988d2f7381ff2ca823d7e0a74bb931f1b5288dd4d574cc8e4e5d2f5d4c7b1cb24c9d4fd9bb8cd1a9710d43ba2e6db90430cb SHA512 4444201bda84c9fc9eaffca6904df20fd06bcdf772a09a16d20d08015fea6672edb9e17435b35933b9ce71552831560b361732147c510ab1d79cea43073de8e1
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
index c94e1d9cbba9..132952a0bfef 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="test? ( dev-cpp/catch:1 )"
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 2aaaebe6a5f3..b8a8b124c07f 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,7 +1,7 @@
 DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
-DIST qtfm-6.1.8.tar.gz 248195 BLAKE2B e99e9a545a3c534af9e8bd5443f8f99d92b63ece1adf7544272e5c5940e4ebb34dad52fb1d5023c3bbeeb6abb50dfb8f46d2034fa01a23bf649a761bc31f9a3d SHA512 04f82e2cb9bb7a9d68c86ffcb7d5a238e68ade38fad145d699030f743343d33b438234cbb132ebf12a1dad67c331bed14bcbb6e89e78a6d1e812461f2102c15b
 DIST qtfm-6.1.9.tar.gz 248313 BLAKE2B 4c9970754925de3210cc688f8f9ad8caea753b78e8e8377ee8a0a6dec014ab3c4459f20882b00c6d16c7bc36878cf8f483b38af0e9102d097679b12a6a6e0db9 SHA512 44765e219f4774f30e43027056fde04d23579e8c91b72215432ff4718fc702f85ddb9752b166eef8aa1aa89ab7bcc6a14585fce05f447c264087ee8274d4bfea
+DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
 EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
-EBUILD qtfm-6.1.8.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
 EBUILD qtfm-6.1.9.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
-MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
+EBUILD qtfm-6.2.0.ebuild 1004 BLAKE2B 70d82537fb67e5891dc8091169332e454b47becb72124f8c948ff8cb0192e979ef1d2f8d2f3ee66877e31683522dc0649b2b0b013dfba33b5e41613ec32e86d8 SHA512 d7a6be3cb9b67cce16734f2a9aa245972f458f6269283356d28c715a44ff3dfa2874e77cf9a4d935048666e1fc3e92d0f9a87290ffc54ad1b2afeed75baf8e79
+MISC metadata.xml 463 BLAKE2B a44c41a05360291bb3be4933267cb36d2135e513aea6f6b2b1f564130f2946dc150f972fc6300db9f50961a0461151e6bdce8269189e71dcecd0e6da827f2de0 SHA512 69e6f714837cbac98d318ac9b0e8f50804d5522f38a52785e2afe90125dbcae9082fc863cbe62f1e3b7ada3b66b41aac4b9471433836de0b7fbd1a1f4117ef78
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index 3e91ecae7c1c..9c25f5fe1917 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -9,4 +9,7 @@
 	<email>desktop-misc@gentoo.org</email>
 	<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
+<use>
+<flag name='shared'>Install the libQtFM shared library and headers</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/qtfm/qtfm-6.1.8.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index e80647d017f5..866fd51c7eca 100644
--- a/x11-misc/qtfm/qtfm-6.1.8.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit xdg-utils qmake-utils
+inherit multilib xdg-utils qmake-utils
 
 DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
@@ -11,6 +11,7 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="shared"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
@@ -28,7 +29,12 @@ DEPEND="
 "
 
 src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
+	eqmake5 \
+		$(usex shared 'CONFIG+=sharedlib' '') \
+		$(usex shared 'CONFIG+=with_includes' '') \
+		LIBDIR="/usr/$(get_libdir)" \
+		PREFIX="/usr" \
+		XDGDIR="/etc/xdg"
 }
 
 src_install() {
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 8d90036f92b8..57c0eb046b43 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -5,8 +5,7 @@ AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86e
 AUX virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch 5047 BLAKE2B 75dadf6d80456a702a3591b04b771410768e65c009da576502ada0fd192f480b20c6e0b12e470950be3306df7944f3b6bd890d0f4f97b778052eda63309cc0ea SHA512 a7d7dfc54f1fb00c00e8ae3011c7a28b4029f20049b9d792e2e8833fba79eb64f57c6ca6778d6d8bf4f383a2b08013e0d3b3db869ed8c08da549c89f095c4d3d
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
-EBUILD virtualgl-2.5.2-r1.ebuild 2616 BLAKE2B 36f0a927e0663913194c94c42d8e0f88f6cbae7bafe46dd5f7aa304377904c5b289743f62acb52660a36cce054885c552e6625c696b8f09c99bcab0dbc942380 SHA512 1dab9b93693e26a3cf3823237a377a72b177ef0ab9c038570d7bfb5ae2e7352f23d5e0cb0972b751f2457607839498022586adcec2ef98fece098fd5336dacd2
-EBUILD virtualgl-2.5.2.ebuild 2507 BLAKE2B 70374ee9d5ac16a917e3755d3fa2e6228a045e502d57d7060f2a63a7e457524422e588a693870a3ea3da15462925e1a4f761a8a7de868090436afbaccd9b9c17 SHA512 c30fa84d7876b8389a81d52f4f6981419ef3630acbd54ffe8263b5c9beec71c59e14a270a6138e7be10de668b2aaf9c6054e70eb57ac22d9f8b86de905c37f81
+EBUILD virtualgl-2.5.2-r1.ebuild 2614 BLAKE2B 0bfd84d0fd8d3e5a0ea7565e6613b3b9588047038d4aed9d47349b1b20e9e767095410eccbb433a72635b8e153e854d778bb49e7071c809f10b8a53e08f94650 SHA512 f537777092ab9ae86076553ccb6f52b268ac8228133a3f370cabcdfc7744b4e03d4268e1ae6e6c70db9fc4b34be798b826aa77fca91d6fbb1aa81910d19c3421
 EBUILD virtualgl-2.6.1-r1.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
 EBUILD virtualgl-2.6.1.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
 EBUILD virtualgl-9999.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
index aa35612ba1ba..6b5db86e75b8 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
deleted file mode 100644
index 7b5b05a5b7cf..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 95c6d863e6b1..4be20ed77abf 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -2,6 +2,6 @@ DIST fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz 30667 BLAKE2B bb9b3
 DIST xflux-gui-1.1.10.tar.gz 18828 BLAKE2B a249533ace4ff6293ff9b99a455943c1f099628bec97c2730473f8a9550ba38e78e775a10a0f77c160180f5f5d354ac8c8ac924c1a2eb9f48861491583c93285 SHA512 5e8057e47fe2cc8a59758e9ab6b3adc6a8281b42f6b517e3e1327e5470c82a326c853d5d389fd62f6d6c439be4ab70a6c8771ece87e5b8c90a33775f8b7cd54d
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
 EBUILD xflux-gui-1.1.10.ebuild 850 BLAKE2B dbffba8824bd5afb7a743b902fb549bf692285e1350f2b128fdc6cd9641c73ce5059842569d67d1feb99dda8554e911b76da48d21a30b292593296606416de97 SHA512 5333d53788145b32e13bdbf92ff52fb6e2cd1a3ee80d3a3450e8fd52ffced4380132dee758ea005ea57f71c76a01482902c7e9f6948316c46026e744b7495b7f
-EBUILD xflux-gui-1.1.10_p20180910.ebuild 845 BLAKE2B 6a78c9a48e26a5155dfacfddfd5ce804982d5e6cd3e9eaaefe565f828bb42794c91251be13fdfceecd5d69ae227619eeb58c1f285e5a3dbbea003a4fd814baec SHA512 5ae70a858c02e42be5e7ffb181e92c6ca997353958376e328eca6e38219c6511a353ffd3c7f7a9843ef5d18041fa93e69d2107955a48cca201fa26bb4ddfab24
+EBUILD xflux-gui-1.1.10_p20180910.ebuild 844 BLAKE2B f8231a19a24ade0d53346f97fb9fdb1e8608950428cdcf29ad3b93ef11a7519db043e42d469139242160819ffd756de36bb63d5cf0b468908929f092f340a436 SHA512 6d8ed009b5122d454bac9439cb1fe0ba6f9856d2572edf6509918e6a5939442e3648d85f00e22046b488f5cb19876ff2c9d8d32bb51e4b668765962e748f3352
 EBUILD xflux-gui-1.2.0.ebuild 740 BLAKE2B a347c5cb94da0f97adae63ae50bc903c99bba474364ab2bd0a3208c8a23abb9d67c1f7506146d3a0089656feae6e5bf96d6316820d0115b63243e17e28b1702e SHA512 204c588e6a0a53f5bf3b2ac80a56df556825f80ff3cb1e66d844eaf6d38bc37687a4c81f60e08e0460b2d11a348e5e7c8af69033a73f67b0ca2bd7daf89a6dd8
 MISC metadata.xml 856 BLAKE2B a9b5a2682ebacdebcceccafbacc98785964a37d32067bb358d01957fd62b57d2ea897d63abd7d7ab091aab2ea5baa401423656a038478610ea7425f74a09da35 SHA512 584c1896675cab40d1e0dee33deabda4b1cf951fbc4ff8e6c98b05334492db575effb91e801da76db2599f3860871e7150135b0596400484d4e7ad00d7abb82e
diff --git a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
index 7a2c2383e72f..cb52d99934d6 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A GUI for f.lux"
 HOMEPAGE="https://justgetflux.com/"
 SRC_URI="https://github.com/xflux-gui/fluxgui/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index 8ab7fab5e9f0..a5bcf1aa65c9 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -1,5 +1,5 @@
 DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3d19feae947a654ca02437e372bd998a71048d00c5b7bf653eb9fa57c696b8d5bb1b3dfd75a0b17e9213368c1bd SHA512 c35003b9cc6bc95f6ce98efc2e69ea94c99ed31671ec5d1f5919294edd7e504d23aa1df29ec0f1d1c68c4ceafbcd386e1207ef4c9957d7a5079ce96c2ac6d924
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
-EBUILD xflux-20130927-r1.ebuild 638 BLAKE2B 7e18978627cf797c8e8dc11ab8f76f92a66a3c3b456ef9c0e2232c34e99de5babeda96dced2906901d7bee0538ff0404c3eb7c701483ad0f3eabb4d9066db2e1 SHA512 6fb5ce6cd5979a1613eafe274f7a97e6e60076169e03b3ec5457d2ace7c6dd9724a4289336a3ce31a63458ef3668a8e574ffdf592837bcaee9a70c4f57247618
+EBUILD xflux-20130927-r1.ebuild 637 BLAKE2B 9e69e04e8cb2feab648340ae3b76aaca316d9fb2d57ee22174f4cf6c7b9ed322deae0dd14730e084d7f1df41e6420d5dfcbb2e7bfaa7fa0dcf03e0ddca661c93 SHA512 4d145d9811958436ea856b62bc9c466c97e065335feb823aafca9e2c47d23799375bb84bb660b00a7a9aed33d5dd38039f88b798c29a2380f68ccd47535b2fdd
 EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
 MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
diff --git a/x11-misc/xflux/xflux-20130927-r1.ebuild b/x11-misc/xflux/xflux-20130927-r1.ebuild
index 4f56590f7b46..c34eac9ddae4 100644
--- a/x11-misc/xflux/xflux-20130927-r1.ebuild
+++ b/x11-misc/xflux/xflux-20130927-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
 	x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz )
 "
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="f.lux"
 SLOT="0"
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 9155efa647db..06e96e418b08 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,7 +1,9 @@
 AUX xkeyboard-config-2.26-Fixed-broken-pt-layout.patch 5000 BLAKE2B a535925839ee58cafa11151cc9cd5079d6e236444264221f1f59bdd11a44e6d3d66625eb3f25d5c5b71a52642c97af00431a7d14381fddaa5c8a77e39ddcf555 SHA512 b552ebcb902101f06da5454489b659493f2bf6fe5fcf171cb83dba52f4eaaf6f703ebc770ec90416011ab14bca809008a488e364a9c5e0dabd9689172f4e15d6
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
+DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
 EBUILD xkeyboard-config-2.25.ebuild 1255 BLAKE2B f1883e83820a59cfccdef343cbd001eb85583542421d4f13b4814c421e7c9f651bf68a41334e43f567d21866061938e957e16e92ee9091cf8fe6a3f9bdf62971 SHA512 71e9921d25b4578bf7ef268fbb5927d2d896f15756b5d4348aa5ad3a86c33be54f717d7106efa59572a82eb9542f6cb1260f65a09ae59ab2d1fe5df35eaee921
 EBUILD xkeyboard-config-2.26-r1.ebuild 1317 BLAKE2B 6479546b1af2d15f8f8f6492fa82003b02d10d748a0eb3803f5ce19bef0d84dc2b69733a5c0ded4d163b6c38d994457473c7793bf7cf8817f3fe89079b39aeb6 SHA512 9fdcb75bfa3176b7de13f9b6bb72951fe06648aaaab4412641477f30f91ff5ead6d325f26b8771fe20e6a022fb90a6785578cd8d350aa0851b81c94f85452d03
+EBUILD xkeyboard-config-2.27.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
 EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
new file mode 100644
index 000000000000..18bac7384839
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 5012a6f8f4e5..81f914aa3ea5 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -12,5 +12,5 @@ DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
 EBUILD xscreensaver-5.40.ebuild 3351 BLAKE2B 8c649d16315f36741e47c58dfc42de728c3010dfefcc33a9572252f87a90359d66af3feb938215078ca88a6ffe9b0af7cf13d4bdeb099635af8b75aec1a41ac7 SHA512 7b61319958afb344ac5569d78e0db09f8287e9bf1ecbeccb2bdefa261fcd972fb31deadff0c8faec440fd000151dabb55a3ea6178bd2f7edd6c03b477c8079b7
-EBUILD xscreensaver-5.42.ebuild 3391 BLAKE2B 6ba70d5519a31049fe0bbd8d0eabb16c40a6df159bef341552ac676b396de8ec16d0690827e8e22bfaa395df5c92ba4378a81a0f3065adf09ca8be100d221f03 SHA512 d4b386c4cca25379ec4b64909e90c1e975a810ddc6648d3bc466a5fe8aaa184466ee64383822d48422aa78e36bc93ef8b8f7bdf80a7afe02554852a8b7f4c405
+EBUILD xscreensaver-5.42.ebuild 3388 BLAKE2B d31c7b81e9bb04c7bd4f7d247bd59ecbdbb2e8e96564a7a156feab6a80c90bcc0b625d4a642b2a4235ddbce98fecff813e16c2b1f3cf1fd78246cfcb6987f4d2 SHA512 98b1a0900da9f16d7dd0120cfa426739f4236e11c46b33446e254fb5aa94a3221e164b25fbb7718e2f9404e042878fabb37b13625893500237e79ebad645dc2f
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index 941a5d01d775..9a77361bdd1e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 7830de1f209f..1c8205f8e4fd 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -6,5 +6,5 @@ DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
 EBUILD zim-0.71.0.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
-EBUILD zim-0.71.1.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
+EBUILD zim-0.71.1.ebuild 1914 BLAKE2B 200ce1f95158a46e7a1f3ccba21045b5af15b549af734dab620c42bf91c60e1c2b251bc15eacc3be962eeb110961d0dc0fa6f75e6ed91956e10176360be6810a SHA512 7fa5f84d0c42b02f9d1df0cee355b5f5e4938bd96a3e96db3b0336c8ca1bc4de3816845c39fdbdf0559ba057cb73eaa39e3c23c6236221792db29a12d8fb7a94
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
index e9579e77339b..757e353f8877 100644
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -9,8 +9,8 @@ inherit xdg-utils distutils-r1 gnome2-utils virtualx
 
 DESCRIPTION="A desktop wiki"
 HOMEPAGE="
-	http://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
 "
 SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"