gentoo resync : 21.09.2018

25 files changed, 134 insertions, 728 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 1e842cdc934f..d67a134a34cf 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gtk-theme-switch/Manifest b/x11-themes/gtk-theme-switch/Manifest
index 154fabe47398..64c0723068f1 100644
--- a/x11-themes/gtk-theme-switch/Manifest
+++ b/x11-themes/gtk-theme-switch/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-theme-switch_2.1.0.orig.tar.gz 18914 BLAKE2B fb6eb46f16a6ede786e7afe62ffff81bde7a4473d000c6a068b7e506d0d7536554d59d451f594ffa2ae5cc04ab85cc854b3fa83a4a6169e1fca02e4c6da61dc1 SHA512 ccf3876ab764f0a6a5d764aac9912ecf1bf7c92eddf8d38ab153c4ac2772151c67af59762e2cfb6aeb33baf33a141824e0825be0f3a8de4675c577198cfacf2f
-EBUILD gtk-theme-switch-2.1.0.ebuild 796 BLAKE2B 6b6b3a02ea650a5a4203957cf2e5e9197ecb9723649ad3f1a2b88223f6eef78aed9d897fc228a5128f9f17240dea371b27ebb76a61e5640e24c120da81208fe1 SHA512 5e07f443d96e00ddb6fde521b75b86eb457367a0d0e24c8dfa6c7e138b858f8c7a4bb46495e32dd6819080999b87525ed48401d9ef49e9c64d203eeb014f24a1
+EBUILD gtk-theme-switch-2.1.0-r1.ebuild 785 BLAKE2B 8c80dd84d31ebb03ee89480bd430a57f36235e3a624a458803e530942ced1e8430fd5f762dc2cb23569893f93b59f8904585ac752c2f79facb594fa51efcce39 SHA512 9721abbfd4c694e0b22b6edc2d20d6660f7f8d038ba92e5da448cde7da7114d0dda63f9090475f47b2be0f98b8cf6d3bdc8299a6ad773b18ea8b26ed3150bf4b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
index bed77a882361..6d5394a73d22 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Utility to switch and preview GTK+ theme"
@@ -18,6 +19,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:${GCC}:$(CC) $(LDFLAGS):' \
 		Makefile || die
