gentoo resync : 03.11.2019

36 files changed, 284 insertions, 252 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4bcb916f571e..4e3574bd8cd8 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 59c49e9595be..ef27d9f1183c 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,4 +1,7 @@
 DIST arc-theme-20190330-pngs.tar.xz 87632 BLAKE2B a860abe61d98c1ba2c7e13d21cb24e74e110b4e075eb53fc0d34b5e84eeed345a9b32e948e673b445d15e74b4c27991408139861b2d80124c8d97e417ecb3fb3 SHA512 0421530b99ebbe286e111477a056e17e7aa23a63e8c7d63443c4ffcdcb053f191a05fd16e54d9fa4efa9d1c870ff500ffb0c519d6604d6d7294cc1da711de5ba
 DIST arc-theme-20190330.tar.xz 227936 BLAKE2B 35815019884c55ce2d22dbb2d78892c00b35839b017fb7f0c1e9e1f1bad1bf94703e0c15205045eed96add556381c28fdd702c7657226fd75492304abaafd41d SHA512 ac4f1bde028e027314004999502dcc914abf6070ffd4345021df486084de2c943e6c110776b3b6af55143962a40b368c060a11754ffaf30300b87cb923bc55b9
-EBUILD arc-theme-20190330.ebuild 1949 BLAKE2B 62fa7b1c68cc190ca4b0946500e63c43082b598870d1be9bc103c931828c6bf9aaeae8db723e15aafa4d1bb62126c0b652c75e18c1f82d7f77e3e0cb9835f5e6 SHA512 17f81d3399115acd878d80ed497efa5801b235d24ca7b97b3a253506f7b13f9c07318d8c4dbed1d7bde9deec1fd5e9afc100ef2effa37d2252a91d9dfd90a095
-MISC metadata.xml 903 BLAKE2B 32d83b7fa5f836c4faa371b381b3d9487802ea7939c1bfec0d39e18f7853131aeac99b30e244a0f60291acc0d4fc1932d4350732184fc1374ea445f6fcb1424e SHA512 8238f6b4342d0ce1d9d8622bd92c77f123f92e2453e58a660e35c24340c1dc9dd1581f779b8b038c2f782216971a454a54cd6a833354960a1a12dff3e83f1376
+DIST arc-theme-20190917-pngs.tar.xz 87664 BLAKE2B 8f4cd7cf4eaeef6e71113178776e35f81df1c7a86c5a4e1727ddac9e2c18f81ff51f0b8c2ca578c176fddb969fcbdef7135080c1a8851f56e1b1a33d8c2b86e6 SHA512 5ded6dd5f0c7067c8abefef8fae4620caf795f10b5fe46c30ab7b430379f3b3e2eb27ec85c752bb4a77288a640bcf6a5f4d60e19a97f96af1b31143014afde37
+DIST arc-theme-20190917.tar.xz 308592 BLAKE2B 0ca3b6bb9c501891243755984799c404645a524fd5e65e6ed5d509d3c3b0b54d60a2219030b86d6e8a19a12106da832ff4a4fcd35ff1f02766b57d104e9e642b SHA512 da3e98e696160542fc77678193ff4fdeecc1cab7b4c1ec57e1bd850486a80547e1d688c9784f5ef422f097449f1105c071a3ff917c25a6a315fe970bedf10c6f
+EBUILD arc-theme-20190330.ebuild 1947 BLAKE2B 6b57679c082fd8cfdd6f9838737b6a6687e5a7e335233636457cda58f387a4271e4329854d5cdd1d6015d7ac1b694b7ecb9e32e00a146949a9b52a6094511fb4 SHA512 1200c505dcc9a24ad2a1d7e74405e1190ff59a5584bc2674703fc86ab72ea993476f1b2d205189f04f397f168e94eac65ee2f1d14c182593410e36fefe9d1992
+EBUILD arc-theme-20190917.ebuild 2065 BLAKE2B 080d0e58c39d3cd2ce704c1b6f899b34447b5074d9c39f00ea193fffa4130d602c148a85d31ddedca29d4ae9a62e23847d1c6bad2ea53d6ec2aa48e3b8650584 SHA512 7a8df0c74028139ee5859a29b210994eda114e62e7c0ca14030db5632e7cc43b17b77110f785993fcfaeda691457faef226de687a9a83c2f0a42bcc38ac1dcca
+MISC metadata.xml 904 BLAKE2B 98f5e710287c3dd33fef6ce5b2489fc9bd007d98493e58a9ad61b3dcb68eeadf8bdbfe51fa56e3219d7c1a725517ea77496affe525d110ad9e18353738db9cc7 SHA512 a258fb23cfa69a8a6d774d8b5cdfc38b9513d5201a1b8b06034a7347a693562f2727f2a58d3f1147c6f203a6b15b26a08fae9ff3e4f87c5b011036ded5884853
diff --git a/x11-themes/arc-theme/arc-theme-20190330.ebuild b/x11-themes/arc-theme/arc-theme-20190330.ebuild
index 6ceb36af4e7c..1c13c2afb1e3 100644
--- a/x11-themes/arc-theme/arc-theme-20190330.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20190330.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/NicoHood/${PN}/releases/download/${PV}/${P}.tar.xz
 	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
 
 SASSC_DEPEND="
diff --git a/x11-themes/arc-theme/arc-theme-20190917.ebuild b/x11-themes/arc-theme/arc-theme-20190917.ebuild
new file mode 100644
index 000000000000..99e91d871927
--- /dev/null
+++ b/x11-themes/arc-theme/arc-theme-20190917.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
+# cd ~portage/x11-themes/${P}/work
+# make -j -C ${P}/common/gtk-3.0/3.18
+# find ${P}/common/{gtk-2.0,gtk-3.0/3.*,xfwm4} -name "*.png" ! -path "*/menubar-toolbar/*" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz
+
+inherit autotools
+
+DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
+HOMEPAGE="https://github.com/arc-design/arc-theme"
+SRC_URI="https://github.com/arc-design/${PN}/releases/download/${PV}/${P}.tar.xz
+	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
+
+SASSC_DEPEND="
+	dev-lang/sassc
+"
+
+SVG_DEPEND="
+	!pre-rendered? (
+		media-gfx/inkscape
+		media-gfx/optipng
+	)
+"
+
+# Supports various GTK+3 versions and uses pkg-config to determine which
+# set of files to install. Updates will break it but only this fix will
+# help. See https://github.com/horst3180/arc-theme/pull/436. The same
+# applies to GNOME Shell but I don't know whether that's fixable.
+BDEPEND="
+	cinnamon? (
+		${SASSC_DEPEND}
+	)
+	gnome-shell? (
+		${SASSC_DEPEND}
+		>=gnome-base/gnome-shell-3.18
+	)
+	gtk2? (
+		${SVG_DEPEND}
+	)
+	gtk3? (
+		${SASSC_DEPEND}
+		${SVG_DEPEND}
+		virtual/pkgconfig
+		>=x11-libs/gtk+-3.18:3
+	)
+	xfce? (
+		${SVG_DEPEND}
+	)
+"
+
+# gnome-themes-standard is only needed by GTK+2 for the Adwaita
+# engine. This engine is built into GTK+3.
+RDEPEND="
+	gtk2? (
+		x11-themes/gnome-themes-standard
+		x11-themes/gtk-engines-murrine
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use pre-rendered &&
+		export INKSCAPE="${BROOT}"/bin/false OPTIPNG="${BROOT}"/bin/false
+
+	econf \
+		--disable-openbox \
+		--disable-plank \
+		--disable-unity \
+		$(use_enable cinnamon) \
+		$(use_enable gtk2) \
+		$(use_enable gtk3) \
+		$(use_enable gnome-shell) \
+		$(use_enable mate metacity) \
+		$(use_enable xfce xfwm)
+}
diff --git a/x11-themes/arc-theme/metadata.xml b/x11-themes/arc-theme/metadata.xml
index ac2d19205792..cec57cceb9c0 100644
--- a/x11-themes/arc-theme/metadata.xml
+++ b/x11-themes/arc-theme/metadata.xml
@@ -6,7 +6,7 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">horst3180/arc-theme</remote-id>
+		<remote-id type="github">arc-design/arc-theme</remote-id>
 	</upstream>
 	<use>
 		<flag name="cinnamon">Install theme for <pkg>gnome-extra/cinnamon</pkg></flag>
