Rename USE flag qtmultimedia->multimedia, fix dependencies

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 25 insertions, 17 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/Manifest b/kde-base/smoke/Manifest
index 9f8b63ee9a0e..313bef993731 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,7 +1,7 @@
 AUX smoke-4.4.1-webkit-cmake.patch 1939 RMD160 2c8edf4126a8b9c543c22c22712100bc35a4a85f SHA1 ba916a423838f85e378a0fc15bfb8fbbd4e46dc4 SHA256 d3845d12811c73cce9f22b9b6cddb3fcc289148d958041c7523255c09c7f06c5
 DIST kdebindings-4.4.2.tar.bz2 5090793 RMD160 7c08c71c29a661c2e0f53faa48638cfec56230cd SHA1 283e2c099ed4a55ed49e826eb1bdb694d7022089 SHA256 d7cb00eaad66a5397e3656b442f7d911ab1f63601b628917fce9cd1aeaeae204
 DIST kdebindings-4.4.3.tar.bz2 5092068 RMD160 21dd5c9975d6a183ba37f6f89124e833d98d18ea SHA1 dbfaf3760b5cbdaf6fed9672af32f938ddca29a2 SHA256 efdaac0baefc5fd7d40f3e0bc89dfb1daab3d5dec87cab70f7b7800ab903ca3e
-EBUILD smoke-4.4.2.ebuild 1570 RMD160 c4d9a6737379fe7a88f345c3cf8d2da882b425c9 SHA1 2486700aecaab05b5f0adca5d9cb2b0ae1f835e5 SHA256 1e95ccad5968071f2165717b820ff526cced6989fa624d7e0ef9811b95918b25
-EBUILD smoke-4.4.3.ebuild 1570 RMD160 559736426d4ed557c42f08265d59ca8918c8af47 SHA1 055f91774974897fbd14e0a01ad36dc6e5e1387a SHA256 fe5929fd44486960b5b014347a69627b8fbd2ce617de0bce3e5771372f3ec761
-MISC ChangeLog 12133 RMD160 b3c88767441ad20e327c63f84f88a88955e193f1 SHA1 5a4afb80514f42d8dc73aece6fd0b047474ac45a SHA256 264276256ba8324be9e7f722f1a100955e185b75b7d9bfded8ef5b10ca153052
-MISC metadata.xml 906 RMD160 5a11afb49d44f2a253e71eacfeed6d1eb019947d SHA1 9c6eb600fe4efff22c39d9fe1d095ccc0d0e1a81 SHA256 4d3ce96ebd9222ff8b400de251a7fc21265e178929f7cf3c5aa671bc79cbe701
+EBUILD smoke-4.4.2-r1.ebuild 1588 RMD160 525fb17a36dde04153bf45120afaf726ce1fabd3 SHA1 52e29e5d4c460db62356cc06a4ad9c85564a5fa7 SHA256 095386ec07306fa77018e63541372d0866753c234297a6e5b43419a05adb32f7
+EBUILD smoke-4.4.3-r1.ebuild 1588 RMD160 170446698a40fea1e5386223fa71724f9cdc3823 SHA1 cf817717f9814f8eb6b0617f3a9842105cf2dd59 SHA256 3a7cd854b6436d096f21d11c3bf2639c2ff38c2841873ee5d71af74b77091242
+MISC ChangeLog 12420 RMD160 17e438c12f770d5e81954720f74bb74585c98d86 SHA1 177a7409a8c2877632701c81b5ad0fb43219ccfa SHA256 54dda2e6d598edca3320c886a6dc9dcbfaa2d652efa2587328185e2f4efa883c
+MISC metadata.xml 864 RMD160 ed18b2fab7efe6b2725bccc69500d74984214878 SHA1 9d109e6149cf1091bb6844b717ce081f1d1fe915 SHA256 4e822bd82b7e80b0493f87fec641c4cd3a9413c78838cf9b8f76505d7ee2a9d4
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)