@@ -25,11 +27,11 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CFLAGS="${CFLAGS} -Wall" || die
+	emake CFLAGS="${CFLAGS} -Wall"
 }
 
 src_install() {
-	newbin ${PN}2 ${PN} || die
-	newman ${PN}2.1 ${PN}.1 || die
+	newbin ${PN}2 ${PN}
+	newman ${PN}2.1 ${PN}.1
 	dodoc ChangeLog readme todo
 }
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
index 845ad0bbd1b4..a9b32d1773b0 100644
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@@ -1,30 +1,6 @@
-DIST mate-themes-3.16.3.tar.xz 4304720 BLAKE2B cc16529451c03568d593c213621d84fb7c9a57c26aeca034b49574e9f29ed354b271a1aae76bd28b55adc221ebbade09bee5178b370cc8005470a39d6a8dfb10 SHA512 6edaec87c830bb88b9500ec106259e62767bc333d75bc4025866c42700c4cf8e2be0ab6c9d6b9518c5d89a5fc6cfc928eac3102c4354ef4cdd181f1e30eb5dfc
-DIST mate-themes-3.16.5.tar.xz 4307832 BLAKE2B a50d09718145756e23d7a00d8f15e25a97ad66b47cc648129017c8043edc4bd40b246a44b806eea51b15bdbe56cf209b168b2d0522b2c13e30b71b251a13bc50 SHA512 157c84416b0df0bc72bb84e0952cbb58b7314cbe347d9e9f1316ebd5633063eba69c740e64829167e28422649bee66d1e34e5cbf66fb282d15887db188935e08
-DIST mate-themes-3.16.6.tar.xz 4298004 BLAKE2B 30e13430008a123f4e03b861119d46b11500fee01d745b955a78c3a996fbef979f1d7bf56d682c7a83bea1989d2cb8a20e48c68c0becd250da4b7f43e27bfb70 SHA512 28e216765ffb7fff0885e7be9ba8976e962ffd6554db81103766d3c7023a812a504090cc89b33cf73e43b266762d831124646cde391a80681043d3ee2da76228
-DIST mate-themes-3.18.3.tar.xz 4326564 BLAKE2B 77f50f643bf6803b8590c046303835be615797e8863a5f1f50f71104c2c4f5474509be752fcb147c26ef57d6b910f93e8fb6c722237338d47e8f53af449fd5e5 SHA512 7138c1e49b843116812e43ce723af57845bfef9d2e1ff7f455c57f02f613b0a8ef7da6f641ac76dbf8209207d75327c1e101f09e8ac76b4ffa497c0a6167fa39
-DIST mate-themes-3.18.5.tar.xz 4331036 BLAKE2B 1eab2dfd633de081215b6dd086d25bf5acf5388a5e10823b02ff8bb9e91482fa25050b8a98f96ba967a6c9f420f2a0adb9f45314517743aa7bd7efab90f52993 SHA512 941b04b02925d2d503ebc6568857a87d82cf8d675eae55ff04d87fbadebae1133b8889b76c5b081191413d54916976a5e78dd6095805b940fab127564fd06190
-DIST mate-themes-3.18.6.tar.xz 4325356 BLAKE2B ae2dcbfda667eb74eb25b818d3f21c59db663ac0774429bae25bd9cc41db099e2abdf1ae6831ca0875bbe637a259f6de71f667d25a32e904b4fd10bb33a18476 SHA512 aa6a7dd54fa872efff22f555ecd78f909cf493a6bda1b64d08b933297716503f92b139421c5fa9f55f6748025542520993c4fe1cd745f5db225be9e0e4e0bc4d
-DIST mate-themes-3.20.10.tar.xz 4254436 BLAKE2B 1f2cc05d1be712e47877f7350acc1f75975cf9bce56fcc3e37a5190a10d7e2bcf1448161716abcbbcdf590381365500fff119192ceaac68152c2ce4d4c5e563b SHA512 23f3e26c914480e85a4d1792e81885f720042c46b6850bc0096cea5d59112ed22f83fa79d4fb85a96d1b4210c5021179e8ac7cd1a3cfe4f640d1573349cf0895
-DIST mate-themes-3.20.11.tar.xz 4252692 BLAKE2B a723b19b4a62c38c302f5dddf3ad34bf4a42222c8e816d55c4924834d27ccb46c625eeefa67ffc2582d1e305c0cce90f4d225ec24bb757c83c9ee436b6b4525d SHA512 9c437385be1e4476d6ec5caf2dd1170c3dc700f19eb00108edfc45ca9c8a9b63ffa0f71da3b411c1f6546963b47efee28cb3a99fe5e9d9d61a4dbb65fc129c8c
-DIST mate-themes-3.20.13.tar.xz 4260048 BLAKE2B 165a4efe418c5767bc958022a5ea39d9a6bc9d65056c36f79dfdc9fb50991ddaa7828b4cad4af9364727325a772df6d02fdac98a15ab13af5bc3c2c9cc422762 SHA512 bb2d513d417ffe58e6e2b0664b63a81c3d17539f2926a99909595560f8e89c5b6122e5d0392e8c485c941a9af6194e82d52d270eeb4d2a0e2f91c68b5ae100ef
-DIST mate-themes-3.20.16.tar.xz 4263684 BLAKE2B 05b0298759b87c64f4179a59821ce7790a492e1f457f5d61fce5c69ee04b4554116c0559bd54b10a925fe17386618bdd4e28988ca8b3f76ee8edf1c848789bf5 SHA512 1f45f221a6715b2cb642d316533d56034e0b9d832ef9cf9a2fdafd25793c0f24a6ffa188104e854d4ad44bce828565958414d75d4ffa748e46d6d0a1f45c81f0
-DIST mate-themes-3.20.17.tar.xz 4258980 BLAKE2B 83f28e62e6fed0f225e625ad9ea51c1fd94b74a08b8db642ee999e04a81529e405ce3071f44f8a26656e87a38a4fecb0e72014bfde9c33f1ac15fbc12b17c2fe SHA512 2ec2a498c66f1fc94bff79c415bef1224036de342575d4459890e6b19b1c7a4a413e2715115ff730d2715f8d9552083b398d23db2c99ef750e8c59afa0f8042b
-DIST mate-themes-3.20.20.tar.xz 4266764 BLAKE2B b73c3f1f22293a42730900097bd20afdd4c3e2f0af473019e7f957978a2556c4ca8599ce905bdba90cf717b980a111c0efdb1a8c2381d5dbc7400c9d4d8c9456 SHA512 29e3debd9fd5181118ef93abab535093315248d48c9fba96de73580aafc8e9df2d5c7ed4b9d39c9f4f445c2b71b15d13391b2c2e58bbf784c1af1267a1956f8b
 DIST mate-themes-3.22.11.tar.xz 4268704 BLAKE2B 7a85bc6987b2d530d4ecdeebb7d1d9c4833a86ec01b7d734d0b88b8ef829035d4e4f9c5c2afda06a91c85f06db5c96fb6c0944539b0053f450d51ca0dee62c05 SHA512 e8f36ed93485b8229370cb9a009e2473695477574ef2d70f638ecc5757b4d387a0e59a5eadfad5a5c240460cd61f594ee56be015730cdaf62490fc66a652c234
 DIST mate-themes-3.22.7.tar.xz 4266344 BLAKE2B 4ae92fdea650bae3bcbe9be324b5457b5df4617dcb572c25637cc94228b452c792dc99b15430ba288941dc76c7caa643970bb7336856a1ede8c5468a3cd6c157 SHA512 bf44841686461fc55238bb3d62a6bdccf41e23116b321787dae2c4995ab5c5df7c9431dc7c831473c0a78867eb10f6142554434991a7654fa59ab3f76eafdca2
 DIST mate-themes-3.22.8.tar.xz 4266436 BLAKE2B 65e6ab39455b791f58a05319367106ba424ad4797d0e376c3578e6296bf51733d782a7ee1be5811103d966f8c53735840bccc233cf62515a42eb444207bfbd43 SHA512 1ee02a93ff03a2e2c50c352e9a4b2fd3f093a8d7990fce36bc0d3af65501202a281904bee74c095eda549b1be9a50bf4a293071cf0980fced8158df97d986d0e
