gentoo resync : 22.01.2019

35 files changed, 387 insertions, 116 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ef38ec2c4302..dc8eca0d7145 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/calise/Manifest b/x11-misc/calise/Manifest
index 84d1c064ab01..db637bc12794 100644
--- a/x11-misc/calise/Manifest
+++ b/x11-misc/calise/Manifest
@@ -1,3 +1,3 @@
 DIST calise-0.4.2.tar.gz 102792 BLAKE2B cedc0b8edd31f4b6b414a593d94b1454fed2844a63f8417b42e8fad616735a1eea728afbfc55668bb1b5964de5f470cd6ab267cf3cc7f41421dd5963bd9fdf00 SHA512 b08722083447780dbfe6a3614cf0891eed791819adc6c434b878c55cbad6fa122d3c2042274fe9acbc0c68a2acb3ca7835422ec6d2d1f867d6fd9ec806a4f750
 EBUILD calise-0.4.2.ebuild 1506 BLAKE2B c84196cb5eecf22deb6a2241a5f8115ff56f9e8f927c42e963bd9f89971877d0b4a82ae0dc7760c302f89d901ef0399ac3a6a232b3e3c71345655283ddf820a1 SHA512 3e4a437d98ca82d716864a085d678c433235867401f17648d5a8a3b437d19c367bd5b90521ec84d2f09e9819e5f754dc04a5ae7a468eff800e87bf036ff402c3
