gentoo resync : 24.12.2018

27 files changed, 55 insertions, 489 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index e7373df52529..6d50a15fc515 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/Tulliana/Manifest b/x11-themes/Tulliana/Manifest
deleted file mode 100644
index 6b707eb5eda4..000000000000
--- a/x11-themes/Tulliana/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Tulliana-2.0.tar.gz 7959903 BLAKE2B 689fcbbe40705c864e8af3fd02cfd84c35b6308596429c84c10c91bc6f2c288cba079638e13d64216daccefd6ef3970ba6060efafef8d7dba5aa84891a7804f5 SHA512 b124d64dbbb63f036576d2d55658142621af6f0faf6b5e917507a4ec923a94e11f368cf56e5942daefd5738b4957d6dc1f4c2d263d5dc97805fa11627e8ce74f
-EBUILD Tulliana-2.0.ebuild 466 BLAKE2B ea04c01d54322fbd779603b16b5cd925291c1ae1e3b1d5d3ed05ee3f1bbdd660d1c6a7eb2e9496a15cd8e7bce06c3cefcf14160febe97fddd8c7dcb234e37b73 SHA512 9dac7e04ef9f0e8d8e8e88f5377b24a5ba44516f57dc478d2cd09c28d0d25c36037dc766da01fccb62c2c12232ae633d4bd2660234f09e2bacba6d1725e1bf5d
-MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/x11-themes/Tulliana/Tulliana-2.0.ebuild b/x11-themes/Tulliana/Tulliana-2.0.ebuild
deleted file mode 100644
index c448c5d26479..000000000000
--- a/x11-themes/Tulliana/Tulliana-2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Tulliana icon set for KDE"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=38757"
-SRC_URI="http://cekirdek.pardus.org.tr/~caglar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-RESTRICT="strip binchecks"
-
-src_install() {
-	insinto /usr/share/icons/${PN}
-	doins -r .
-}
diff --git a/x11-themes/Tulliana/metadata.xml b/x11-themes/Tulliana/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/x11-themes/Tulliana/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 8baa0216b441..78e9fd96a56a 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -4,6 +4,6 @@ DIST adwaita-icon-theme-3.24.0.tar.xz 20717972 BLAKE2B cce76731e7c33d42330eb2e00
 DIST adwaita-icon-theme-3.26.1.tar.xz 20729696 BLAKE2B 428027b2e4d2662fd1c58165f68e0c2e85f3a7710897deaf309fc1774fc8ef0167188ac3cf84b9491f66671f6e236c6f8d1711ae1c2c78fdfa923a871d0c21ba SHA512 bed005074b63e72b6f4280aa5bc998099217336bed43ccc2f139ddc56f1bb83786238c3c2615254b2cd78c26cbc82114b207adeb3932add22efd39e8ca47eda6
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.22.0-r2.ebuild 1477 BLAKE2B 6b4b50f6e287b692593910ef50848f297a250b1f221a1c1b17a21786e1f8ddadd5a6466542c301cf85ae864ed834d207c25a1423ffc3932133f2a632bdb7d260 SHA512 678001d88dadaf071c6436eaf04690613b96e00d1b7b6fe1a1919e617ea30e8c3c8f8de309efef55ac5ca7c5f682b35e98702a66a5cafccc3cb1c5b54d1273e9
-EBUILD adwaita-icon-theme-3.24.0.ebuild 1676 BLAKE2B a2b81ffc50e5f06bc7a2157d41ab877d90c17dc8e5688f1634cd655aaa5495c9eddbf8a5231caa17b80346b2c78d76a7c331a2dadc536c06da3c40bee0a88599 SHA512 570ae3dd6d3c6429c63e2772ce3cdc899bc89a811c6c8af2fdd26aacea725650bc80434204e7c80d50f71db1ffb3808312b4c8e36a62aa82cf26134e422cd068
-EBUILD adwaita-icon-theme-3.26.1.ebuild 1684 BLAKE2B 6fe538bd071646be8720433c9406ba52f11026c7cdaf9431ae40bab6a1aa37ddcc2a7ed446f8677e4ca97bb70085ba2c5d17679c090c0eadd041871e5d851ee4 SHA512 aba3e3ea073d6f5aa84c431295008265f29f65dae74d73a3b71f7f541ace454fc6e38121fc388af467b1d307717da09d8d61e636c3885b20a7bb2281fded71c7
+EBUILD adwaita-icon-theme-3.24.0.ebuild 1678 BLAKE2B 12d6dd2c0530641c0becf8515c2e4298698a8429e752d479225f9374e2907104c8421abce747ecb54c1801ba91f695e2cc7063b237790db359eb1594f0d310a4 SHA512 cabb90462dad1294907746d92b375e0ded4943bcd671aa5332b99bf0604c0d0f91b7e937548740c1ee42428b0ede2acf80ab27e2c0870fcc3f33db9ca441be33
+EBUILD adwaita-icon-theme-3.26.1.ebuild 1687 BLAKE2B 5a439269b18287dba8e3d96eb5d67ba4bf73bc3a519a959f8e2a3fcc951768b7edb62576b3a640467a18fc64aa4c1a33044a7f535abfe1a8629c464168def5a1 SHA512 ae6a41d2af66b848e3601d0f845953d6294318443fb36fe3fc3d5068280fb96d6d62dbe26639a8c78b3bb0a9a9d23e0496f0384e2a945065562a62f8eda39ffc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
index c9bba922a7b7..3aee6a8fcf03 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.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"
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.26.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.26.1.ebuild
index 58e3fa1e0761..685e2ae981dc 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.26.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.26.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"
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest
index 67acb1176452..d95bc8ab2a3a 100644
--- a/x11-themes/gtk-engines-xfce/Manifest
+++ b/x11-themes/gtk-engines-xfce/Manifest
@@ -1,6 +1,6 @@
 DIST gtk-xfce-engine-3.2.0.tar.bz2 376203 BLAKE2B 700584aeea0708dfc1cbad521ba96578141eeb21bbe23f48ad36917476b32bb97b9ff60537a5a372fbb48a805fb002128215a9a9bcb71422641c0ab2a9d12154 SHA512 c965e597c1b4aa04f3b474f3c4cea249aa6e753be697d5d3d7a19184adca650fc084f39acbd357f53eaf4180d96d5d3499866367e221ae445de4864fc9487012
 EBUILD gtk-engines-xfce-3.2.0-r200.ebuild 972 BLAKE2B 7e66efd9f398928f235ae696813e64baf79b22b66c0b09128475b99329608513031c2cb7285c36a3009d3efdc1f10e96755af2fe72d89770ae84b3ff0331d841 SHA512 06ef08131e8a543f426f8a3d26eb8781ee6fbb74b5e78c848db9598ccc2f8659eba90cedde064d05490d21af1722684f44352aba0d0ac745c28d1a34faa3f13b
-EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 922 BLAKE2B c8dae77914d05bcc8b90534858125d2c2e8d60a8b3b96be423acfd46d201c4daa39093648a1847737b71cbe682929a5e4231950c85a35d7cdc479312b5fa1ab6 SHA512 ae30f002527099276808afdddbf3c54104c835d001d93e7bf8cf8c6fe7c289687fa1c237a69636088b8909a20251e92e56bf02f5d926dbc7bc6325b312980cc1
+EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 917 BLAKE2B 8ed23525fad3bb2e2fdef19d96a596108acfd906fe14a7ec7ea2ca465361889e4c460824072d545088c5cc0fd722587c4401afdb12cde1e2f731fba8275e5333 SHA512 455529b574635de2c4b8b0e59566a4d3985e09ee1f1df79cb6d15a91e55bb3220180872accb227530813eef0e6ea503124cd4d0231cae5ff44dd90b5346de72b
 EBUILD gtk-engines-xfce-3.2.0-r300.ebuild 963 BLAKE2B d5ea466648cdcb7d376a16f58bedf37dc76902a734b272bf8e70fdba689f63e5c50b89bdff7fe0d20fd5658c5dcfc3f9430f2d8b03f361d1801db3397273037a SHA512 ffef8d32f14efc88be776723c97aff5854cca4dbb8d7cdf0c044e9ec2a5883d94a163c44a48f30307dd0617cbe61c19b36ab252a092c1aa0619f2541306e3057
-EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 897 BLAKE2B b8e08b1d11b2f539209c54939071f214152217baecb2c2d621c6f7256c897587f4d3c533f0b649ef376c8d8dbc65f3d63f27126360d5f564e8b671b8649e72b4 SHA512 53a285e1d506c87c4026a5934531d7b3653d79f4538f9caddf4dab02e22967b617e3261b53034a77145b404f482d764f9449a81896cbedc347b8373ce2e5b153
+EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 892 BLAKE2B 3c931f85b86ac6ecd3aa0abc1cc87f465f0899eb69dcd49fe3d1cca0998bbc810d29ba06da0e5b9872a1a0cb4be4bdc6fb798903f636bd4dcfb9a1d32bc3082a SHA512 648244fdb3146de6f1ef45f1a01395521a93db68bfc29c45336f2d1e02dec2c65861d926baf87b9b86453498b632a28a3723c753d3109a3bab423f0f5a93c21c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
index 018f3597fca7..cf68d377e24a 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
index b702b2799788..85c3406e0b4b 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
diff --git a/x11-themes/hicolor-icon-theme/Manifest b/x11-themes/hicolor-icon-theme/Manifest
index 2c3314a35188..6f5eb0612de8 100644
--- a/x11-themes/hicolor-icon-theme/Manifest
+++ b/x11-themes/hicolor-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST hicolor-icon-theme-0.17.tar.xz 53016 BLAKE2B c20c6e23eae799468d9f4aac038d823611cabdbcc8237d9fdb4f3d7ee5c8031223b0e9e0cf7c2b3fdf975291489223445775f340024cb6d4bdbdd29a4cf5548e SHA512 eca8655930aa7e234f42630041c0053fde067b970fad1f81c55fcd4c5046c03edfdf2ede72a3e78fba2908e7da53e9463d3c5ae12ab9f5ef261e29a49f9c7a8d
-EBUILD hicolor-icon-theme-0.17.ebuild 761 BLAKE2B d2f6b44fe379a28c60fe51d0d50ac14c685032e7c06f736c68ee25915c14888d57b6da8b54ef289e3a7cfbbea468f50010d53505caf23f50030248e180132b43 SHA512 fd3003ac333d9f513afb388f11c4c4b037443d2d1fa4eeffd9c62f3730f77304515d6d341891c993be9f001ccdbf80cc2993e6e2a6a52283ab27571bfeba96fc
+EBUILD hicolor-icon-theme-0.17.ebuild 763 BLAKE2B d6d2a0b2642f7433f24fe7348391392a39005b22a5db72b8ff0010890b69e5885ee4f6f480bbc3274e7e6ff97cb48061884c27661044d24632a819740ae5821c SHA512 74c2945688f2cfa125dcb29ac801496b48c57f23c77f386fa15c271e0af3190fd6bf0750651489f0c5e7653114d306ed9b0adbf2e1e0787817b8bee95056ad63
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
index 0ad5a2d14855..57f541de5380 100644
--- a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
+++ b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.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
@@ -10,7 +10,7 @@ SRC_URI="https://icon-theme.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~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=""
 
 RDEPEND=""