-EBUILD mate-themes-3.16.3.ebuild 1272 BLAKE2B 14ecc23e8f624f9d456a4593fab8f06fb92ad9a91836594534bcf5058d567000bfbf27d98c2fd8ba5f7a6063b2188575968195af0cc76f9df9bf73483d80de91 SHA512 eb48d15408e292e5353166bd176034ab1976b3ce77e224021f1b4c20289c87a47cb54c359abc25bc04c0ed46ec7ec934385f3eb08aa52774a72c66c8ab0d7503
-EBUILD mate-themes-3.16.5.ebuild 1274 BLAKE2B a2988375fe7c3085c7d5b20f0c577533ff815266058b28a100de273c12363ffb0d19d1449f91a331752ab899bcf1ef31c8c1397783e55b6174b45bbc5577a27b SHA512 b2906a65a56f564f1c802b209e70e8e027109f31ac70d1aecfe4df249713dc0d48b66be5d97ba7afa4a378904e334201a8bff7b5ef960770f635df3f8f086ee5
-EBUILD mate-themes-3.16.6.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
-EBUILD mate-themes-3.18.3.ebuild 1272 BLAKE2B 14ecc23e8f624f9d456a4593fab8f06fb92ad9a91836594534bcf5058d567000bfbf27d98c2fd8ba5f7a6063b2188575968195af0cc76f9df9bf73483d80de91 SHA512 eb48d15408e292e5353166bd176034ab1976b3ce77e224021f1b4c20289c87a47cb54c359abc25bc04c0ed46ec7ec934385f3eb08aa52774a72c66c8ab0d7503
-EBUILD mate-themes-3.18.5.ebuild 1274 BLAKE2B a2988375fe7c3085c7d5b20f0c577533ff815266058b28a100de273c12363ffb0d19d1449f91a331752ab899bcf1ef31c8c1397783e55b6174b45bbc5577a27b SHA512 b2906a65a56f564f1c802b209e70e8e027109f31ac70d1aecfe4df249713dc0d48b66be5d97ba7afa4a378904e334201a8bff7b5ef960770f635df3f8f086ee5
-EBUILD mate-themes-3.18.6.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
-EBUILD mate-themes-3.20.10.ebuild 1272 BLAKE2B 14ecc23e8f624f9d456a4593fab8f06fb92ad9a91836594534bcf5058d567000bfbf27d98c2fd8ba5f7a6063b2188575968195af0cc76f9df9bf73483d80de91 SHA512 eb48d15408e292e5353166bd176034ab1976b3ce77e224021f1b4c20289c87a47cb54c359abc25bc04c0ed46ec7ec934385f3eb08aa52774a72c66c8ab0d7503
-EBUILD mate-themes-3.20.11.ebuild 1274 BLAKE2B df905c3edeb2bfdb165f81906d418642e90731b13ddada625a0c677b5e705df6f98270dc9e2fe1406b32f8d75d3bcaf15e934e0013771c4dc2d91d9700ccc8b6 SHA512 f71bb6b55d1cb15910c9d60a1b8fe3d4ca982badc1001ea1c7aa24e3e0c97692bcce2e52b8f54aced3cd77b5ca51912eabdeade8342fda0a5d0554c3b0e41b28
-EBUILD mate-themes-3.20.13.ebuild 1312 BLAKE2B a9ba39760e5539c8f7cc47d5dd426b9e740377b5b76bcce4dd9df5646428fc365699e1e3e195921706572f33c617432a1838bf8e75de2618b74f8d42ca57430d SHA512 85aefda8ff8b6553f92fb27517ae30f30083fe62c25d1114da4e2a95523a8693bd8c2baf061a20a7d3f847b19e08fb9d56da5d59cebf3624139c9a17886523ac
-EBUILD mate-themes-3.20.16.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
-EBUILD mate-themes-3.20.17.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
-EBUILD mate-themes-3.20.20.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
 EBUILD mate-themes-3.22.11.ebuild 1317 BLAKE2B cd689979f3f3141d547561a67bdc0f1cee30ae5e23ea78a27b62651197f717b60d4b0cc91795ea022cb43846e420ba11db8c0d05c3d328119c93363b5481bf5c SHA512 51275e079d7d7199441c622cf27c2555d9e5069edd6f63c45b8a3f1617c8faf7026ac429b0521b0ee8a376c930265fdd98f5c339406cdb0334a2c991fc9c72ed
 EBUILD mate-themes-3.22.7.ebuild 1310 BLAKE2B c5df46bb43cdc391d093c7473e334486eab2fc26a146bbbd52fb2f5b537dc42ac7a419ae4df22c3565b7b4e5a34f0df785f4dfe8525f8b1c2144f63071b324d2 SHA512 ed65bf13f0dcb31e42eaf7b43d090a1fada0161a40bf204b99fbfed10f29411b39cfbbb543222174a13f7aaa10ca667ac5e0048ba5c6ab445ab3f956a5ac2950
 EBUILD mate-themes-3.22.8.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