-MISC metadata.xml 434 BLAKE2B 42ae76a524d89668a581db32927a0b54b9ceed7077e266e47624574d83951634018de99b2cfa7bd0954acc29b7b31d8b6a3190122f8a4167dd1d2ae45c21c715 SHA512 f2e544211ea0fa26be86ec4faa6124b10a5af4a348a06122a99a783a74e1d9b37c0ccd6e6e26689474f752e3dd98095d13fdfa5df4ae669e3adec7b8a5713c7c
+MISC metadata.xml 243 BLAKE2B ff834c240baa749df9aefcce72bf41c1f1665f083db9df2abbf27ae7a195a73a2cf185e2c54845bb78405ba69094314f863425ecc343fb411d80c70a1dcd96a8 SHA512 fdee944e8f6e963d436f23f1de055a5071b87b3c3921f296ad61c9d15b006ebd09b35fe05541e90af79e7088b161d2a186d766f9ff9576177e161607b625a8bb
diff --git a/x11-misc/calise/metadata.xml b/x11-misc/calise/metadata.xml
index 4e24c1984732..9c7ac3781950 100644
--- a/x11-misc/calise/metadata.xml
+++ b/x11-misc/calise/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">calise</remote-id>
 	</upstream>
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 4cbca5aac421..a12ebb0935b5 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -2,10 +2,8 @@ AUX dmenu-4.6-gentoo.patch 1134 BLAKE2B 4df80fcec2f35777ff25e0600798e1101bcc7f1c
 AUX dmenu-4.7-gentoo.patch 1153 BLAKE2B eebeac590f6fd759a5524c2613419ef65ddc6f9c4b3f8c24ed9e734a244ae14c8787dbd67c1a6d8d4d94f09f8b6cd73f2672dd321761beba82e7425086f1479c SHA512 14e286b582895985403babc6084b096075f759e0e4a8acf231508cbf4fd5a70e95638f9f99aa35bef72e656b85642bb088f5b4052d703a2b852a787902b23e27
 AUX dmenu-9999-gentoo.patch 561 BLAKE2B 6c0d69737040068fae1ed2286902d2afea9e4ce6be4f3a1682bae4de8477953e50f92b137a0b347434027ec9f31dc635a0980aa12ac2f59ca16862284eed56e9 SHA512 4896a7fa15630650c028073a45856d0680c8e84c14dcf6b5bb0fc02b2303f460d4ee91730ddfb7684ac6c46e24d1651a46539b080feb61d130944dc47fa14af4
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
-DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
-EBUILD dmenu-4.7-r1.ebuild 1327 BLAKE2B 0646edee514a726203e4c30bfb62ec930f363824759b6d83f6afb42e4f573e0ab781e3c8305229f698209fbcc84a056f2ffb5456f36d6e804545a29974e967e4 SHA512 3262456f61e12f996bcecfcdebf2cf963bff0a3682b25b6881955c875c09586800f0c4acd43963798ab81f30cf6631c990a14a0dcaa8d0a53f1183d78491ee54
-EBUILD dmenu-4.8.ebuild 1321 BLAKE2B b77fa651f585fe815894907a1b377462cb1a357845dded9dfee2246292599ced8238ca771b86741c29f581e6d3b67a272e0984f6e7bf023344c0030b03eca317 SHA512 bcb386fe847a5cce843f6f05779b4b4e4d7abb7b80294aec3be2865a01455a7c62c5ca874e1dce9e45ba2b0a8cb6c5531d2820529a5f4480e803cdfc2e11652f
-EBUILD dmenu-9999.ebuild 1151 BLAKE2B 9c85ecf080068cbac6b58ef558ae99747a854fdd34372e9d5d53513e66af64cbc73dc3b56cdea4428eb2c3ba632cb909e2c87db011d4fa3079cc36c1a0a0922d SHA512 3f5ce19b865487b2ab20e35d05086818c81fc0e315fe4b7e1f8b840ab2e3bb87b0dde735e3a73d7af270e96e73ba70174a25ec35ff4ccbd5dc0de1f776108163
+EBUILD dmenu-4.8.ebuild 1331 BLAKE2B cd9a7d863e5f1ebcf407a9b8679770e5710ef473329b3fd21c2502cd238a8e35325f2cd1b6feb1746230d17364a0f1fa1ce1d346f71ec97e977221e3100f3d6b SHA512 d7616941e416beb543b0abd4b7ed16e7b157c36fe5e454ef7a1c9a5a78ec4de5c10ee34b7f4b749b6e77c012b82437acf87a374d883c56047cdee09fd30ced6b
+EBUILD dmenu-9999.ebuild 1158 BLAKE2B 1f70618cd79408543653a9d4288a25e0b40ca7f141596ce66154c70dfbc85405cfca8a748eb14e54662e057ff41d5308f3c7cbb90922b90d7da88b678c860bdd SHA512 c45538edf8b4a9d3c000984634833c8e226d0a75ad647c56935b3c6fa3a435db9d210f47aaca076d086bbf0ef0ae584d8fddd37c9796082552e5c70461b16ee2
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
deleted file mode 100644
index 1bf43050b79d..000000000000
--- a/x11-misc/dmenu/dmenu-4.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
-HOMEPAGE="https://tools.suckless.org/dmenu/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|^	@|	|g' \
-		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-		-e '/^	echo/d' \
-		Makefile || die
-
-	restore_config config.h
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) \
-		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
-		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
-		"XINERAMAFLAGS=$(
-			usex xinerama "-DXINERAMA $(
-				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
-			)" ''
-		)" \
-		"XINERAMALIBS=$(
-			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
-		)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	save_config config.h
-}
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 7d0c6c78aff3..aaf42bf59d99 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.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=6
@@ -54,7 +54,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	save_config config.h
 }
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index f2222c4d6bc8..8001b06f1d66 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	save_config config.h
 }
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index f9fa55e0ea20..5740bfbd64aa 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,4 +1,4 @@
 AUX j4-dmenu-desktop-2.16_system_catch.patch 5533 BLAKE2B 69745ebc955550ab3c02d31b455e8d36210aa845c09e3c1a5f61a829c0dfc779e093d818c977f98b1c5089f0a43662bd0b75d99bebeb83f9ada85175987134ad SHA512 dedb23a4b946a31778fdc1451ad2841d78bb6bfa00661e6e496fbd329f1c7fa6a3a3fcf52b35e1c02b049c1b2e614c9eeae6717851f56b6e89719cf017807c83
 DIST j4-dmenu-desktop-r2.16.tar.gz 32553 BLAKE2B c1c7f0f2a59421b2e244a8f65251b296ad44ae37c10cbffb62bdefb168b6104e3d89c0a43b74feaf0afcc52ac78c8d46204ed397f131e526c447379b066b9b88 SHA512 d5bb0902d4bdc474fa20bc9d8f79de90a92bb4941f0d325dfcfaa1347ea3ad355b87da8194bc3f654970e9ab8848e6ecb5093f3c75fbaa8dbc40199fe6ea2837
