gentoo resync : 14.07.2018

26 files changed, 44 insertions, 349 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 86715dc71c60..5e5ed8010542 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/experience/Manifest b/x11-themes/experience/Manifest
index 57f70f1d4c4c..d3590bedace8 100644
--- a/x11-themes/experience/Manifest
+++ b/x11-themes/experience/Manifest
@@ -1,5 +1,3 @@
 DIST experience-3.04.tar.gz 108140 BLAKE2B 0909eb0a55fcc27f806ccebcf4ebfa8fef53e753227bf04accd4460c0ea4507d9627c7a2796a4fb6fad1841b9c032de0397e72ce62a623a0cd6756578340ddce SHA512 528c282fae43da76d88401dc1225cb8ce357e3c2786d5848bfdc3560692939837a813d7689f2136ef1cf8f832390a8619c4736c0ff99ea5a2c1818be2cd47a81
-DIST experience-gtk-3.04.tar.gz 108140 BLAKE2B 0909eb0a55fcc27f806ccebcf4ebfa8fef53e753227bf04accd4460c0ea4507d9627c7a2796a4fb6fad1841b9c032de0397e72ce62a623a0cd6756578340ddce SHA512 528c282fae43da76d88401dc1225cb8ce357e3c2786d5848bfdc3560692939837a813d7689f2136ef1cf8f832390a8619c4736c0ff99ea5a2c1818be2cd47a81
-EBUILD experience-3.04-r1.ebuild 951 BLAKE2B 3a53c8fcf8e8759c8400af85f65195087d7c4233521093cda3afa112e137f63c73c615d1e032ca8933c8f5fd123012e760a295f675c9e3b75f00d8501e5421a0 SHA512 971afbd4226ea80e869ae9f9bf5e8b811e1c5d6832f21687755dd7b6b9b59ac4c1fe921b41afaa7cbfea33e887fdb6584154be42dc92617a51e50c58fb329cbb
-EBUILD experience-3.04.ebuild 981 BLAKE2B e1ff9cf7ffaf5182e3e615e1436b6f6817aece92bf76038145bf0b844625681fde5b2756c1fe95e91535d696df7dff89300a0cbfedd45b2a179663661a00b4f8 SHA512 16f8d237087be52f33eebea4a5232fb63829cb0785955dc77ab4e2bc5fa47e68287d75e81100277f3ee73c813fde187e13eed6123245aebd0690ed4019e96819
+EBUILD experience-3.04-r1.ebuild 950 BLAKE2B 7e0ebdc0b6fadd242e75316007611c6ec76c7ccd97281252d9f6a65394320b83e6dc9cadbf538df95213f3bae686801731f673df0a8390db226362696edadc20 SHA512 9b39c0b87ce382dfb763682a93cfbbaf426affe49e1972644f353373100f86d8d8b4b7fff0ad9b8af3912a3fc08e87d9726715a8623aa60756f9254009ca357b
 MISC metadata.xml 331 BLAKE2B 683186b8efe651ffac30992e60113dcc94e5f89edbc0f9ba2fc426641f6342b655da48a358d0dca02fa81184bd5b4e46366672cfa1539a21e0c4e4b6fe971bbe SHA512 4730233c5d83eca88c8dd674e421d3fc04eb65c94f5a64aca8273410fdd8b670f2a88f155ea26ec029538940c0e896c504f5ded9b8a526b60a729c2427dc6ecd
diff --git a/x11-themes/experience/experience-3.04-r1.ebuild b/x11-themes/experience/experience-3.04-r1.ebuild
index 5e5f3ebfcf1a..2c334ee3a0d1 100644
--- a/x11-themes/experience/experience-3.04-r1.ebuild
+++ b/x11-themes/experience/experience-3.04-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnome/teams/art.gnome.org/themes/gtk2/GTK2-EXperience.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-themes/gtk-engines-experience"
diff --git a/x11-themes/experience/experience-3.04.ebuild b/x11-themes/experience/experience-3.04.ebuild
deleted file mode 100644
index dce8d130b177..000000000000
--- a/x11-themes/experience/experience-3.04.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="GTK+2 themes which copy and improve the look of XP Luna"
-HOMEPAGE="https://web.archive.org/web/20130730053042/https://art.gnome.org/themes/gtk2/1058"
-SRC_URI="http://freshmeat.net/redir/${PN}/50795/url_tgz/${PN}-gtk-${PV}.tar.gz"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-themes/gtk-engines-experience"
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	mv "eXperience - ice" eXperience-ice
-	mv "eXperience - olive" eXperience-olive
-
-	# Don't install index files, since this package doesn't provide the icon
-	# set. Remove cruft files also.
-	find . -name 'index.theme' -o -name '*~' | xargs rm -f
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	cd "${WORKDIR}"
-
-	for dir in eXperience* ; do
-		insinto "/usr/share/themes/${dir}"
-		doins -r ${dir}/*
-	done
-
-	dodoc eXperience/README
-}
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 699e3acf2c13..af6af33443b3 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,16 +1,6 @@
-DIST greybird-1.2.2.tar.gz 112022 BLAKE2B 9353a38352099fb8700e2a4e575c8e46cfd04bb5722869cdb64f864f33dc7965dad596b4a780faa6015bb8bdab16a32290c74f18462aab3fbe5e34705889deae SHA512 0384647c51e6b473f104c10d5418f8d1e465190dcbfdaebc9946f47cab77e90d7c81555cf94c47298a053e150c6b92adfd0d5c84f20f2b5f2ebcc0e12cdb444e
-DIST greybird-1.3.4.tar.gz 116901 BLAKE2B 57bd83de788899eff18bb019eb79e1e270c803945701b20fa950f914208ef3142845c3ab358ec126a57a8e15fc08cd75588be3c7d7c96896afc10052108302ca SHA512 78bb9372d9c05c7c83ae130a3559f7b1f413bb0519d5f626d477bef917ca35892c7b0235872a084720fdba5aa5b381401fb36f7fa11dea00bc0986c76670c286
-DIST greybird-1.5.3.tar.gz 118732 BLAKE2B a084aee7520a5d9861a631ccbeb667669bb66c59906a6a6bf8a2417dc059aba91eb91724794c0e41b55f5fcd458ab6626e1c8bfc389629256bdd2e0621be9c87 SHA512 1010019b1341cf1c0d48d15d0bc371bbe62e3b6d4aa5d8feb6998093487f465c7dbe42133753a6ca74a01e351ce7b15fcc14c4e194a97034e2e4c171885accae
-DIST greybird-3.18.0.tar.gz 133088 BLAKE2B ffa7cd5cd444219fea5db3a2755c4d9e4f7b9ed1bddcea6a5f19167a0c89547a14c18edde26907887aff82e7235026f7d3f7e590dc26e49fa552d3ad0e4938af SHA512 0f4e9161a8c99dfe2569ba755af819dbb14a75ca11816deccbcdb057469e697e0adbfe8af6deafadf629425b83d96ccfe0c979cde0733e516d9203061700820d
 DIST greybird-3.20.1.tar.gz 193824 BLAKE2B d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
-DIST greybird-3.22.3.tar.gz 194488 BLAKE2B 7c6f6510723cc2f96b2fe878e6ad8304accf89b34db7ed56fa2ed45234e880c6fc8a5b9c82e6c58400174d0db3e4352785fea06c0124ce5ff24ac6a69592e88c SHA512 2a36f8eeddf95ade7d91b882e80475f7db840bd749ba76deb2bc223868ec0c0020ddfc60b0055091478f5a8313f545f5b44088ba3bdf8213ec82924c8affc90b
 DIST greybird-3.22.8.tar.gz 211084 BLAKE2B 958b1dd837bbf91c40ef9ec3e5944d24d83d984e46b53cee8297dbf93931efd3f2efbda496929c3ced875f7a1d9046804b48b870bdca37a7bcffd57271e80470 SHA512 c6ac0dafc926ec2a0b01b4d44f602e533f97f806be32096208c08461502cadcda3f1e63012ad78ffaaa9c791c5af72ce2b7e0578b1f7c0d3ab407763bc40f94b
-EBUILD greybird-1.2.2.ebuild 885 BLAKE2B 509cfe380945c9a7882155bebc5ec03c17f374b2ace8c7f9625869103df50aa6d082f0636879e6fcee72eaff15185c69146d2ba4f1f5256a4c18d35fdd762492 SHA512 acff693b4476810cd25fd2c299be0c0c00556d7dc6b75d8d91bc1c224da942b0f97ea1dbccfa98cd652fb142ed911b98e57b8bcb30de3260c6dcbd977325ff28
-EBUILD greybird-1.3.4.ebuild 946 BLAKE2B e976312d446fae0cb920bf49f5aa71dadde2cf0d2b14eebc4e3f769348fa5cef1169a9c7bd2e4394f2ddbc557b27b96d486466866c4f380f9c995368d04e8638 SHA512 71d8d90c95400cbf588d290f0ed58935b36ec6480878737d232d7ad5ed76091778474657e28f22c166923fa3dd155eecbb6586c54bd775d7aedfe851ab4151d9
-EBUILD greybird-1.5.3.ebuild 944 BLAKE2B 2ef6b96d4c87082b86db66e9c905f333e6efb63e6a4f3296c7365c63ca55e330c70e995789cd7dfe02b0a7062c0c5662f7004cc09866240afd4159a4b330fe83 SHA512 92890d3329ea1151b933e0ccbe4ea33e3f2dce4689272c3a289ebe05e585a308b74a16017fbc51fa3801aa2d36152599f658dee8042dad9ca0aad99da372e971
-EBUILD greybird-3.18.0.ebuild 1149 BLAKE2B a7cc7bd66b2a0456c78616d7a790fa06c84d82846e2e370720d01e043852cb4d2d6d28f65a6bb9f55d942a4878a5d4b55572af57e76723f08976f4ee3446a165 SHA512 85195bf47f633d8153b6187c0e914eac62cbd6456670605407b5ed8f54e66484402b2c94fcc40a7e3e9ff5a5a1d5f7b06c70c7944e4f724d4c0a1664fdb59523
 EBUILD greybird-3.20.1-r2.ebuild 1334 BLAKE2B 9345926c3d85689c910c590ceb36a5368129c09790adcf091bd8cc358a9696706490451294149640a5d127c0167e01252f1c36687074103dd4a1af140b96a455 SHA512 3334a278c7ab07961de8e545aa75355136dbe770c1240ccd3ffc15bec2fe0498083a4e6566cfab9e5296993eca9f37fbc1b0b65e7b36d1bfe8ac29175150b783
-EBUILD greybird-3.22.3.ebuild 1334 BLAKE2B 3c752c9d3f62dd441a139c89045fde6e788f23a4d3e6dc141ce2bce83e4e0dac4aa651c7932180ca50360dfce2b9b0f2aa747d96d4f8c9cda9200e783df5b26e SHA512 42835eff7af784a67c1d24bb6a66535fa43f3f13d95af1ac548135f5d8976afe9afa71d635b61ca93acfefd6aedfbddc9d82c702530cc4ad0d35a52513d5c542
-EBUILD greybird-3.22.8.ebuild 1334 BLAKE2B 743d33fe01a1b098231289347b19693fcca7d3cc02786fc210e852223139ee6e73ce6ed6ba119cdc23d4369cd9281ca8fcda6aa5e82eda66d5eb7d26527af773 SHA512 7a7ede31ca25a85ffc9288263c1fa7bb360e1fb3b441b741542fb755220ab20379ce88f8af1d49746e680b4a608b222dc1b38cc1fcd8c49a722d0923c243830a
-EBUILD greybird-9999.ebuild 878 BLAKE2B 20ae797da9569039a2c37839b9bb43e4e5eda87fa0b4944d88a287c18ed6c9698036cf6ab42cc7fce2c77cd381d8df7d2a67e7d8fd42c544014cd387521192ad SHA512 534763be5f8ca2de8af0ab7ea606a0d043d9b9b30e33e6d5fc62c637d36bd59e08247b409f9cd9459a507544b4553b81e43ca4e15edfb1729ca8d3e3cd1e9b2e
-MISC metadata.xml 374 BLAKE2B 0aa19bbf371e3bc39e050647220cb73eaca379b266c55c220713eb4bcf1c41a6142a5264d90e2e8723034506d12c373e191766805883f3ef5c7a9dc536dcc436 SHA512 b5267663c1c10dde8dad040af61482e50646f583cdd696e06e97f52d6ae28ed4d2e302179646d2eb4f7c3fda197b42238de50d55738048439643ddddc1b01d9a
+EBUILD greybird-3.22.8.ebuild 1338 BLAKE2B 5acae1774de4ca86032452f47d41f9cb5765b8895b0ea0d56dd9c65edb2968f29d425d930707e0b387b656671835f66f5ae9291324a3b85644ec20e6f83e2e09 SHA512 cae81741dad1726a8d50d543f0c19415b9a1f7651fb57c135f98a95fcf22afa21abab2f2addb19fefbed4adc1a984ae2e18a3d9684deebf32be249f50c0b5f17
+EBUILD greybird-9999.ebuild 1234 BLAKE2B 8c91cdbccd7d64115727444ac89de4b05775abe1835c57658bd30c8782e93489e6ddc1198e52820937425c11e19b4a428f4b5e9af20245aa75f0b6e7913d4bfe SHA512 e2199ba7670b80c6156412b3b5d5923e528e95dfa60078f3cbdd5587d6ef2064617d906391403b7cb3daac0de22add53839100eecbf5e1c149f7c75dbed01494
+MISC metadata.xml 364 BLAKE2B 8282ff88bef556b0960a4892d8daeea81ee1dfa2a893668ba1f28a6edcdc931a668136461d7ec56a205f636fae9dda3cdd93b68e4a62c7ce1e856b4b03549b67 SHA512 e111800ac19d8e86381866fd00115a67d11c33eb35871a7fcf50beecebabf9eee26290b32c3928126f5f8c8a8a530c5f2afac301464c193429cfe1504af8b44b
diff --git a/x11-themes/greybird/greybird-1.2.2.ebuild b/x11-themes/greybird/greybird-1.2.2.ebuild
deleted file mode 100644
index 7f1d7f47c190..000000000000
--- a/x11-themes/greybird/greybird-1.2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-NC-SA-3.0 || ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ayatana gnome"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
-	unpack ${A}
-	mv ${MY_PN}-* "${S}" || die
-}
-
-src_install() {
-	dodoc README
-	rm -f README LICENSE*
-
-	insinto /usr/share/themes/${MY_PN}_compact/xfwm4
-	doins xfwm4_compact/*
-	rm -rf xfwm4_compact
-
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-
-	insinto /usr/share/themes/${MY_PN}
-	doins -r *
-}
diff --git a/x11-themes/greybird/greybird-1.3.4.ebuild b/x11-themes/greybird/greybird-1.3.4.ebuild
deleted file mode 100644
index bb3735b637ab..000000000000
--- a/x11-themes/greybird/greybird-1.3.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana gnome"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
-	unpack ${A}
-	mv ${MY_PN}-* "${S}" || die
-}
-
-src_install() {
-	dodoc README
-	rm -f README LICENSE*
-
-	insinto /usr/share/themes/${MY_PN}_compact/xfwm4
-	doins xfwm4_compact/*
-	rm -rf xfwm4_compact
-
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-
-	insinto /usr/share/themes/${MY_PN}
-	doins -r *
-}
diff --git a/x11-themes/greybird/greybird-1.5.3.ebuild b/x11-themes/greybird/greybird-1.5.3.ebuild
deleted file mode 100644
index e4902bb200e0..000000000000
--- a/x11-themes/greybird/greybird-1.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ayatana gnome"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
-	unpack ${A}
-	mv ${MY_PN}-* "${S}" || die
-}
-
-src_install() {
-	dodoc README
-	rm -f README LICENSE*
-
-	insinto /usr/share/themes/${MY_PN}_compact/xfwm4
-	doins xfwm4_compact/*
-	rm -rf xfwm4_compact
-
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-
-	insinto /usr/share/themes/${MY_PN}
-	doins -r *
-}
diff --git a/x11-themes/greybird/greybird-3.18.0.ebuild b/x11-themes/greybird/greybird-3.18.0.ebuild
deleted file mode 100644
index b88c112859db..000000000000
--- a/x11-themes/greybird/greybird-3.18.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# IUSE="ayatana gnome emerald"
-IUSE="ayatana gnome"
-
-RDEPEND="
-	>=x11-themes/gtk-engines-murrine-0.90
-"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	dodoc README
-	rm -f README LICENSE*
-
-	insinto /usr/share/themes/${MY_PN}-compact/xfwm4
-	doins xfwm4-compact/*
-	rm -rf xfwm4-compact
-
-	insinto /usr/share/themes/${MY_PN}-a11y/xfwm4
-	doins xfwm4-a11y/*
-	rm -rf xfwm4-a11y
-
-	insinto /usr/share/themes/${MY_PN}-bright/xfce-notify-4.0
-	doins xfce-notify-4.0_bright/*
-	rm -rf xfce-notify-4.0_bright
-
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-
-	insinto /usr/share/themes/${MY_PN}
-	doins -r *
-}
diff --git a/x11-themes/greybird/greybird-3.22.3.ebuild b/x11-themes/greybird/greybird-3.22.3.ebuild
deleted file mode 100644
index 8f8ce5e67bfb..000000000000
--- a/x11-themes/greybird/greybird-3.22.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana gnome"
-
-RDEPEND="
-	>=x11-themes/gtk-engines-murrine-0.90
-	>=x11-libs/gtk+-3.22:3
-"
-DEPEND="${RDEPEND}
-	dev-ruby/sass
-	dev-libs/glib:2
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-#RESTRICT="binchecks strip"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
-		elog "For upstream's default icon theme, please emerge"
-		elog "x11-themes/elementary-xfce-icon-theme"
-	fi
-	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
-		elog "For upstream's default cursor theme, please emerge"
-		elog "x11-themes/vanilla-dmz-xcursors"
-	fi
-}
diff --git a/x11-themes/greybird/greybird-3.22.8.ebuild b/x11-themes/greybird/greybird-3.22.8.ebuild
index 0e52f4581388..aa8b49e170fd 100644
--- a/x11-themes/greybird/greybird-3.22.8.ebuild
+++ b/x11-themes/greybird/greybird-3.22.8.ebuild
@@ -17,12 +17,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="ayatana gnome"
 
 RDEPEND="
-	>=x11-themes/gtk-engines-murrine-0.90
 	>=x11-libs/gtk+-3.22:3
+	>=x11-themes/gtk-engines-murrine-0.90
 "
 DEPEND="${RDEPEND}
-	dev-ruby/sass
 	dev-libs/glib:2
+	dev-ruby/sass:3.5
 "
 
 S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/x11-themes/greybird/greybird-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
index ab2fb8815922..395fa8e0a143 100644
--- a/x11-themes/greybird/greybird-9999.ebuild
+++ b/x11-themes/greybird/greybird-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,12 +17,12 @@ KEYWORDS=""
 IUSE="ayatana gnome"
 
 RDEPEND="
+	>=x11-libs/gtk+-3.22:3
 	>=x11-themes/gtk-engines-murrine-0.90
-	>=x11-libs/gtk+-3.20.0:3
 "
 DEPEND="${RDEPEND}
-	dev-ruby/sass
 	dev-libs/glib:2
+	dev-ruby/sass:3.5
 "
 
 src_prepare() {
@@ -38,3 +38,14 @@ src_install() {
 	use gnome || rm -rf metacity-1
 	popd > /dev/null || die
 }
+
+pkg_postinst() {
+	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
+		elog "For upstream's default icon theme, please emerge"
+		elog "x11-themes/elementary-xfce-icon-theme"
+	fi
+	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
+		elog "For upstream's default cursor theme, please emerge"
+		elog "x11-themes/vanilla-dmz-xcursors"
+	fi
+}
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index 1f60df2aaca7..be797ac505ab 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">shimmerproject/Greybird</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">shimmerproject/Greybird</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest
index 9c3c9727a702..dd70af0a23b1 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 961 BLAKE2B 1a7d185cc5c4e88856079d341003cf1e3b1ae56ae0f8d662cd01df16c018ce98a8dfb870a3e52ba1d2ed56c2d5f1a23093360e95e8623c0bfe3b43fe04db29ac SHA512 8661f3184a06031c0e0272e87df374905ba0ff0b3bcff96bee86a309eb9ef9fd27c09be669beeba3cdcaafa265d0ffdf364eb2367f7105a50ce049681ca555d8
-EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 916 BLAKE2B 3ad59b3cfc89d65ce828199e32265add62586dd5801e692dba42d2c8d83b88c57e75032a31aafd2cabef86afcd806e816e640f3f59fa7fe73eca4593c46d06d0 SHA512 ed72186dcfddf937944398610603327e4ee8df57d2ef8b085fc917d75ab2153b969025d5dc426b744137deb4bb146859e095c0c2f720df2bc40e4bd57539276a
-EBUILD gtk-engines-xfce-3.2.0-r300.ebuild 952 BLAKE2B 9f113b6a6e015ceb950c4335e158f5744e8dd63ae5800383ef53c6a8b7d4d143bea4ef19271ae9aae6ab47b5734c709b7f775239f1e8259c36650c3032cbebe8 SHA512 c31ce787a2bfbf00b51aade21bf0a13e1490e7844f28d626453c4acba871bf14f07d28ed0e0c31f545e553340fe634ee791c1cdf34f3a9f5585e5da7b75ef905
-EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 891 BLAKE2B dab50b81e2636caaf64eee1d061be1ac81811264bc583383fb854f06e6c14d74f8354d562dcb7c057b1c0c5e177602fd7a6c1812896b3aa4ba486fde3a111272 SHA512 38059ef0ab86203e0874e2c8aa97d634501ee51df1eebdaef2ef5718fbc4820df9ec7974b1e934a05a1b526772d6137c99f153da449e4cd0206a2fc8e8b10739
+EBUILD gtk-engines-xfce-3.2.0-r200.ebuild 972 BLAKE2B 7e66efd9f398928f235ae696813e64baf79b22b66c0b09128475b99329608513031c2cb7285c36a3009d3efdc1f10e96755af2fe72d89770ae84b3ff0331d841 SHA512 06ef08131e8a543f426f8a3d26eb8781ee6fbb74b5e78c848db9598ccc2f8659eba90cedde064d05490d21af1722684f44352aba0d0ac745c28d1a34faa3f13b
+EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 927 BLAKE2B 390f01f310391b2c9b8abc7830faf0a7c5e8e180b7b87268c1b318bc2b1e9f0a44eee2a675b92d4ba3feff2f51aa2c0b4544bfc6888af8c681ac4d2c901ea01b SHA512 0ec27229322c13f6de71030699be150f7937da3e6a887afc5f4ec85fcf12448651cfbadcbdc3ee05da265eef98b1856dd82287d25989a19e5e65ec9aada5333d
+EBUILD gtk-engines-xfce-3.2.0-r300.ebuild 963 BLAKE2B d5ea466648cdcb7d376a16f58bedf37dc76902a734b272bf8e70fdba689f63e5c50b89bdff7fe0d20fd5658c5dcfc3f9430f2d8b03f361d1801db3397273037a SHA512 ffef8d32f14efc88be776723c97aff5854cca4dbb8d7cdf0c044e9ec2a5883d94a163c44a48f30307dd0617cbe61c19b36ab252a092c1aa0619f2541306e3057
+EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 902 BLAKE2B fbf1455e965c78a369aa06d77a507d2a214a722d0ce9eb3db8c755fdee62f6c5f4d14b810d08e47f32cd012086792af5d4a88935807f0d96215a0ecb7461d8c2 SHA512 d8431b720c39700e236d51d720000921887acc37098bcf83cb03dc84d91cc5755bc866881fb0cf2c525bda28258336a12d9f37a34110c2f6349f389d16c994d2
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
index 637b867fef9e..f50cddd2a1ff 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
@@ -7,7 +7,7 @@ inherit xfconf multilib-minimal
 
 DESCRIPTION="A port of Xfce engine to GTK+ 2.x"
 HOMEPAGE="https://git.xfce.org/xfce/gtk-xfce-engine/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
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 87d432f8a438..b81e0cf61d5d 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
@@ -7,7 +7,7 @@ inherit multilib-minimal
 
 DESCRIPTION="A port of Xfce engine to GTK+ 2.x"
 HOMEPAGE="https://git.xfce.org/xfce/gtk-xfce-engine/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
index 4002d528b706..18c83efc8449 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
@@ -7,7 +7,7 @@ inherit xfconf multilib-minimal
 
 DESCRIPTION="A port of Xfce engine to GTK+ 3.x"
 HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="3"
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 784947e3a22a..b0a291857673 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
@@ -7,7 +7,7 @@ inherit multilib-minimal
 
 DESCRIPTION="A port of Xfce engine to GTK+ 3.x"
 HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="3"
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 07e60725a1f1..37ec56c3d5ed 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,6 +1,6 @@
 AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1960 BLAKE2B 4587c07047c0f21fe3f63d95eee9cb771fe453e51aa4c7cc6a10ffd456b5fa1f11b9308e35410b9a3ca003066481cb107aed1652f6a6486411431075d83aa1f2 SHA512 e406769e290be4e2bc1a2589b164d0d72cb532cce33804a331b948e0c4d0b01c58a14fb83e6ca01b449ba30793a1c7ab504a1e41669b7d0db2731f4fe4cc71d3
-EBUILD qtcurve-9999.ebuild 1912 BLAKE2B 5995c2956da4675290c0b4d688dad677b58c9616d48b32413bbbb44c4f41ea3119d73685775309074f528b237f01b78bb9994587af11681cd09aa9095f332ddd SHA512 2b4a358871d1ed0daf8d8769301edc6c0735a3f6039a168a92db40fa8e357c20b3c8b7ffa6a247d41551062415c3955751bb75dd01b92bd051c80d05c8232fae
+EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1987 BLAKE2B 2f321fbfea11cba255d14d59d5211ab27e44d95fbf5107b0cad998bd799835a3ddaaae0ed0260e4a6223958fab7d6885681647a49984c6227e77192c46ef66bb SHA512 37e08003b638b27d36346d05bd19037af1f7d53c0e5d12a0de2a0341e602d63b89ce64acc4527adf2bd44babeb9adb57cb7b10ac6ede60c2133c5b801b9c9539
+EBUILD qtcurve-9999.ebuild 1939 BLAKE2B cc64e737f57f494291cc957c4e23dbbf5f0c034f01f9340a77934f84cba43b8352e8d004889b344a7821aa3db3eda1bb8ca5707b9bea2044c41810cd8489794e SHA512 9ff4d5abf4d4d53136f4fc38b780ebe334a91d11eb2f334f4d1081844ed4012263d2ca70650375cef32721b743d9c48927a39f9fa4ca0ab43768b88757e502a6
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index e795ba2ee0fe..752def4b821b 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+ECM_KDEINSTALLDIRS="false"
 KDE_AUTODEPS="false"
 inherit kde5
 
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index d5f28086e7cc..9a99d8eec626 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+ECM_KDEINSTALLDIRS="false"
 KDE_AUTODEPS="false"
 inherit kde5
 
diff --git a/x11-themes/xfwm4-themes/Manifest b/x11-themes/xfwm4-themes/Manifest
index 5380126278a9..d8160a9e9126 100644
--- a/x11-themes/xfwm4-themes/Manifest
+++ b/x11-themes/xfwm4-themes/Manifest
@@ -1,3 +1,3 @@
 DIST xfwm4-themes-4.10.0.tar.bz2 621206 BLAKE2B 42cc46f8b3ac4584f33273373a54f3b31a5ae7c3dd3ae0bee97b2d6e721fd1d6263964c90fdfb5f53fc1c8c138ff07b7c0b4000661ceea4f074a23788f74886c SHA512 5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305
-EBUILD xfwm4-themes-4.10.0-r1.ebuild 535 BLAKE2B 17841945968fb5b9621915d0ad47d289b77babfe116354b78722fbe3af7a5b89368ef0eaee5a021709f02da565b826b8cf082ea78f69810283bc958c1163a96f SHA512 4254b7d652d763039ab2748b9de65ba9bfa34520297e10909e19a148e379503a7ea042e529e7e15677e828f79850946047100fa64c084792c0671a0b5a1ec7cb
+EBUILD xfwm4-themes-4.10.0-r1.ebuild 546 BLAKE2B e5012514c2e9d8861c9a4b4f172ebdd010b584601c215e12c598ba508a5ed74f6e672c15b2d9fdd7810c2d7268d7365e8f7085bc8dc05fa2d87722cccd4fb7f2 SHA512 239d31163fd3908973f7914a4ec0a35c9bb0545eeac60f21dcdb11735bfa667a75fd7f1d1861b15b5590816d8fd53f9d416c73db7576a92c8f21b9a74aed17b3
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
index 1f1f4de7069a..566ecfa1a40a 100644
--- a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
+++ b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Additional themes for the Xfce window manager"
 HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-themes/zukini/Manifest b/x11-themes/zukini/Manifest
index 3c546b4372fb..c59c86c64df3 100644
--- a/x11-themes/zukini/Manifest
+++ b/x11-themes/zukini/Manifest
@@ -1,5 +1,3 @@
-DIST zukini-20120806.zip 195927 BLAKE2B efca985f735de11b2a8681c139a8df1dd6c3b5b58cd9dd0e9043c25d449d29dab6397e4d9cbb42cd7be7aefc7bc1eb37cb05c8c65f7abe7fbb49b7df565a4a17 SHA512 90e663645ec2c867b88a8d02d940bed70270a940c7162ce761c5d7018a1ad9a2f11c3b547ac1d470f19a3729533836cef8cc53bdc18ea89eb293265c51f37083
 DIST zukini-20120817.zip 195930 BLAKE2B 78ba7fa7fe5d21add63f1f5028d1616ea8a9cfbe885ea1b373a60ebc6c9acc1d0b7798a585c958ba092f52b6fc05bcbab8550d7524828983c665060cfada689b SHA512 0ea42bc729100018acc16405283d41a10381bbcc411ea1b473880b7fdfe6785d6b7ae409959bdfb4f86c6081ae5fd102701efff793ea852c9c9913a03805e5f0
-EBUILD zukini-20120806.ebuild 780 BLAKE2B ddfe09e122f894255a69baeedec59215fc5298583c76bb6949f3659d1d5bc3c02fc53e5f7dac5586fc5573025204d02a92d30e620f553a9a4102c012c9fa297f SHA512 74a9d7594f9f5539b88b899a89a62d32ae0375ef4837ee400b9a5b2eb92e81a2f09b7997fa6be115bc3829e39f37fb674bdb1961097a642959f4b649a6ec4fc6
-EBUILD zukini-20120817.ebuild 796 BLAKE2B 1c5df4597f859ebefc88147d09567924e3a8fbf0287eb16426f7dd24f4a70ebc479cf6b17070fb1f61a4a788d9db0d87f224ebc4a3aa41195d20156741d43fef SHA512 720b9473a5861179483c6c49ce4557779325aaea88a4b736ce328d6c5339abc1ebbf53ea1bfdecac64c36bf8e7a8959171061e1abab044d92570c1609e2e5bd7
+EBUILD zukini-20120817.ebuild 795 BLAKE2B d1bb86f5edf20b2e4fe6dd7b76531bcaae2c083f746aebd4108824d000b9ea1c9845266b61edb18efc2b7f29f3f918f6251d7ae473976606af79cd3fdc6fdda5 SHA512 1ecfe10844466fb86d1e2a10f9eaf467fe62d428d44923472fd6e96d11ae6a479346a6d7eab7b078ba5ed5a5e74a2951940924f8fc67557e8ec68afe4cf7ddb4
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/zukini/zukini-20120806.ebuild b/x11-themes/zukini/zukini-20120806.ebuild
deleted file mode 100644
index efd943153294..000000000000
--- a/x11-themes/zukini/zukini-20120806.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Unified look for GTK+ 2.x, GTK+ 3.x, gnome-shell, metacity and more"
-HOMEPAGE="http://lassekongo83.deviantart.com/#/d4ic1u2"
-SRC_URI="https://dev.gentoo.org/~sping/distfiles/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-RDEPEND=">=x11-themes/gtk-engines-murrine-0.98.2
-	>=x11-themes/gtk-engines-unico-1.0.2"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	local x=${S}/Zukini-awn
-	mkdir -p "${x}"
-	tar -zxf Zukini-awn.tgz -C "${x}"
-}
-
-src_install() {
-	insinto /usr/share/themes
-	doins -r Zukini
-
-	dodoc -r INSTALL panelbg.png README Zukini-awn # Yes, we want INSTALL!
-}
diff --git a/x11-themes/zukini/zukini-20120817.ebuild b/x11-themes/zukini/zukini-20120817.ebuild
index 1830c71ba052..86d498ceec3c 100644
--- a/x11-themes/zukini/zukini-20120817.ebuild
+++ b/x11-themes/zukini/zukini-20120817.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sping/distfiles/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RESTRICT="binchecks strip"