gentoo resync : 31.12.2018

32 files changed, 85 insertions, 444 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 00306c2d9f18..f93127e6de7e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index c731d7aa9545..3ad03360035e 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,5 +1,5 @@
 AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a4adab3f2491e52c7bfe674de1509120104ea7f042b2a6a61fa30ce1d5573289c01bfa63ff0826c9d76281ed927ada61 SHA512 c6eba0da6cc37702293273d762481b522467f3cd5ae7d216f397ff47657762db78deaa0780706c2e13d0010b739067e65d09b235ab9df379430a826c95e6fed8
 DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
-EBUILD imake-1.0.7-r1.ebuild 1158 BLAKE2B cbc2d0a82cdc0202ef46b7c56c676edc160c0447f15ed4a92d0a771cb7674c06343d6c7b1542fe786d6cff06ffc006212cdebb7f908fa457add376a734756755 SHA512 e9aee670e8ef3ea3db798c98d01348f506befb3ad0aaec81981c9b17dffdf53a64cfe2986dd2aa5314084e8077122bc1972091a13608d14d23610b4fb24c93a8
+EBUILD imake-1.0.7-r1.ebuild 1157 BLAKE2B ab36a3af135e091e95c9c8142cacf36b4bd66c7f1be97232e697bcdf46445f5b97bef6a5cadc66df30ba1355dd66533d12fb9b2064951a25d1cf5c3b89fc6d6f SHA512 6f6f738215c1cd2da5b6c3f891bf6722681b59f0deb80ecae268edc7666f3651b600c24fe56588119e2af9832438a1b1c28c1d97d725426b22d175e131990d1c
 EBUILD imake-9999.ebuild 1170 BLAKE2B 4c9722b3260289f3244313ee6cb8cc352dfa8d419f40fc8d3332ea56916db9e66f8b40d7d911afd920ee05dc47b0493d95dc4bb0caed0e626fe39483b2b178f4 SHA512 89c11988a9d639352656d212d87e747c55d7e6fa8bdcbe34b84e45e4db08f8138d3d22fd9cf57b3fa2eccc112c4070fff0695fbbca3f28882a83139353cde921
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
index e58d443f1ed9..79263523f8d8 100644
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 4410af60ad1f..3c722c3a9c3d 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.14.tar.gz 302768 BLAKE2B 17b604cd4fa8d832a92c3fe74d20cb2df6a7f697dc7c165472315cb2925dc3496757879777bcc9fbba867303ea046fb88e53f976fff85011ac3458dfeda34a16 SHA512 1e87f338faa3c7ea4e1e14e5a40aa5913b33bee06e5b858e876453787694db4f285d93396efa44b82dc59cb2b296d6a3e6d358d008a09056257844f919555782
-EBUILD py3status-3.14.ebuild 727 BLAKE2B fde811aa5971c357e29f60c891876f50ebb906e3c49febbcd50569583acab1097658bc23ffa6563adefdb7319820d933e4957d7bc26b1184e67accd9ac967728 SHA512 5d4c3a6e4eadc650d8f6968266155a866c8967547ce999ba07d402d5a0886cda741f83bf8cf9b92e24b618e8c5ba2301aa4c3801419d73a9549a0a88aaa710b4
+DIST py3status-3.15.tar.gz 319839 BLAKE2B 336d6b22c6c670df5e267755e06dfa42c74cf26cf2e448a72608035a0a944d7677b63a62058b59423f6d6649298702149e54ad8aa3bd4f09fd7d254a3b80de22 SHA512 cb2bf60e48257735b8ef636548e83ef35cdff355cfa17d71f4a7cec47db6ee7045278c3cc81825621da4b2f959d20be86fe28dc85f894f4d3d4057f2685bcf2f
+EBUILD py3status-3.15.ebuild 727 BLAKE2B fde811aa5971c357e29f60c891876f50ebb906e3c49febbcd50569583acab1097658bc23ffa6563adefdb7319820d933e4957d7bc26b1184e67accd9ac967728 SHA512 5d4c3a6e4eadc650d8f6968266155a866c8967547ce999ba07d402d5a0886cda741f83bf8cf9b92e24b618e8c5ba2301aa4c3801419d73a9549a0a88aaa710b4
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.14.ebuild b/x11-misc/py3status/py3status-3.15.ebuild
index 10ccdf7c1270..10ccdf7c1270 100644
--- a/x11-misc/py3status/py3status-3.14.ebuild
+++ b/x11-misc/py3status/py3status-3.15.ebuild
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 76dec17d68c7..4dbabeb3042d 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -3,5 +3,4 @@ AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71a
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
 EBUILD rss-glx-0.9.1-r1.ebuild 3727 BLAKE2B 29ca700f51e3f37072e8f427a0c5c6271a0f88cbe96af2b2e4ed7ea6dec438eabba005264ebdc747249f04a8dabd1c492db9f4b767512731780d05c49ced1894 SHA512 d5de768a3dc6a8f1a89dde65cb05d057868fda01a7e3d7cb326501135f5ba1e5d0902aecfebf8d78c9912b7337307cba573befd01a22493959a9a9f68a4d76ff