diff --git a/x11-themes/blueglass-xcursors/Manifest b/x11-themes/blueglass-xcursors/Manifest
index d8a4fc3cd9e3..aad4f81031a0 100644
--- a/x11-themes/blueglass-xcursors/Manifest
+++ b/x11-themes/blueglass-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 5532-BlueGlass-XCursors-3D-0.4.tar.bz2 764792 BLAKE2B 04f43e7906cc9fc3a7d0d601e282e0d8e41076b18cea00d9427cc3fb0c84a36c293557d753df1c9b2ab9f1fa90e9a8814b0e7c244e278e477fa439e5251f7e09 SHA512 2d80a1a470e50c64c94a72e1bd553de10c2ff8e62e26fe348e3bc0c0dec18c0fcb589e3dfbc21c4032716d7a409efc0e42f361cf01f00d5829bde002329f976a
-EBUILD blueglass-xcursors-0.4.ebuild 1529 BLAKE2B 51ca945179a5d1f89e55d9adeb5df652480e8f870766aa5453d85dc443de3e90fb99cffe62e22851647d0a39812fb0f0a9cd0660b1cfd87f922c180cdc2ec7b9 SHA512 771b98dc0df698a8650066ecb595e59320ca54c23b0ce6f385c4f247807fdf7e6796f836802a89f7da94e2c222aa6a2c8678b0e91e462f627c616ab14428ddb3
+EBUILD blueglass-xcursors-0.4.ebuild 1423 BLAKE2B 7511f694bdfdf9147f1abd3546689697d6a3074fcc8f9b5e4cbce3ff53aef8999431e440d041c2fa201e95de46849605b484abccabe6d42d3946ba409c6eac81 SHA512 9553be023e77789a411c872cc4ca786b044db146d016dfa3a83cfae5bf34259e1c529f38e64ef62b3b9b55c9148426a38d7cc06fbfa1eed3084ebe7a1f28b595
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
index 3b72b7eb69a9..737c68f7943c 100644
--- a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
+++ b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 MY_P="5532-BlueGlass-XCursors-3D-${PV}"
+
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=5532"
 SRC_URI="http://kde-look.org/content/files/$MY_P.tar.bz2"
