Rename USE flag qtmultimedia->multimedia, fix dependencies

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 21 insertions, 13 deletions

diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index b56637c698ee..ea7441e2b18e 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/smoke
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.100 2010/05/04 05:53:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.101 2010/05/17 15:31:55 reavertm Exp $
+
+*smoke-4.4.3-r1 (17 May 2010)
+*smoke-4.4.2-r1 (17 May 2010)
+
+  17 May 2010; Maciej Mrozowski <reavertm@gentoo.org> -smoke-4.4.2.ebuild,
+  +smoke-4.4.2-r1.ebuild, -smoke-4.4.3.ebuild, +smoke-4.4.3-r1.ebuild,
+  metadata.xml:
+  Rename USE flag qtmultimedia->multimedia, fix dependencies
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -smoke-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/smoke/metadata.xml b/kde-base/smoke/metadata.xml
index 0749e5bb2a98..8c504369eee6 100644
--- a/kde-base/smoke/metadata.xml
+++ b/kde-base/smoke/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
-	<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.2.ebuild b/kde-base/smoke/smoke-4.4.2-r1.ebuild
index 0a59a5f0d2db..032e7b2bc9ae 100644
--- a/kde-base/smoke/smoke-4.4.2.ebuild
+++ b/kde-base/smoke/smoke-4.4.2-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.2.ebuild,v 1.2 2010/05/15 16:53:49 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.2-r1.ebuild,v 1.1 2010/05/17 15:31:55 reavertm Exp $
 
 EAPI="3"
 
 KMNAME="kdebindings"
+MULTIMEDIA_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-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-4.4.3.ebuild b/kde-base/smoke/smoke-4.4.3-r1.ebuild
index 27a64d76425a..bd28b83883f2 100644
--- a/kde-base/smoke/smoke-4.4.3.ebuild
+++ b/kde-base/smoke/smoke-4.4.3-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.3.ebuild,v 1.2 2010/05/15 16:53:49 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.3-r1.ebuild,v 1.1 2010/05/17 15:31:55 reavertm Exp $
 
 EAPI="3"
 
 KMNAME="kdebindings"
+MULTIMEDIA_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-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)