-EBUILD rss-glx-0.9.1.ebuild 3690 BLAKE2B 582a7fb11166b5a06024ce0993e45e8fa8c2c6028d26215df84cf82dfd3822abd897d519d1e860467f5022b0e74f68a3e18a15ce2b5d7ca3cf2dc5b0fa607b1b SHA512 0ed2be0bd6d23d9093beae568cab1f312a9dd140816f726ca84e8d5e145775c10b6c7ab359a0c303e3449f999ba7db9771c73621baf10abc2acae373c8c28fc4
 MISC metadata.xml 444 BLAKE2B efed936fd7e5f9ec41b4944de689f03be14cc92c75759f91cb0f488599beb09b6fbed538df863a38909a674c4da4aebfc93b190765c9194280c62ee1b42bf9b8 SHA512 05849c2a8dbfed55c72261d2d977ece92058ddfe14565eeb22edb7d57ba2fab707bf8d97948fcbafe6f53a0880dcb651a6f8b4caf8fcc6935415c94de9443e8d
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
deleted file mode 100644
index 33678d15e886..000000000000
--- a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver"
-HOMEPAGE="http://rss-glx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="+bzip2 openal quesoglc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=media-libs/glew-1.5.1
-	media-libs/mesa
-	>=media-gfx/imagemagick-6.4
-	>=x11-misc/xscreensaver-5.08-r2
-	bzip2? ( app-arch/bzip2 )
-	openal? ( >=media-libs/freealut-1.1.0-r1 )
-	quesoglc? ( media-libs/quesoglc )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	sys-apps/sed"
-
-DOCS="ChangeLog README*"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS=/s:-O2:${CFLAGS}:' \
-		-e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die
-	epatch "${FILESDIR}"/${P}-quesoglc.patch \
-		"${FILESDIR}"/${P}-asneeded.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--bindir=/usr/$(get_libdir)/misc/xscreensaver \
-		--enable-shared \
-		--disable-dependency-tracking \
-		$(use_enable bzip2) \
-		$(use_enable openal sound) \
-		$(use_with quesoglc) \
-		--with-configdir=/usr/share/xscreensaver/config
-}
-
-pkg_postinst() {
-	local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
-
-	if [ -f ${xssconf} ]; then
-		sed -e '/*programs:/a\
-		GL:       \"Cyclone\"  cyclone --root     \\n\\\
-		GL:      \"Euphoria\"  euphoria --root    \\n\\\
-		GL:    \"Fieldlines\"  fieldlines --root  \\n\\\
-		GL:        \"Flocks\"  flocks --root      \\n\\\
-		GL:          \"Flux\"  flux --root        \\n\\\
-		GL:        \"Helios\"  helios --root      \\n\\\
-		GL:    \"Hyperspace\"  hyperspace --root  \\n\\\
-		GL:       \"Lattice\"  lattice --root     \\n\\\
-		GL:        \"Plasma\"  plasma --root      \\n\\\
-		GL:     \"Pixelcity\"  pixelcity --root   \\n\\\
-		GL:     \"Skyrocket\"  skyrocket --root   \\n\\\
-		GL:    \"Solarwinds\"  solarwinds --root  \\n\\\
-		GL:     \"Colorfire\"  colorfire --root   \\n\\\
-		GL:   \"Hufos Smoke\"  hufo_smoke --root  \\n\\\
-		GL:  \"Hufos Tunnel\"  hufo_tunnel --root \\n\\\
-		GL:    \"Sundancer2\"  sundancer2 --root  \\n\\\
-		GL:          \"BioF\"  biof --root        \\n\\\
-		GL:   \"BusySpheres\"  busyspheres --root \\n\\\
-		GL:   \"SpirographX\"  spirographx --root \\n\\\
-		GL:    \"MatrixView\"  matrixview --root  \\n\\\
-		GL:        \"Lorenz\"  lorenz --root      \\n\\\
-		GL:      \"Drempels\"  drempels --root    \\n\\\
-		GL:      \"Feedback\"  feedback --root    \\n\\' \
-			-i ${xssconf} || die "sed failed"
-	fi
-}
-
-pkg_postrm() {
-	local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
-
-	if [ -f ${xssconf} ]; then
-		sed \
-			-e '/\"Cyclone\"  cyclone/d' \
-			-e '/\"Euphoria\"  euphoria/d' \
-			-e '/\"Fieldlines\"  fieldlines/d' \
-			-e '/\"Flocks\"  flocks/d' \
-			-e '/\"Flux\"  flux/d' \
-			-e '/\"Helios\"  helios/d' \
-			-e '/\"Hyperspace\"  hyperspace/d' \
-			-e '/\"Lattice\"  lattice/d' \
-			-e '/\"Plasma\"  plasma/d' \
-			-e '/\"Pixelcity\"  pixelcity/d' \
-			-e '/\"Skyrocket\"  skyrocket/d' \
-			-e '/\"Solarwinds\"  solarwinds/d' \
-			-e '/\"Colorfire\"  colorfire/d' \
-			-e '/\"Hufos Smoke\"  hufo_smoke/d' \
-			-e '/\"Hufos Tunnel\"  hufo_tunnel/d' \
-			-e '/\"Sundancer2\"  sundancer2/d' \
-			-e '/\"BioF\"  biof/d' \
-			-e '/\"BusySpheres\"  busyspheres/d' \
-			-e '/\"SpirographX\"  spirographx/d' \
-			-e '/\"MatrixView\"  matrixview/d' \
-			-e '/\"Lorenz\"  lorenz/d' \
-			-e '/\"Drempels\"  drempels/d' \
-			-e '/\"Feedback\"  feedback/d' \
-			-i ${xssconf} || die "sed failed"
-	fi
-}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 3afbbd752c02..135f4156354f 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,17 +1,7 @@
-AUX 0.12.12-fix-compilation-without-svg.patch 533 BLAKE2B 7367cd03e58f333a922c103be96182a5a2da52643634177f760f31a8f5af50ac7ac22e360b36e29c43245dade9fc392e52cc17863288b87a5554e80029df6b32 SHA512 4f4353f433dd30a244e33f320986ae1f0009d4d5144e85050e8799a772a78d6959927b91ee16f124270c450286b82b4e5ec3166e4624923684de88a7b3c6b014
-AUX 0.12.12-no-hardcode-update-icon-cache.patch 1678 BLAKE2B 28f21c878f512bd4f1965766d8380205c7b0e4eeb9f482b13def561115b3b7a21c2e6aa5341565fc62e079baf72db696ca8ea570903eac84d37adfe1937d3e3d SHA512 4d874220998de50d71140af792e9e081ad68e9cdc09530747c4b053ff1536c8d971160bb1d3e850bc831a3c7eed31dba7516fdc21c9b579aba22a9e45be6c06e
-AUX 0.12.12-relax-pango-includes.patch 615 BLAKE2B f01aa39fc2c6ac50f27223914dbbabd7031299384603cfea93b3322ce20c9413928bf9366cded6362afeb2782d94b6e5f6f57ca6c4274d242d0df5327406df13 SHA512 a35615fbf20b0a13c22b23f9882f67cc34c69a9492840d3bf1753a76e218d1b72607884e4e7d7c6d8836e0b6b35c1eb10e88e7d1c327677b059264f2184f76ec
-AUX 0.14.6-sysconfdir-xdg2.patch 660 BLAKE2B deb073f781e2434e54d158e2ff2fe8482f17d0214210591dd13fc658e45cf612afd7e1e23d9576f2b79328e1d9e43c7fb4357e9644721204dcb8a4d39c03495b SHA512 0780f293148ec97c5cdaf2751c3b69e6b4f75256f10eb0f756a7685caffd0c1903459fb0710cce70b0de65bc07d5a9dfff29abf9ae0711ce76e9b7336621c9be
-DIST tint2-0.12.12.tar.gz 469724 BLAKE2B cfb9eb702680e23f7f9c9b98c8853d1e059a4d189347496eaa9e667bb91852b66dfc451d310d0194971b03c8a68ba60a596b380cae046e3d34a75a65523f2bf6 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c
-DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b71d6c04eb3835100f74df5c12d692b50ce57a2a31f4956c09e404acd8cfd2bd1ef87e6fc55f21f583f5a13977 SHA512 eb1505bef932aa0cd0291dc762d3c9cbe760e3fea0684fc604aa3cae3f5ddf63e5b791db745eb29384e4732e6de09a01084f3ce2a92931b431cdf69a59b1f6da
-DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344
-DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c
 DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
+DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46
 DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
-EBUILD tint2-0.12.12.ebuild 1400 BLAKE2B 9f386182995036c6f99f279c461f26486d3ec05bb3f6fc4eb7e94f12c002f6a2404b3f408e2704f144d26949780dfc6c3686708a3a762479edc4ca5aa1cd3ed8 SHA512 97b0a093ba91d254201b1105524c5eb087d09589be1560f5adfd76da26b803da3efff44f3974e273d694086dc3f50693c6a5cae1798fd1e11be98d6942167d0d
-EBUILD tint2-0.14.6-r2.ebuild 1341 BLAKE2B 8a26bdde86b7c5c0b44e05c184c7f6f2994c1ba52884025032aa71058a6ea3a3f0a35ba0abe69429ba608dc389c28ba609d868bea58a6b4a6ad08981fedb1637 SHA512 a76155df865a0b6dd2c12709f42e2848b9330e51a0c55392c42caa76f017550a94343469b741cfbee375f527b711a8a158efdccf315f3917442f13fec91d19f7
-EBUILD tint2-15.3.ebuild 1273 BLAKE2B f481e61000569a5491f3d02a03fbf74d2e824ece425c38c6ebe2a9d342c53881ac6a53c02c962e783dd609d8cfa4d9ebbd34374f5e2226980c17fa92462a89c9 SHA512 661effd4bf12390e7fdcd08e363ae7d8dc8aa9d4388c65b7f0360d6f9529ac60223edfe0f993cf99edeffe7f002f8e0eab436c58261be7f77f9e933e17667c8e
-EBUILD tint2-16.1.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
-EBUILD tint2-16.2.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
+EBUILD tint2-16.2.ebuild 1273 BLAKE2B ef37602f6f90f16fe0b6fef490bed60e55b326437d925cac0187df093c16b0038eb2e7460db16bb8f02881a797064510076ac7f8f99e26a43e6b85fbf4ea8f4c SHA512 329bf5a8f20b644e6fcc5e382cc72a8d1fa3766f66e302c3648d59c7f9495efb3babe31848772116320dc0df23f687d86233859fafd54f762a46aa26e2db132c
+EBUILD tint2-16.6.1.ebuild 1275 BLAKE2B f8cacb894d6955a00e3432a2ebc3de37faefd9e1c07a6da5da3cf288d7382a63252bf5b88ab87c085b3eb2616da7b133e15c04212407df5133b36ca33f92f472 SHA512 82db6f40551561c1ffa5fd315380f929f3747de63cedecf7e2ea66845db444aba2dc350b4dfd32f90172af750917e3a5a28044d5a7fceb08414e944218ac0893
 EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