@@ -11,17 +12,16 @@ SRC_URI="http://kde-look.org/content/files/$MY_P.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P:5}"
 
 # Note: although the package name is BlueGlass, the tarball & authors directions
 # use the directory 'Blue'.
 src_install() {
-	dodir /usr/share/cursors/xorg-x11/Blue/cursors/
-	cp -R "${WORKDIR}"/${MY_P:5}/Blue/cursors "${D}"/usr/share/cursors/xorg-x11/Blue/ || die
-	dodoc "${WORKDIR}"/${MY_P:5}/README
+	insinto /usr/share/cursors/xorg-x11/Blue
+	doins -r Blue/cursors
+
+	einstalldocs
 }
 
 pkg_postinst() {
@@ -33,14 +33,15 @@ pkg_postinst() {
 	einfo "Xcursor.size: 48"
 	einfo ""
 	einfo "To globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/xorg-x11/default/index.theme"
+	einfo "   ${EROOT}/usr/share/cursors/xorg-x11/default/index.theme"
 	einfo "and change the line:"
 	einfo "    Inherits=[current setting]"
 	einfo "to"
 	einfo "    Inherits=Blue"
 	einfo ""
 	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
-	einfo ""
+	einfo
+
 	ewarn "If you experience flickering, try setting the following line in"
 	ewarn "the Device section of your XF86Config:"
 	ewarn "Option  \"HWCursor\"  \"false\""
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index e044b7a17dc0..d5df7c23c1e4 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,7 +1,3 @@
 DIST elementary-xfce-0.14.tar.gz 6265406 BLAKE2B 8f51e42224d4c458094855b1a807a726ec3f85ce3a9f0a676b8736d6c5d68141e137c4e7257e762dfd9d50260409c2da0cb954f23b96b4632ebeab818d050b73 SHA512 014d438699152585531942f1cff864f019c594b37de433831f3f941622b8cd5182e2537a114638d3af42f79409c0b0406bc0e71261688717e70a1914c9155756
-DIST elementary-xfce-icon-theme-0.11.tar.gz 7945508 BLAKE2B 2a313e72bb71deed37a69bfb4186d5133c1d6dc721c7364a7ee63aef80181421cad6100ad12a6585daf6e8f0256579cde6aaf29540561816071721b454231560 SHA512 77695f25cd09afa595fdb49b40b5b605f791ad498cb795aa441c51fd89e2e99e4effd21ade9f62aceccfd4b682d1f95b9656dae97cff17e6c7a1ce159d3672b0
-DIST elementary-xfce-icon-theme-0.13.1.tar.gz 6270817 BLAKE2B c4fa8b6de5a839dfaa564f2b850598d6d071912fcd892348e5e0c77095c89c47091351097c7e3a50eb9cc2518f36d23c1216aea59b22d0ef321235edae0a1fbb SHA512 6a0de74110a7a9d0052e469c930b518a7e4582fd499cffe4322b22148bc0dcbe62bfaf1181aa0f6e3dd3fe5eab85dacfeabc9d280303fb2377581e6ac93832e2
-EBUILD elementary-xfce-icon-theme-0.11.ebuild 1052 BLAKE2B 480ddaf6bac9dca4c3ec7d4a740c51fb43307ebb441fb14ef3d0f7474559a5c90c0d9ff24bcff919442d2f0948cbbfbc82a51258a4770d29ed1c66de68b408ba SHA512 258a0bf5e9168b5dd3303c06dca4544d55e978c8f4087792f34c78d41829f0902b146c413069514d50f6576c8765b7ac5f934a7ebb616b05595e817a02264ca3
-EBUILD elementary-xfce-icon-theme-0.13.1.ebuild 1073 BLAKE2B 1c48416af4fd9afbd59eee82680c064778baf692b4bdf61c238b1be359c644e8a09b88dafd2e3dad87da70864de1742a704c135d5543b7062350b18dc50e7df9 SHA512 7a16e39f1f6fb3ab1acac1dd6eb27cc96e28b37bbf7d158f878417c56044efbae20146aecc5c6714b58b6ad2971c592d06ff5974e8a428495b118fdcc9881276
 EBUILD elementary-xfce-icon-theme-0.14.ebuild 938 BLAKE2B cfac1dc61e002b308c84d2de7202d8ba71acf341a20d3d7c1f8f2216caddbe1aec0994c4740acd0bc89f7f0783599703793d475c78f4c302b63b8663c83cb2b1 SHA512 31eb588e6fa506138780997b542f5ef673ced5658f597f29de04f1a52dac2651f6b6db21d7d500c0de3d1bdad0acfbd3d5dd9566157200304526e2adb046ebe5
 MISC metadata.xml 346 BLAKE2B aadbfac92004404037c41af003c6db9a99e9ed48f35ffd7c8561a4a624ea43f31a7262cc913a8ce75df4280f1d557672696e880712db5cbd90fc2be92e261f25 SHA512 41a313ca1a567e691e144d3e0aa1110cc1fc4110c63d7a72e8acafb83805e278360019e31b8d387604f4f932a16e6c3b57b77a2a81f32a1cee3b4e6e492f26cb
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.11.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.11.ebuild
deleted file mode 100644
index 744d7ada4014..000000000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-MY_PN="${PN/-icon-theme/}"
-
-DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
-HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${MY_PN}-${PV}"
-
-src_install() {
-	insinto /usr/share/icons/
-	dodoc README
-	for shade in elementary-xfce*; do
-		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
-			if [[ -f ${shade}/${doc} ]]; then
-				newdoc ${shade}/${doc} ${shade}-${doc}
-				rm -f ${shade}/${doc} || die
-			elif [[ -L ${shade}/${doc} ]]; then
-				unlink ${shade}/${doc} || die
-			fi
-		done
-		doins -r ${shade}
-	done
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.13.1.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.13.1.ebuild
deleted file mode 100644
index 4ed05e3230f1..000000000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.13.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-MY_PN="${PN/-icon-theme/}"
-
-DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
-HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="media-gfx/optipng
-		sys-apps/findutils"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /usr/share/icons/
-	dodoc README.md
-	for shade in elementary-xfce*; do
-		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
-			if [[ -f ${shade}/${doc} ]]; then
-				newdoc ${shade}/${doc} ${shade}-${doc}
-				rm -f ${shade}/${doc} || die
-			elif [[ -L ${shade}/${doc} ]]; then
-				unlink ${shade}/${doc} || die
-			fi
-		done
-		doins -r ${shade}
-	done
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/fedora-backgrounds/Manifest b/x11-themes/fedora-backgrounds/Manifest
index 795cf3b001fd..bbd9e548d44c 100644
--- a/x11-themes/fedora-backgrounds/Manifest
+++ b/x11-themes/fedora-backgrounds/Manifest
@@ -2,10 +2,10 @@ DIST f27-backgrounds-27.0.1.tar.xz 20291452 BLAKE2B 14057cf872aed949daafd0a6e1cb
 DIST f28-backgrounds-28.1.5.tar.xz 158614448 BLAKE2B 8a2c98c3aa195512c000d2f0cb596fbfc85cfd49806ec6a204a1e6545b130f5d64ded68b0d25157c0ba2f1d82a0f026fb204e8fecb9756bd5bfed212f2ebf6c0 SHA512 2b97c947f59a24a4221588a4776d58d57c27668ecfc7370ec04e17b11aad2451df48b56d0603b9aff1f72dbedeae210f9c923cfb2c26ba1b7b1c12d7b0018384
 DIST f29-backgrounds-29.1.3.tar.xz 170130460 BLAKE2B dc7e8e25f8d65f9de8939e0468d49986f0228993920b49d53c2cfdc99c108218b338921657b790f30b3997a9dedfa51cae8f0db161b42fb723f2a2e4ea56a6b6 SHA512 707ecc56c5b0070b07f316dd9d24b9bc51a7b77e82049f7f693f4c5a828cba2d7731f14b5f2ea574875c81c60b1a490f55d9b655df936b6052e0bfa23eb171ad
 DIST f30-backgrounds-30.1.2.tar.xz 215810052 BLAKE2B 203a8d5213aab09de7e050fceb333092d77df99557d827930542cbe0443ff16f510b0fb66d294e63871ffb6e942e373eb9890e7eb139523b1573bc12e328e9b7 SHA512 a6b2c3d0d38a0bb76f987e85b584afe2ce8079f8667a3ef253deff12b96678f2fb92ab2f6d04770e9154dd3bb4bc0fc871d5c18da989e5fa7f9f61464d7b3322
-DIST f31-backgrounds-31.0.3.tar.xz 342995408 BLAKE2B 16ca7590eb199d19870fbe8c6caf7a5d753d0fa9ffa4845914f9ebee01165541b315ca26ddcd234969f08a4676259dace5d3e593ebe72d40bc8d8c58b0c17ed1 SHA512 e757dcf8cb6894fee0228b75016dd442c0969457e7fa4a54e1af90656ac38cc9a70a89a6cb2d8ed21fbb5a3b72bd31f21147520c826f01bf35414eac99870c4a
+DIST f31-backgrounds-31.0.4.tar.xz 317019080 BLAKE2B a6d3d8f1e41e5f0186ce4b4ffa052190d8422bf24db3c6fa02f1eda0d016af7cf58f8da9d1a391a8c2a46d1f1b2a21f2c889c6704a9e997262ae9a43447e55dc SHA512 77244938ef3bd3dff8d8327645373b368f10aef78cf15fa56045b3f6c76dee502a6682b4bb756e1c16f4021481f7ee2317a73273bb2e50abc729b5847db23718
 EBUILD fedora-backgrounds-27.0.1.ebuild 509 BLAKE2B d9c0d052e726f168d8514c6b66dc63d9e8989f6392359ce6207902cfee955fdb31b5eab2b57d27c9384f12c30acd433355f7bdbe1bf0ff9ad628349a40721059 SHA512 7623c567d138a8031f0714367d320735bd95b36929f585c0252067b337998a6705454f3c4e94cac0a2a7d016a647a94f4bf212ad9bd700609333618e98ffc2c5
 EBUILD fedora-backgrounds-28.1.5.ebuild 509 BLAKE2B d9c0d052e726f168d8514c6b66dc63d9e8989f6392359ce6207902cfee955fdb31b5eab2b57d27c9384f12c30acd433355f7bdbe1bf0ff9ad628349a40721059 SHA512 7623c567d138a8031f0714367d320735bd95b36929f585c0252067b337998a6705454f3c4e94cac0a2a7d016a647a94f4bf212ad9bd700609333618e98ffc2c5
 EBUILD fedora-backgrounds-29.1.3.ebuild 509 BLAKE2B d9c0d052e726f168d8514c6b66dc63d9e8989f6392359ce6207902cfee955fdb31b5eab2b57d27c9384f12c30acd433355f7bdbe1bf0ff9ad628349a40721059 SHA512 7623c567d138a8031f0714367d320735bd95b36929f585c0252067b337998a6705454f3c4e94cac0a2a7d016a647a94f4bf212ad9bd700609333618e98ffc2c5
 EBUILD fedora-backgrounds-30.1.2.ebuild 520 BLAKE2B 0f97ae78c807748db388857e3830a061081619edb02eb3b4fcf4cae7bd7c0ddde7915ba6de9a8abc7eae4abd83bdaaf6e043b484f1d1212d81bb801936d6f1ef SHA512 13a862ba14369d522ea2422052d56db356628afac82e4a8736d41458b08653921ed0ed411334e75ba88e2f227e3ca280a7d469ccf2f497199da19b53e8379f1f
-EBUILD fedora-backgrounds-31.0.3.ebuild 596 BLAKE2B 08667994190cffc366e39d2990fe5b67177202dda2f1381cb7297079667ee4f25c21e6beca7fe0bdea8d2bfac1ba51dff7a988586225c7d9e697b0b8d32780fb SHA512 96ec87909439c58de5693ef762f03c5a3e86dd0f009402e6e3b93e99abb52d3028e1580251dffc7d88ce041618802e0c901b65097ab841107ae52cb9cfc03602
+EBUILD fedora-backgrounds-31.0.4.ebuild 596 BLAKE2B 08667994190cffc366e39d2990fe5b67177202dda2f1381cb7297079667ee4f25c21e6beca7fe0bdea8d2bfac1ba51dff7a988586225c7d9e697b0b8d32780fb SHA512 96ec87909439c58de5693ef762f03c5a3e86dd0f009402e6e3b93e99abb52d3028e1580251dffc7d88ce041618802e0c901b65097ab841107ae52cb9cfc03602
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.3.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.4.ebuild
index e586436dce6d..e586436dce6d 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.3.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.4.ebuild
diff --git a/x11-themes/geramik/Manifest b/x11-themes/geramik/Manifest
index 2b77a960dfac..b5f67d922875 100644
--- a/x11-themes/geramik/Manifest
+++ b/x11-themes/geramik/Manifest
@@ -1,3 +1,3 @@
 DIST 3952-Geramik-0.27.tar.gz 352677 BLAKE2B f49013d0cb4f4c2b43e1351b5adab37d8be262574c09db12fecbdba078ef61ba89cf0c5b5f8d2d8ec770483c698b2b4921ccffe82de061557d976fab86ce4cb2 SHA512 bfd4ae1f8e021a14da79f45b86da41d6858aa1fca8ce21260aecef3b74989d73213ea12f653936ecc699a80e76a4edd9cbf039ab7f5347303aab5a89f3bd6e11
-EBUILD geramik-0.27-r1.ebuild 583 BLAKE2B 5efc66c58c7db7a9eb009d56b67f99e0660fd57df153c90bff5acbad0ff95443d51b53ea774c764750663b34dec4faa21ed1da1c95da73ffe620389be298ab20 SHA512 1edcb83d067f5cb4d1a53d61ac2ac88481980dfe64224a8613ab6cce82be611e0985619836a6a2277c30fd203338a855dc08c5497a7f481e0b39562c22a103db
+EBUILD geramik-0.27-r1.ebuild 442 BLAKE2B 7a65c66026e56f862500e1acd7c63cb7ea120d9502ff60ec878bd00d2342a7a8c29093db0905e1835301d50b48f73bb2b2b6d1809b44e8ed95d95bb104631f22 SHA512 9f0a99b8deebc98a3ada09d7160da2bdfe049ddf063e40e5bb57dc14159f5609daba0f11a290e56e7928c7e7bf693dae4229a527f463b19fa5d1cb54b7cfc40a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/geramik/geramik-0.27-r1.ebuild b/x11-themes/geramik/geramik-0.27-r1.ebuild
index 6b294f1c2f80..501f2c627ff8 100644
--- a/x11-themes/geramik/geramik-0.27-r1.ebuild
+++ b/x11-themes/geramik/geramik-0.27-r1.ebuild
@@ -1,25 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-MY_P="Geramik-${PV}"
 DESCRIPTION="GTK+1 and GTK+2 Geramik Themes"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
-SRC_URI="http://www.kde-look.org/content/files/3952-${MY_P}.tar.gz"
+SRC_URI="http://www.kde-look.org/content/files/3952-${P^}.tar.gz"
 
-KEYWORDS="alpha amd64 ~mips ~ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 ~mips ~ppc sparc x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="x11-themes/gtk-engines-qtpixmap"
 
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog README TODO
-}
+S="${WORKDIR}/${P^}"
diff --git a/x11-themes/haematite-xcursors/Manifest b/x11-themes/haematite-xcursors/Manifest
index 24e43501ae5f..811f624ff82b 100644
--- a/x11-themes/haematite-xcursors/Manifest
+++ b/x11-themes/haematite-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 19594-haematite-1.0.tar.gz 23514 BLAKE2B 275b46d77650a5aa3b7ff1f3f054b659df60063413cebc04bd4fe462a689ce3ee7d5387b1d3dd461642232ee97cc1f6f1d0749e30354d9bd9c242f96aa67f161 SHA512 3e135a10300a5a4fdda626a2b3831b4b715ce3ed4da53d65f185396d38f6239611806474ef2bb5060a0bf7250815007690ea8c15c49c25d0c55030fb11cb45d7
-EBUILD haematite-xcursors-1.0.ebuild 1327 BLAKE2B 4b566c504091c9e868a5f6fb5c1cc16f47967f2b578aad3535c142a314b97e4a0c4ec6a2ddd327a01bd258599a08f0f12c32ff7c2160bafe2d2de9764891f852 SHA512 a1defdc891f388f06c981f94a648d83665106dd7cc63f60a4592c98ed04e0d07307233439282282ecf13b56fd3dc9ac33af00143a89fc4c2d51e8df1ed1e2a14
+EBUILD haematite-xcursors-1.0.ebuild 1274 BLAKE2B 6887a327188a08654e4efa3cfefa267c583f13ec2d5b530f50a88ce9a8b5aad5574bf7b481fbd636c5fb00d91d6755741c305a7c0f9d6064e7a0e513f75b6345 SHA512 e4ad11f1760247b22cb4eda0d08712b2b28f9d32cd3ce3716515c9529965d3d9c9e08b6bc41bcb8bd5c75184a288bc8c47e4a45ba8a7dda5651ac5a1abdc25bf
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild b/x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild
index 8d8aec2e7980..dab4234c4ccf 100644
--- a/x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild
+++ b/x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
+
+MY_PN="${PN/-xcursors/}"
 
-MY_PN=${PN/-xcursors/}
 DESCRIPTION="A simple crispy dark-grey xcursor theme"
 HOMEPAGE="http://www.kde-look.org/content/show.php/Haematite?content=19594"
 SRC_URI="http://www.kde-look.org/CONTENT/content-files/19594-${MY_PN}-${PV}.tar.gz"
@@ -11,16 +12,12 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/19594-${MY_PN}-${PV}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_install() {
 	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r ${MY_PN}/cursors || die "doins failed"
+	doins -r ${MY_PN}/cursors
 }
 
 pkg_postinst() {
@@ -32,7 +29,7 @@ pkg_postinst() {
 	elog "Xcursor.size: 48"
 	elog
 	elog "Also, to globally use this set of mouse cursors edit the file:"
-	elog "    /usr/share/cursors/xorg-x11/default/index.theme"
+	elog "    ${EROOT}/usr/share/cursors/xorg-x11/default/index.theme"
 	elog "and change the line:"
 	elog "    Inherits=[current setting]"
 	elog "to"
@@ -40,6 +37,7 @@ pkg_postinst() {
 	elog
 	elog "Note this will be overruled by a user's ~/.Xdefaults file."
 	elog
+
 	ewarn "If you experience flickering, try setting the following line in"
 	ewarn "the Device section of your xorg.conf file:"
 	ewarn "    Option  \"HWCursor\"  \"false\""
diff --git a/x11-themes/icewm-extra-themes/Manifest b/x11-themes/icewm-extra-themes/Manifest
index a496525ec15e..bc1a70e0d6b7 100644
--- a/x11-themes/icewm-extra-themes/Manifest
+++ b/x11-themes/icewm-extra-themes/Manifest
@@ -1,3 +1,5 @@
 DIST icewm-extra-themes-1.1.tar.xz 2773992 BLAKE2B ac5aabf4702bdc0e894e5e7f219a3dd62d95937f40b779c85c56a543ae1f0c718d68324212a522c33493f0d571662bc013a86e1f7c9c3a1945fb82ef0d7f0353 SHA512 7cd56e9715d5ea6295c89c2ea72a4bf8046c7fd0e6a3a356e4d80b680ace1a69fb92e22ab83fd33fbeaeec2bef9649e616f8b8351aa9a8b9b621d630eae4009a
+DIST icewm-extra-themes-1.2.tar.lz 2746693 BLAKE2B 4b610a5f8aadaf5a890b1ca476b1667cb891e4e11028b3e1767d76d3177982a45fc4bce113ee054bc840d26f78b137086f64902832b74cb6d0fb480bee03e819 SHA512 60b9a939927f633f67b466fa1cd1d392b36d6267423eb7f20d18b14c621c4e30d28ffe3c950262f7e8663dadc393f68b7f4c14899c569affd6f7063d3088ffb5
 EBUILD icewm-extra-themes-1.1.ebuild 384 BLAKE2B 9d723b4f32bb011cb6aa72dfe9fc8a641f62845bf47eda20ca1cfdafc24ad5dfcc154b462257ef08bbdb910bcbca8878ccb54c0dc59e6168e6f38408aaa4f63a SHA512 5a52ec1c584085a3478df5eb0bba4c55ea60a2900359a29c9f3a83406debae1abb72da1dadd886b3f969d34628b3af7322041525950486bce3d51f4202d3ec34
+EBUILD icewm-extra-themes-1.2.ebuild 439 BLAKE2B 5d329825367a6e3cbb66fc23ea1b7dc05181156f34a669a43b64e62d858ce9a9bb332b239775d1ce6b6108aae570d152f01084a307b3d6ca42bd7f8216ef6e20 SHA512 c964214898f52a9db11a8d2efc938b84fb0778d62dac3c6b52a8d7d0eb915b3c192528af638e73233a47357c88c40a8609a85b0a26cee5736f355b49b0c3ab82
 MISC metadata.xml 344 BLAKE2B fc5b802091ec1e6b700e0d80d63ee5389f7c35a3a2642e02d9a10e0537fb4c3a3e2a0f4f0b07466d60f39522016f4736c1eed0f223fd1574030f388d8a59b513 SHA512 0234dc7cff1d3beea46e836314b2ca4b0927c93dcddb04ddedffe962f81c9fc88c4b9915400917dc789a0b9494158c701c1a296b3c682bbef3851f44b6b771bc
diff --git a/x11-themes/icewm-extra-themes/icewm-extra-themes-1.2.ebuild b/x11-themes/icewm-extra-themes/icewm-extra-themes-1.2.ebuild
new file mode 100644
index 000000000000..1892101ad089
--- /dev/null
+++ b/x11-themes/icewm-extra-themes/icewm-extra-themes-1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="Extra themes for IceWM"
+HOMEPAGE="https://github.com/bbidulock/icewm-extra-themes"
+SRC_URI="https://github.com/bbidulock/icewm-extra-themes/releases/download/${PV}/${P}.tar.lz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-wm/icewm"
+DEPEND="$(unpacker_src_uri_depends)"
diff --git a/x11-themes/kvantum/Manifest b/x11-themes/kvantum/Manifest
index 1a91c7305624..029036c1b66d 100644
--- a/x11-themes/kvantum/Manifest
+++ b/x11-themes/kvantum/Manifest
@@ -1,3 +1,3 @@
-DIST kvantum-0.11.0.tar.gz 2352370 BLAKE2B 9b0372e85cf00f9ca1133e053810e1011c210d556abd201b7ecadd6b77d82d617e884bfe23f032424032a9f8fd7b7fee83118eea2ca04586d3c208310621cb38 SHA512 6ee173561359f6f0e634808aefa29c7371a5a12810c8aa05cc36ab091ceba3cf53b8848123c1fb839d44101a565c85f389730ed5e4e37975d15486f3fbf14b99
-EBUILD kvantum-0.11.0-r1.ebuild 574 BLAKE2B bf19d46e0a7c7911074661346791e047d99070584026c0360fb346b793c030f6428d5bc49cf1decaa501fb0ca5d665fd2d09bf426d379ee0e7548260b168fcc9 SHA512 9139ab380ed9dc38d999cad5c10c0104165e93584f43200009cd551e7a2a2a527105d8eefe407a418627e81e14a92afd2fadc07b9671eb0fbecac273a43f11a4
+DIST kvantum-0.12.1.tar.gz 2445944 BLAKE2B ef637f8e3475a8c63b6da9cde3aeb4849e7ca656cfb3c2fdef341d9c9bb4fb4de19c3c1a99957a67bcf7337c6dc91f244968bfb54d9ec9e75d09f057c093c21b SHA512 a3c3c6418baca89b3d1d6c02ec370cde530882643dec3c8714f01cc8c36541b0cc7f124d605f8931086cd74eebd522b88a968bcf9cd1f7adea2028b359ff1de5
+EBUILD kvantum-0.12.1.ebuild 570 BLAKE2B ca317cfc72096e9799cf4ca1741e9f15034f4e06d84e8376ec30658ad04400605ca7476ff5149f61421d7e57dc61ec1d167e60a2eea22026496ce0a81fcab931 SHA512 1621ff86bd1d55e45caf82abe151cb41d27ca9d584248d3f0fed1c9fa060e028dbdb48dd65a60b2b881cc0e5a724487c24419aac1a9222e505eef0af5cd90d40
 MISC metadata.xml 252 BLAKE2B 11c8366ef963cda3ae7aaf5fa07d085bf57b6a5e00fd8033ce6bee3bcdbc6cfb8d385b64b924b5e02cf4be79d34e137b8e525bbd2c9446dc1ec5eddbd3235329 SHA512 43db8b1cda45f79f3a14df2735f53b1a1b8ce9d9aa101fa1863454c24015f2e691b686bde15667988f82ce74e023504ea9ff76e0459df3f1ac5191e678141a39
diff --git a/x11-themes/kvantum/kvantum-0.11.0-r1.ebuild b/x11-themes/kvantum/kvantum-0.12.1.ebuild
index b34ddc203319..7fb83f7f6772 100644
--- a/x11-themes/kvantum/kvantum-0.11.0-r1.ebuild
+++ b/x11-themes/kvantum/kvantum-0.12.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
 MY_PN="Kvantum"
 
-DESCRIPTION="SVG-based theme engine for Qt4/Qt5, KDE and LXQt"
+DESCRIPTION="SVG-based theme engine for Qt5, KDE and LXQt"
 HOMEPAGE="https://github.com/tsujan/Kvantum"
 SRC_URI="https://github.com/tsujan/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index 3fd4b17ff8c3..9d84fce3cf3b 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -19,5 +19,5 @@ EBUILD numix-icon-theme-circle-19.02.22.ebuild 653 BLAKE2B 797c9df13d53cbd894126
 EBUILD numix-icon-theme-circle-19.03.20.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 EBUILD numix-icon-theme-circle-19.04.15.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 EBUILD numix-icon-theme-circle-19.05.07.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
-EBUILD numix-icon-theme-circle-19.09.20.ebuild 655 BLAKE2B 8d544960483a02ee55c7b58ff027fbea3c995ef558acdb18f505c582e1e2056a921ff7edd52c675346feecd314e603c7ff9df668227a5766f0550d8f0442adee SHA512 f3e25bde3e6afa629bd65aee679d3cb4ce8e463ed2a6a6aebd1dbf81068cb2e052243a18e8c03154ab0f00c32b8b064045a577fb938514e32e4644e869b36e37
+EBUILD numix-icon-theme-circle-19.09.20.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.09.20.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.09.20.ebuild
index e552e442f10f..d88f88cffa05 100644
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.09.20.ebuild
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.09.20.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/obsidian-xcursors/Manifest b/x11-themes/obsidian-xcursors/Manifest
index 78b139bb4d00..7a87f27f748b 100644
--- a/x11-themes/obsidian-xcursors/Manifest
+++ b/x11-themes/obsidian-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 73135-Obsidian.tar.bz2 262096 BLAKE2B 9521f26ac749343f841bc307809619954e688cc8367a59bc2b3dabd38e065a1bbbf1c275e573101a048cbf1185542dc5636914a0e11088caf4a130abccebe7f7 SHA512 e705f1faa2d094b2aa7ca5525f687595ff619ad8b49e3b533a429ea4268550babe24008fbe8b53332bf5753825e9d6d13e2e8ff9049fdc55b44b1ff64c70ec6a
-EBUILD obsidian-xcursors-1.0.ebuild 1305 BLAKE2B 1782735284c19c20b2ccdf59f7b4d48153d1c2ff86ce83089cb789663275ddc7b7eddb9fca69153b658602d4e6481cdcfc86bcdef33f55149611843b4bab8b4c SHA512 19f5881ece1763cf11d9cd3a17dcb40b4e998f2476a307e76567853be6681b4480c845d9a98b833b18232359995f6832e48e51f6b40e6e2112ca4d49bfde1b18
+EBUILD obsidian-xcursors-1.0.ebuild 1250 BLAKE2B e30f437c1513e3c249bd002ba7e4b346d9aa36a2c38a4fcf0c4d7037391ecc866bb558c54d5187d870fa11c5b9fd0cbfaf43970b67ee07f206be3a21ec5cc64d SHA512 5692f65e051663b044ae101ed03d428f668e74438ed349e90fc2be1547ddf91cc6b050f92b6369e7a67ebe49593ff24246255e036a48d48e24032150b711830a
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild b/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
index e7f002283bc3..8e5b355625e0 100644
--- a/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
+++ b/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 MY_PN="Obsidian"
+
 DESCRIPTION="A shiny and clean xcursor theme"
 HOMEPAGE="http://www.kde-look.org/content/show.php/Obsidian+Cursors?content=73135"
 SRC_URI="http://www.kde-look.org/CONTENT/content-files/73135-${MY_PN}.tar.bz2"
@@ -11,16 +12,12 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/73135-${MY_PN}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
 
 src_install() {
 	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r cursors || die "doins failed"
+	doins -r cursors
 }
 
 pkg_postinst() {
@@ -32,7 +29,7 @@ pkg_postinst() {
 	elog "Xcursor.size: 48"
 	elog
 	elog "Also, to globally use this set of mouse cursors edit the file:"
-	elog "    /usr/share/cursors/xorg-x11/default/index.theme"
+	elog "    ${EROOT}/usr/share/cursors/xorg-x11/default/index.theme"
 	elog "and change the line:"
 	elog "    Inherits=[current setting]"
 	elog "to"
@@ -40,6 +37,7 @@ pkg_postinst() {
 	elog
 	elog "Note this will be overruled by a user's ~/.Xdefaults file."
 	elog
+
 	ewarn "If you experience flickering, try setting the following line in"
 	ewarn "the Device section of your xorg.conf file:"
 	ewarn "    Option  \"HWCursor\"  \"false\""
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
new file mode 100644
index 000000000000..6221f9b0aa21
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -0,0 +1,5 @@
+DIST papirus-icon-theme-20191009.tar.gz 18636796 BLAKE2B cb1797468ffb1542fb6b732a0e54cf18b4158bf15ee0fd7f2c7616cba8568876bdfff0247fc1f311d15f064836d7a17916ac14887c3f4132983ebc7e75736668 SHA512 09d259783439721baf68bb5c65cc9cb51af148356e8c8c277ba2f45b5c96358f14defe1bb34db0281cb0cf77023ab54017e0d348de2910648a918a1638ae334f
+DIST papirus-icon-theme-20191101.tar.gz 20072061 BLAKE2B 457d47e16ce2c4465c8d23e46bbbc0753351442415be0a8293880d33909beb06b53d4ceb4e13eb2fb4fc1c453c0cc71bb313f7506deba3fec0f98cd47cf75150 SHA512 abbf3c6b248abd6945e7397ea53fe92e645d74918f6fa6f54e3701e560d75e94ac75c2e9d01d5bed7c989af8e14ea9dff4dba018956aaff43291d45fc7ab9e4d
+EBUILD papirus-icon-theme-20191009.ebuild 632 BLAKE2B ef5c8a7d9b717e29c75d8ad544ba3cf158c4b9d4e075efdbe0ec1cb8dcdabcfa31f77b36f350ec84a7e33c5e48e28d955ba3b5ab4352715bf8860ca203739628 SHA512 42cbddebd3935e5b11cb1bb8d913449677c0157f438ce931670dff4dd7e06826772dfe10eab4eea5566d263f841063daf47123dac63e1c4c4f7ff0fb142e5a91
+EBUILD papirus-icon-theme-20191101.ebuild 632 BLAKE2B ef5c8a7d9b717e29c75d8ad544ba3cf158c4b9d4e075efdbe0ec1cb8dcdabcfa31f77b36f350ec84a7e33c5e48e28d955ba3b5ab4352715bf8860ca203739628 SHA512 42cbddebd3935e5b11cb1bb8d913449677c0157f438ce931670dff4dd7e06826772dfe10eab4eea5566d263f841063daf47123dac63e1c4c4f7ff0fb142e5a91
+MISC metadata.xml 346 BLAKE2B 2d58a9d14140c9604368097a28fc9c0042172bf4d023cb8efe6cab6b06b43226e5ed6f221cf55a7b7ec02ce4724426ffca9c025e44a515fdf16f5f0f33ca9a9a SHA512 6e71bcff36afe7da780a7241f0a32d39d78b9ffdc1b3c7b9b1025ccd9c37b38d9b519e44584c78af431d124b97a7c6303921be3716f43c9769da0eff525e4235
diff --git a/x11-themes/papirus-icon-theme/metadata.xml b/x11-themes/papirus-icon-theme/metadata.xml
new file mode 100644
index 000000000000..cf5de6be3f61
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191009.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191009.ebuild
new file mode 100644
index 000000000000..8afbb557b0ce
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191009.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils
+
+DESCRIPTION="icon theme for Linux"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20191101.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191101.ebuild
new file mode 100644
index 000000000000..8afbb557b0ce
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20191101.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils
+
+DESCRIPTION="icon theme for Linux"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/pearlgrey-xcursors/Manifest b/x11-themes/pearlgrey-xcursors/Manifest
index 1d9a4e7b4bec..d8037233be6e 100644
--- a/x11-themes/pearlgrey-xcursors/Manifest
+++ b/x11-themes/pearlgrey-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 11313-pearlgrey-1.0.tar.gz 17978 BLAKE2B aa2b35885a25bdd2a36ac6d9265ce9bacb1a5e1f4319ec3ad5434a1202c1fafff18236197f133c0268219c13d141ed0d75ca0014d935b731977db059203b1e20 SHA512 863b9d0ff5f0ef387b66e85c1f0b9431e4f77b362d4f5f55ab6ec00c511bc357e1c2b20c0c14cea41bbc90ea5c7aa0da57dc34c474da672cf04094d4f6247e99
-EBUILD pearlgrey-xcursors-1.0.ebuild 1328 BLAKE2B bddf88ed043aa406009c517bce7a4fdea8f76dc56e3d22dd569b94efda34d1c17cae8c988363ddfe71571aa77073ba2210f0fbb498d4ddc5d33a3e3b616a1799 SHA512 1bc7001ace29e69a70d632f32f401f9d3a515c6c63e37ef2b6cb92a8765ec01e36fa5e40884df1cadb07161529d3f91b335b03c431a69853680bbf037c2f4147
+EBUILD pearlgrey-xcursors-1.0.ebuild 1275 BLAKE2B ac980c8d41f1b01b58e712762219a5dd7c4ee52a60e99f77d4002505025c43b75c5e3b9d5b916920d3bca942ca50e72417276c07da86b39a122d67c37c210786 SHA512 e9b5699e5361f5b61942c083371f3c23751323e7b0d8e72ea4706c86297e3eb2abd10f76989d7c7c2092ae3f146f0d8b3cb463891bb264d9f58e47077e8947f4
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0.ebuild b/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0.ebuild
index 7f64129c8183..7faf0e6e30b6 100644
--- a/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0.ebuild
+++ b/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
+
+MY_PN="${PN/-xcursors/}"
 
-MY_PN=${PN/-xcursors/}
 DESCRIPTION="A simple crispy white-grey xcursor theme"
 HOMEPAGE="http://www.kde-look.org/content/show.php/PearlGrey?content=11313"
 SRC_URI="http://www.kde-look.org/CONTENT/content-files/11313-${MY_PN}-${PV}.tar.gz"
@@ -11,16 +12,12 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/11313-${MY_PN}-${PV}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_install() {
 	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r ${MY_PN}/cursors || die "doins failed"
+	doins -r ${MY_PN}/cursors
 }
 
 pkg_postinst() {
@@ -32,7 +29,7 @@ pkg_postinst() {
 	elog "Xcursor.size: 48"
 	elog
 	elog "Also, to globally use this set of mouse cursors edit the file:"
-	elog "    /usr/share/cursors/xorg-x11/default/index.theme"
+	elog "    ${EROOT}/usr/share/cursors/xorg-x11/default/index.theme"
 	elog "and change the line:"
 	elog "    Inherits=[current setting]"
 	elog "to"
@@ -40,6 +37,7 @@ pkg_postinst() {
 	elog
 	elog "Note this will be overruled by a user's ~/.Xdefaults file."
 	elog
+
 	ewarn "If you experience flickering, try setting the following line in"
 	ewarn "the Device section of your xorg.conf file:"
 	ewarn "    Option  \"HWCursor\"  \"false\""
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 38de33db05c5..0cda2550e593 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -4,6 +4,5 @@ AUX qtcurve-1.9.0-libreoffice-crashfix.patch 2509 BLAKE2B f5aa8b5355da28eedde976
 AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7
 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66
 EBUILD qtcurve-1.9.0-r1.ebuild 2034 BLAKE2B f49917ab9cde7eb01c60d1105a64b8d715bfeac9bfcdc716b95bb93f4e70ab1fb61b970d09de0454b3defa6eacaa0d29d9f9ceb13e98e09daaeae05e62e820d4 SHA512 25c3625505a32cc0bcfcb8c2623563b083646a7a34281885ac75986890fcc1533cd4bfd4affd6c629b93b0ec0a94f549e54ca3320d08de53d056c0d2d1a7ae98
-EBUILD qtcurve-1.9.0.ebuild 2043 BLAKE2B c4184122dd2b6eb529d230f54fe04cc73450c4b085bbd0c533f559a0532d0d21e8565938756c4f6eb1d6a9a4528911c4ea3bf19f5e274e2eff4c500216d8b112 SHA512 7eb621404eb818b9d814359c41f8462483e81788338e4c4c78a0f4a105afbf22be9c5b836638753e97aff39624e7749823f2a79f79bba75a47381f4374150f21
 EBUILD qtcurve-9999.ebuild 1839 BLAKE2B a82f14b59a6aa08250aad17cdfb146fce67feb134d98f1e77fccfa4654068eada366045f46de976c9de1f54efcd5b8622a1165b7c2bd3912f4f7d28a2cc7fda6 SHA512 9fc95e7187df48cf78c816e3823177006e452d0e23de9dbfff19d350bab0edb7d6212ba2eff184e9e73848beea108f57fd8861dff773fcda31496aee084a49e4
 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
deleted file mode 100644
index 428c60441af9..000000000000
--- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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)
-		X? ( $(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
-"
-
-RESTRICT+=" test"
-
-DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.0-build_testing.patch"
-	"${FILESDIR}/${PN}-1.9.0-no-X-buildfix.patch"
-	"${FILESDIR}/${PN}-1.9.0-gcc9.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/sawfish-themes/Manifest b/x11-themes/sawfish-themes/Manifest
index de929b1208b6..1bb15bfc12cf 100644
--- a/x11-themes/sawfish-themes/Manifest
+++ b/x11-themes/sawfish-themes/Manifest
@@ -50,5 +50,5 @@ DIST twm-0.30.tar.gz 2259 BLAKE2B 9b282e4fa3cb1d64201546bff079658de94b76c1d6fa6f
 DIST ultraclean-0.30.tar.gz 661214 BLAKE2B 6d6a2d050d97d2da97acbe20225f4f93bf576c6479de571f6040374850ab001225ad718bc22140a600788efe3192599f39693c5884f2e0226fce58b551f5b243 SHA512 864b3ecafabecad84a4b828a4d0c3e56208345e075d8edd2222da40105e78ce82199d667b6eb4dc5ce2e351c3649e05faab3a4a06f9c4709742f8e4cb4d4af2e
 DIST whistlerk_-0.30.tar.gz 6896 BLAKE2B 68514eca78c7ceca4f0b34be87ce021370a85e7035f5c8152dd87ccb26eb945dc5bdef406ea495192dde987d6ca0d3af4e5084a2451d424c3b90b8b235bde514 SHA512 c1a5dd0b079076e25d6f392a71ac7cfa4016ef304e05e832b27f18ebb86d3fde88c737b4efbcd8be0fa2c41b057726cb4e4d8c3be38bc89d7af37d4e820b22c9
 DIST win98-0.30.tar.gz 5176 BLAKE2B 0e2cc34ed26c81b54a7de6548d9080e063a584c6f1948c6d07e6348736ff96059950d234f0b9266206563c2c3da98000486015f8c7a88d60ee433a037e071002 SHA512 5767b2e2da79e5417a15b1d747aaec1fe869e2084e81301092982a4d044afa18b53dda626d0e77058e8917e5598e502f38884de95b502f9a356fa3c7f892e535
-EBUILD sawfish-themes-0.0.1-r3.ebuild 2864 BLAKE2B 18401541966d04055f2797d3546041923b8dd543b940409376c41de4198135f44c68c36cdda83841e129b6561e0c8e21bbad02e5516b682ba3647f12c6a8e2f6 SHA512 4ba2b4c4cefd3c0591e056181e2ea07b75b11bd774dca6d848ab96c686a24801dd540cb008485e0f9a86be6f5b3a53df2acee534ffa6080160ec07278dcdcf73
+EBUILD sawfish-themes-0.0.1-r3.ebuild 2837 BLAKE2B 799355caf6641685cf4786fb6411e404cddcdede0152851a49727d1e75b65b8bf6ee2a1fd60cd51dc2a18ef4ffaae7ee7d4cabd9977ba1412efda8d8c97af7c8 SHA512 1cee5f326433888d352ac2d9b2928cb50acba546c51d30ea5ffac9272810f325eb554ede19fe57c53155f73ba8e64854f516e1970d0edb3a78276adc3b915629
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild b/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild
index db63478d82ba..faad1cad1ef3 100644
--- a/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild
+++ b/x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Some nice themes for Sawfish"
 HOMEPAGE="http://themes.freshmeat.net/"
 THEME_URI="http://download.freshmeat.net/themes/"
-SRC_URI="${THEME_URI}/absolutedarkness/absolutedarkness-0.30.tar.gz
+SRC_URI="
+	${THEME_URI}/absolutedarkness/absolutedarkness-0.30.tar.gz
 	${THEME_URI}/adaptblue/adaptblue-0.30.tar.gz
 	${THEME_URI}/ampullacu/ampullacu-0.30.tar.gz
 	${THEME_URI}/antarctic_/antarctic_-0.30.tar.gz
@@ -59,17 +60,18 @@ SRC_URI="${THEME_URI}/absolutedarkness/absolutedarkness-0.30.tar.gz
 	${THEME_URI}/whistlerk_/whistlerk_-0.30.tar.gz
 	${THEME_URI}/win98/win98-0.30.tar.gz"
 
-SLOT="1"
 LICENSE="GPL-2"
+SLOT="1"
 KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="=x11-wm/sawfish-1*"
-S=${WORKDIR}
+
+S="${WORKDIR}"
 
 src_compile() { :; }
 
 src_install() {
-	dodir /usr/share/sawfish/themes
-	cp -pPR * "${D}"/usr/share/sawfish/themes
+	insinto /usr/share/sawfish/themes
+	doins -r .
 }
diff --git a/x11-themes/ubuntu-wallpapers/Manifest b/x11-themes/ubuntu-wallpapers/Manifest
index 6c2cbbd86ae9..ddf8dd314b31 100644
--- a/x11-themes/ubuntu-wallpapers/Manifest
+++ b/x11-themes/ubuntu-wallpapers/Manifest
@@ -1,3 +1,5 @@
 DIST ubuntu-wallpapers_19.04.2.orig.tar.gz 201172357 BLAKE2B 0ee1b8073dc47260667377ebf293cfd867e56b2f46c909c9dc88dbe9f94e9090e716d0b352af72661ec9c5088b7d52fdacda4bb9c274e84a13a2ce030f304779 SHA512 324812015f04c7286e9f90d73bb671013fff386eaf7933998a1199ebc24dbd1bba4ca3f8fc526afe4e26df738662d6d033a90f99195380b7fb4cf09feb8e631b
+DIST ubuntu-wallpapers_19.10.2.orig.tar.gz 209308453 BLAKE2B 250b386697e6802b13b624206142ad13224c032d9b909ff0de0ae4ecc1a47e99d8ad30933f4967fd8f570bfca728191a7021b1e2cff81a8fc21ddcd0445534f4 SHA512 754902be43064593c303feb87f3de94351cf1067ae08344e65bd420eca57d5cf516996d89c0116887aabedaf0d032132d9139c8ebe414525eda61b16cc8cca9a
 EBUILD ubuntu-wallpapers-19.04.2.ebuild 783 BLAKE2B d45c52d77cf7e3d1f72e15975513325939de141ee42f2592f7ae31de48093a65077247efe3f5b989343962fc992f398099792aca88fa6eb3b10443c8ba64696f SHA512 592e91de3f7ad52215c0b14d5a0273dc8b55138082fc3bcc2bcad865b272a0d3ab37b0bcf4e1757a4af9c21d7370d8fed56ce729ac3d0b9e872687bebfa53c48
+EBUILD ubuntu-wallpapers-19.10.2.ebuild 750 BLAKE2B 36be3e90259fa66941435fca5b1beb24a8fd1b69c068af7b901bbd047139283a8c3873acd0431f4edf605faca023529d78c666c93963739ef926ca7b4dd146fb SHA512 afa919dfcc1ff5fdfebe6d214e6a6321b0013ac0e3a2b18010278fd319fb4369d6810a47fe9d2d8ddf4f41af2156f09dadf5cd07438b64968681ef016ed102e6
 MISC metadata.xml 316 BLAKE2B a54db9a97a4e74453d251c1d1905bb0f1d0fdeff85fb9b3064c1efd259306ccbd5b895b269587c657d328358f18cc15dc8dbc737c490a1ad5fb829c72cc15808 SHA512 82eff3745d3cc9097b48d9c789f3754c96ac8b5921709bd1545f8380a2fed6abc274e60ff8dde614344731fe9759cc8e016e465b025555a20c1ec57d23119ab7
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-19.10.2.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-19.10.2.ebuild
new file mode 100644
index 000000000000..02448c2af689
--- /dev/null
+++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-19.10.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Ubuntu wallpapers"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
+MY_P="${PN}_${PV}"
+SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
+
+# Review COPYING file for updates
+LICENSE="CC-BY-SA-3.0"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+SLOT="0"
+
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	insinto /usr/share/backgrounds
+	doins *.jpg *.png
+
+	insinto /usr/share/backgrounds/contest
+	doins contest/*.xml
+
+	for i in *.xml.in; do
+		insinto /usr/share/gnome-background-properties
+		newins ${i} ${i/.in/}
+	done
+
+	einstalldocs
+}