gentoo resync : 18.11.2018

17 files changed, 73 insertions, 132 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index b0bb25f7994d..e7373df52529 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index b6d5fa069eeb..05e2eb09b307 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,5 +1,3 @@
 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.9.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.9.ebuild
deleted file mode 100644
index c9b20a3f4677..000000000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 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/v${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}-${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/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest
index dd70af0a23b1..67acb1176452 100644
--- a/x11-themes/gtk-engines-xfce/Manifest
+++ b/x11-themes/gtk-engines-xfce/Manifest
@@ -1,6 +1,6 @@
 DIST gtk-xfce-engine-3.2.0.tar.bz2 376203 BLAKE2B 700584aeea0708dfc1cbad521ba96578141eeb21bbe23f48ad36917476b32bb97b9ff60537a5a372fbb48a805fb002128215a9a9bcb71422641c0ab2a9d12154 SHA512 c965e597c1b4aa04f3b474f3c4cea249aa6e753be697d5d3d7a19184adca650fc084f39acbd357f53eaf4180d96d5d3499866367e221ae445de4864fc9487012
 EBUILD gtk-engines-xfce-3.2.0-r200.ebuild 972 BLAKE2B 7e66efd9f398928f235ae696813e64baf79b22b66c0b09128475b99329608513031c2cb7285c36a3009d3efdc1f10e96755af2fe72d89770ae84b3ff0331d841 SHA512 06ef08131e8a543f426f8a3d26eb8781ee6fbb74b5e78c848db9598ccc2f8659eba90cedde064d05490d21af1722684f44352aba0d0ac745c28d1a34faa3f13b
-EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 927 BLAKE2B 390f01f310391b2c9b8abc7830faf0a7c5e8e180b7b87268c1b318bc2b1e9f0a44eee2a675b92d4ba3feff2f51aa2c0b4544bfc6888af8c681ac4d2c901ea01b SHA512 0ec27229322c13f6de71030699be150f7937da3e6a887afc5f4ec85fcf12448651cfbadcbdc3ee05da265eef98b1856dd82287d25989a19e5e65ec9aada5333d
+EBUILD gtk-engines-xfce-3.2.0-r201.ebuild 922 BLAKE2B c8dae77914d05bcc8b90534858125d2c2e8d60a8b3b96be423acfd46d201c4daa39093648a1847737b71cbe682929a5e4231950c85a35d7cdc479312b5fa1ab6 SHA512 ae30f002527099276808afdddbf3c54104c835d001d93e7bf8cf8c6fe7c289687fa1c237a69636088b8909a20251e92e56bf02f5d926dbc7bc6325b312980cc1
 EBUILD gtk-engines-xfce-3.2.0-r300.ebuild 963 BLAKE2B d5ea466648cdcb7d376a16f58bedf37dc76902a734b272bf8e70fdba689f63e5c50b89bdff7fe0d20fd5658c5dcfc3f9430f2d8b03f361d1801db3397273037a SHA512 ffef8d32f14efc88be776723c97aff5854cca4dbb8d7cdf0c044e9ec2a5883d94a163c44a48f30307dd0617cbe61c19b36ab252a092c1aa0619f2541306e3057
-EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 902 BLAKE2B fbf1455e965c78a369aa06d77a507d2a214a722d0ce9eb3db8c755fdee62f6c5f4d14b810d08e47f32cd012086792af5d4a88935807f0d96215a0ecb7461d8c2 SHA512 d8431b720c39700e236d51d720000921887acc37098bcf83cb03dc84d91cc5755bc866881fb0cf2c525bda28258336a12d9f37a34110c2f6349f389d16c994d2
+EBUILD gtk-engines-xfce-3.2.0-r301.ebuild 897 BLAKE2B b8e08b1d11b2f539209c54939071f214152217baecb2c2d621c6f7256c897587f4d3c533f0b649ef376c8d8dbc65f3d63f27126360d5f564e8b671b8649e72b4 SHA512 53a285e1d506c87c4026a5934531d7b3653d79f4538f9caddf4dab02e22967b617e3261b53034a77145b404f482d764f9449a81896cbedc347b8373ce2e5b153
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
index b81e0cf61d5d..018f3597fca7 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
index b0a291857673..b702b2799788 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index ca3c35e7c678..f64ef8d45c43 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -7,6 +7,6 @@ AUX oxygen-gtk-1.4.6-warning.patch 823 BLAKE2B f544b0c5412adce2ada2fbc45ac4db235
 AUX oxygen-gtk-1.4.6-xul.patch 3556 BLAKE2B 59818ece59ebb36bc89481f9451e1d92da32b84ddf9e9206a71e674b86734dffc17c1b9e357ec27c21519f8ac0479d73f7e95add6033593974a125650810e9d4 SHA512 6010bcefc0e94bfa1dadb52eef93ea11b702a6c7bb4e4fc5badf9dd02fc948201f62c84a7ecd0dff1cf62f7b803ecfa1ef40eae610a7e7f9708a6c6cba9059cd
 DIST oxygen-gtk2-1.4.6.tar.bz2 201105 BLAKE2B 0116c331a4d417975d64d057f990d8526b4129a2da48902dc9a0167820d7a255cb29dc5ff465a66703a74fdd0ac7981b97fa46e914a00d1b08cd85deea846958 SHA512 89f0edba061973ef85607c6cdb8329768faea52f12147d7436530cdec59649c92472cacf1030e1ad6f610f138b11ad60f4f67847b670cf9b7409ad5b6ae25ed0
 DIST oxygen-gtk3-1.4.1.tar.bz2 197242 BLAKE2B 40516410e4422942fec8092da91386c9fb1faa01be2bbe58307c1adf6b50c5dfc5274a69a396fc156e9208f6ae4fca758c7c1378222f7066f398cd7177b70adc SHA512 22f18efe51029d078f80563956b1e67fc7d24fd165650d5050641785aedd55ac7cb065d61cb04e0b62b483e2d5c0c1dd13ffe6a4271e06be2f254375e97e8934
-EBUILD oxygen-gtk-1.4.1-r1.ebuild 1428 BLAKE2B 6240ab49ce72b6d755dd16db166b86bcd9097f0be1d295a328f5d2774e22ad309ac8b679fdc243e86a2a6e2f7b1dcfc2dc5e8a9cfb8c6e7dc50f93710238f6bb SHA512 f56970929aff2e3d6198f944f1447a7cd9e7ad37d2584e7384c5ba6e0f297298d66b88aee66e9668782ba5aab8f609fc2ba1d4efa9dd60966e383b1c0ed1e54f
-EBUILD oxygen-gtk-1.4.6-r1.ebuild 1511 BLAKE2B ecd011b0e960817b45e77c72b11a36bbf842b703b01eeb62981782cb4d40002ba023daa216edfc04cdd53377578479d924a2f68c7c95a6e08ff144922dba6727 SHA512 a281b9437c12a0948733f4ee776d0848e519dce8609965eed213a6e547e5dabcaa1769f3715fe3e6d5f2247d7bb493b78717e48e31bdd30af3d6e1e96ae54d22
+EBUILD oxygen-gtk-1.4.1-r1.ebuild 1285 BLAKE2B e675b92f7f9c715a8454f31dc14ec48ab18d82d87f6d60f016b0730c56854abe9927258faa6fc7b6b7f3975044beacc181fb9cacb9adc6795c0a5e82cc6b6a3d SHA512 fb12bd04928fc05f36d54f401be7e38aa6506021031e4be8205bc0a807f33e7da1a7d0d4d8f29473e2d02f8e1207c67623d51fc5acd934abb4b15094a5cf535e
+EBUILD oxygen-gtk-1.4.6-r1.ebuild 1368 BLAKE2B cfaf73b9eda499a5d23ff0741eb9f303f69b1f7481367346910e1a3e46ff9209f88f9d1a101af845d0f8bbceb555e0a698c1771b1aec18d8bdf65ed3ca6af765 SHA512 e27274b0a5d861bb71af4164eedc957037ab2a27576332189c0dc10ae0537b655ffc4bd08eb3a6dd4ccbea07c71e8c9f2da11c60abd88ae4fc8a286a9afca86f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
index db872163b5a7..757eb7553411 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~ppc x86"
 SLOT="3"
-IUSE="debug doc"
+IUSE="debug"
 
 COMMON_DEPEND="
 	dev-libs/dbus-glib[${MULTILIB_USEDEP}]
@@ -28,7 +28,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-themes/oxygen-gtk:0
@@ -52,11 +51,6 @@ multilib_src_configure() {
 }
 
 src_install() {
-	if use doc; then
-		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( doc/html/. )
-	fi
-
 	cmake-multilib_src_install
 
 	cat <<-EOF > 99oxygen-gtk3
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
index 13ad7933192c..9c643ec4e767 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~ppc x86"
 SLOT="2"
-IUSE="debug doc"
+IUSE="debug"
 
 COMMON_DEPEND="
 	dev-libs/dbus-glib[${MULTILIB_USEDEP}]
@@ -28,7 +28,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-themes/oxygen-gtk:0
@@ -55,11 +54,6 @@ multilib_src_configure() {
 }
 
 src_install() {
-	if use doc; then
-		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( doc/html/. )
-	fi
-
 	cmake-multilib_src_install
 
 	cat <<-EOF > 99oxygen-gtk2
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 2b5f786b43bf..0c5d26ca2f9c 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,8 +1,9 @@
 AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
+AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7
 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0.ebuild 1935 BLAKE2B e3fbef80435438375bd6fb9f42dffd57e3697b4a024c0dd339cd684b84a95f5b584be79cf311b95db5b15e8c524f870f19e5c38c8b7a3a984212b258c7f7529e SHA512 937d89c004588ecdb4dceb6657b7d79684dfa7ccdfb8693269cbf4816b291a35f0fbb2395086134ee8a1207b00ad601fe53aba137feac25170fd292dac8f9bb5
+EBUILD qtcurve-1.9.0.ebuild 1989 BLAKE2B 579a37559cef8c0f3c0cc69af606244207513d29371c024614ccaf653bd58be60ac6a4de6fe16d9636ff95b9dedd88054b920968b2727e86866fc9590f4f37fd SHA512 dd7696ba307d7eea9974d37d40a1b96a4463d78c5bea215b1256bf682f19a7bb476b753f2fa34bc6b4eda68a9ea822c92575b883688789ae154f7ce2aec09002
 EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1987 BLAKE2B 2f321fbfea11cba255d14d59d5211ab27e44d95fbf5107b0cad998bd799835a3ddaaae0ed0260e4a6223958fab7d6885681647a49984c6227e77192c46ef66bb SHA512 37e08003b638b27d36346d05bd19037af1f7d53c0e5d12a0de2a0341e602d63b89ce64acc4527adf2bd44babeb9adb57cb7b10ac6ede60c2133c5b801b9c9539
-EBUILD qtcurve-9999.ebuild 1939 BLAKE2B cc64e737f57f494291cc957c4e23dbbf5f0c034f01f9340a77934f84cba43b8352e8d004889b344a7821aa3db3eda1bb8ca5707b9bea2044c41810cd8489794e SHA512 9ff4d5abf4d4d53136f4fc38b780ebe334a91d11eb2f334f4d1081844ed4012263d2ca70650375cef32721b743d9c48927a39f9fa4ca0ab43768b88757e502a6
+EBUILD qtcurve-9999.ebuild 1943 BLAKE2B 8bca5a9694ae117d1e255dab57a557061bad9b1b0b1e8c27e4fd0161e7a0f50d7b63633c26ee4876ee3ecf0f71cc7a623481bc7dfdb0b51d26042c93b0df63b6 SHA512 7c60cde110d1c22ffac534ec12c85811a94f2e7482eb7a8fba25b539bc83a2acf711ad136c009aff8a8ce7e444d80824e54b2f4f93db14d7077a8a79e87c0229
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch
new file mode 100644
index 000000000000..883a8af24355
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch
@@ -0,0 +1,54 @@
+From 9aae21bb68308d9017977a53059dd75b347d7bbd Mon Sep 17 00:00:00 2001
+From: "R.J.V. Bertin" <rjvbertin@gmail.com>
+Date: Tue, 3 Apr 2018 18:18:37 +0200
+Subject: Minor X11-related build fixes:
+
+- don't override QTC_ENABLE_X11 with platform conditionals
+- use qtcX11Enabled() instead of QTC_ENABLE_X11 everywhere
+
+Committed from host : Portia.local
+---
+ qt5/CMakeLists.txt           | 2 +-
+ qt5/config/qtcurveconfig.cpp | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 930c919..8cff198 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -36,7 +36,7 @@ if(ENABLE_QT5)
+     set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS})
+     set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS})
+   endforeach()
+-  if(NOT APPLE)
++  if(QTC_ENABLE_X11)
+     set(QTC_QT5_OPT_MODULES Qt5X11Extras)
+   endif()
+   foreach(QtModule ${QTC_QT5_OPT_MODULES})
+diff --git a/qt5/config/qtcurveconfig.cpp b/qt5/config/qtcurveconfig.cpp
+index b320c25..a34f9bd 100644
+--- a/qt5/config/qtcurveconfig.cpp
++++ b/qt5/config/qtcurveconfig.cpp
+@@ -42,6 +42,7 @@
+ #include <qtcurve-utils/dirs.h>
+ #include <qtcurve-utils/process.h>
+ #include <qtcurve-utils/qtutils.h>
++#include <qtcurve-utils/x11base.h>
+ 
+ // Qt
+ #include <QCheckBox>
+@@ -975,9 +976,9 @@ QtCurveConfig::QtCurveConfig(QWidget *parent)
+     dropShadowSize->setRange(0, 100);
+     dropShadowSize->setSingleStep(1);
+     dropShadowSize->setValue(qtcX11ShadowSize());
+-#ifndef QTC_ENABLE_X11
+-    dropShadowSize->setEnabled(false);
+-#endif
++    if (!qtcX11Enabled()) {
++        dropShadowSize->setEnabled(false);
++    }
+ 
+ 
+     sliderWidth->setRange(MIN_SLIDER_WIDTH, MAX_SLIDER_WIDTH);
+-- 
+cgit v0.11.2
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
index cb783404aa59..6047b67909da 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtgui)
 		$(add_qt_dep qtsvg)
 		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