-EBUILD j4-dmenu-desktop-2.16.ebuild 908 BLAKE2B 0e1a90e0a0649040c3955c2a9359e24755b44c2f4bd4040c880732ab5dce79e866653ab4ac55680e5aad930d5c9a139162e3c8d54331bc35ebf499272729293a SHA512 ed85e3170a25159fd046723e77a1901b1ecfaa543c145e5b615c64b0c27f38fb178a3e0ab76c489f23367e4fba80c6a0d5917b3151007e52e56db16edeaa7d87
+EBUILD j4-dmenu-desktop-2.16.ebuild 904 BLAKE2B eaa5872c1fdde74a767910a477271343d01f7426248c9178f0d14d6b4cededc765d117d4870e683533fdb7aaf3c487a013da42f394872558c5d733ec9e7f0e56 SHA512 08b252636cd5a7186c1a739abb44b331302e0ea87566ad26c6baba152969838ea82d93d5df43c71cd2f71f49381ae94003f7ff94b51192d44b238145cee43eee
 MISC metadata.xml 777 BLAKE2B 180659005f20d3b3d011d5459cf3e34bb11f4942167b5219d570254255173f79a7ab90e9446a4b6ec8108e2bc3fc48373a8b10fa7dfb8f4aaad898e995d97acb SHA512 0b3f5d514237b845e609f5b99384fb27aa111f0e04b44fde1e2601d2a7089dac1401918afd3e8c1cc670d96273cb8797a2450ee2df9b6489e01b6426da0af617
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
index e758d1c57c4a..4770b776eb0f 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="test? ( <dev-cpp/catch-2 )"
+DEPEND="test? ( dev-cpp/catch:1 )"
 RDEPEND="x11-misc/dmenu"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 3c722c3a9c3d..566cd94170bd 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.15.tar.gz 319839 BLAKE2B 336d6b22c6c670df5e267755e06dfa42c74cf26cf2e448a72608035a0a944d7677b63a62058b59423f6d6649298702149e54ad8aa3bd4f09fd7d254a3b80de22 SHA512 cb2bf60e48257735b8ef636548e83ef35cdff355cfa17d71f4a7cec47db6ee7045278c3cc81825621da4b2f959d20be86fe28dc85f894f4d3d4057f2685bcf2f
-EBUILD py3status-3.15.ebuild 727 BLAKE2B fde811aa5971c357e29f60c891876f50ebb906e3c49febbcd50569583acab1097658bc23ffa6563adefdb7319820d933e4957d7bc26b1184e67accd9ac967728 SHA512 5d4c3a6e4eadc650d8f6968266155a866c8967547ce999ba07d402d5a0886cda741f83bf8cf9b92e24b618e8c5ba2301aa4c3801419d73a9549a0a88aaa710b4
+DIST py3status-3.16.tar.gz 311381 BLAKE2B 6511a651be9d2681efa7e7a6b509c42e55867c703444924d311a3914bfd3bd192169ead0774335155fca29efe83584202e1d0c3bd8901694e3f456891a6db9fd SHA512 da7cf5ee1991c0f66571277dc4764359ec36ee9aa8a2ae9573a250660c55da3301509c8daa2057b1a1fa8e66ebadc0d0456f7e17001445dc342b8cdf725eda9a
+EBUILD py3status-3.16.ebuild 727 BLAKE2B 621132a7919075196ee01dcd783993edf13f18eba3ce709374450c7541710b771d534aeea706ba0e90635235b3232af30faddddaecdbfb15fe3634a7901990dc SHA512 72a418e869cb50e2f370d8ece9a6055e499f0c60f04df8ce1b4ba72992128a7f9e78efadda4c3d77802b5db67df3691451c490dd35b581105949b09c4bf81371
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.15.ebuild b/x11-misc/py3status/py3status-3.16.ebuild
index 10ccdf7c1270..f7ced049aa03 100644
--- a/x11-misc/py3status/py3status-3.15.ebuild
+++ b/x11-misc/py3status/py3status-3.16.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=6
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 98a508e65f52..cdb9fff5b37f 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -15,5 +15,5 @@ AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
 EBUILD slim-1.3.6-r5.ebuild 4185 BLAKE2B b6caa9a24635afef43ef751a50bbe02f5b6e168cf3c6e48bd9a8227932870d96d2f96e1357d1cc4398520147a3c365dcc16686c0d45132ad972323589f052301 SHA512 5e753674aa49797f8c264b8d21aa35f12f725df368c3da7a8fb9332f57216a903d3c5c011f11bc76492c8d3ec65551f43b677c40058731f2d02dda2e4233dd76