diff --git a/x11-themes/mate-themes/mate-themes-3.16.3.ebuild b/x11-themes/mate-themes/mate-themes-3.16.3.ebuild
deleted file mode 100644
index 672c0d9c8eed..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.16.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 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 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}"
-
-RDEPEND="
-	>=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"
-
-DEPEND="${RDEPEND}
-	>=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.16.5.ebuild b/x11-themes/mate-themes/mate-themes-3.16.5.ebuild
deleted file mode 100644
index 6e88f31b8f6d..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.16.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 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 ~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}"
-
-RDEPEND="
-	>=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"
-
-DEPEND="${RDEPEND}
-	>=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.16.6.ebuild b/x11-themes/mate-themes/mate-themes-3.16.6.ebuild
deleted file mode 100644
index 55aed57590a7..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.16.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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 ~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.18.3.ebuild b/x11-themes/mate-themes/mate-themes-3.18.3.ebuild
deleted file mode 100644
index 672c0d9c8eed..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.18.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 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 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}"
-
-RDEPEND="
-	>=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"
-
-DEPEND="${RDEPEND}
-	>=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.18.5.ebuild b/x11-themes/mate-themes/mate-themes-3.18.5.ebuild
deleted file mode 100644
index 6e88f31b8f6d..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.18.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 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 ~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}"
-
-RDEPEND="
-	>=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"
-
-DEPEND="${RDEPEND}
-	>=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.18.6.ebuild b/x11-themes/mate-themes/mate-themes-3.18.6.ebuild
deleted file mode 100644
index 55aed57590a7..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.18.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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 ~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.20.10.ebuild b/x11-themes/mate-themes/mate-themes-3.20.10.ebuild
deleted file mode 100644
index 672c0d9c8eed..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.20.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 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 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}"
-
-RDEPEND="
-	>=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"
-
-DEPEND="${RDEPEND}
-	>=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.20.11.ebuild b/x11-themes/mate-themes/mate-themes-3.20.11.ebuild
deleted file mode 100644
index 85b67d5016ca..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.20.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 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 ~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}"
-
-RDEPEND="
-	>=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"
-
-DEPEND="${RDEPEND}
-	>=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.20.13.ebuild b/x11-themes/mate-themes/mate-themes-3.20.13.ebuild
deleted file mode 100644
index 199b880e97ef..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.20.13.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 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 ~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.20.16.ebuild b/x11-themes/mate-themes/mate-themes-3.20.16.ebuild
deleted file mode 100644
index 55aed57590a7..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.20.16.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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 ~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.20.17.ebuild b/x11-themes/mate-themes/mate-themes-3.20.17.ebuild
deleted file mode 100644
index 55aed57590a7..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.20.17.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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 ~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.20.20.ebuild b/x11-themes/mate-themes/mate-themes-3.20.20.ebuild
deleted file mode 100644
index 55aed57590a7..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.20.20.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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 ~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/notify-osd-icons/Manifest b/x11-themes/notify-osd-icons/Manifest
index 872a133188eb..e3304a54a93e 100644
--- a/x11-themes/notify-osd-icons/Manifest
+++ b/x11-themes/notify-osd-icons/Manifest
@@ -1,3 +1,3 @@
 DIST notify-osd-icons_0.7.tar.gz 518154 BLAKE2B e487277b9f3655a9c72b5db8398057bc49921103a7b341d82c2692a57f70949712673fb98d5f93da77752571da656e01ed13514a59f74e05d67ab5ffca6a61d8 SHA512 3e50f54d3edbecf525491ce3d2d7ab41228d40d3c55b904babfa84c7760a5ef2b685361bbfbed1c1072a737f0492745c2e02edaa08a5d2aa9da099cc3d8266d4