+		X? ( $(add_qt_dep qtx11extras) )
 	)
 	X? (
 		x11-libs/libX11
@@ -68,6 +68,7 @@ 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"
 )
 
 src_configure() {
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 9a99d8eec626..0d7ef602fb66 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtgui)
 		$(add_qt_dep qtsvg)
 		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
+		X? ( $(add_qt_dep qtx11extras) )
 	)
 	X? (
 		x11-libs/libX11
diff --git a/x11-themes/smplayer-skins/Manifest b/x11-themes/smplayer-skins/Manifest
index b2d199a1060c..49aaa5bfe775 100644
--- a/x11-themes/smplayer-skins/Manifest
+++ b/x11-themes/smplayer-skins/Manifest
@@ -1,4 +1,3 @@
 DIST smplayer-skins-15.2.0.tar.bz2 382879 BLAKE2B bda1e651a5f38ffb6c727634d6829d52f189af419c795ffb194fb1f38617d92f472094a600f48029bbc9882ecc0517e16745ed00d13a0a95527a0802f8bc0c05 SHA512 58d1dcc9caf5d93b7f0692ffa7ff4875eb8dd83db78293aee25a713a1f6007c83af556215cd1f7666dec98bc323b074c6b1fdb66eb9560176db842669c206a83
 EBUILD smplayer-skins-15.2.0-r1.ebuild 704 BLAKE2B 120f79f543721d5e091cb1b6dfe5b74435d12ff400b2e76d5c0ec352e61d0454d02f37dd26ccbfa0a6b6c735d51632f0ba087c284324648b48e0ee0772176671 SHA512 1a994e9a73aa46f68a2b2fe41788f5287fa55fdc7f9e3baa989622403775e2acd4b11938cc97be33204872c9f367bc61be3185a579b7e6cd3f3f208e9425706d
-EBUILD smplayer-skins-15.2.0.ebuild 522 BLAKE2B 7fb63d141b26cbfc8892cd6b676635047258a3b8e4f3c5d32e90287f171c43504eff81baf5a879497aab7fb5e9e9ddcc1003b7c18b544b3127281424eda774ae SHA512 f05eac7b6d2188275e1c74fc9b6b36edb98b38642378b944256bc88a9884fd2b9ffb7ffb49399adc7b205c087fafb753acb38580a5c9bc30e99fbb803a715c5c
 MISC metadata.xml 445 BLAKE2B 3cc26829e4dcfd7ad584ae03834f4e1a627323393a022d582f4a354232d44d86c814e652d0e689ca12bf29a246c4673d4088b395f2665d4c8aadf608da9448d8 SHA512 3886c993922515ec56ae8bd971bdb47f582cd6ec2fb9341e89902394f30a9186d8b66d958e3ef1b042ce0dbbb39fd35f28abed6e4056c27b53ba25d97a2b7a8e
diff --git a/x11-themes/smplayer-skins/smplayer-skins-15.2.0.ebuild b/x11-themes/smplayer-skins/smplayer-skins-15.2.0.ebuild
deleted file mode 100644
index a90ee50e734b..000000000000
--- a/x11-themes/smplayer-skins/smplayer-skins-15.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Skins for SMPlayer"
-HOMEPAGE="http://www.smplayer.info/"
-SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
-
-LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="media-video/smplayer"
-
-src_install() {
-	rm themes/Makefile
-	insinto /usr/share/smplayer
-	doins -r themes
-	dodoc Changelog README.txt
-}
diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest
index 229c6bc1a8d7..3187d62873f0 100644
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@@ -1,5 +1,3 @@
-DIST smplayer-themes-17.3.0.tar.bz2 3480857 BLAKE2B d3385d6f416a4a2aaca4709006de574df89cd281dd20dfcf4fd9fd2501a7cd918d30fa9326d77cb14bcddfd4eaf16356d17d5a5d64f443256af91b6d6abea28c SHA512 99f320fdd6934b377da7f39486489e8c5f6f2c76168b06a58ef4b019689da87fe7474ba59d0653e1ec8f2e2e075c1e9af06c09b6a3bc7a416f8c328a47e495fe
 DIST smplayer-themes-18.6.0.tar.bz2 3739369 BLAKE2B 55618c03649c6c93cb3951d8b4ffff6f45ab153c169ad0fcbbf53c92b2110a57591db71b3fd0fa05cf9a84c4186b8c0e4998ea39b8d8d51100569c679d78d27d SHA512 e16f2dc50015b0034134a096ca99603167309c31bb50a44679c343b5f9c0ea786a17a0fb64eb1d71c61dacbd2a295adc0a82d23bd0837adf96664120f33adda6
-EBUILD smplayer-themes-17.3.0.ebuild 759 BLAKE2B 102abccf74e1e5779d96ec00797137f1266f7f79246c53bc294691fa5d4b0d2552de0e0a6adeb1bad50c7a6b6595921320a74e04ea1d337a8232696d62c9c817 SHA512 e458eb802e5e949e85419a18aafeb9262002f9158eed5ca6888765a70c692eeaae7c8053b311d07564d8ae0c810470a3e5dfba307505dc47f7249ae5c75bd9e4
 EBUILD smplayer-themes-18.6.0.ebuild 759 BLAKE2B 57784249f74ee18a407314cb2b9ccd2465500d91e55b193811a180b75ff50cc9951250610acfe991701772a6ae0efcf8a8079da971c4295ceacc1efcf8d4b0fd SHA512 aa0b02169975b867cbfbe60fdef5f568d311e56aade7e2c9d2c29348e7b7302ffbf2558d8a19431ac294bde2b9fe4ae46e9f377b94466924501d8f6a1444ad2f
 MISC metadata.xml 445 BLAKE2B 3cc26829e4dcfd7ad584ae03834f4e1a627323393a022d582f4a354232d44d86c814e652d0e689ca12bf29a246c4673d4088b395f2665d4c8aadf608da9448d8 SHA512 3886c993922515ec56ae8bd971bdb47f582cd6ec2fb9341e89902394f30a9186d8b66d958e3ef1b042ce0dbbb39fd35f28abed6e4056c27b53ba25d97a2b7a8e
diff --git a/x11-themes/smplayer-themes/smplayer-themes-17.3.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-17.3.0.ebuild
deleted file mode 100644
index 5f24f5a236e9..000000000000
--- a/x11-themes/smplayer-themes/smplayer-themes-17.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Icon themes for smplayer"
-HOMEPAGE="https://www.smplayer.info/"
-SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
-
-LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 CC0-1.0 GPL-2 GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5"
-RDEPEND="media-video/smplayer"
-
-src_prepare() {
-	default
-
-	# bug 544108
-	sed -i -e "s|	rcc|	\"$(qt5_get_bindir)\"/rcc|" themes/Makefile || die
-
-	# bug 544160
-	sed -i -e 's/make/$(MAKE)/' Makefile || die
-}
-
-src_install() {
-	rm themes/Makefile || die
-	insinto /usr/share/smplayer
-	doins -r themes
-	dodoc Changelog README.txt
-}