-EBUILD slim-9999.ebuild 4058 BLAKE2B 3f7544ac2bb799284f879214ce52ec2e67aa826dca0ae19fe5797508c35f839c7efbc7b5a7158c603a8b3e3eeceef48c49f2a87ba31babf86a16e5b16a543284 SHA512 0527243f7f00b129ff8423c30e6703f90bdd6f1ba27da0f220b29c97dfde0b75fecddfe9ff9ee8b397873f176683689fb11497c2f8d6891ecfad1dfab7b46b27
+EBUILD slim-9999.ebuild 4017 BLAKE2B 35ec802f7ebe715086ef78816b2ab7fcbf356f2885b94f764d2f06060ce213d3466110806f9c6c238b4e5a6464c201cdba122e1febf18c2cd402cb152edfb40d SHA512 604c28588ceb8cf881eb8ffef3ed948c562bc61df78f6ab68bb7abc974e94ea55185a92fed6c4c0b4a54ac5c310e4e738357d74267037b4ffde2d74535249081
 MISC metadata.xml 514 BLAKE2B 30f0fae6144c9bed109df03b4b77c25ddc0b2e8a69b8cecf08eb14ac3ecfa364d206d2b6832892e74986b28e293d51f51f6ae7102348d81f8a0f5594f8f95c94 SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 263d58016abb..42f6d06b502f 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils pam eutils systemd versionator
+inherit cmake-utils pam systemd versionator
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -31,7 +30,7 @@ RDEPEND="x11-libs/libXmu
 	x11-apps/sessreg
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? (	virtual/pam
+	pam? ( virtual/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -59,8 +58,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use pam USE_PAM)
-		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+		-DUSE_PAM=$(usex pam)
+		-DUSE_CONSOLEKIT=$(usex consolekit)
 	)
 
 	cmake-utils_src_configure
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 33112ce9d5b6..d0e1463206bd 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -1,5 +1,8 @@
+AUX wdm-1.28-ar.patch 645 BLAKE2B 0fb3dd263ca9ab9ba285c05c46c5a9cbb9bf26ea451681232b646027889f1a2fc9368b8e8b63f38c8c36d81dbe4e2edc9654bf85fbfaa0e7d1cf2e9b894b0510 SHA512 03cfbde2efcf68090fb3c39d634104a40eff646b44f34cb12af1abb669d5aa9ce0295f2c0f1f0879daa519896d3411b62c2b8065ac6bab0c64db30201899f43d
+AUX wdm-1.28-pkg_config.patch 779 BLAKE2B 9455f411e2f1884522836033ba104ec588fe88a9f53235743fd365092a5fe9270474456b7320820553cdd614175c26c43bb532fb596e6465f51b474f441fe930 SHA512 0a255a416069a8d7a256a4b707bb715df551c34d92d439b6fbc6d0c22dd2011fd615c295bb7f2f950e6f0c8ef554235a0801b8fa412aeb372dec495011711966
 AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386a26f3b6b9103765d4597d77e0d8d5afa6c81023e3f096747b7020e3ce536a05781ca13120c4abc358ed02419d3538fc SHA512 55ce47472f0d7ba03bef88af52ace7db88ded7f45862d884a7bb3409a122ec17002a40195cef078f57bcaba24cfcb881d156e990bc856ca7c4f1f4dabbb6764c
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
 EBUILD wdm-1.28-r4.ebuild 965 BLAKE2B 6645dbbe18a762aa1f0fe6f78069546892226def6e55fd2545132b5ba55341caa05534acee32c1884de9a53021281331f9933a350de2e87a560a5827b40949b8 SHA512 cb058ccd55ab042ddcd3d0291acb1788c2b697dc8fe7f23bd6de0ddac2a68187be732c808859246c20aa99ee63a0dfc971baa7c65f8b5b224ce767fcf9c04fbe
+EBUILD wdm-1.28-r5.ebuild 1138 BLAKE2B 4048408d5e9a2fd33a7536e6641081e83d6451339647093531ed3813885045b7d89f99728019c3c00d0932bc7a94ca75e82866c4ebe1887c02f674d805e3dcc3 SHA512 b00ab1c0ee09cd4d32383727d309c887228a8f5ad2f191c8f80f506ca6d3e5e1f5ca044628b46502e3349a947ae212152674cd56a946c8b83962901fab05665a
 MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