-EBUILD notify-osd-icons-0.7.ebuild 750 BLAKE2B 8332e47358ca305419648aabd92b76798f35afe139bffce2d9231b1fcbe8f351fe4a1e6ca7680dcc686d49938b8429881d50c2728f713797fa31e3d3653d888d SHA512 97f530115b6829484a0671898e26cdf70a7f0dbb726777241e016ec15b38ca89c5d18c4fa46889d5e0d726bebf3bfc51dc85f031361ba3570a5463ae4bb7f6b4
+EBUILD notify-osd-icons-0.7-r1.ebuild 722 BLAKE2B 0b6f2ddb2047122df54eb09d637665b014f1e1bc0e022c81d943f9fc9e7745f4834920e081c33f02d9964c908321dd458296fa0a108976a092f8edfcc38edb82 SHA512 ec2797f7bb8950b84b1f74a0b0210961a42cfd6735173216172bb1013bc1249b12cf88823a862f0a609f62c0e8814b8d9a22b2d9a920f976e304f43d2d504f64
 MISC metadata.xml 250 BLAKE2B 138c4f4c717e9e24abf19f3d4cb9a8a8b49761ac301ac26b527c86802bbc509a4afd2678adb71bc3a9ef3d0ea17438d57d03211627bcf6ace221f08f39151f56 SHA512 0bed48908552a27396c77549264bbb7516677909afdecd967cce446529ea944c8f9ddf167241a033ca790123be27f8e3a4c503954100f9ea076f40b8ef5b0209
