gentoo resync : 30.06.2018

15 files changed, 97 insertions, 151 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8b08c919dafb..ef9ea02a52e8 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 3af9179f1a54..07e60725a1f1 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,6 +1,6 @@
+AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0_rc1-r1.ebuild 2065 BLAKE2B 4b45d665aeba947e5b51477e6f720fe0f756c9e16e0659cb0504fd03df123a2b81829e3a24ab699d60b12a1dcf96a688002df8eae6a06409ffcccf53e104a9d8 SHA512 84a6fa3e5d59a3fc10e632aa27a864c256fcd569ced6fb49f77802b2a8d30675da3768503f30426d5c284c221ee6f59f7507ac8a0fb1717d2d48137f4332e6a3
-EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1974 BLAKE2B 001e67d1a862f5040e7088ff3671738b5ddd0669ba7dcf56e8a7d8fae97990304542e37861930bd8aebde72e18250c1b35b8e7151cfa356618fed52c5ae88117 SHA512 cff3c3ee7ca5fdd3d13aa9c953bc1bede44ac1b16cc616538b542b0ba9380dda124b12e3989e3dbbe84bb81a445da6f328702fabcf13d7dd793f4de457291124
-EBUILD qtcurve-9999.ebuild 1971 BLAKE2B df4f9f6c79453d76dbe65bdeb2657d1d80763a35073898fa32b03b118ebba732561be8711ae43215b748dea9069defa12691d0bb3b59c8e8ee6b446c5c6000be SHA512 4ad09d774e114645fd74ef7d4f8841af3cc6229e7d49ebef4cc88638b89def50743e79e44568c95ccdbad79939f11c3684ebcade4323d5aaca1d0836050b89b1
+EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1960 BLAKE2B 4587c07047c0f21fe3f63d95eee9cb771fe453e51aa4c7cc6a10ffd456b5fa1f11b9308e35410b9a3ca003066481cb107aed1652f6a6486411431075d83aa1f2 SHA512 e406769e290be4e2bc1a2589b164d0d72cb532cce33804a331b948e0c4d0b01c58a14fb83e6ca01b449ba30793a1c7ab504a1e41669b7d0db2731f4fe4cc71d3
+EBUILD qtcurve-9999.ebuild 1912 BLAKE2B 5995c2956da4675290c0b4d688dad677b58c9616d48b32413bbbb44c4f41ea3119d73685775309074f528b237f01b78bb9994587af11681cd09aa9095f332ddd SHA512 2b4a358871d1ed0daf8d8769301edc6c0735a3f6039a168a92db40fa8e357c20b3c8b7ffa6a247d41551062415c3955751bb75dd01b92bd051c80d05c8232fae
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch
new file mode 100644
index 000000000000..16f7198aba8f
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch
@@ -0,0 +1,44 @@
+From 237912b291dcc706fcc1d9b02a8398385d19f38f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 26 Jun 2018 18:03:06 +0200
+Subject: [PATCH] Switch from ENABLE_TEST to the ECM/CMake standard
+ BUILD_TESTING
+
+Summary:
+BUILD_TESTING is used throughout KDE projects as provided by
+CTest and/or KDECMakeSettings.
+
+Reviewers: yuyichao
+
+Reviewed By: yuyichao
+
+Differential Revision: https://phabricator.kde.org/D13741
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70e21b3a..15f6b177 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,7 +52,7 @@ qtc_option(ENABLE_QT4 "Building Qt4 theme." On)
+ qtc_option(ENABLE_QT5 "Building Qt5 theme." On)
+ qtc_option(ENABLE_GTK2 "Building Gtk2 theme." On)
+ # option(ENABLE_GTK3 "Building Gtk3 theme." On)
+-option(ENABLE_TEST "Enable testing." On)
++option(BUILD_TESTING "Enable testing." On)
+ option(QTC_ENABLE_X11 "Enable X11" On)
+ option(QTC_INSTALL_PO "Install translation files." On)
+ 
+@@ -247,7 +247,7 @@ if(ENABLE_GTK2)
+     add_subdirectory(gtk2)
+ endif()
+ add_subdirectory(tools)
+-if(ENABLE_TEST)
++if(BUILD_TESTING)
+   enable_testing()
+   add_subdirectory(test)
+ endif()
+-- 
+2.18.0
+
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
deleted file mode 100644
index 484ac77201a3..000000000000
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 qt4 +qt5 test"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-REQUIRED_USE="gtk? ( X )
-	|| ( gtk qt4 qt5 )
-	plasma? ( qt5 )
-"
-
-COMMON_DEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		$(add_qt_dep qtdbus)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtsvg)
-		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
-	)
-	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)
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-themes/gtk-engines-qtcurve
-"
-
-DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
-
-#PATCHES=(
-#	"${FILESDIR}/${P}-add_utils_include.patch"
-#)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_QT4_ENABLE_KWIN=OFF
-		-DQTC_KDE4_DEFAULT_HOME=ON
-		-DENABLE_GTK2="$(usex gtk)"
-		-DENABLE_QT4="$(usex qt4)"
-		-DENABLE_QT5="$(usex qt5)"
-		-DENABLE_TEST="$(usex test)"
-		-DQTC_ENABLE_X11="$(usex X)"
-		-DQTC_INSTALL_PO="$(usex nls)"
-		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
-	)
-
-	kde5_src_configure
-}
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index 600372fcffb2..e795ba2ee0fe 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
@@ -15,7 +15,7 @@ IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
@@ -67,6 +67,7 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.0-rare_crash_hang_fix.patch"
+	"${FILESDIR}/${PN}-1.9.0-build_testing.patch"
 )
 
 src_configure() {
@@ -74,11 +75,9 @@ src_configure() {
 		-DENABLE_QT4=OFF
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_QT4_ENABLE_KWIN=OFF
 		-DQTC_KDE4_DEFAULT_HOME=ON
 		-DENABLE_GTK2="$(usex gtk)"
 		-DENABLE_QT5="$(usex qt5)"
-		-DENABLE_TEST="$(usex test)"
 		-DQTC_ENABLE_X11="$(usex X)"
 		-DQTC_INSTALL_PO="$(usex nls)"
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 0c90108fce51..d5f28086e7cc 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -74,11 +74,9 @@ src_configure() {
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-DENABLE_QT4=OFF
 		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_QT4_ENABLE_KWIN=OFF
 		-DQTC_KDE4_DEFAULT_HOME=ON
 		-DENABLE_GTK2="$(usex gtk)"
 		-DENABLE_QT5="$(usex qt5)"
-		-DENABLE_TEST="$(usex test)"
 		-DQTC_ENABLE_X11="$(usex X)"
 		-DQTC_INSTALL_PO="$(usex nls)"
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
diff --git a/x11-themes/skinenigmang-logos/Manifest b/x11-themes/skinenigmang-logos/Manifest
index b638cc9ac262..e58f638e603c 100644
--- a/x11-themes/skinenigmang-logos/Manifest
+++ b/x11-themes/skinenigmang-logos/Manifest
@@ -1,6 +1,3 @@
 DIST enigma-logos-20131008.tar.xz 1740544 BLAKE2B dc0df1e0e8542d36e755883edb2d83ae3536b080ac0f1ce0ddb1bd203e068abce1c11f7f97fac18f258871ca9f7e419f4335dd0bb7b2afc68b50f8dcd6ce3bed SHA512 f7d7916986ce693706c1278abd295171e88655b0eb4d971d3b0ba8a4af9fe04655182c04af5a6d2e7f2bbb75dde063608c22453a419ff1f7237eb47e7f43b3ca
-DIST skinenigmang-logos-xpm-hi-20070214.tgz 528736 BLAKE2B 1ff0c4dbdfd366010862340779b88628fbf36ecbfe9b783da083300a1400fc39356151c1f4070648e719235b8428026d9273c67cb334805170ca99b1458266cf SHA512 8ab41969ce1e3142ccd93801591342cec4dad910bf37a103171d1f67e928326fbc7fd1ffad40d550bca43674e1f4a994626b1e60571a96e66793e2aaac207b21
-DIST skinenigmang-logos-xpm-lo-20070214.tgz 341812 BLAKE2B 14895b0ce7d03e928b1569b69bdbce9fb5cccb712263a1614eebbc8323c4c71959c8e4eb931b717b76d29a37de8867bd2b8e2178c55eba64a7ad909aebdeb21e SHA512 5013d3d4e3696ad6c7541beaecd092da481d62d580a66888630c6346c1e45b2d39245b5773e3a7e62d5927415a6a9c0d902bb455674d10012b461b44769581c8
-EBUILD skinenigmang-logos-20070214-r1.ebuild 769 BLAKE2B 6186766cbf82591f5c933c62c6950aa7e6487e80fefe2936389cbed940841cb67d28df490046113964edbe2befea1782a74195031034dca01d184dda8d2995ae SHA512 24fa454976e909cdb30f94e214cc4ada72fb4e36bb86030d86c9696c58a0a28f62dca68b7b6ee2577fcc6948a9dc24de100f4dcb3f0ebfbc9aa6eb009a760bb9
 EBUILD skinenigmang-logos-20131008.ebuild 605 BLAKE2B 2439deeae8b76daf0607b25fede3dce4783a9c4a03cb4f0b4ef1d13d89e09e3a93f377509e84e41dc25f03972e1026a7f98e6c7fcdb6c758bf43d3bf3f12b2bf SHA512 3e73fbdd0fb2f71af3efedef5a6ea84efdeab41f56e3e6d499e736780e669589668817647e75310dfaa158718251c05880c6e077312a1b6c641847dec8a6e4dc
-MISC metadata.xml 345 BLAKE2B a3e28f75cced61044ac6a7dd508bbb3e93c243d5e89ee134b7043be19ff3b5145f797e95e598c3e2b315f5b48d040dba1645797297ebd1d25bad68b637e56b80 SHA512 cad7095f10458b5e831c849b3bef6fe8d6f9d4610671d3c12988363901d82b442d8db87036a7dffc35c34ddee9957c0b2949fcccb8ec8d34d9c6abc30861fe9e
+MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/x11-themes/skinenigmang-logos/metadata.xml b/x11-themes/skinenigmang-logos/metadata.xml
index e62650c54a53..984a01fab265 100644
--- a/x11-themes/skinenigmang-logos/metadata.xml
+++ b/x11-themes/skinenigmang-logos/metadata.xml
@@ -5,7 +5,4 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-	<use>
-		<flag name="dxr3">Install logos for lower osd color depth on dxr3 cards</flag>
-	</use>
 </pkgmetadata>
diff --git a/x11-themes/skinenigmang-logos/skinenigmang-logos-20070214-r1.ebuild b/x11-themes/skinenigmang-logos/skinenigmang-logos-20070214-r1.ebuild
deleted file mode 100644
index 6e7a2d058e50..000000000000
--- a/x11-themes/skinenigmang-logos/skinenigmang-logos-20070214-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="VDR - Skin Plugin: enigma-ng logos"
-HOMEPAGE="http://andreas.vdr-developer.org/enigmang/download.html"
-SRC_URI="!dxr3? ( http://andreas.vdr-developer.org/enigmang/download/${PN}-xpm-hi-${PV}.tgz )
-		dxr3? ( http://andreas.vdr-developer.org/enigmang/download/${PN}-xpm-lo-${PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="dxr3"
-
-RDEPEND="media-plugins/vdr-skinenigmang
-		app-text/convmv"
-
-S=${WORKDIR}/skinenigmang
-
-src_prepare() {
-
-	convmv --notest -f iso-8859-1 -t utf-8 -r "${S}"/
-}
-
-src_install() {
-
-	insinto /usr/share/vdr/skinenigmang
-	cp -r -a "${S}"/* --target="${D}"/usr/share/vdr/skinenigmang
-}
diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest
index 8c5598e24642..79ddb8afe532 100644
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@@ -1,3 +1,5 @@
 DIST smplayer-themes-17.3.0.tar.bz2 3480857 BLAKE2B d3385d6f416a4a2aaca4709006de574df89cd281dd20dfcf4fd9fd2501a7cd918d30fa9326d77cb14bcddfd4eaf16356d17d5a5d64f443256af91b6d6abea28c SHA512 99f320fdd6934b377da7f39486489e8c5f6f2c76168b06a58ef4b019689da87fe7474ba59d0653e1ec8f2e2e075c1e9af06c09b6a3bc7a416f8c328a47e495fe
-EBUILD smplayer-themes-17.3.0.ebuild 758 BLAKE2B 852ac243b3336ba2ca4773fe8a8f549f50244ef94406fdc190ec0006c8d45c74b3b6c1fed1e5ea9e6858866c8b82f23b49722c280a5f59c53c5fca4130742ed6 SHA512 54d9d2d4cb31cd20dd2e5d33040a1bf557dc2fc81a8b23b69d626eb7c1122bb70573ff2700c8b8022e5e0bb9ccc98748adfae45cc2273af689e2a2335d4b0a88
+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 761 BLAKE2B c944fd417549c9ed1a51332c4234871e0e3d417a68a94bc1d30dd988c6df7924125176b76945d08e292a2aaf5c5953683f25f0bd357d2226d77aa2252ad29c67 SHA512 43d9249e03ea8e4bd4ce975e57b2712b5e5c32dd727184058faf6f84007eb1a05b899c652585f1ecf5e46f9d13bd0d0311686ed51eb3feeef96eda2cd12418cb
 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
index fba270cc180f..5f24f5a236e9 100644
--- a/x11-themes/smplayer-themes/smplayer-themes-17.3.0.ebuild
+++ b/x11-themes/smplayer-themes/smplayer-themes-17.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="Icon themes for smplayer"
-HOMEPAGE="http://www.smplayer.info/"
+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"
diff --git a/x11-themes/smplayer-themes/smplayer-themes-18.6.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-18.6.0.ebuild
new file mode 100644
index 000000000000..25a6b959aaea
--- /dev/null
+++ b/x11-themes/smplayer-themes/smplayer-themes-18.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+}
diff --git a/x11-themes/zukini/Manifest b/x11-themes/zukini/Manifest
index ce20532a1c4e..0329b5fe3ec4 100644
--- a/x11-themes/zukini/Manifest
+++ b/x11-themes/zukini/Manifest
@@ -1,5 +1,5 @@
 DIST zukini-20120806.zip 195927 BLAKE2B efca985f735de11b2a8681c139a8df1dd6c3b5b58cd9dd0e9043c25d449d29dab6397e4d9cbb42cd7be7aefc7bc1eb37cb05c8c65f7abe7fbb49b7df565a4a17 SHA512 90e663645ec2c867b88a8d02d940bed70270a940c7162ce761c5d7018a1ad9a2f11c3b547ac1d470f19a3729533836cef8cc53bdc18ea89eb293265c51f37083
 DIST zukini-20120817.zip 195930 BLAKE2B 78ba7fa7fe5d21add63f1f5028d1616ea8a9cfbe885ea1b373a60ebc6c9acc1d0b7798a585c958ba092f52b6fc05bcbab8550d7524828983c665060cfada689b SHA512 0ea42bc729100018acc16405283d41a10381bbcc411ea1b473880b7fdfe6785d6b7ae409959bdfb4f86c6081ae5fd102701efff793ea852c9c9913a03805e5f0
 EBUILD zukini-20120806.ebuild 780 BLAKE2B ddfe09e122f894255a69baeedec59215fc5298583c76bb6949f3659d1d5bc3c02fc53e5f7dac5586fc5573025204d02a92d30e620f553a9a4102c012c9fa297f SHA512 74a9d7594f9f5539b88b899a89a62d32ae0375ef4837ee400b9a5b2eb92e81a2f09b7997fa6be115bc3829e39f37fb674bdb1961097a642959f4b649a6ec4fc6
-EBUILD zukini-20120817.ebuild 782 BLAKE2B 0a1a71fdf98e7479efc3ed1cb69fc76f22f31709452b97405b9d3c4755a47d9f3365b9439c3585ae954e920dcfeae6233c7f1a157599ec5f6d7d814ea9261ddf SHA512 3c6e59114e724312db01ad72c1e9ffe88a5f48ff22d77919b17c47c41c24cd0bfeef32c4eca68913351b1f6d604e3864f0f22b14b58ecf3d95e82fbe9e6f2f46
-MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
+EBUILD zukini-20120817.ebuild 797 BLAKE2B 7457049f6b8c167e49dc67fb4be04d9aeac5656dcde0f68edbf0b960b48920a7b3b7872112e03f1edaf8658e45275f9ef670d45583f5491b4c97527a634bc0be SHA512 915c32032add2c18682f0e76435d8db4435cf505fc0d92d66804d4cd3bebe37e43fbe08676c700fbe40a3e428430946a41a6541bb0a70e7a41f1bf00245a7688
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/zukini/metadata.xml b/x11-themes/zukini/metadata.xml
index e945e1307667..2ba8e9e851e4 100644
--- a/x11-themes/zukini/metadata.xml
+++ b/x11-themes/zukini/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
diff --git a/x11-themes/zukini/zukini-20120817.ebuild b/x11-themes/zukini/zukini-20120817.ebuild
index 6b2e7d7d2bf9..05d476b9d932 100644
--- a/x11-themes/zukini/zukini-20120817.ebuild
+++ b/x11-themes/zukini/zukini-20120817.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Unified look for GTK+ 2.x, GTK+ 3.x, gnome-shell, metacity and more"
 HOMEPAGE="http://lassekongo83.deviantart.com/#/d4ic1u2"
@@ -14,9 +14,9 @@ IUSE=""
 
 RESTRICT="binchecks strip"
 
+BDEPEND="app-arch/unzip"
 RDEPEND=">=x11-themes/gtk-engines-murrine-0.98.2
 	>=x11-themes/gtk-engines-unico-1.0.2"
-DEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
@@ -24,8 +24,8 @@ src_unpack() {
 	unpack ${A}
 
 	local x=${S}/Zukini-awn
-	mkdir -p "${x}"
-	tar -zxf Zukini-awn.tgz -C "${x}"
+	mkdir -p "${x}" || die
+	tar -zxf Zukini-awn.tgz -C "${x}" || die
 }
 
 src_install() {