diff --git a/x11-misc/wdm/files/wdm-1.28-ar.patch b/x11-misc/wdm/files/wdm-1.28-ar.patch
new file mode 100644
index 000000000000..f4783061b1ca
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-1.28-ar.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -26,7 +26,7 @@
+ xgettext = @XGETTEXT@
+ msgfmt = @MSGFMT@
+ ranlib = @RANLIB@
+-ar = ar
++AR ?= ar
+ 
+ cc = $(CC)
+ cflags = $(CPPFLAGS) $(CFLAGS) $(DEFS) -I./include
+@@ -249,7 +249,7 @@
+ 
+ bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
+ 	mkdir -p bin
+-	$(ar) cru bin/libwdm.a src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
++	$(AR) cru bin/libwdm.a src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
+ 	$(ranlib) bin/libwdm.a
+ 
+ $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man
diff --git a/x11-misc/wdm/files/wdm-1.28-pkg_config.patch b/x11-misc/wdm/files/wdm-1.28-pkg_config.patch
new file mode 100644
index 000000000000..3670830bf86f
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-1.28-pkg_config.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_RANLIB
++PKG_PROG_PKG_CONFIG
+ 
+ AC_ARG_VAR(XRDB_PATH, [Path to xrdb program from X])
+ AC_PATH_PROG(XRDB_PATH, xrdb)
+@@ -153,15 +154,11 @@
+ 	],,[$XLDFLAGS $XLIBS])
+ fi
+ 
+-dnl		WINGs support
+-AC_CHECK_PROG(GETWINGSFLAGS,get-wings-flags,get-wings-flags,,[$PATH])
+-if test -z "$GETWINGSFLAGS"; then
+-	AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.])
+-fi
++PKG_CHECK_MODULES(WINGS, WINGs,,[AC_MSG_ERROR([WINGs not found])])
+ 
+-WCFLAGS=`get-wings-flags --cflags`
+-WLDFLAGS=`get-wings-flags --ldflags`
+-WLIBS=`get-wings-flags --libs`
++WCFLAGS="$WINGS_CFLAGS"
++WLDFLAGS="$WINGS_LDFLAGS"
++WLIBS="$WINGS_LIBS"
+ 
+ AC_SUBST(XLIBS)
+ AC_SUBST(XCFLAGS)
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
new file mode 100644
index 000000000000..9a7b26373b7c
--- /dev/null
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools pam toolchain-funcs
+
+DESCRIPTION="WINGs Display Manager"
+HOMEPAGE="https://github.com/voins/wdm"
+SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam selinux truetype"
+
+COMMON_DEPEND="
+	>=x11-wm/windowmaker-0.70.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pam? ( virtual/pam )
+	truetype? ( x11-libs/libXft )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	pam? ( >=sys-auth/pambase-20080219.1 )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-terminateServer.patch
+	"${FILESDIR}"/${P}-remove-fakehome.patch
+	"${FILESDIR}"/${P}-pkg_config.patch
+	"${FILESDIR}"/${P}-ar.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	tc-export AR
+	econf \
+		--with-wdmdir="${EPREFIX}"/etc/X11/wdm \
+		$(use_enable pam) \
+		$(use_enable selinux)
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}"/etc/pam.d/wdm || die
+	pamd_mimic system-local-login wdm auth account password session
+}
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 25cf59ec6e8f..345552ce210f 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,5 +1,7 @@
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
+DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6
-MISC metadata.xml 694 BLAKE2B c81a1713da2084ad68df6c91b75cba02df7c39950b331916362ffc8dd67b6b72dbf40248c3a906d1f582a8ed5034c4cbebcab7bc4b9db69508a753f44df07102 SHA512 842b0faca49ae6810c42d117ca3f79fc693acfb8a965d3fd2a8c890f475350c29175303f1b56b0c64468dae20e692d2430fc790e7b88165c0f30d65e1bdcb606
+EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0
+MISC metadata.xml 503 BLAKE2B 2abaa727781a7a18a68993b4bb95d475138ca1b3d2a30080da7f619d35f2d323bbd8273c9983887bf884a026f9750ef68e0a53f75603f1329f28257066787967 SHA512 5d8635e9f87aaee274f263bff2fb05be5bf8e348d4e9a899924049a210dea6210be4df0c9b9c8db4af04798cf49f16e10a47018482d9aaaa38b5613d2348b1b1
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 5c7cf9889fd4..f25d54c19120 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		The primary goal of this program is to create a portable and
 		simple command-line server utility that allows a VNC viewer
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
new file mode 100644
index 000000000000..fdb0b5c8392a
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vcs-snapshot
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl xinerama zeroconf"
+
+RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	>=x11-libs/libXtst-1.1.0
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xinerama? ( x11-libs/libXinerama )
+	zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		--without-v4l \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		$(use_with xinerama) \
+		$(use_with zeroconf avahi)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 07d1042fb42b..95819a932378 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,4 +1,6 @@
+AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e8079a0f22ac91084742ed93df51b27e42fcabce36009f811f5d456e6ff803a08c75651ef7fbb9eab4248d79d3e09f8cb27 SHA512 4ac7fee35265c996a6bc82e3895d69e702b33e164f904da3dd022ce0f591b721c8e74493a53633695f66e332464a63007548fd24181b00b7dcd4228475355411
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
 DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
+EBUILD xautolock-2.2_p5_p1-r1.ebuild 1239 BLAKE2B b1121134e2e9e4da0397ec4a01e321664faf086410a96f0d5f73c04a3a924fab4ab9e037ecaf2cb0d27b5fa50667fc7a16369f2df17e4f146a71508d06c15339 SHA512 fa6f130ffc11cd59ff0b81d1de4835fa5f37c9a5fd33fe9d6697da23dd14c66f6641b227ac346b4f494f410c8f1d0e5a19510fa3da975b320dff235d0e28248b
 EBUILD xautolock-2.2_p5_p1.ebuild 1377 BLAKE2B 57065aa8645601ef4047d84633226029a324fbfe057ca231db535169c8726c74ad47dacdf894bfba558d374c209b55c5eea51eddd0448cedead839a280ec8099 SHA512 4f2acd15acfb25139ae95d12e5755909364a0b6c60e83d1c7266ba46406f64ad19d03db775b9890dd5b786545db9c0871c98ac05c4f678c1bac06dd7817eb11e
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch b/x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch
new file mode 100644
index 000000000000..98d96b2e2d34
--- /dev/null
+++ b/x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch
@@ -0,0 +1,25 @@
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -210,22 +210,14 @@ evaluateTriggers (Display* d)
+ #else /* VMS */
+   if (lockerPid)
+   {
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+-    union wait  status;      /* childs process status */
+-#else /* !UTEKV && !SYSV && !SVR4 */
+     int         status = 0;  /* childs process status */
+-#endif /* !UTEKV && !SYSV && !SVR4 */
+ 
+     if (unlockNow && !disabled)
+     {
+       (void) kill (lockerPid, SIGTERM);
+     }
+ 
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+-    if (wait3 (&status, WNOHANG, 0))
+-#else /* !UTEKV && !SYSV && !SVR4 */
+     if (waitpid (-1, &status, WNOHANG)) 
+-#endif /* !UTEKV && !SYSV && !SVR4 */
+     {
+      /*
+       *  If the locker exited normally, we disable any pending kill
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index 2ba8e9e851e4..b822c45366ac 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/metadata.xml
@@ -5,4 +5,15 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
+<longdescription lang='en'>
+If no user activity is detected after a set timeout, xautolock runs a program
+for you. If you want that program (with optional arguments) to be a screen
+locker, then one of these packages might fit your purpose:
+	x11-misc/alock
+	x11-misc/i3lock
+	x11-misc/slim
+	x11-misc/slock
+	x11-misc/xlockmore
+	x11-misc/xtrlock
+</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
new file mode 100644
index 000000000000..63dd3677304c
--- /dev/null
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator
+
+DESCRIPTION="An automatic X screen-locker/screen-saver"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
+
+DEB_REV_MAJ="$(get_version_component_range 3)"
+DEB_REV_MIN="$(get_version_component_range 4)"
+DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
+SRC_URI="
+	${HOMEPAGE}/${P/_p*/}.tgz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
+	"${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
+	"${WORKDIR}"/debian/patches/12-fix-manpage.patch
+	"${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
+	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin xautolock
+	newman xautolock.man xautolock.1
+	dodoc Changelog Readme Todo
+}
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index dc82f1a443c8..8ea0df60bcbe 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,3 +1,3 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.2-r1.ebuild 671 BLAKE2B 2f41c74b094f98b64c0516ac25d21c88bbfb0ebe10576dfdcd5752fe61904a41cb9dd73fc8515d474dc66fac3fecbfd29d404a587ed0b01e1957ef6e372e62b2 SHA512 b23495927e5e83c904fd07a7bb1574bbfbcf1a58e2fcf5a92c12e52d75ff2c26ac471ae01c580c4e30c48877c1a3b5d8ede89a3e3045bbcea0b16a9cf100fc5a
+EBUILD xbitmaps-1.1.2-r1.ebuild 670 BLAKE2B c823212d8f2a7512856bd7db567d27293f89ae771eb8b44ba1b7a4d1529b5873ea6c48c1989f69ab4266f5e17c59ecf868ae1e49c4a9ecd98ae162c0e5417cb0 SHA512 35bbd4f3a4c7474a49433aba07c4db5b3852e67b3a727de1195a56d39b8b2b2bee5e8a8c456d61848941ade9031297611d031da7340fdf6f0dd7ac5c4b080e35
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 0bb27cf96fc4..65304d80e889 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 9ae625fa0dee..083fcc581a05 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,4 @@
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
-EBUILD xkeyboard-config-2.25.ebuild 1179 BLAKE2B 46db8fa37555b380fbaf820284bce384706ac4a053656250598b67cd5ea66cfa5bcf52f9ca69d62bb7dafd8c124537c7fa9adb1df88148b6741272cf806a6cc7 SHA512 9f828f05da15445c8882c97c9ce18af69143bb21bd145f1dad2dd4505086b27e97773054612723f75a125cb76b4b2f4dab0183c80390bfffa00829516b83baac
+EBUILD xkeyboard-config-2.25.ebuild 1178 BLAKE2B 7eb3a66b616bbf51ff8f28ae9fae57f1842ca6af23956be1d3a97a7efe4378975f557cef979e0d91c34dc2610e97bce1e0549c54d7e1d445fc2d01b12b1cabc0 SHA512 fce43266643ef25c8274a6b0fe3812ae69c49fbe610835870e8a6bdd42667e0ca00d26c3ba9b229ca9b0c6c4e760af099ed1ccb1bf114ab3d1b47eeb5e05d890
 EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
index ca7ba64fa052..771e138381b8 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.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
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index cf214e2e8efc..e18a110f53c7 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,5 +1,5 @@
 DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
 DIST xosview-1.21.tar.gz 146428 BLAKE2B 899e0cb68489bd02e035765f8f33424d41996b80a7c16651f60a2e46538cf4eac1a9377342c2ed4f35da6cb00aa3961e34802c77fe26e4743a23e2d3dc443484 SHA512 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b
-EBUILD xosview-1.20-r1.ebuild 1209 BLAKE2B 4dd8a3dc63cd238022db4952abc2970b15de99e3d833221255de4c3c604eba709ed1bc81c398a06ab58fd1170fc9840322ae2d2d337296765230760ca3d97fbb SHA512 e0a95ad65e44bb364b7eaf3f767bc08a4f41f3483e9e5fd9fe67e7d870125bd664b88ef34a91ca9a1ef55410c5a18af40e5fa415b1f3ce85ea3eac40c062d286
-EBUILD xosview-1.21.ebuild 1210 BLAKE2B e2443c9ac1f85d22361ddc93a4dd50eaf92b4132ca37187e4f5716a7091e2bb689681ecb7d814929c4d0ecf3a03c782c98e47d223871a44c3e7b6b54981814d8 SHA512 3dc670f4f16e0513ca0d33686fe6cdaaff4b100006aea2728bddfab4a336a5feb38875c9ec860bc63efffa5af72fa828c78633f80c52728f920cd2356bf0fe05
+EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
+EBUILD xosview-1.21.ebuild 1203 BLAKE2B 35780c1fbe4c4d9070e9ab245bdb46d115dc910d4690fc25b549deea37c134cf59e13cdcbcb26a9e9c02d0f5c799fce45f07278022d77eb6eacefdec84f3be86 SHA512 1e78f0a0c87d266229a7bb533b701180d843f8f77e0b8e566feb62df715301429ac872cd7219140d60a78b79506da6b7f2fc141f81ab3b53e13189f0c7b7ca9b
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild
index e06a58bfd2c2..3ecc36b3b663 100644
--- a/x11-misc/xosview/xosview-1.20-r1.ebuild
+++ b/x11-misc/xosview/xosview-1.20-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="X11 operating system viewer"
 HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
