gentoo resync : 28.04.2018

21 files changed, 148 insertions, 88 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index c3439f56c619..316b9e5362ff 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/commonbox-styles-extra/Manifest b/x11-themes/commonbox-styles-extra/Manifest
index 6f38e449e91c..f35bac38c4c2 100644
--- a/x11-themes/commonbox-styles-extra/Manifest
+++ b/x11-themes/commonbox-styles-extra/Manifest
@@ -1,3 +1,3 @@
 DIST commonbox-styles-extra-0.2.tar.bz2 8155158 BLAKE2B 80f4d299c6e805a637996372675087092f900035d10c683e1e26958a4cdc7a34708a10e1319058f98401ca4b9db3c00be132a8de32f60e8d72ee8b3cf10e4c4b SHA512 4c6408231037b327ec96e4345c84282476ef8ccb8b048769c0b80c22c65941aa3832fe7ada0a0701e876d305156c1eddcc9b19e903a94454a7b4fcf281d04b45
-EBUILD commonbox-styles-extra-0.2-r2.ebuild 717 BLAKE2B 3d37711f79efb0fa10dd493b7f7dc385a9c7772426fe54709fb97b5bc38f28a7d8ab8d87a7da407579a60c280c1875e93035fe800bd307a1013a7b3e5a117a38 SHA512 c65b7898a7126683162a8910e5caedd84c8ca5b3ff22d1c33f8a58003ac3e6afe879cc40abbf520f7f5b08663e7abb3f9c9ab772d1995e57a871741f73f9874a
+EBUILD commonbox-styles-extra-0.2-r2.ebuild 705 BLAKE2B 6ccb84932cfbb597dbd7f3ebc4732cf0e9dbdd3010f2a5cef8cd3c7aa1f1b07839e3e939a8c2ba4a31d9fceffd356eaab6814ae98cf47630de219b78b41a0b7d SHA512 1ee376abc92e9f75b543602b1d60d491d6bdd722ea0aebb79b9d063a563071e57080dce23677931018c3668bcb3c89b3f8230dac38cbc9bc14f5c77269132c4e
 MISC metadata.xml 238 BLAKE2B c7d924cce0d6da8571cb37d590bb649ecc34eb75b3ebe0028c756f64207b74d1964da5204c5560518fd05a4d2249d4c55151d1e899ece474454f7c60e47dd7c4 SHA512 a6dcdd4ed6a11ccf9ab4cdba59fba56904010958dd690648367a3985791a17dd981e3da30155eca19cf6263132be81f738766d3e3a7ed6e5931f3e8888999871
diff --git a/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild b/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild
index 21c0b3115136..c2576a37de84 100644
--- a/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild
+++ b/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-IUSE=""
+EAPI=6
+
 DESCRIPTION="Extra styles pack for flux|black|open(box)"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://mkeadle.org/distfiles/${P}.tar.bz2"
 HOMEPAGE="http://mkeadle.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://mkeadle.org/distfiles/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
 
 # xv is there so *box can convert backgrounds/textures to use
-DEPEND=""
 RDEPEND="media-gfx/xv