diff --git a/x11-themes/mate-themes-meta/Manifest b/x11-themes/mate-themes-meta/Manifest
index 6d15ec105165..80ceee62c5bf 100644
--- a/x11-themes/mate-themes-meta/Manifest
+++ b/x11-themes/mate-themes-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD mate-themes-meta-3-r2.ebuild 604 BLAKE2B 877830dd6775a22d27f3a684bc0492f15588ebc619ea13c1e090daf84a3c5458d3ad91bb402268c2bb364ee522207ff7e89e66f1d05c7bda4105d875d50b3ef0 SHA512 bfd07324f8dc911613a390c6af6934aced8d41ad3a6f77f1e0c29b2b1c466355aea929205865d8a5a745bbbb37229fa29d591fa9356392f9a420e709a0686068
-EBUILD mate-themes-meta-3-r3.ebuild 507 BLAKE2B 800956175d5a7ee19a091f78cb5ffd80a75c991a766facb2780403c873f7c0a6313801891e91bed3212c118e856baafd56a39a23ee6e44ef69848f4d6aa5479c SHA512 51b0851b540184eb54be61e57891133a7a12bb52bdb56ec4987a14a97bb39d34010f3938e8543aaf6db889c8185e9c239611fcfdb1fed3362f98d95a30287388
+EBUILD mate-themes-meta-3-r3.ebuild 502 BLAKE2B 21d1449934afbac0fbcd3ffd186bffecf2b4536529d451a18ef7223e8f59ccac9328ebb6286c3069172acf1f7757c2890407e759707521eeca866ff33b7ea4ea SHA512 b0b91365057c3a54ec0b913b6b381f29431720f3ad55f39696e43abfcaab4b03db4d3b824f5804797ec5bfa7f6777b363690bdd06fb9775f40d7a04caff68d40
 MISC metadata.xml 353 BLAKE2B 4428f947c36672fb27aaf8803cb0992be2d5fe96385a7479027e8bdaee24590ed9acec5312b040fe70f8d8131d905221ca7aa1f23b4aaef587c482d878913e10 SHA512 f04ff1e8e0747331740a0615d5694f60408a5c995dd59284e296f5968bf472fbf20e398a6c8b7a09477cdbae31909f2f97815be6a00b81775d0ba5d677420886
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild
index c1fd735c622c..35f49358093e 100644
--- a/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.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=7
@@ -7,7 +7,7 @@ DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MATE"
 SRC_URI=""
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="metapackage"
 SLOT="0"
 IUSE="gtk2-only"
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
index f93da7e8c1b5..f365f595b661 100644
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@@ -1,5 +1,3 @@
-DIST mate-themes-3.22.11.tar.xz 4268704 BLAKE2B 7a85bc6987b2d530d4ecdeebb7d1d9c4833a86ec01b7d734d0b88b8ef829035d4e4f9c5c2afda06a91c85f06db5c96fb6c0944539b0053f450d51ca0dee62c05 SHA512 e8f36ed93485b8229370cb9a009e2473695477574ef2d70f638ecc5757b4d387a0e59a5eadfad5a5c240460cd61f594ee56be015730cdaf62490fc66a652c234
 DIST mate-themes-3.22.18.tar.xz 6103368 BLAKE2B 35cb77fc40d364e19d4e7cf25e7a168773bd8c33e256d97b4cbea91368b38c17201480f21f74c107b5c47fa6254042bdd64e4186dc1b87e00dab89e6b26ad439 SHA512 0851dee8ddb7495b43cbb7590ca3ecd1b3fa5a474f66806cb644462a70324c8221630d1d555e84beb8fa7025c080edc9524f244e47ac42c9843cc9eccc78dd74
-EBUILD mate-themes-3.22.11.ebuild 1317 BLAKE2B cd689979f3f3141d547561a67bdc0f1cee30ae5e23ea78a27b62651197f717b60d4b0cc91795ea022cb43846e420ba11db8c0d05c3d328119c93363b5481bf5c SHA512 51275e079d7d7199441c622cf27c2555d9e5069edd6f63c45b8a3f1617c8faf7026ac429b0521b0ee8a376c930265fdd98f5c339406cdb0334a2c991fc9c72ed
-EBUILD mate-themes-3.22.18.ebuild 994 BLAKE2B a3a83dc3e03ba12b67c8e563f4caa9031dd263b0295f814da8362109c6f58bcd69cd6495bad5fe6b3a0a7c355c13250e5ca09f32a82a8494f5a45803b5ca6454 SHA512 fde30d05101d06ca2b80eb54eaca0002e821d30f0ca4cf3b6b21800239c11500f778d8ca26a057b2118756e6269292344b73c421f752927d323ab8560600b80d
+EBUILD mate-themes-3.22.18.ebuild 989 BLAKE2B 37fac4104db3243e2c7fd630e3fe7e60c4c0ddc03b81982ecb0260104925cd34ac9e05196059bbd5ca25a0ca7d048bd5836fe43782e773a9e6ee73797d80c3e4 SHA512 77ec7a82809f2994a8ffaf28743e06b3cf968d5ba199cbbc1a62b1736d9834c4cf6069512376a9f1f6122cd69e73f8e46fa2d8f1cdf8b978cdd38fd3a1b57af9
 MISC metadata.xml 340 BLAKE2B 0f81542df7350281f9a6c6e9dcbfba92c1cc5c0c2ff08061bf1365d66b9fbf3ce6174d4abb0fdc424972f0eb849a3fc828f43dad005f62046aefa116613db3ae SHA512 27950f2be161bae9f2efe16f8c1be8283414a56f79ec6cc11569e6a3f32591ace7728c7805ca50a1f7262f900e90269657b151f50751c757fce843e00d20ffb1
diff --git a/x11-themes/mate-themes/mate-themes-3.22.11.ebuild b/x11-themes/mate-themes/mate-themes-3.22.11.ebuild
deleted file mode 100644
index 6e75fe2e8d24..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.22.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils versionator
-
-MATE_GTK_V="$(get_version_component_range 1-2)"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
-
-if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
-	EGIT_BRANCH="gtk${MATE_GTK_V}"
-else
-	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-HOMEPAGE="http://mate-desktop.org"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-LICENSE="LGPL-2.1"
-SLOT="0/${MATE_GTK_V}"
-
-COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-themes/mate-themes/mate-themes-3.22.18.ebuild b/x11-themes/mate-themes/mate-themes-3.22.18.ebuild
index 76fcc6df404d..cf83fa9ec3e4 100644
--- a/x11-themes/mate-themes/mate-themes-3.22.18.ebuild
+++ b/x11-themes/mate-themes/mate-themes-3.22.18.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
@@ -7,7 +7,7 @@ inherit autotools eapi7-ver gnome2-utils
 MATE_GTK_V="$(ver_cut 1-2)"
 
 SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 HOMEPAGE="http://mate-desktop.org"
 DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index e2048a6f6c8a..1e513968fe23 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -1,7 +1,9 @@
 DIST numix-icon-theme-circle-18.08.29.tar.gz 2095843 BLAKE2B b39bd5eaf3c9ec4156a71d235059b28d049ddf25ec600a5f3a782e4b51149d0e7eccf37379a117ae7471a3885f7a529989f9085419864975afbb07a325bda629 SHA512 433c343730b23dd3969903f85d7ac36d40a4723f342b259e8136c1fbe35b7af8c17227541f3ccacffbeacf2873547c9327a1c5f0d522da04483719606e26293b
 DIST numix-icon-theme-circle-18.09.19.tar.gz 2196678 BLAKE2B a58ab5381f4ad1e441d188c1b7db0836b025d57c4075030c0e83a12de7917cd775be7bb8ae686afe302188232569c67d21772c119102a30d4bc717f301b3e44e SHA512 ace6c50ec9e9b08aac579ae92a44ba48494f2f22403e233c5ec00bb967c9bb6b70e785fbb061bfc9693db4de0ee90023af66c66e6984bd36d1e92be5f68afb02
 DIST numix-icon-theme-circle-18.10.03.tar.gz 2198504 BLAKE2B 632baceb5dd56cce372a79cb8a0e21cc5201d4bf32f939db10fd9dcfb5642f64ab38e180c622e832e23299580b3c4c4f23baccf6a771e09c1e7efeb4864af4e7 SHA512 0e494367cffd7e77dca282ceb7d368950eb6c2e64d8bc58ded95bfdf4b83265be5bd9c7ed8cb5377a5e8250109dbc87ba48c2fcab29e9c3e2626e93cd999eb54
+DIST numix-icon-theme-circle-18.12.01.tar.gz 2212077 BLAKE2B f599b71061bba262ee85e3d582ef8c9dfe9811f32ae18f1c33acc0e56db411cb1d71f93045adb86eaa8e0b21be274d73e1c51743837fbf3c5f10caab331bd157 SHA512 2e90504579941f289892f14a7f25316066fee78cd816a4fd5ebc2f19ba2635267eb52d38680625120eda68e4afa095be2eb6bb258d948cd5dd70742e3dd61436
 EBUILD numix-icon-theme-circle-18.08.29.ebuild 656 BLAKE2B 2b8c3adfbe332b3d7756d932436dd91bbd4bb3980e1c771a3a40e34d84089fbad6bc77302bf9ea0cb71dadc02e3e85ae13f95cc70dbd13bfc8a79109fbfe5491 SHA512 13e9ef15122930c5bef8f06a69e9536cae6a87872d0872438989dee3422882e8a3c2d769eacbe3a4de6327a6d9563308969d1ffa6a77871b45314215548aa8a6
 EBUILD numix-icon-theme-circle-18.09.19.ebuild 653 BLAKE2B 26975b6f26f195b4f01a6e725368f777b62868e4ea86a07358086c0ecd8032c03d7592268aefd53b6eb047413df2406ada1edea2f70a2644ae0f172f57065fdb SHA512 fccb29eb884f727777a4a640ea01fc2831dfea7e767dc631547f24b48bce7dce27aaafc31f9f2cd2d3c06f74b4371843aec8ec4b39f24e197fb10409980b91da
 EBUILD numix-icon-theme-circle-18.10.03.ebuild 653 BLAKE2B 26975b6f26f195b4f01a6e725368f777b62868e4ea86a07358086c0ecd8032c03d7592268aefd53b6eb047413df2406ada1edea2f70a2644ae0f172f57065fdb SHA512 fccb29eb884f727777a4a640ea01fc2831dfea7e767dc631547f24b48bce7dce27aaafc31f9f2cd2d3c06f74b4371843aec8ec4b39f24e197fb10409980b91da