diff --git a/x11-misc/xosview/xosview-1.21.ebuild b/x11-misc/xosview/xosview-1.21.ebuild
index a88949d99bbb..f19498d37816 100644
--- a/x11-misc/xosview/xosview-1.21.ebuild
+++ b/x11-misc/xosview/xosview-1.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="X11 operating system viewer"
 HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 10ab94f1d947..ea437806bfe2 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -3,5 +3,5 @@ DIST xtermcontrol-3.4.tar.gz 140662 BLAKE2B 8d151cf323899363e094a9d64776a80b700e
 DIST xtermcontrol-3.6.tar.gz 151916 BLAKE2B d5ade1c89d0bb45b401b59e5e13586d54c55226e1c647cbb60d047bdd0e0a61e871b0c405adac8a4bb71d5addd5a8bb11d1ac45aff9cf456a17600f099e04d02 SHA512 f59e729a9bd6739604c0c687ca93fb9091d69d7c28624d514baecf6839db9897a919adeda6e6d02e368b5f8a980c3f616155da955d5581415625a5757df650c1
 EBUILD xtermcontrol-3.3.ebuild 374 BLAKE2B bf70633c9c4afb87202812152092510c5766ba2df6bbbf31ac7cdb1928ebdb81d4d55316638cb2d9fcf6cd616964cbce8765d3ec3336189d719556d3500b3ba1 SHA512 448e85ed7404095ca0ad64d75b4a713895fc1f2a168d0ed8fc668241c731615c2e7e825078011fede0720ac204dbab792bf8f1da8b91f5ff0af8dcb549c86e91
 EBUILD xtermcontrol-3.4.ebuild 373 BLAKE2B 836d55e50d4021a1d005c4b111cb88e11498b36ad837233e3dad2ac2424f1a4398647818674122c7ba39a5b79996e5e7ad2f650039bfc7c6e4abf46c7c55e61f SHA512 f02e93b2c590a6f4d9a70b896eeccaab5d42e383b64252baa1be51c6de53362f91704ca6491b16af3a6c4333d15920c20baaef20275319e28d35eae4637d22bc
-EBUILD xtermcontrol-3.6.ebuild 376 BLAKE2B a404dd6099e71f8206987827d9a79e97470f14418c636cb96b450c7cb4ff1dd74455762a3adbebbd743f3615bbc799dc7383f8ef8264ffa7c54f23899e9f754e SHA512 31dc63172fe7979505b2312972ed13262bba53b08df068f4aaa306053dbc7d1d865d03f0d3631ca05bd93ee1bd52e4be6ed63c8eda459812be65eea1a2ec95ec
+EBUILD xtermcontrol-3.6.ebuild 373 BLAKE2B e3725eaaeaa360735f65adbb31739c93522cab954ad009a586c54e317c8fee69c09a95e19ce060d512d8d1ab440a27d44e59632149ea542e81b28558cd262405 SHA512 ae2650c941782ea5bed9af6b62e91e317cf0d134f4e65ec97c2d3a95649fa8ece9c3bf88545f888fe5d49e339adab1d6dba4f6272ba2c32141d3154329a65295
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
index 3a592732de18..18ff93b92b86 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.6.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=6
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc sparc ~x86"
 IUSE=""
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 284eb9c68211..41866378c7bf 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
 DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
+DIST zim-0.70_rc1.tar.gz 2889546 BLAKE2B ca0c2274472f7e3f50e2b51ba59a75ae1422e7bad86a8fdc55474c150b1ac227ad785c3484d1255079a8aa169bc437e6016254ed8d4691d8e8d78a5112d71038 SHA512 fca61ea5c249ba33187d48a6794c11f30afd664e07462c738ca2b64f7d970e95628ecbcdb9c19a23b70c1609993d4111a9976cdddbf2fd5ad3029014a8a01339
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
+EBUILD zim-0.70_rc1.ebuild 1975 BLAKE2B 353454f5ea9e44f5ad8a191fa795eeaf80f14ce709c7bc71688f65d438dc3861276dd717b1141d684393a90aeb90182133519695a78a37b12d9e9624d9312cb7 SHA512 40693d96c405ba43e3ad1f2d112fd2312303ecc133316e485ad680c78c49cd9d36c3b84608b8fbd0dbcfffae54aa3f85f196afb394bb0a0eecc0169d62bcc9ab
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.70_rc1.ebuild b/x11-misc/zim/zim-0.70_rc1.ebuild
new file mode 100644
index 000000000000..9e40d67b06e5
--- /dev/null
+++ b/x11-misc/zim/zim-0.70_rc1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	http://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial
+	)
+"
+DOCS=( CHANGELOG.txt README.txt HACKING )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx ${PYTHON} test.py
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}