-		|| ( x11-wm/fluxbox x11-wm/blackbox x11-wm/openbox )"
+	|| ( x11-wm/fluxbox x11-wm/blackbox x11-wm/openbox )"
 
 src_install () {
 	insinto /usr/share/commonbox/styles
-	doins "${S}"/styles/*
+	doins -r styles/.
 
 	insinto /usr/share/commonbox/backgrounds
-	doins "${S}"/backgrounds/*
+	doins -r backgrounds/.
 
 	dodoc README.commonbox-styles-extra
 }
diff --git a/x11-themes/commonbox-styles/Manifest b/x11-themes/commonbox-styles/Manifest
index 2006b247aceb..2d0660ba5bad 100644
--- a/x11-themes/commonbox-styles/Manifest
+++ b/x11-themes/commonbox-styles/Manifest
@@ -1,3 +1,3 @@
 DIST commonbox-styles-0.6.tar.bz2 106381 BLAKE2B 4aedfb2d149d1a1b95322eb82a4ecc91decce0364edc850933f7cefb6ecccf7f4b9912b17da55f719795f330e00a3a147bd3d527c1e90842df631724e1532f3c SHA512 fff627e62cca21f44a98579ebdaf45f6c6391be3e846fd20ec261a4d147ba1524d13add7bb830d529728ad59c16f52c28a4cd0471b2d62b98e6f9c08f51304d1
-EBUILD commonbox-styles-0.6.ebuild 661 BLAKE2B ec705637992a46ecb9f19398657396914fe6c2d3f56e115296e8d48ca6a4becd152c6513aeafdeb11697fcfd799f0a6500938346bf3e8b6e38580d4cba621717 SHA512 a81582eb931c3d10ee692b1d5bf9570f6630e9507e3ed4899807112ebbe821491e8dab502224f5a64280eb7b50a6ab6b2823055c68737ed05fab50b0c57b0981
+EBUILD commonbox-styles-0.6.ebuild 667 BLAKE2B f8e0f7c12d9a71b1632b61ac0144f7834b145bed00e57816a8e85755f18c7034574258ce360e198942d7687de54f66d0aa96cc3a87693795cdaa2e55b67f99fb SHA512 8941420170a66404dc98c61fe8b5202181bd7bc10f65f84980eeaf1f7fa5e86d3ea95b9b1a0877c688570a9d31c3ecf181f70170d12a76f139cee903c5e4f9d7
 MISC metadata.xml 228 BLAKE2B 84e1c298135d88153f0823e30db094b108b48e2e0548b0b4dea81d089f19258156b7fe0e6323a085f9f2d9bd5792393c394f8f34eda6dae46ff9a8bacfe4e08c SHA512 c31c3b70d9f96755a2c83d38668f184cf5b130dd6b1ab90385b6c118fd7eedaca3d243154c4f7ccba5f08168f36913df8f2f4d0736f1ee8681cb79c3e7a7b7d9
diff --git a/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild b/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
index d51701fdebaf..7701de8d7eef 100644
--- a/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
+++ b/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-IUSE=""
+EAPI=6
+
 DESCRIPTION="Common styles for fluxbox, blackbox, and openbox"
+HOMEPAGE="http://mkeadle.org/distfiles/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 		http://mkeadle.org/distfiles/${P}.tar.bz2"
-HOMEPAGE="http://mkeadle.org/distfiles/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND="|| ( x11-wm/fluxbox x11-wm/blackbox x11-wm/openbox )"
 
 src_install() {
-
 	insinto /usr/share/commonbox/backgrounds
 	doins "${S}"/backgrounds/*
 
@@ -22,5 +23,4 @@ src_install() {
 	doins "${S}"/styles/*
 
 	dodoc README.commonbox-styles STYLES.authors
-
 }
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 9cb6519d919b..b6d5fa069eeb 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,3 +1,5 @@
+DIST elementary-xfce-icon-theme-0.11.tar.gz 7945508 BLAKE2B 2a313e72bb71deed37a69bfb4186d5133c1d6dc721c7364a7ee63aef80181421cad6100ad12a6585daf6e8f0256579cde6aaf29540561816071721b454231560 SHA512 77695f25cd09afa595fdb49b40b5b605f791ad498cb795aa441c51fd89e2e99e4effd21ade9f62aceccfd4b682d1f95b9656dae97cff17e6c7a1ce159d3672b0
 DIST elementary-xfce-icon-theme-0.9.tar.gz 7724631 BLAKE2B 197db65ebc24f8f62e862613c28222036bebfe99c59b91f36c3d5c83266ac29c635badc6453f8372a46c3bfcd2161a08073d021994372275716ced91f29f2f66 SHA512 9db76522a4feb10bb4cd7d6bb3febab20ca3ae752a42d23926908edf20d69dd674d281d679bad197f19e7a8efe84576da19cdbbc37b3e4b9ce0570d54782016c
+EBUILD elementary-xfce-icon-theme-0.11.ebuild 1052 BLAKE2B 480ddaf6bac9dca4c3ec7d4a740c51fb43307ebb441fb14ef3d0f7474559a5c90c0d9ff24bcff919442d2f0948cbbfbc82a51258a4770d29ed1c66de68b408ba SHA512 258a0bf5e9168b5dd3303c06dca4544d55e978c8f4087792f34c78d41829f0902b146c413069514d50f6576c8765b7ac5f934a7ebb616b05595e817a02264ca3
 EBUILD elementary-xfce-icon-theme-0.9.ebuild 1034 BLAKE2B 1b2fcab6d8a098f89c53ae1b66b1f3fef6dd14e6eceb13279e994b9f86a20c53abd9b1aa1bba5bfa95f403908e8eec85e116f067bacf62b90fc2fd86e32f9863 SHA512 541f835daa54b1f5df772db3f6c0938f87661f38e318128901a6ab6b2a3fbf1ac3a3df49c1648ac6ba309bd5a99394651d550d3da80e2945864b948b12097f70
 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
new file mode 100644
index 000000000000..744d7ada4014
--- /dev/null
+++ b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.11.ebuild
@@ -0,0 +1,41 @@
+# 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/ethemes/Manifest b/x11-themes/ethemes/Manifest
index 26d8dd68d559..d00aba35b2b3 100644
--- a/x11-themes/ethemes/Manifest
+++ b/x11-themes/ethemes/Manifest
@@ -1,7 +1,7 @@
 DIST e16-themes-0.16.8.0.3.tar.gz 8203866 BLAKE2B 198dab06e1dd1baf47315991d2b22f55adeff8e0fcc8d5e860526d8f08e92b6ce85b3eea6435d19dd228e85be04d146653e4fc30a98aea0d521500a4088901b2 SHA512 95d5f6c4e9a1aff32cb97b15810a3ea6b1948c41fefbbf681ebd2e20babd68a1ea28a31f5799ad229f77988cc08f5099d3895bb7e8646f50bb71f9cbf5117f87
 DIST e16-themes-1.0.0.tar.gz 8225413 BLAKE2B 4444b1ee50bff7b2088009d819cb6722d6fc783ffb7e21f2e0b5588e8233a5e32b01c76838a176bc288d76f77ed759378ac7411dab01e829620814def949a5da SHA512 22f543051fb1bcd9a27e4b8acffb2c9fc04042dda6456d1b34117dba499a7355e1c1f9ea164d1461f086400d0b7b4be409be7c37012c141274ae9ec8e8bd47a4
 DIST e16-themes-1.0.1.tar.gz 8249438 BLAKE2B 3bc5bc51918ad8425aa653d1cd6bd1dfb911de9005d5f0f7488dee166405fd3e299cfae81be65b17d140a062144fceda1dfe975e0056775f3168e3961d41f881 SHA512 ffac8cd2975a6c27862fed91f6e5b43ff25046e4983401309a380187e2b9715eb71963bc73be35ecd7e4044a3408a62c274965af9cc44cfafe8bd197e23e0d5b
-EBUILD ethemes-0.16.8.0.3.ebuild 617 BLAKE2B b8aa5d00097853d080db3d3ce4cc9ef2fc3fee305a1db2a31a40069b413d79803df0d865dbb70f8ce8cdc677993886a3c31bc2e7a4c84129351ff33f24cbbb2c SHA512 839e5d04b0ed68cbc569e709bbda53b965d6455d671a86dfc8129ab522a7cf5301e5625c6ca046e6abb31d707a18d6e35a7347bbae9e44c449719d5b56f18aeb
-EBUILD ethemes-1.0.0.ebuild 626 BLAKE2B 052d5141f241d511ee7fe7842330f97515140d8ab64039e493cd5a1b20a08bc16330bd748d39c944f9bcbe4c7f70c58a4f6d32cf6aa40cbf606e039aaa158b38 SHA512 888467abb6a4f18017b0575954b50c3f0941a206f85838b129eb6cb21b928b01126c8d20c89eea67a7300bb7e3e4afa6af78015a384fb3e9df134fc7edfe9278
-EBUILD ethemes-1.0.1.ebuild 626 BLAKE2B 674591e04175758afb71952b8906d45e0414d5cff362e4fa53fcb303bb51466b54bab998511815ac1f6217de60ede7c58aaaa0b231f7d63f52d6c402b828b28e SHA512 6358d70c038a1a0005c99d8084ed404a14c0c36cdd1b4fa1884df29bd21892a5af220720055034fae1c3edb6c6e3577a7a3abb00cf8c97cf7ff63554ae60e1fa
+EBUILD ethemes-0.16.8.0.3.ebuild 546 BLAKE2B 73b0c76844ea497bdc92dab0db600049eb5fb6ad83e0fe16342569f8abf7ec3fc07d5a21a23c9c2336b58a2d5974f9b983061bc5543d5de49140df55b9d9d1b2 SHA512 981e2207bfa5cb9ce32032ee1cbb455510a129628f534f9eede8065ba4cbfe2746e03e99012df9f7a8222298cfc33de349e11b86465ea85b8e8b0fe073b9897c
+EBUILD ethemes-1.0.0.ebuild 555 BLAKE2B 9db83be6f711d83f8110d03c52e3eb00c2a34c8cdfb8721eaa42dda6d76acaf814d4b8b85003011acda90036c51b87b5d9178c3d0d9fd995b5696acc26350d36 SHA512 3e2614888383cb5496a05197e06787d66be40c896f504438e2d0031eaabea6db791287cee9ba4bb1ffc009377802d30e400a9a7156b8fb8fb837ca6ddabe7ba7
+EBUILD ethemes-1.0.1.ebuild 555 BLAKE2B 9db83be6f711d83f8110d03c52e3eb00c2a34c8cdfb8721eaa42dda6d76acaf814d4b8b85003011acda90036c51b87b5d9178c3d0d9fd995b5696acc26350d36 SHA512 3e2614888383cb5496a05197e06787d66be40c896f504438e2d0031eaabea6db791287cee9ba4bb1ffc009377802d30e400a9a7156b8fb8fb837ca6ddabe7ba7
 MISC metadata.xml 246 BLAKE2B 8e42a79334d5ae7cf62794aa2d53ec5b472d6bc28550d58d37b09b26e68b87e22749bdd2c23cd120da320a5af5f0346569dd93cc417c04e83c5913864557e066 SHA512 460d202301d84244b49bd0eac9611142f8800f9f79dd0f42872b35c39b439e1be231cad8c3cd5cfabc162f26198df38aabcd65fcd6c13e9fff0c58ae939dad7f
diff --git a/x11-themes/ethemes/ethemes-0.16.8.0.3.ebuild b/x11-themes/ethemes/ethemes-0.16.8.0.3.ebuild
index 44604d70a788..ed3bb1736f5c 100644
--- a/x11-themes/ethemes/ethemes-0.16.8.0.3.ebuild
+++ b/x11-themes/ethemes/ethemes-0.16.8.0.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_P="e16-themes-${PV}"
 DESCRIPTION="all the official Enlightenment themes"
 HOMEPAGE="https://www.enlightenment.org/"
@@ -16,9 +18,4 @@ RDEPEND="!x11-themes/etheme-BlueSteel
 	!x11-themes/etheme-Ganymede
 	!x11-themes/etheme-ShinyMetal"
 
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/x11-themes/ethemes/ethemes-1.0.0.ebuild b/x11-themes/ethemes/ethemes-1.0.0.ebuild
index 6ddd154ef406..a2d573acf137 100644
--- a/x11-themes/ethemes/ethemes-1.0.0.ebuild
+++ b/x11-themes/ethemes/ethemes-1.0.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_P="e16-themes-${PV}"
 DESCRIPTION="all the official Enlightenment themes"
 HOMEPAGE="https://www.enlightenment.org/"
@@ -16,9 +18,4 @@ RDEPEND="!x11-themes/etheme-BlueSteel
 	!x11-themes/etheme-Ganymede
 	!x11-themes/etheme-ShinyMetal"
 
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/x11-themes/ethemes/ethemes-1.0.1.ebuild b/x11-themes/ethemes/ethemes-1.0.1.ebuild
index 6460caec09c0..a2d573acf137 100644
--- a/x11-themes/ethemes/ethemes-1.0.1.ebuild
+++ b/x11-themes/ethemes/ethemes-1.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_P="e16-themes-${PV}"
 DESCRIPTION="all the official Enlightenment themes"
 HOMEPAGE="https://www.enlightenment.org/"
@@ -16,9 +18,4 @@ RDEPEND="!x11-themes/etheme-BlueSteel
 	!x11-themes/etheme-Ganymede
 	!x11-themes/etheme-ShinyMetal"
 
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/x11-themes/fvwm_icons/Manifest b/x11-themes/fvwm_icons/Manifest
index 9aa9860da4f4..a4646fd0dbff 100644
--- a/x11-themes/fvwm_icons/Manifest
+++ b/x11-themes/fvwm_icons/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm_icons.tar.bz2 328620 BLAKE2B 3df1b64903601e1db420c09d80c2907ecddbfdd8fd235b9f1a833be9ccdf20e0e8889ef6259e1c5663e107c7e7625f26fc0d7432a46571ad906436948a01f561 SHA512 79bd47492bb3854c79b5ea144467732460a0dc97a975b4ddf273d60f97a51ac71c94004293c6e073cdcbde72e6f6b38da697df6849808314937384e280f3d6d4
-EBUILD fvwm_icons-1.0.ebuild 509 BLAKE2B 64bdf9b4133b890434bf04f4a356bbb5b78ab221c8530d97e03d79880312d190bb5a484e0e35687b102aa91e2335290478725517757336892cd42a784158f102 SHA512 f6d26f7b26ae0ad4359bfb95b03abc0075a598a59699f041caa06e5dd01b27f91e226699a55d4a002c3906ad6fa704cca2d44be2bc360c37dfa283c2ea7cf5b9
+EBUILD fvwm_icons-1.0.ebuild 503 BLAKE2B 2e34b20a77a721eb2872729999e2c4cef80083d7b119995217bd7b6dafb2fa9a80b58527eb09a3282ebcbd49defb923bf03b6599760fc3654e7adcdfab2b1ccf SHA512 16615d13f5e8d9ca1309a3a9c020442e85045e75762fda0162e251daba32ad71839f062a7fadaf22588fd3ee751111a31d4887551218fd6437e6bfb8e41cf9f7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild b/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
index e835eaa17621..6fb714715db7 100644
--- a/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
+++ b/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Icons for use with FVWM"
 HOMEPAGE="http://www.fvwm.org/"
 SRC_URI="http://www.fvwm.org/generated/icon_download/fvwm_icons.tar.bz2"
@@ -11,12 +13,11 @@ KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-wm/fvwm-2.6.2"
-DEPEND=""
 
 S=${WORKDIR}/${PN}
 
 src_install() {
 	dodir /usr/share/icons/fvwm
 	insinto /usr/share/icons/fvwm
-	doins "${S}"/*
+	doins -r .
 }
diff --git a/x11-themes/fvwm_sounds/Manifest b/x11-themes/fvwm_sounds/Manifest
index bb1f79ff64b6..d5e8c6a92639 100644
--- a/x11-themes/fvwm_sounds/Manifest
+++ b/x11-themes/fvwm_sounds/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm_sounds.tgz 81920 BLAKE2B 679b6e44d7ec3a233ddb8665366e770a8ef58335cbb19c3ee6be94457975c33013ce222ba7d32c441e6d059703f2ad77550d92b0cc78243785e90461a5dd03f9 SHA512 816c5462459c9bd167ff1eb80ef3069ef3f3ef5ac5b797254bb1b17858c8c8cb1d3f335d7a85e159067427efb0329ff1599fb8cf5e93b723a9cffc978ab98555
-EBUILD fvwm_sounds-1.0.ebuild 495 BLAKE2B f464a408944bfa48c90e20aa434a525bfe6b368ff5b35bf934c89c23fcd215e118ace048048e1332a7468c78e0340541c3b026583595dfac1fdb0b94f09510aa SHA512 2f30976386010068d7620d7f150bf20d7882bf3875dc6d817bec09f77c06487fb87576087fe31980622723bf5a5d4f3afd8c0ddf5e2127ba30f09b5f2c0e6064
+EBUILD fvwm_sounds-1.0.ebuild 489 BLAKE2B e6dd004e24b0062af9a1fcd1522bc9e945ce3721266da0634b7a58226dc482411d5b53b9c1e6f1ea8ef8d1ef5e0b89fc0587f54667446d6cccfbdc1bb1916463 SHA512 84182ff45ab871c0c6871e2aa66eed193a850de1c57d160fb3d2e0a75d2633505053f1df8ba84d7ea5e84c6811deed22aa61535e3992cf2179f00956f127402c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild b/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
index a76bc545f6b1..341948fe0de7 100644
--- a/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
+++ b/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Sounds for use with FVWM"
 HOMEPAGE="http://www.fvwm.org/"
 SRC_URI="http://www.fvwm.org/generated/sounds_download/fvwm_sounds.tgz"
@@ -11,12 +13,11 @@ KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-wm/fvwm-2.6.2"
-DEPEND=""
 
 S=${WORKDIR}
 
 src_install() {
 	dodir /usr/share/sounds/fvwm
 	insinto /usr/share/sounds/fvwm
-	doins "${S}"/*
+	doins -r .
 }
diff --git a/x11-themes/pulse-glass/Manifest b/x11-themes/pulse-glass/Manifest
index 07053904f466..c0c76a831c7a 100644
--- a/x11-themes/pulse-glass/Manifest
+++ b/x11-themes/pulse-glass/Manifest
@@ -1,3 +1,3 @@
 DIST 124442-Pulse-Glass.tar.gz 353912 BLAKE2B 5b4dc7c06f29aaad63849504cd9d365dd58a45a32be483e5dbc1cd76f54a180a447bed9b33d61c8c2fec9cd525cbb30146dd8f90e5e3c6e1172c11aef6b69f57 SHA512 83ef7543fff222dcb7bb220c66bd8ad5505793945dae4b9b779a9a13303adf71480cf8f5c2e00f6d910af255461c04cb440c2596484aaa9bc7086b0be1d229eb
-EBUILD pulse-glass-20100616.ebuild 504 BLAKE2B 0a59a157b795ec77bb0d1689f732bc138f540d2976ba73e853669a235e4bf4bc4299764adecc5385b2fee0d44b27ce929e29c16f06b5e4188d3fe88ef41393a9 SHA512 8fe3f643ef89a5129ed85f9488a75ef57a7b79d6d4800ec463dbaca633a6a1c5616e005e48aed14700357f858e524efc7c313391240293336dae0cc7dea5e032
+EBUILD pulse-glass-20100616.ebuild 585 BLAKE2B 1cbe191bb9e9a89aa8389b7bdb9022f22f5b1456256fa4ba9b8952b115dcb39327d434c230dc33d1af3bf5c31bc88a8c6c60ce1bb7e00f3b7d58a4ce2a1d485e SHA512 92035f3878567c530e9f1f66afc9c48a41a90c42d032b1e2625bc990b00ea6de7a644a8211dec150ac2aeae42d0fbdd81761f0dcde5e291147ace0963793c2cc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-themes/pulse-glass/pulse-glass-20100616.ebuild b/x11-themes/pulse-glass/pulse-glass-20100616.ebuild
index 2f02fd2fca77..bd67f1cb7b81 100644
--- a/x11-themes/pulse-glass/pulse-glass-20100616.ebuild
+++ b/x11-themes/pulse-glass/pulse-glass-20100616.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_PN="Pulse-Glass"
 
 DESCRIPTION="The Pulse Glass x11 mouse cursor theme"
-HOMEPAGE="http://kde-look.org/content/show.php/Pulse+Glass?content=124442"
-SRC_URI="http://kde-look.org/CONTENT/content-files/124442-${MY_PN}.tar.gz"
+HOMEPAGE="https://store.kde.org/content/show.php/Pulse+Glass?content=124442"
+SRC_URI="https://dl.opendesktop.org/api/files/downloadfile/id/1460735439/s/bdd2fc99c6d7c6dae5a922c9ee5f688f/t/1524406902/u/54541/124442-${MY_PN}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -16,5 +18,5 @@ S="${WORKDIR}/${MY_PN}"
 
 src_install() {
 	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r cursors || die
+	doins -r cursors
 }
diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index 7cf248079804..ac76ecce204d 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,5 +1,6 @@
+AUX wm-icons-0.4.0-build.patch 747 BLAKE2B d74f553bd1f7c4de8c2dbb9e128f5da13dd39d72d440c6a6815f7d70abc319eaf134850e370f02c5471caec39708edb8759441a516da3766ac78c67438498734 SHA512 3f48412b4af34a1ae3ed781182c28f269c85cc582e93292c17bc681d67cc2801ed58264d3b05d66341ac0df6ec1262869b00aa6880fb8f4c66c16f0f6b5ea790
 DIST wm-icons-0.4.0.tar.bz2 3433177 BLAKE2B d5d04aaa8da0f0bc8c4887de77febd5a7546981c2f7da0b0869bb2ce9e080488c57ddc4ed89374bb24c0b708c3ac77a6890da4a3624cd98db7e4031336098d98 SHA512 9b21dbb1ac697520792c1e8bfc6b06d4d9933828759571b7af978a670223841fcfe9adcf7f945de3f3a4a39e0d991045d6086be9b293bd89b67cf937262d53a5
 DIST wm-icons-0.4.0_pre1-cvs-01092003.tar.bz2 2046784 BLAKE2B 2895aa2d14c2154cb3dd31f41c398593f9564e27a8f9d3960e5e11b24ed2d1138ca3c1e187eaf5c9b982451270eb18762504aac4dc7918a0ff6bdee082d238ae SHA512 c2a8f6d6c460ae326381a3bc7ca23fc21986c757ece09a304da8eec5beff826421e1e3089cb1d0016ad7ddf3c650d27d140924b254e4ebb27cc8b8aad794b4f9
-EBUILD wm-icons-0.4.0.ebuild 1167 BLAKE2B d49b937e3b832b203af3e8fde7b1f266f5d06ef44629b7b20fdf08598d4288d8b7579fd55dc1f72cabeadff256319ef29eb94a9be2711b2a23259591161260ea SHA512 c3f44c3bc956e2cdc32d04a20fcc45b786bbda4afac64b15d80ecd27ed4e3e15487243ff31561091e501578b57de0be4322fea03c1ea3afbdec054dd4829f042
-EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1577 BLAKE2B c5aeda99c0ab129349e0bd9528a26a6ee231d0c42971070952393a116832faff96a6b7cbb04142600e64b635606d54f399912a5043d8a1e3bd700ff313d46840 SHA512 840dc711156fceb435a17291dc174981127c333f64ef937300fafaf6a9af61575f7a25e3e80e952c8ecedda86ddc6398faed798da8e4a4ef09ef4dc1b514833d
+EBUILD wm-icons-0.4.0.ebuild 1174 BLAKE2B 7ebfccedf45548c2256fc9adf47a6952d6da8243a006ae117cc62689cd910a409c6394f219e72729ebf74f3f0630aac31f8c4138c9dcaba166a4c7cae1b8999a SHA512 7d8e15e704d14e7fb58aed27a80d4244bacfc7d1f9f39772e4bf418389f7afbb2b4c6f5e089ce2a0d11c8b9c88fffe64791ab4281004e39829581a53e4fe07c6
+EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1229 BLAKE2B 0b4fa9e1fa43f29932df48c531621cf1ef43f9813e8d1d875f6442e4ddc578a8762d13dfa778e4b9c273fcaa606f2814e868516a7470a8f126f6a261832957db SHA512 60e3b43c131a774f273df28d52b1ac67df1b13b5ee16216ec52d7805bd6d44ac5bbf12e0b30e0978752b46ffce5d92851bc0cef94442b6e0b3650c66b591aaa6
 MISC metadata.xml 413 BLAKE2B 8658f6251830bc9b10bb617d272d7b77b5ec50e8af755e0b1b906a931634c723535a46f870aab969762a05a6f5b66f4603e22c43db5c41e02076bf160e9a7b9e SHA512 3ac253166be95b1fc9bdc58cf47efeb6095e8ce37ebb76dc8e9a3db57c9385f4777eb0233a0214b044812639ec9406c1f0c80b3ae20c26f411c8494434b5f5b4
diff --git a/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
new file mode 100644
index 000000000000..bd92342e1edc
--- /dev/null
+++ b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
@@ -0,0 +1,24 @@
+--- a/configure.in
++++ b/configure.in
+@@ -129,7 +129,7 @@ AC_OUTPUT(
+ 	etc/debian-menu-system/Makefile
+ 	devel/Makefile
+ 	devel/bin/Makefile
+-	bin/Makefile
++	
+ 	bin/wm-icons-config
+ 	doc/Makefile
+ 	doc/wm-icons.lsm
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,8 +13,8 @@ SUBDIRS = bin doc icons etc devel rpm
+ # => icondir) is different for the build and install phases, as it
+ # is for a distribution package building.
+ install-data-local:
+-	# set the default icon set aliases (symlinks)
+-	$(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
++# set the default icon set aliases (symlinks)
++	true --user-dir="$(icondir)" --defaults --quiet
+ 
+ wm-configs _pack-symlinks _unpack-symlinks:
+ 	cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index 0ab33021870c..d6932e13238d 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind"
+EAPI=6
 
+DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind"
 HOMEPAGE="http://wm-icons.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wm-icons/wm-icons-${PV}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
 IUSE=""
+
 RDEPEND="virtual/awk dev-lang/perl"
 DEPEND="${RDEPEND} sys-devel/autoconf sys-devel/automake sys-apps/sed"
 
-src_compile() {
-	econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed"
-	emake || die
+src_configure() {
+	econf --enable-all-sets \
+		--enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
 }
 
 src_install() {
-	make icondir="${D}/usr/share/icons/wm-icons" DESTDIR="${D}" install
+	# strange makefile...
+	emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
 
 	einfo "Setting default aliases..."
-	"${D}"/usr/bin/wm-icons-config --force --user-dir="${D}/usr/share/icons/wm-icons" --defaults
+	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
 
-	dodoc AUTHORS ChangeLog NEWS README
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
index 68a7e5ba3b2d..733a3a198bd7 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
@@ -1,52 +1,46 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit autotools
+EAPI=6
 
-DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind"
+inherit autotools
 
+DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind"
 HOMEPAGE="http://wm-icons.sourceforge.net/"
 SRC_URI="mirror://gentoo/wm-icons-${PV}-cvs-01092003.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
-
 IUSE=""
+
 RDEPEND="virtual/awk dev-lang/perl"
 
 S=${WORKDIR}/wm-icons
 
-src_unpack() {
-	unpack ${A}
-
-	sed -i 's#$(bindir)/wm-icons-config#true#g' "${S}"/Makefile.am
-	# duplication of bin/Makefile in configure.in #91764
-	sed -i '132s/bin\/Makefile//' "${S}"/configure.in
-	# non-portable comment bombs automake.
-	sed -i 's/\t#/#/' "${S}"/Makefile.am
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.0-build.patch
+)
 
-	cd "${S}"
+src_prepare() {
+	default
 	eautoreconf
 }
 
-src_compile() {
-	econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	econf --enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
 }
 
 src_install() {
 	# strange makefile...
-	einstall icondir="${D}/usr/share/icons/wm-icons" DESTDIR="${D}" || die
+	emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
 
-	dodir /usr/bin
-	mv "${D}"/"${D}"/usr/bin/wm-icons-config "${D}"/usr/bin/wm-icons-config
 	rm -rf "${D}"/var
 
 	einfo "Setting default aliases..."
-	"${D}"/usr/bin/wm-icons-config --user-dir="${D}/usr/share/icons/wm-icons" --defaults
+	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
 
-	dodoc AUTHORS ChangeLog NEWS README
+	einstalldocs
 }
 
 pkg_postinst() {