+EBUILD numix-icon-theme-circle-18.12.01.ebuild 655 BLAKE2B a61d0b3b4873188d9543ef6a3b796f9774375f71545cd0efdf5112f0cf54d5db45095e6c433b285af49eef3844aeebb595cf1cfdcf9b9c709198ece1de9d52c2 SHA512 71590593d27b1a537137006f687f0b869688fad7b8c9439cd4bcc9073f67f50a66c47649478345ccd4452fc76f2ffc5628d83282b1f2483ed9181d1bd915d893
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.12.01.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.12.01.ebuild
new file mode 100644
index 000000000000..d2b6a630f0ba
--- /dev/null
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.12.01.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="An icon theme for Linux from the Numix project"
+HOMEPAGE="https://github.com/numixproject"
+SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-themes/numix-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r Numix-Circle{,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/nuvola/Manifest b/x11-themes/nuvola/Manifest
deleted file mode 100644
index 0b572865928f..000000000000
--- a/x11-themes/nuvola/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nuvola-1.0.tar.gz 13594245 BLAKE2B 9826dce032841bdff09385d2bd46a7d54b252dd94476f87160bb9366f33d021236d4543eb4b2e550d286a7106345fbac640fdd333b38d591b01a64ba5d8138c0 SHA512 65970f741836be53ba7599a1a9a1b1c3839b6672ea7797e2dedc383d5782832fe233da3d1039dcb71b00c5dbde75ea4a83b4f8cabedc9d3f5bebf50a600affb2
-EBUILD nuvola-1.0-r1.ebuild 626 BLAKE2B e60f4247f158e790936869420678c01a949b0759c209d4e9f65547b3bba3e50955cc8a9b43fcf9b3c3bd29dfefa965727fca53ed36000bfdf41251a97f75678b SHA512 7ed9939b2367be8b50647d2b16adaf9d5161facfdb0b92516d240c07b5a726a38220c1e69dde585d8ae8210182ae2a31d403b677a7a0bfb5de1a5bc753e0d611
-MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/x11-themes/nuvola/metadata.xml b/x11-themes/nuvola/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/x11-themes/nuvola/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-themes/nuvola/nuvola-1.0-r1.ebuild b/x11-themes/nuvola/nuvola-1.0-r1.ebuild
deleted file mode 100644
index 6d710f6a8b2b..000000000000
--- a/x11-themes/nuvola/nuvola-1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Nuvola SVG icon theme"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5358"
-SRC_URI="http://www.icon-king.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="strip binchecks"
-
-DEPEND="!=kde-apps/kdeartwork-iconthemes-4*"
-
-S=${WORKDIR}
-
-src_install() {
-	cd nuvola
-	dodoc thanks.to readme.txt author
-	rm thanks.to thanks.to~ readme.txt author license.txt
-
-	cd "${S}"
-	insinto /usr/share/icons
-	doins -r nuvola
-}
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 0c5d26ca2f9c..4521dd379db2 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,9 +1,6 @@
 AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
 AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7
-AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66
-DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0.ebuild 1989 BLAKE2B 579a37559cef8c0f3c0cc69af606244207513d29371c024614ccaf653bd58be60ac6a4de6fe16d9636ff95b9dedd88054b920968b2727e86866fc9590f4f37fd SHA512 dd7696ba307d7eea9974d37d40a1b96a4463d78c5bea215b1256bf682f19a7bb476b753f2fa34bc6b4eda68a9ea822c92575b883688789ae154f7ce2aec09002
-EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1987 BLAKE2B 2f321fbfea11cba255d14d59d5211ab27e44d95fbf5107b0cad998bd799835a3ddaaae0ed0260e4a6223958fab7d6885681647a49984c6227e77192c46ef66bb SHA512 37e08003b638b27d36346d05bd19037af1f7d53c0e5d12a0de2a0341e602d63b89ce64acc4527adf2bd44babeb9adb57cb7b10ac6ede60c2133c5b801b9c9539
-EBUILD qtcurve-9999.ebuild 1943 BLAKE2B 8bca5a9694ae117d1e255dab57a557061bad9b1b0b1e8c27e4fd0161e7a0f50d7b63633c26ee4876ee3ecf0f71cc7a623481bc7dfdb0b51d26042c93b0df63b6 SHA512 7c60cde110d1c22ffac534ec12c85811a94f2e7482eb7a8fba25b539bc83a2acf711ad136c009aff8a8ce7e444d80824e54b2f4f93db14d7077a8a79e87c0229
+EBUILD qtcurve-1.9.0.ebuild 2005 BLAKE2B 250c63621e9953f757ed5532e717086551c3e79c0b626455fe9c0127c96aeb03d55692421493507eb92f0e472d076484519f2b49875ea268ff6a3f8f5dc574e2 SHA512 2fb95bd6428a38de5b86fdca3e117af90fc2969c975506b07d66e5680f00fa970b596d2d31904f5e128db0e4dc45abf4b4bc5e8f5e9a86df659997dd48826b84
+EBUILD qtcurve-9999.ebuild 1902 BLAKE2B 50cb4486f8203224cf1e3d1eda0e40ca97ad59cf7c691317c5f07d9181c5c8eceb56e5fd6cc1ae73da46d73f9ca25bc7a13f2c2f96daeb30da6f106414de4adc SHA512 41be7b6921f6c4cc47129298e520a6a65421305d3da540a763fccb2f02c221305b6d22ccfc971ae3d187e1ecfa472f47110c56568386089cfa445ac76a643853
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-rare_crash_hang_fix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-rare_crash_hang_fix.patch
deleted file mode 100644
index 921001f44544..000000000000
--- a/x11-themes/qtcurve/files/qtcurve-1.9.0-rare_crash_hang_fix.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From b7da5ec7e2965332e3922dfb03a3d100aa203b94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin@gmail.com>
-Date: Fri, 8 Dec 2017 10:10:47 +0100
-Subject: address a rare crash/hang on exit
-
-Under rare circumstances Qt would attempt to deliver signals to stale
-style instances, or leave orphaned style instances after unloading the
-plugin. This is addressed by disconnecting the (currently only) signal
-originating from an external application and the plugin now ensures it
-leaves no orphaned style instances behind.
-Also, moves the code handling pre-exit disconnection to a subclass.
-
-Differential Revision: https://phabricator.kde.org/D9229
----
- qt5/style/qtcurve.cpp        | 72 ++++++++++++++++++++++++++++++++------------
- qt5/style/qtcurve.h          |  5 +--
- qt5/style/qtcurve_plugin.cpp | 15 ++++++---
- 3 files changed, 67 insertions(+), 25 deletions(-)
-
-diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp
-index 1bf6e1d..07eca0f 100644
---- a/qt5/style/qtcurve.cpp
-+++ b/qt5/style/qtcurve.cpp
-@@ -101,6 +101,26 @@
- 
- namespace QtCurve {
- 
-+class Style::DBusHelper {
-+public:
-+    DBusHelper()
-+        : m_dBus(0)
-+        , m_dbusConnected(false)
-+    {}
-+    ~DBusHelper()
-+    {
-+        if (m_dBus) {
-+            m_dBus->disconnect();
-+            m_dBus->deleteLater();
-+            m_dBus = 0;
-+        }
-+    }
-+
-+    std::once_flag m_aboutToQuitInit;
-+    QDBusInterface *m_dBus;
-+    bool m_dbusConnected;
-+};
-+
- static inline void setPainterPen(QPainter *p, const QColor &col, const qreal width=1.0)
- {
-     p->setPen(QPen(col, width));
-@@ -321,6 +341,7 @@ static void parseWindowLine(const QString &line, QList<int> &data)
- #endif
- 
- Style::Style() :
-+    m_dBusHelper(new DBusHelper()),
-     m_popupMenuCols(0L),
-     m_sliderCols(0L),
-     m_defBtnCols(0L),
-@@ -343,13 +364,11 @@ Style::Style() :
-     m_progressBarAnimateTimer(0),
-     m_animateStep(0),
-     m_titlebarHeight(0),
--    m_dBus(0),
-     m_shadowHelper(new ShadowHelper(this)),
-     m_sViewSBar(0L),
-     m_windowManager(new WindowManager(this)),
-     m_blurHelper(new BlurHelper(this)),
--    m_shortcutHandler(new ShortcutHandler(this)),
--    m_dbusConnected(false)
-+    m_shortcutHandler(new ShortcutHandler(this))
- {
-     const char *env = getenv(QTCURVE_PREVIEW_CONFIG);
- #ifdef QTC_QT5_ENABLE_KDE
-@@ -394,6 +413,23 @@ void Style::init(bool initial)
- #ifdef QTC_QT5_ENABLE_KDE
-             connect(KWindowSystem::self(), &KWindowSystem::compositingChanged, this, &Style::compositingToggled);
- #endif
-+            // prepare the cleanup handler
-+            if (QCoreApplication::instance()) {
-+                std::call_once(m_dBusHelper->m_aboutToQuitInit, [this] {
-+                    connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, [this] () {
-+                            // disconnect from the session DBus. We're no longer interested in the
-+                            // information it might send when the app we're serving is shutting down.
-+                            disconnectDBus();
-+                            // Stop listening to select signals. We shouldn't stop emitting signals
-+                            // (like QObject::destroyed) but we can reduce the likelihood that pending
-+                            // signals will be sent to us post-mortem.
-+#ifdef QTC_QT5_ENABLE_KDE
-+                            disconnect(KWindowSystem::self(), &KWindowSystem::compositingChanged,
-+                                       this, &Style::compositingToggled);
-+#endif
-+                        } );
-+                } );
-+            }
-         }
-     }
- 
-@@ -663,14 +699,11 @@ void Style::init(bool initial)
- 
- void Style::connectDBus()
- {
--    if (m_dbusConnected)
-+    if (m_dBusHelper->m_dbusConnected)
-         return;
-     auto bus = QDBusConnection::sessionBus();
-     if (bus.isConnected()) {
--        m_dbusConnected = true;
--        if (QCoreApplication::instance()) {
--            connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, &Style::disconnectDBus);
--        }
-+        m_dBusHelper->m_dbusConnected = true;
-         bus.connect(QString(), "/KGlobalSettings", "org.kde.KGlobalSettings",
-                     "notifyChange", this, SLOT(kdeGlobalSettingsChange(int, int)));
- #ifndef QTC_QT5_ENABLE_KDE
-@@ -699,12 +732,15 @@ void Style::connectDBus()
- 
- void Style::disconnectDBus()
- {
--    if (!m_dbusConnected)
-+    if (!m_dBusHelper->m_dbusConnected)
-         return;
--    m_dbusConnected = false;
-     auto bus = QDBusConnection::sessionBus();
-+    if (!bus.isConnected())
-+        return;
-+    m_dBusHelper->m_dbusConnected = false;
-     if (getenv("QTCURVE_DEBUG")) {
-         qWarning() << Q_FUNC_INFO << this << "Disconnecting from" << bus.name() << "/" << bus.baseService();
-+        dumpObjectInfo();
-     }
-     bus.disconnect(QString(), "/KGlobalSettings", "org.kde.KGlobalSettings",
-                    "notifyChange",
-@@ -739,9 +775,7 @@ Style::~Style()
-         m_plugin->m_styleInstances.removeAll(this);
-     }
-     freeColors();
--    if (m_dBus) {
--        delete m_dBus;
--    }
-+    delete m_dBusHelper;
- }
- 
- void Style::freeColor(QSet<QColor *> &freedColors, QColor **cols)
-@@ -4467,10 +4501,10 @@ void Style::emitMenuSize(QWidget *w, unsigned short size, bool force)
-         if (oldSize != size) {
-             w->setProperty(constMenuSizeProperty, size);
-             qtcX11SetMenubarSize(wid, size);
--            if(!m_dBus)
--                m_dBus = new QDBusInterface("org.kde.kwin", "/QtCurve",
-+            if(!m_dBusHelper->m_dBus)
-+                m_dBusHelper->m_dBus = new QDBusInterface("org.kde.kwin", "/QtCurve",
-                                              "org.kde.QtCurve");
--            m_dBus->call(QDBus::NoBlock, "menuBarSize",
-+            m_dBusHelper->m_dBus->call(QDBus::NoBlock, "menuBarSize",
-                           (unsigned int)wid, (int)size);
-         }
-     }
-@@ -4479,10 +4513,10 @@ void Style::emitMenuSize(QWidget *w, unsigned short size, bool force)
- void Style::emitStatusBarState(QStatusBar *sb)
- {
-     if (opts.statusbarHiding & HIDE_KWIN) {
--        if (!m_dBus)
--            m_dBus = new QDBusInterface("org.kde.kwin", "/QtCurve",
-+        if (!m_dBusHelper->m_dBus)
-+            m_dBusHelper->m_dBus = new QDBusInterface("org.kde.kwin", "/QtCurve",
-                                         "org.kde.QtCurve");
--        m_dBus->call(QDBus::NoBlock, "statusBarState",
-+        m_dBusHelper->m_dBus->call(QDBus::NoBlock, "statusBarState",
-                      (unsigned int)qtcGetWid(sb->window()),
-                      sb->isVisible());
-     }
-diff --git a/qt5/style/qtcurve.h b/qt5/style/qtcurve.h
-index 56960a5..ecfa2e7 100644
---- a/qt5/style/qtcurve.h
-+++ b/qt5/style/qtcurve.h
-@@ -522,6 +522,9 @@ private:
-                                       const QWidget *widget) const;
- 
- private:
-+    class DBusHelper;
-+    DBusHelper *m_dBusHelper;
-+
-     mutable Options opts;
-     QColor m_highlightCols[TOTAL_SHADES + 1],
-         m_backgroundCols[TOTAL_SHADES + 1],
-@@ -564,14 +567,12 @@ private:
-     mutable QList<int> m_mdiButtons[2]; // 0=left, 1=right
-     mutable int m_titlebarHeight;
- 
--    QDBusInterface *m_dBus;
-     ShadowHelper *m_shadowHelper;
-     mutable QScrollBar *m_sViewSBar;
-     mutable QMap<QWidget*, QSet<QWidget*> > m_sViewContainers;
-     WindowManager *m_windowManager;
-     BlurHelper *m_blurHelper;
-     ShortcutHandler *m_shortcutHandler;
--    bool m_dbusConnected;
- #ifdef QTC_QT5_ENABLE_KDE
-     KSharedConfigPtr m_configFile;
-     KSharedConfigPtr m_kdeGlobals;
-diff --git a/qt5/style/qtcurve_plugin.cpp b/qt5/style/qtcurve_plugin.cpp
-index ce363ac..481fffc 100644
---- a/qt5/style/qtcurve_plugin.cpp
-+++ b/qt5/style/qtcurve_plugin.cpp
-@@ -129,6 +129,11 @@ StylePlugin::create(const QString &key)
-     if (key.toLower() == "qtcurve") {
-         qtc = new Style;
-         qtc->m_plugin = this;
-+        // keep track of all style instances we allocate, for instance
-+        // for KLineEdit widgets which apparently insist on overriding
-+        // certain things (cf. KLineEditStyle). We want to be able to
-+        // delete those instances as properly and as early as
-+        // possible during the global destruction phase.
-         m_styleInstances << qtc;
-     } else {
-         qtc = nullptr;
-@@ -151,12 +156,14 @@ StylePlugin::~StylePlugin()
-     qtcInfo("Deleting QtCurve plugin (%p)\n", this);
-     if (!m_styleInstances.isEmpty()) {
-         qtcWarn("there remain(s) %d Style instance(s)\n", m_styleInstances.count());
--        QList<Style*>::Iterator it = m_styleInstances.begin();
--        while (it != m_styleInstances.end()) {
--            Style *that = *it;
--            it = m_styleInstances.erase(it);
-+        foreach (Style *that, m_styleInstances) {
-+            // don't let ~Style() touch m_styleInstances from here.
-+            that->m_plugin = nullptr;
-+            // each instance should already have disconnected from the D-Bus
-+            // and disconnected from receiving select signals.
-             delete that;
-         }
-+        m_styleInstances.clear();
-     }
-     if (firstPlInstance == this) {
-         firstPlInstance = nullptr;
--- 
-cgit v0.11.2
-
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
index 6047b67909da..85ce451395d6 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
@@ -16,7 +16,7 @@ IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
@@ -64,6 +64,8 @@ RDEPEND="${COMMON_DEPEND}
 	!x11-themes/gtk-engines-qtcurve
 "
 
+RESTRICT+=" test"
+
 DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
 PATCHES=(
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
deleted file mode 100644
index 752def4b821b..000000000000
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Widget styles for Qt and GTK2"
-HOMEPAGE="https://cgit.kde.org/qtcurve.git"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+X gtk nls plasma +qt5 test"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-REQUIRED_USE="gtk? ( X )
-	|| ( gtk qt5 )
-	plasma? ( qt5 )
-"
-
-COMMON_DEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	plasma? (
-		$(add_frameworks_dep frameworkintegration)
-		$(add_frameworks_dep karchive)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kdelibs4support)
-		$(add_frameworks_dep kguiaddons)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kwindowsystem)
-		$(add_frameworks_dep kxmlgui)
-		$(add_qt_dep qtprintsupport)
-	)
-	qt5? (
-		$(add_qt_dep qtdbus)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtsvg)
-		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-themes/gtk-engines-qtcurve
-"
-
-DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.0-rare_crash_hang_fix.patch"
-	"${FILESDIR}/${PN}-1.9.0-build_testing.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT4=OFF
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_KDE4_DEFAULT_HOME=ON
-		-DENABLE_GTK2="$(usex gtk)"
-		-DENABLE_QT5="$(usex qt5)"
-		-DQTC_ENABLE_X11="$(usex X)"
-		-DQTC_INSTALL_PO="$(usex nls)"
-		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
-	)
-
-	kde5_src_configure
-}
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 0d7ef602fb66..e51b07b8f845 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -64,11 +64,9 @@ RDEPEND="${COMMON_DEPEND}
 	!x11-themes/gtk-engines-qtcurve
 "
 
-DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
+RESTRICT+=" test"
 
-#PATCHES=(
-#	"${FILESDIR}/${P}-add_utils_include.patch"
-#)
+DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
 src_configure() {
 	local mycmakeargs=(