deleted file mode 100644
index c6da687baca8..000000000000
--- a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 2c42a787257e0801b8454fd8960d6794831cedea Mon Sep 17 00:00:00 2001
-From: o9000 <mrovi9000@gmail.com>
-Date: Sat, 8 Oct 2016 15:02:28 +0200
-Subject: Fix compilation with ENABLE_RSVG=OFF (fixes issue #602)
-
-
-diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
-index 0b4172f..0052e90 100644
---- a/src/launcher/launcher.c
-+++ b/src/launcher/launcher.c
-@@ -30,7 +30,6 @@
- #include <glib/gi18n.h>
- #include <glib.h>
- #include <glib/gstdio.h>
--#include <gdk-pixbuf/gdk-pixbuf.h>
- #include <sys/types.h>
- 
- #include "window.h"
diff --git a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
deleted file mode 100644
index 21a80eb36d43..000000000000
--- a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6306f9920f639cf092ca3f1935ac7aa202f78c86 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Fri, 13 Jan 2017 19:06:43 +0400
-Subject: [PATCH] cmake: do not hardcode icon cache update
-
----
- CMakeLists.txt               | 1 -
- src/tint2conf/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b4a1089..ef06393 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -241,7 +241,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin
- install( TARGETS tint2 DESTINATION bin )
- install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
- install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
- install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
- install( FILES AUTHORS ChangeLog README.md doc/tint2.md doc/manual.html doc/readme.html DESTINATION ${DOCDIR} )
-diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
-index 9595f6a..fd616fa 100644
---- a/src/tint2conf/CMakeLists.txt
-+++ b/src/tint2conf/CMakeLists.txt
-@@ -72,4 +72,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
--- 
-2.10.2
-
diff --git a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
deleted file mode 100644
index e9e40f305b34..000000000000
--- a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c3a86e185d548e11bb12bc766a58fd3b617c1c46 Mon Sep 17 00:00:00 2001
-From: o9000 <mrovi9000@gmail.com>
-Date: Sun, 18 Sep 2016 12:53:59 +0200
-Subject: [PATCH] Fix include (fixes issue #596)
-
----
- src/config.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/config.c b/src/config.c
-index a831ece..13f3b7b 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -31,8 +31,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <glib/gstdio.h>
--#include <pango/pangocairo.h>
--#include <pango/pangoxft.h>
-+#include <pango/pango-font.h>
- #include <Imlib2.h>
- 
- #include "config.h"
---
-libgit2 0.24.0
-
diff --git a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
deleted file mode 100644
index 6b29b49aaf72..000000000000
--- a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -257,7 +257,7 @@
- install( TARGETS tint2 DESTINATION bin )
- install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
--install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
-+install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
- install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
- install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
- install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
-
diff --git a/x11-misc/tint2/tint2-0.12.12.ebuild b/x11-misc/tint2/tint2-0.12.12.ebuild
deleted file mode 100644
index 8f0b0b56d984..000000000000
--- a/x11-misc/tint2/tint2-0.12.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-fix-compilation-without-svg.patch"
-	"${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch"
-	"${FILESDIR}/${PV}-relax-pango-includes.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-0.14.6-r2.ebuild b/x11-misc/tint2/tint2-0.14.6-r2.ebuild
deleted file mode 100644
index bc7cd9da3b23..000000000000
--- a/x11-misc/tint2/tint2-0.14.6-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-# bug 629312
-PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg2.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-15.3.ebuild b/x11-misc/tint2/tint2-15.3.ebuild
deleted file mode 100644
index c34f97885496..000000000000
--- a/x11-misc/tint2/tint2-15.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.2.ebuild b/x11-misc/tint2/tint2-16.2.ebuild
index e901507e5acb..97820dabd24e 100644
--- a/x11-misc/tint2/tint2-16.2.ebuild
+++ b/x11-misc/tint2/tint2-16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="battery svg startup-notification tint2conf"
 
 DEPEND="
diff --git a/x11-misc/tint2/tint2-16.1.ebuild b/x11-misc/tint2/tint2-16.6.1.ebuild
index f7cbd25ca6f4..5a5f9d056fd8 100644
--- a/x11-misc/tint2/tint2-16.1.ebuild
+++ b/x11-misc/tint2/tint2-16.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="battery svg startup-notification tint2conf"
 
 DEPEND="
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 50ea4d1e1b88..1854fe62b86a 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,3 @@
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.2-r1.ebuild 688 BLAKE2B 0f5350fd97da3bfedce5440f8509745fafb8c88b40e7dd1d0e0fdc0eba35a7f07bebc83ef0df8fff9538dd72a1a545a46e26bd89a7258508c9042d71c430a9f3 SHA512 cb254e3d5c1925c780138cb6d28ac6b22a9ed454478127b769e740309bcb666b5bda8963c433927a0eccfe2d7dd6091e31fc43c250a59147b78b71dc82923c5f
+EBUILD util-macros-1.19.2-r1.ebuild 687 BLAKE2B 587c6195f29feb4d95c4d9d4bbac1c20541f7088d0e1ebc897e633608468beba15927c115b00069d978feea77223c1f81151fa2eaeaf58603146602c3c68b585 SHA512 144315370c8fc12453a648438de6f073340f7c1ea2d06cc8026f69748f8a12819196ad12011e52a4f73eebd5196ee7e0a1bb47b032ff0e15532ff37bb5f821f3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index 788375df9175..2b9da7591c9e 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/util/${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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
index 3ddc5d82957b..e64f06de4ad6 100644
--- a/x11-misc/xdaliclock/Manifest
+++ b/x11-misc/xdaliclock/Manifest
@@ -1,3 +1,5 @@
 DIST xdaliclock-2.43.tar.gz 2300886 BLAKE2B 91b5f6ad0eff544ffde213d575c84a9b6c05b62c6bd26332eefb28b0d064ac8b5314a60e70fa82ebf6270e022b079ce4e86197ee5e8a713c34d84227c00dd94f SHA512 4906632148599254d9b29b032d846fcea1a568de8156cfe9556aa1603e063015d7e3422ba9ce4f47c2877f144837a660964456584a643f274b78422c12c0c923
+DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00
 EBUILD xdaliclock-2.43.ebuild 578 BLAKE2B a6de3c54051122c4d5ee0f7abed385250665718722d1914e09aed1c7a5beb1e9a7b34848ea5157d76b452573ffa8a5546adb71305a4700e63a9287cfd78aba45 SHA512 05e7757307de829ee80ca39296ee619a140ca92c0e01b9326eb9424c9a8f4a16a8bca30e128646bb05cd2a68139985a243b14ca9624a0437e9e1f24b561d59cf
+EBUILD xdaliclock-2.44.ebuild 559 BLAKE2B 5f151a3691763d98ffb83f896dd001dc08f4221a4c3a3dbbe234c9446a01ed815841022809236386ed635ff58f6159b6ad18579347543c06570ca6eade659bf8 SHA512 c3b4866a11e3700f2bc5570ac839f764798c46dfd0f77e3eeb18d8dfefbb823d9edf3633ac8c11580c9ea8c370a63845204c7c94aac95593388b82cf028acf3e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
new file mode 100644
index 000000000000..c7df038b41b2
--- /dev/null
+++ b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape"
+HOMEPAGE="https://www.jwz.org/xdaliclock"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+S=${WORKDIR}/${P}/X11
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.man ${PN}.1
+	dodoc ../README
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index ca7966655f2e..61ae3afe77fb 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bf
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 EBUILD xdg-utils-1.1.1-r1.ebuild 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619
-EBUILD xdg-utils-1.1.3-r1.ebuild 2136 BLAKE2B 3e73355bf3c1dd246f6fbf7447e4da0b1f8e20b32a854bd13886967c35054cf6b5d79879a6e631319f8dedff0f1319667512034ac44453cb09397c5e8d243b7b SHA512 10945ca0a93a3e8e76b05e926b1b82a95f8fff298129d4861a776c742f5b789ad80ac0aa1b162cbdafa1c9a7a68014e8d1dcc61609fd52f4d97a7fa6c01ae9d3
+EBUILD xdg-utils-1.1.3-r1.ebuild 2135 BLAKE2B 61faa38102e1ce409bac5f70256e1cd8aeb761654f24bf2e0ba642f380a868e952643ee46d6fc272433dd71c3b6d753d81773ba623367b934760de2722c0c5eb SHA512 90f9d2b5ccc24552e294adb881ccc8b438134db8ceec167b53016b02a4b43efaa31d558245df72abb821066b8d5b17cc7f1f95fdd78e422ca13e100ebea65b3d
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index 88c11df35fcc..17f10243d785 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ac5f73c2a491..9ae625fa0dee 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 1180 BLAKE2B 326631f041704b22acf168278744373ae93e00d126572ccb45904d4276544736a5b39276939318f296489440450e362077897fd93e58d82564fc41db05d48d0d SHA512 13248a3d3d036d394163eaee853fef2c316a8e80b5337fc3bc624dd675636a03e5b6e23c31c704e6ce44941c07f2fea4db59887d399c67b1e0f44c83e1a7a2a6
+EBUILD xkeyboard-config-2.25.ebuild 1179 BLAKE2B 46db8fa37555b380fbaf820284bce384706ac4a053656250598b67cd5ea66cfa5bcf52f9ca69d62bb7dafd8c124537c7fa9adb1df88148b6741272cf806a6cc7 SHA512 9f828f05da15445c8882c97c9ce18af69143bb21bd145f1dad2dd4505086b27e97773054612723f75a125cb76b4b2f4dab0183c80390bfffa00829516b83baac
 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 4800e8660599..ca7ba64fa052 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
@@ -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/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 51c451b4cd5f..e41cdd64b480 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2101 BLAKE2B c24f3e8f35492095918d1d7c05d21b60070f754a9190cff6e83d90fd0da2ecfb61b8a9f6772fcaae0414d2ca6d28b303f57beec849192dc5825308bad03dc110 SHA512 e3849d9072447decabc3e10b4076b1872800ba54c3ca5e38adcff7c4b3703569798f41b28a7258ad8540da9fad428f9eb813c8a8ce6c69174f1095ad7c32fa05
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2100 BLAKE2B dae280c063fb8d5a1d29177a38f3503be919f650e040c6e772213fb2a60649fc1ed22e25c75211e75913a98924bc5b6c5364a9c5fbb2011d21e853c269513aca SHA512 ac315cade36321b0f4aaca36f54c79154015cea00a35a2d5103dc4310f48a49f492bfb56d0fed1ecefe0e1a99097f651f7c804867792feda9973295c20f3bd20
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 3f17605c8b80..2184e9dd3911 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 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 ~x64-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index 00761517c9e4..3f97b7883b36 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,7 @@
 DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7
-DIST xpad-5.1.0.tar.bz2 152853 BLAKE2B f0ccfee8649d59554c7e7f903cba067f40bde76855545283e254b114a9439d514111e2829b002c7d27fd4c97f6d21533b89d1cadd7c494d0639be5d1bd9d0267 SHA512 9999ccc14a3086cbe720f1ce0edfcb0c3840c5253c04aa64652988ce3b15230cca2c181f446239ef4bce3d4058d35e52aa69f2a115e0615cd670221bdde0bce4
 DIST xpad-5.2.0.tar.bz2 157906 BLAKE2B 9913809522573d12315744d6d0d156ef941be4c6db6d37f32807ce812a17c6c28a887aa110f277dc970b1ae86a3345511b242acd15d0ed245f49895c4bc89c62 SHA512 f3d0dc2d654613eec6316beca66c2250c4bb4060f144884c5280510f8e6d45799e13488a4d3c827135db697c1214fd8c7e997acfc8741b06ef0fb4cea1434f93
+DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d
 EBUILD xpad-4.2.ebuild 574 BLAKE2B 16154fba76fb1d4db26feadc5cbaa0b1902e6bee8ee7d0cb23280bf574fdab4014905f89e70fa8c7d92df9485473905f23a82da79332f889be2382b366a2f3af SHA512 3c22e6a96effe2daa82ef879f9cbafd5ea1c37375e4c20b96f8ed333a980c53c9b568012f4afc4d69929ffba1001ce2a54aaaaf89c145266afb039134a1d126c
-EBUILD xpad-5.1.0.ebuild 738 BLAKE2B 40f69bc6d3e5c9300c45d31e3a92156d248ebe1937cb38bfa3c107cb25657205cb95e4506eb30eb3e661cafb69efebb2c510584c3e4fec56a840692c92047d2e SHA512 f78741d761dbfe71b8ae3684a6bc5149814f09424a434a99f6b4439c48c5be506f69ff8af3517a1511d3937955f63daf1ac9afdbec5cb087a3d8557c29e27bae
 EBUILD xpad-5.2.0.ebuild 735 BLAKE2B 2f90ea91117fe65a7033eca864e2ccfceba9f70d5848dbcd3f84b74de6119292a1819f7e6abed452d84ea64e2b77c078338dbeb8f675382a388cb56d7866e5dc SHA512 fee743fc98eeccbab4b00e063653ce04ac8371b4cf52dc99fc88513c90b52a3962ee20882772663249bf319f557f0159c713501c786561750f961171eddcf315
+EBUILD xpad-5.3.0.ebuild 735 BLAKE2B 795a03edb0efd9057d62fe2ce6fb9ea6a6c63fb48a1b856b785f8fed3e147b5ca87d503a15d9432125fa6073d5ff575a767959b49c69e20d6d530a1bbb661e2a SHA512 dc9093f8933db19bf9fba9375a5964cd0967e15b485d9634306b512c1856fbf21b7076a3a3c410eea21e0a7e5814dbda9109f273007481d4e777711f3ab725fa
 MISC metadata.xml 424 BLAKE2B fa08ddf7fe7b630108f7f6c67abb3bb80ee3530d24f20f92bf1d0232a445eaea1878d96731b076d29599ea329fd405e0afa56c284a98b76c60eaa9608f4e3cf5 SHA512 b9eab4ffef3b831a8c2fdaac0ffa5d4d32b7083d54746130c4cd0e38556238ae40574d9f759f411ba070ad967675944c090214ee66b9c300b9a459cca6927235
diff --git a/x11-misc/xpad/xpad-5.1.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild
index 5d3ed022bf60..683c0124fb09 100644
--- a/x11-misc/xpad/xpad-5.1.0.ebuild
+++ b/x11-misc/xpad/xpad-5.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 DESCRIPTION="a sticky note application for jotting down things to remember"
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 9b08185bde6d..5012a6f8f4e5 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,10 +6,11 @@ AUX xscreensaver-5.28-comment-style.patch 698 BLAKE2B da9a224ae0b657c8868fef24ad
 AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b7e5dca4911a76de46372751c82a060ae9c0ee5ed35d1efb33f02d6ffbfbd5903ba5f823e1db5ba9d2762a8841cefacf SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557
 AUX xscreensaver-5.35-gentoo.patch 1328 BLAKE2B 406f9c9d318ad3de6d5b098f54b2586971240f513b6d5dba12bb2862693a548dc550d9c812fa570a68aaa652d6287bb48818512ededfc621edbb4be384312d60 SHA512 ac7b953a353f75821cb15a81b6dec224fe16601df9a9a00f90831d55ac8a69074ec86fa16967ac40e0583bdabc3b7aa2576acf3879942f274296a36997918b2f
 AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf2656ac63bb77ec1c21885e0dc8f213580669d8021ff2de76556e7be00bfee78f9c6adf410b50e57d404637fff83c42437bc SHA512 fbc7a4f8e296e1249c2e0454978e48ea82a7b99f2467e2f46ff65e3294f5d8b4a5e366c3b6c9bc37b7f0aca92fa6d59d7492b6310d48c0b3240953f77821408a
+AUX xscreensaver-5.41-comments.patch 462 BLAKE2B 6df2d5573bd3a1c44582116f3653c7c0f2ea3738e94695dd3a680a5e0333c490c9a308554ae370e6565d766768e87a49a28d0c7cefbf7e69c8e32a4a1f4dba82 SHA512 672ee1c9d455883215bbf09bc5ebb7c38efa132419a27352d0b6b570e94f193e374524e6a4e5a75f8bb178cccd1d72442b7adf5866a0c2dc389704f123f8f931
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
-DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
 DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
+DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
-EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64
 EBUILD xscreensaver-5.40.ebuild 3351 BLAKE2B 8c649d16315f36741e47c58dfc42de728c3010dfefcc33a9572252f87a90359d66af3feb938215078ca88a6ffe9b0af7cf13d4bdeb099635af8b75aec1a41ac7 SHA512 7b61319958afb344ac5569d78e0db09f8287e9bf1ecbeccb2bdefa261fcd972fb31deadff0c8faec440fd000151dabb55a3ea6178bd2f7edd6c03b477c8079b7
+EBUILD xscreensaver-5.42.ebuild 3391 BLAKE2B 6ba70d5519a31049fe0bbd8d0eabb16c40a6df159bef341552ac676b396de8ec16d0690827e8e22bfaa395df5c92ba4378a81a0f3065adf09ca8be100d221f03 SHA512 d4b386c4cca25379ec4b64909e90c1e975a810ddc6648d3bc466a5fe8aaa184466ee64383822d48422aa78e36bc93ef8b8f7bdf80a7afe02554852a8b7f4c405
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
new file mode 100644
index 000000000000..8cef848ac7bf
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
@@ -0,0 +1,14 @@
+--- a/hacks/fontglide.c
++++ b/hacks/fontglide.c
+@@ -2421,8 +2421,9 @@
+ 
+   textclient_close (s->tc);
+ 
+-//  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
+-//  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
++/*  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
++/  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
++*/
+   XFreeGC (dpy, s->bg_gc);
+   if (s->charset) free (s->charset);
+   if (s->font_override) free (s->font_override);
diff --git a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index cc36c3d5c819..941a5d01d775 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic multilib pam
+EAPI=7
+inherit autotools desktop flag-o-matic multilib pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
@@ -62,6 +62,15 @@ DEPEND="
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.05-interix.patch
+	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
+	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-5.35-gentoo.patch
+	"${FILESDIR}"/${PN}-5.41-comments.patch
+)
 
 src_prepare() {
 	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
@@ -74,14 +83,7 @@ src_prepare() {
 			configure{,.in} || die
 	fi
 
-	eapply \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch \
-		"${FILESDIR}"/${PN}-5.35-gentoo.patch
+	default
 
 	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch