[kde-base/smoke] Rename USE flag qtmultimedia->multimedia, fix dependencies

5 files changed, 16 insertions, 15 deletions

diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index b57246780fa..344d9eee45b 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,5 +1,5 @@
 DIST kdebindings-4.4.75.tar.xz 3941788 RMD160 cbf6e0cadd2dfb1db6542264bed9ed77908669b8 SHA1 3c0f5f289f0e6ca5c20c4427ee373c48f1d694f1 SHA256 2404976301612078441beb88987a5e9df5a12810c2b1872b2df90c0f0b8522b3
-EBUILD smoke-4.4.75.ebuild 1493 RMD160 24bc274485da77cc1578617fa3a820ca7f0bcbda SHA1 2c5b540808b7f5260040b39ee3d8e4f9ebfe6ba3 SHA256 4f05e2fa8eb8d030473e9ec5c0fdbb63b1dfbfe7821d8317200c9b8057ea20a7
-EBUILD smoke-4.4.9999.ebuild 1444 RMD160 8c1d84a6a590e86d49797551f38eed0cfdd6b423 SHA1 6d24cf420f058e96d502d0b4d77a06e38ffe56a8 SHA256 34e5ecdd65094a79c220d38b55505eab6562ac9dad111d88ac6796c6d3fe4695
-EBUILD smoke-9999.ebuild 1464 RMD160 b9ac3028ca7f74a3d900752fbb16987383745c5c SHA1 fa86441bbbc7f865348197052c21bb5670da6947 SHA256 82650a9eee2ac22732f48bf7f92941d20d2232982aad84a19d13ded4f28a270c
-MISC metadata.xml 986 RMD160 b010950a769d1d1769834e3835fa31510d5027dd SHA1 ca9d93cf02803a01237ef82e933d6dad38bdc668 SHA256 46b110aa76512d7c973c60dda4becdc09fbaee6c9a0d67183256bca0199b7dfa
+EBUILD smoke-4.4.75.ebuild 1478 RMD160 58d6396ae053fe4fc13d5afb5886445e6dd1a945 SHA1 2514ad08efe1618b5ae8928dbe2ce9d09a23f710 SHA256 63963243049cdae6ce8ff9a8dece07854c134f33767ef6a449d6d19091962722
+EBUILD smoke-4.4.9999.ebuild 1459 RMD160 8bbbb0279be254884b1fc6e8c1414b13fb6cb0e9 SHA1 1266974468cd8b7f1b5d3ddb2bdaf6dfc99656c4 SHA256 5d09e6ee6fbb2657edc4149f01c4aeb098bc9b1712302c550b4e5c2d2b9d0796
+EBUILD smoke-9999.ebuild 1480 RMD160 50fee7b29215558e55910f891d5842a0603ba812 SHA1 25c95f0f9b0c749b7c4dc4326f3041cb35f44da8 SHA256 552ec86a5d6cb34044903500e2f9465e7b3c0d0aa8703dbf40b24e0c69b17b5d
+MISC metadata.xml 944 RMD160 fb1b9282608d5ea4bd47a9ebf98c8bd43b36637a SHA1 5d63a679aea6acd65847af8f4f361238c5446607 SHA256 20a009b1fb09f9488a94c2bd8f3e651a276096b08e730cbd1d76bd33e6e44b98
diff --git a/kde-base/smoke/metadata.xml b/kde-base/smoke/metadata.xml
index de9fbd4dfdb..da52fee479f 100644
--- a/kde-base/smoke/metadata.xml
+++ b/kde-base/smoke/metadata.xml
@@ -4,14 +4,14 @@
 <herd>kde</herd>
 <use>
 	<flag name="attica">Compile bindings for <pkg>dev-libs/libattica</pkg>.</flag>
-	<flag name="akonadi">Compile bindings for <pkg>kde-base/akonadi</pkg>.</flag>
+	<flag name="akonadi">Compile bindings for Akonadi.</flag>
 	<flag name="kdevplatform">Compile bindings for <pkg>dev-util/kdevplatform</pkg>.</flag>
+	<flag name="multimedia">Compile bindings for <pkg>x11-libs/qt-multimedia</pkg>.</flag>
 	<flag name="okular">Compile bindings for <pkg>kde-base/okular</pkg>.</flag>
-	<flag name="phonon">Compile bindings for <pkg>media-sound/phonon</pkg>.</flag>
+	<flag name="phonon">Compile bindings for Phonon.</flag>
 	<flag name="qimageblitz">Compile bindings for <pkg>media-libs/qimageblitz</pkg>.</flag>
 	<flag name="qscintilla">Compile bindings for <pkg>x11-libs/qscintilla</pkg>.</flag>
-	<flag name="qtmultimedia">Compile bindings for <pkg>x11-libs/qt-multimedia</pkg>.</flag>
 	<flag name="qwt">Compile bindings for <pkg>x11-libs/qwt</pkg>.</flag>
-	<flag name="webkit">Compile bindings for <pkg>x11-libs/webkit</pkg>.</flag>
+	<flag name="webkit">Compile bindings for <pkg>x11-libs/qt-webkit</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/kde-base/smoke/smoke-4.4.75.ebuild b/kde-base/smoke/smoke-4.4.75.ebuild
index a5ba35730eb..b5f67396f87 100644
--- a/kde-base/smoke/smoke-4.4.75.ebuild
+++ b/kde-base/smoke/smoke-4.4.75.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="akonadi attica kdevplatform okular +phonon qimageblitz qtmultimedia qscintilla qwt semantic-desktop"
+IUSE="akonadi attica kdevplatform okular +phonon qimageblitz qscintilla qwt semantic-desktop"
 
 COMMON_DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
@@ -34,11 +34,11 @@ src_configure() {
 		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_with kdevplatform KDevPlatform)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
 		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
 		$(cmake-utils_use_with qimageblitz QImageBlitz)
 		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qtmultimedia QtMultimedia)
 		$(cmake-utils_use_with qwt Qwt)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
diff --git a/kde-base/smoke/smoke-4.4.9999.ebuild b/kde-base/smoke/smoke-4.4.9999.ebuild
index 36c3d3775cc..f37b619246b 100644
--- a/kde-base/smoke/smoke-4.4.9999.ebuild
+++ b/kde-base/smoke/smoke-4.4.9999.ebuild
@@ -5,12 +5,13 @@
 EAPI="3"
 
 KMNAME="kdebindings"
+MULTIMEDIA_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS=""
-IUSE="akonadi kdevplatform okular +phonon qimageblitz qtmultimedia qscintilla qwt semantic-desktop"
+IUSE="akonadi kdevplatform okular +phonon qimageblitz qscintilla qwt semantic-desktop"
 
 COMMON_DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
@@ -22,7 +23,6 @@ COMMON_DEPEND="
 	qscintilla? ( x11-libs/qscintilla )
 	qwt? ( x11-libs/qwt:5 )
 "
-
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
@@ -33,11 +33,11 @@ src_configure() {
 		$(cmake-utils_use_enable akonadi)
 		$(cmake-utils_use_enable akonadi Kdepimlibs)
 		$(cmake-utils_use_enable kdevplatform KDEVPLATFORM_SMOKE)
+		$(cmake-utils_use_enable multimedia QTMULTIMEDIA_SMOKE)
 		$(cmake-utils_use_enable okular)
 		$(cmake-utils_use_enable phonon PHONON_SMOKE)
 		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SMOKE)
 		$(cmake-utils_use_enable qscintilla QSCI_SMOKE)
-		$(cmake-utils_use_enable qtmultimedia QTMULTIMEDIA_SMOKE)
 		$(cmake-utils_use_enable qwt QWT_SMOKE)
 		$(cmake-utils_use_enable semantic-desktop Nepomuk)
 		$(cmake-utils_use_enable semantic-desktop Soprano)
diff --git a/kde-base/smoke/smoke-9999.ebuild b/kde-base/smoke/smoke-9999.ebuild
index be389075095..0277e36403b 100644
--- a/kde-base/smoke/smoke-9999.ebuild
+++ b/kde-base/smoke/smoke-9999.ebuild
@@ -5,12 +5,13 @@
 EAPI="3"
 
 KMNAME="kdebindings"
+MULTIMEDIA_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS=""
-IUSE="akonadi attica kdevplatform okular +phonon qimageblitz qtmultimedia qscintilla qwt semantic-desktop"
+IUSE="akonadi attica kdevplatform okular +phonon qimageblitz qscintilla qwt semantic-desktop"
 
 COMMON_DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
@@ -34,11 +35,11 @@ src_configure() {
 		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_with kdevplatform KDevPlatform)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
 		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
 		$(cmake-utils_use_with qimageblitz QImageBlitz)
 		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_disable qtmultimedia QtMultimedia)
 		$(cmake-utils_use_with qwt Qwt)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)