diff --git a/x11-themes/notify-osd-icons/notify-osd-icons-0.7.ebuild b/x11-themes/notify-osd-icons/notify-osd-icons-0.7-r1.ebuild
index 302e7e912042..0280f86f587f 100644
--- a/x11-themes/notify-osd-icons/notify-osd-icons-0.7.ebuild
+++ b/x11-themes/notify-osd-icons/notify-osd-icons-0.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 DESCRIPTION="Icons for on-screen-display notification agent"
 HOMEPAGE="https://launchpad.net/notify-osd"
@@ -18,7 +18,7 @@ DEPEND=""
 S=${WORKDIR}/${PN}
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
 	# Source: debian/notify-osd-icons.links
 	local path=/usr/share/notify-osd/icons/gnome/scalable/status
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index b06ddb3fe388..b069db6ebfdc 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -1,3 +1,5 @@
 DIST numix-icon-theme-circle-18.08.29.tar.gz 2095843 BLAKE2B b39bd5eaf3c9ec4156a71d235059b28d049ddf25ec600a5f3a782e4b51149d0e7eccf37379a117ae7471a3885f7a529989f9085419864975afbb07a325bda629 SHA512 433c343730b23dd3969903f85d7ac36d40a4723f342b259e8136c1fbe35b7af8c17227541f3ccacffbeacf2873547c9327a1c5f0d522da04483719606e26293b
-EBUILD numix-icon-theme-circle-18.08.29.ebuild 658 BLAKE2B bdf504c4bed139c463f9f53bf909566572fdcbd839df81d3f3a2865b5261b82de6b3f4d43d4d30b842f1f0f656d37fd1473e72940435ac29f03c0367ccbb7aa9 SHA512 03dc8c0bfe49741f67202254481b9a6527f254485bd103d5a96fd526496bc2f7d38fdf8f8a5de70f152817b3061a8302597939f7b082b8c7f758ed3128598914
+DIST numix-icon-theme-circle-18.09.19.tar.gz 2196678 BLAKE2B a58ab5381f4ad1e441d188c1b7db0836b025d57c4075030c0e83a12de7917cd775be7bb8ae686afe302188232569c67d21772c119102a30d4bc717f301b3e44e SHA512 ace6c50ec9e9b08aac579ae92a44ba48494f2f22403e233c5ec00bb967c9bb6b70e785fbb061bfc9693db4de0ee90023af66c66e6984bd36d1e92be5f68afb02
+EBUILD numix-icon-theme-circle-18.08.29.ebuild 656 BLAKE2B 2b8c3adfbe332b3d7756d932436dd91bbd4bb3980e1c771a3a40e34d84089fbad6bc77302bf9ea0cb71dadc02e3e85ae13f95cc70dbd13bfc8a79109fbfe5491 SHA512 13e9ef15122930c5bef8f06a69e9536cae6a87872d0872438989dee3422882e8a3c2d769eacbe3a4de6327a6d9563308969d1ffa6a77871b45314215548aa8a6
+EBUILD numix-icon-theme-circle-18.09.19.ebuild 658 BLAKE2B bdf504c4bed139c463f9f53bf909566572fdcbd839df81d3f3a2865b5261b82de6b3f4d43d4d30b842f1f0f656d37fd1473e72940435ac29f03c0367ccbb7aa9 SHA512 03dc8c0bfe49741f67202254481b9a6527f254485bd103d5a96fd526496bc2f7d38fdf8f8a5de70f152817b3061a8302597939f7b082b8c7f758ed3128598914
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.08.29.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.08.29.ebuild
index 52eb0e5b258b..120351952d3d 100644
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.08.29.ebuild
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.08.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="x11-themes/numix-icon-theme"
 RDEPEND="${DEPEND}"
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild
new file mode 100644
index 000000000000..52eb0e5b258b
--- /dev/null
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/numix-icon-theme/Manifest b/x11-themes/numix-icon-theme/Manifest
index e940ba263831..1db0596b87af 100644
--- a/x11-themes/numix-icon-theme/Manifest
+++ b/x11-themes/numix-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST numix-icon-theme-18.07.17.tar.gz 4415673 BLAKE2B f2bd9342dfb914872df429edc756eebf457f2938cb9db28948bec308eb9cb533268103957a2cc3381948ba4cc1405c82f3cba225bc1f956304119fdde4503b4e SHA512 dd71dd5b05df9f00b9a3d066ce9ad44aa2959d0fae5083a2203d0562b774c0f7d25edf278a285a4e3813fb7d4346626fafc6c6d947cf9d510beb320839dbd757
-EBUILD numix-icon-theme-18.07.17.ebuild 584 BLAKE2B 6542c6a64a54e29f62df2f10b7171616b60db4333edfa37ce409358048c442d73714e675fe671f233cbcae9c520f58087879ce44540be0acdd321c698f525585 SHA512 fb76ade5da3254c65f31a36bbde0d623fcd53a7f5d06d53ade036d6b3dc68a756dc439be1727bed9da7d0b16bc7ad6ce6a126f2de0dfc88c46052b96597d5fbd
+EBUILD numix-icon-theme-18.07.17.ebuild 582 BLAKE2B aea30ad1f01578d5129b32f2cde29322eaa2879903a9a0b511cdade93d70f59fd6ea9a35f6c78a292ffb30db6b9b3de6156658f3414eca78452255b3ff2c8d7b SHA512 9959acf8bfc718eb237f701e103ada92e81bbf8d5399557140ef284b699d45274a3a1f20af5e9bfc423279c363cfddbfebdf4f30680b608e1b4072063db9a750
 MISC metadata.xml 334 BLAKE2B 958781b2c06e602c5d2da02305394e45b0aa20630e5825183f2c04b4acf04cdd997bc36dcea917e84eae0a1b8b736202f676cb2258de419a4c2b6406999a60d4 SHA512 afb3b61e88c013843d7946aadf00bdf2c710ceda801a0f5649c889fa5aa0e8c7c658d356211c1b4db3d153d2bfd7bc75f8dc741e862b79698e3f8de0f9ceea3c
diff --git a/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild b/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild
index c26f88fd4c35..ada198a107e2 100644
--- a/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild
+++ b/x11-themes/numix-icon-theme/numix-icon-theme-18.07.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/numixproject/numix-icon-theme/archive/${PV}.tar.gz -
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_install() {
 	insinto /usr/share/icons
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 37ec56c3d5ed..b7e8a97d51db 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,6 +1,8 @@
 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.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 1940 BLAKE2B ed736138e4e148f4aac0d8ec5e5982d16c15f3a008a6970e08849f9d45582b60de2e8690991ef5974e99c6f9810060d2616e3377c3dc940b5eaa398cd44fec57 SHA512 c26975371d232e637b2104eebf8146509a1e293f719595b8d17e3c5368e6de3288cc40e60f6d733be5c78e1b1d39e1b7260125fbaa834c8600ab19b4f52e96f5
 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.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
new file mode 100644
index 000000000000..3d7024de6a83
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
@@ -0,0 +1,87 @@
+# 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/v${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-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
+}