[kde-base/smoke,kde-base/kdebindings-ruby] Reset all recent changes by me on request by reavertm

This reverts commits
	008dc164f01eb3943a0b0a8158afa7d6fbe98ad5
	0e296b1def56221cc93625eb98ff5da06cc8eb79
	c2bd1e1fb4173ee611b5bc0192f818dc4870d106
	9f49739ccc273fb6eb74658342da507d7b373313

12 files changed, 98 insertions, 193 deletions

diff --git a/kde-base/kdebindings-ruby/Manifest b/kde-base/kdebindings-ruby/Manifest
index 86e034a88d7..cf2e7e1fc6b 100644
--- a/kde-base/kdebindings-ruby/Manifest
+++ b/kde-base/kdebindings-ruby/Manifest
@@ -1,10 +1,9 @@
-AUX kdebindings-ruby-fix-linkage-4.5.patch 2367 RMD160 81b66e7525b6a4e7cc92f7773071aa62ea3f75d1 SHA1 6b26466c9507ecee2b5f7a7c77fb331f916879bb SHA256 d2355f7b38e05ba18ecea691e87afa2bc180bc3aa5cf4f7535f80600c77fe84d
 AUX kdebindings-ruby-fix-linkage.patch 1726 RMD160 7f23b1526b7ab6b2f73b31a45bfa6fed0bd62c29 SHA1 c44db3400dae4c81f6c4f6e3941896204fcfd8b8 SHA256 d9ea60a9271db666384ffc0542a7ff3e6d45e0058bcbf14b7ee11907de6052a8
 DIST kdebindings-4.4.85.tar.bz2 6199742 RMD160 712a1979fafb47e48a601dbef83ea2c6f5151b04 SHA1 a46c3d549ba83a16614e8a412a5feece49a1cc98 SHA256 69afa95ea98b6bc7c48e0b552097f7b0378095c2c2c6f531cd5a949c23b35406
 DIST kdebindings-4.4.90.tar.bz2 6310097 RMD160 69dc507abf9a3ac040aad11e8423c974e1c849c0 SHA1 0cf8adcf881bbeecdeba37ac40527fd478a6debe SHA256 1d7a5a98ae1914bb3e83c7e1e097339930d6a99c6479e2d87eafe817b6f64349
-EBUILD kdebindings-ruby-4.4.85.ebuild 2363 RMD160 c14a64a44222ff854c84ebf576d97a82ca827da4 SHA1 fa61bef5b7f134f6a72237345e851945f9615603 SHA256 e64a30270807e077a39eeccafff6da2c548fd569f4e30b1aecc678bd7a5eb3ea
-EBUILD kdebindings-ruby-4.4.90.ebuild 2363 RMD160 c14a64a44222ff854c84ebf576d97a82ca827da4 SHA1 fa61bef5b7f134f6a72237345e851945f9615603 SHA256 e64a30270807e077a39eeccafff6da2c548fd569f4e30b1aecc678bd7a5eb3ea
+EBUILD kdebindings-ruby-4.4.85.ebuild 1812 RMD160 e946c0d2835e0225897a870cc18265330bcce6dc SHA1 088a5a52899a36b71f44563c3f6abef239412773 SHA256 e09b38f6d68e9618d8b0d53bacfe03962f817deee6271e9bf4f5e9f5c6651f68
+EBUILD kdebindings-ruby-4.4.90.ebuild 1812 RMD160 e946c0d2835e0225897a870cc18265330bcce6dc SHA1 088a5a52899a36b71f44563c3f6abef239412773 SHA256 e09b38f6d68e9618d8b0d53bacfe03962f817deee6271e9bf4f5e9f5c6651f68
 EBUILD kdebindings-ruby-4.4.9999.ebuild 2025 RMD160 d8d3cfec50fcc99ed3028b53e58c6ee71f7e876f SHA1 2ef5529de24798ee477f0e93e1d330562f470f83 SHA256 7b12c950366da5ffece2af023ce547435b2e585a6c88a034aa3732522f3c05fe
-EBUILD kdebindings-ruby-4.5.9999.ebuild 2352 RMD160 0afa3b6b019e13ded342ceaa7f4ed71060da55d1 SHA1 d60ea6b25f9b350860fb58b0ea15997a0b084ef8 SHA256 27b66eff8fac48e0fee2843e7b1520f0c22563b1f0362f44ec94bf7c080223d7
-EBUILD kdebindings-ruby-9999.ebuild 2352 RMD160 0afa3b6b019e13ded342ceaa7f4ed71060da55d1 SHA1 d60ea6b25f9b350860fb58b0ea15997a0b084ef8 SHA256 27b66eff8fac48e0fee2843e7b1520f0c22563b1f0362f44ec94bf7c080223d7
-MISC metadata.xml 855 RMD160 16f5782738b7c4c451d4646c1f3ab9e392a23980 SHA1 3e6f74ea1b157df3f6672ef043c27ca909fc7c88 SHA256 285a18a0fefed088f4557acf2c159ebba1a6cae58b4d8d9fe2cb3060d87fc489
+EBUILD kdebindings-ruby-4.5.9999.ebuild 1801 RMD160 8e72787856f8c896f03b6740ff42a5af170b8d7d SHA1 f2c01fb76c06b06786d0e8a89f2cf141f2f74997 SHA256 754d15c0d22abfb26fae733f5f615e33441207371d6ebd826498d67d1a977b5a
+EBUILD kdebindings-ruby-9999.ebuild 1801 RMD160 8e72787856f8c896f03b6740ff42a5af170b8d7d SHA1 f2c01fb76c06b06786d0e8a89f2cf141f2f74997 SHA256 754d15c0d22abfb26fae733f5f615e33441207371d6ebd826498d67d1a977b5a
+MISC metadata.xml 661 RMD160 a61a940860b170381d3b8561f3f2cbd8cb97782a SHA1 189491f1d99cfd0db78d4717111486c610428450 SHA256 5346957821b2b5f5cb1f927e4005400910d14f5b85c0c533d6ea4f98619861d5
diff --git a/kde-base/kdebindings-ruby/files/kdebindings-ruby-fix-linkage-4.5.patch b/kde-base/kdebindings-ruby/files/kdebindings-ruby-fix-linkage-4.5.patch
deleted file mode 100644
index 0903aaa32da..00000000000
--- a/kde-base/kdebindings-ruby/files/kdebindings-ruby-fix-linkage-4.5.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -u kdebindings-ruby-4.4.90/ruby/nepomuk/CMakeLists.txt /home/huettel/tmp/kdebindings-ruby-4.4.90-modified/ruby/nepomuk/CMakeLists.txt
---- kdebindings-ruby-4.4.90/ruby/nepomuk/CMakeLists.txt	2010-05-05 11:39:10.000000000 +0200
-+++ /home/huettel/tmp/kdebindings-ruby-4.4.90-modified/ruby/nepomuk/CMakeLists.txt	2010-07-03 19:53:03.000000000 +0200
-@@ -7,6 +7,8 @@
- target_link_libraries(rubynepomuk 
-     ${RUBY_LIBRARY} 
-     ${NEPOMUK_LIBRARIES}
-+    nepomuk
-+    soprano
-     smokeqtcore 
-     smokesoprano
-     smokekdecore 
-diff -r -u kdebindings-ruby-4.4.90/ruby/qtscript/CMakeLists.txt /home/huettel/tmp/kdebindings-ruby-4.4.90-modified/ruby/qtscript/CMakeLists.txt
---- kdebindings-ruby-4.4.90/ruby/qtscript/CMakeLists.txt	2010-05-20 13:43:58.000000000 +0200
-+++ /home/huettel/tmp/kdebindings-ruby-4.4.90-modified/ruby/qtscript/CMakeLists.txt	2010-07-03 19:43:39.000000000 +0200
-@@ -4,7 +4,7 @@
- set(qtscript_LIBRARY_SRC qtscript.cpp qtscripthandlers.cpp)
- 
- add_library(qtscript MODULE ${qtscript_LIBRARY_SRC})
--target_link_libraries(qtscript ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokebase smokeqtcore smokeqtscript qtruby4shared)
-+target_link_libraries(qtscript ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} QtScript smokebase smokeqtcore smokeqtscript qtruby4shared)
- set_target_properties(qtscript PROPERTIES PREFIX "")
- install(TARGETS qtscript DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
- install(FILES qtscript.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qtscript)
-diff -r -u kdebindings-ruby-4.4.90/ruby/soprano/CMakeLists.txt /home/huettel/tmp/kdebindings-ruby-4.4.90-modified/ruby/soprano/CMakeLists.txt
---- kdebindings-ruby-4.4.90/ruby/soprano/CMakeLists.txt	2010-05-20 13:43:57.000000000 +0200
-+++ /home/huettel/tmp/kdebindings-ruby-4.4.90-modified/ruby/soprano/CMakeLists.txt	2010-07-03 19:44:51.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- set(rubysoprano_LIBRARY_SRC soprano.cpp sopranohandlers.cpp)
- add_library(rubysoprano MODULE ${rubysoprano_LIBRARY_SRC})
--target_link_libraries(rubysoprano ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokebase smokeqtcore smokesoprano qtruby4shared)
-+target_link_libraries(rubysoprano ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} soprano smokebase smokeqtcore smokesoprano qtruby4shared)
- set_target_properties(rubysoprano PROPERTIES PREFIX "" OUTPUT_NAME soprano)
- 
- install(TARGETS rubysoprano DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.85.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.85.ebuild
index 103cdb22491..1d4cb7070e0 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.85.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.85.ebuild
@@ -8,25 +8,17 @@ KMNAME="kdebindings"
 KMMODULE="ruby"
 WEBKIT_REQUIRED="optional"
 
-USE_RUBY="ruby18"
-# No ruby19 for two reasons:
-# 1) it does not build (yet) - solvable I'd guess
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-# Workaround to get things in principle build with several ruby implementations:
-CMAKE_IN_SOURCE_BUILD=1
+USE_RUBY="ruby18 ruby19"
 
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS="~amd64 ~x86"
-IUSE="attica akonadi debug multimedia okular phonon qimageblitz qscintilla qwt semantic-desktop"
+IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep smoke 'attica?,akonadi?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qwt?,semantic-desktop?')
+	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
 "
-
 RDEPEND="${DEPEND}
 	!dev-ruby/qt4-qtruby
 "
@@ -34,10 +26,6 @@ RDEPEND="${DEPEND}
 # Merged with kdebindings-ruby after 4.4.80
 add_blocker krossruby
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage-4.5.patch
-)
-
 pkg_setup() {
 	ruby-ng_pkg_setup
 	kde4-meta_pkg_setup
@@ -67,21 +55,19 @@ all_ruby_prepare() {
 each_ruby_configure() {
 	CMAKE_USE_DIR=${S}
 	mycmakeargs=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
 		-DRUBY_LIBRARY=$(ruby_get_libruby)
 		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
 		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.90.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.90.ebuild
index 103cdb22491..1d4cb7070e0 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.90.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.4.90.ebuild
@@ -8,25 +8,17 @@ KMNAME="kdebindings"
 KMMODULE="ruby"
 WEBKIT_REQUIRED="optional"
 
-USE_RUBY="ruby18"
-# No ruby19 for two reasons:
-# 1) it does not build (yet) - solvable I'd guess
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-# Workaround to get things in principle build with several ruby implementations:
-CMAKE_IN_SOURCE_BUILD=1
+USE_RUBY="ruby18 ruby19"
 
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS="~amd64 ~x86"
-IUSE="attica akonadi debug multimedia okular phonon qimageblitz qscintilla qwt semantic-desktop"
+IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep smoke 'attica?,akonadi?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qwt?,semantic-desktop?')
+	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
 "
-
 RDEPEND="${DEPEND}
 	!dev-ruby/qt4-qtruby
 "
@@ -34,10 +26,6 @@ RDEPEND="${DEPEND}
 # Merged with kdebindings-ruby after 4.4.80
 add_blocker krossruby
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage-4.5.patch
-)
-
 pkg_setup() {
 	ruby-ng_pkg_setup
 	kde4-meta_pkg_setup
@@ -67,21 +55,19 @@ all_ruby_prepare() {
 each_ruby_configure() {
 	CMAKE_USE_DIR=${S}
 	mycmakeargs=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
 		-DRUBY_LIBRARY=$(ruby_get_libruby)
 		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
 		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.9999.ebuild
index 3015acaad36..efcf73f00ec 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.5.9999.ebuild
@@ -8,25 +8,17 @@ KMNAME="kdebindings"
 KMMODULE="ruby"
 WEBKIT_REQUIRED="optional"
 
-USE_RUBY="ruby18"
-# No ruby19 for two reasons:
-# 1) it does not build (yet) - solvable I'd guess
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-# Workaround to get things in principle build with several ruby implementations:
-CMAKE_IN_SOURCE_BUILD=1
+USE_RUBY="ruby18 ruby19"
 
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS=""
-IUSE="attica akonadi debug multimedia okular phonon qimageblitz qscintilla qwt semantic-desktop"
+IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep smoke 'attica?,akonadi?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qwt?,semantic-desktop?')
+	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
 "
-
 RDEPEND="${DEPEND}
 	!dev-ruby/qt4-qtruby
 "
@@ -34,10 +26,6 @@ RDEPEND="${DEPEND}
 # Merged with kdebindings-ruby after 4.4.80
 add_blocker krossruby
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage-4.5.patch
-)
-
 pkg_setup() {
 	ruby-ng_pkg_setup
 	kde4-meta_pkg_setup
@@ -67,21 +55,19 @@ all_ruby_prepare() {
 each_ruby_configure() {
 	CMAKE_USE_DIR=${S}
 	mycmakeargs=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
 		-DRUBY_LIBRARY=$(ruby_get_libruby)
 		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
 		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
index 3015acaad36..efcf73f00ec 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
@@ -8,25 +8,17 @@ KMNAME="kdebindings"
 KMMODULE="ruby"
 WEBKIT_REQUIRED="optional"
 
-USE_RUBY="ruby18"
-# No ruby19 for two reasons:
-# 1) it does not build (yet) - solvable I'd guess
-# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
-#    files with identical path+name will overwrite each other - difficult :(
-
-# Workaround to get things in principle build with several ruby implementations:
-CMAKE_IN_SOURCE_BUILD=1
+USE_RUBY="ruby18 ruby19"
 
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
 KEYWORDS=""
-IUSE="attica akonadi debug multimedia okular phonon qimageblitz qscintilla qwt semantic-desktop"
+IUSE="akonadi debug okular phonon plasma qscintilla qwt semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep smoke 'attica?,akonadi?,multimedia?,okular?,phonon?,qimageblitz?,qscintilla?,qwt?,semantic-desktop?')
+	$(add_kdebase_dep smoke 'akonadi?,okular?,phonon?,qscintilla?,qwt?,semantic-desktop?')
 "
-
 RDEPEND="${DEPEND}
 	!dev-ruby/qt4-qtruby
 "
@@ -34,10 +26,6 @@ RDEPEND="${DEPEND}
 # Merged with kdebindings-ruby after 4.4.80
 add_blocker krossruby
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-linkage-4.5.patch
-)
-
 pkg_setup() {
 	ruby-ng_pkg_setup
 	kde4-meta_pkg_setup
@@ -67,21 +55,19 @@ all_ruby_prepare() {
 each_ruby_configure() {
 	CMAKE_USE_DIR=${S}
 	mycmakeargs=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
 		-DRUBY_LIBRARY=$(ruby_get_libruby)
 		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
 		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebindings-ruby/metadata.xml b/kde-base/kdebindings-ruby/metadata.xml
index 52c9207636d..81e2ae61cbf 100644
--- a/kde-base/kdebindings-ruby/metadata.xml
+++ b/kde-base/kdebindings-ruby/metadata.xml
@@ -4,11 +4,9 @@
 <herd>kde</herd>
 <use>
 	<flag name="akonadi">Compile bindings for Akonadi.</flag>
-	<flag name="attica">Compile bindings for <pkg>dev-libs/libattica</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 Phonon.</flag>
-	<flag name="qimageblitz">Compile bindings for <pkg>media-libs/qimageblitz</pkg>.</flag>
+	<flag name="plasma">Compile bindings for KDE's Plasma.</flag>
 	<flag name="qscintilla">Compile bindings for <pkg>x11-libs/qscintilla</pkg>.</flag>
 	<flag name="qwt">Compile bindings for <pkg>x11-libs/qwt</pkg>.</flag>
 	<flag name="webkit">Compile bindings for <pkg>x11-libs/qt-webkit</pkg>.</flag>
diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index ccbd1adb6f5..fa8c1a0632d 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,8 +1,8 @@
 DIST kdebindings-4.4.85.tar.bz2 6199742 RMD160 712a1979fafb47e48a601dbef83ea2c6f5151b04 SHA1 a46c3d549ba83a16614e8a412a5feece49a1cc98 SHA256 69afa95ea98b6bc7c48e0b552097f7b0378095c2c2c6f531cd5a949c23b35406
 DIST kdebindings-4.4.90.tar.bz2 6310097 RMD160 69dc507abf9a3ac040aad11e8423c974e1c849c0 SHA1 0cf8adcf881bbeecdeba37ac40527fd478a6debe SHA256 1d7a5a98ae1914bb3e83c7e1e097339930d6a99c6479e2d87eafe817b6f64349
-EBUILD smoke-4.4.85.ebuild 1388 RMD160 b883de830653c33dd655a9a3b55098dbc5d64f10 SHA1 a188391ae4dc337befe7420308c047b478400402 SHA256 53380252cdc67834afdfa63ce7753669f2aaedc708c3b70c9e934569b5f29455
-EBUILD smoke-4.4.90.ebuild 1388 RMD160 b883de830653c33dd655a9a3b55098dbc5d64f10 SHA1 a188391ae4dc337befe7420308c047b478400402 SHA256 53380252cdc67834afdfa63ce7753669f2aaedc708c3b70c9e934569b5f29455
+EBUILD smoke-4.4.85.ebuild 1401 RMD160 49840ff5709c1f14492b829ad0674f21f99a6dbb SHA1 e17ebdbd6ad681d6c4c1969e0144e0877cff9e9d SHA256 cb7976dfb851bb35ba9a08f73c538d21d517310498ef29e9ee07650994676484
+EBUILD smoke-4.4.90.ebuild 1401 RMD160 49840ff5709c1f14492b829ad0674f21f99a6dbb SHA1 e17ebdbd6ad681d6c4c1969e0144e0877cff9e9d SHA256 cb7976dfb851bb35ba9a08f73c538d21d517310498ef29e9ee07650994676484
 EBUILD smoke-4.4.9999.ebuild 1457 RMD160 f9e0fa681e4f3b43e3088c60ceedcbfcc2fe3f17 SHA1 f22529917cece17030df2ddda31bc338b6ee9aea SHA256 e73cd15601807cd3bbf932626df47fcece7ca7b58941bfdc82af46b62dea5f73
-EBUILD smoke-4.5.9999.ebuild 1365 RMD160 1b0cfad19940c6ba5481fdc68bf8a5d55d798d5d SHA1 af0f861c9b68e3596a0565083243f97e141da30f SHA256 1da453f0dbe92ae6c68e39b1f88c869d19b53b57e662e38757095626ffaa3ca1
-EBUILD smoke-9999.ebuild 1365 RMD160 1b0cfad19940c6ba5481fdc68bf8a5d55d798d5d SHA1 af0f861c9b68e3596a0565083243f97e141da30f SHA256 1da453f0dbe92ae6c68e39b1f88c869d19b53b57e662e38757095626ffaa3ca1
+EBUILD smoke-4.5.9999.ebuild 1378 RMD160 9143085cd06f6d68c7dc3d28c637e1bb6a9adde9 SHA1 e68e1d24c0f8847f03b3b13363bbb868be9b056b SHA256 9f5b027976e7947097eaeefd5f020aad986f855600e0633c3ae90f306c8445bf
+EBUILD smoke-9999.ebuild 1378 RMD160 9143085cd06f6d68c7dc3d28c637e1bb6a9adde9 SHA1 e68e1d24c0f8847f03b3b13363bbb868be9b056b SHA256 9f5b027976e7947097eaeefd5f020aad986f855600e0633c3ae90f306c8445bf
 MISC metadata.xml 855 RMD160 3366062158944aaf59639aaf4a99725957121a91 SHA1 297448503eddfcff5b0e1adabaaa429be25e4712 SHA256 0f61c4ea91ad15c6f66ac9c4720b4f0f8deefe368476907a2252b3a143a8730d
diff --git a/kde-base/smoke/smoke-4.4.85.ebuild b/kde-base/smoke/smoke-4.4.85.ebuild
index 7ff570a20ba..ca81acdda7d 100644
--- a/kde-base/smoke/smoke-4.4.85.ebuild
+++ b/kde-base/smoke/smoke-4.4.85.ebuild
@@ -30,18 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
 		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/smoke/smoke-4.4.90.ebuild b/kde-base/smoke/smoke-4.4.90.ebuild
index 7ff570a20ba..ca81acdda7d 100644
--- a/kde-base/smoke/smoke-4.4.90.ebuild
+++ b/kde-base/smoke/smoke-4.4.90.ebuild
@@ -30,18 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
 		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/smoke/smoke-4.5.9999.ebuild b/kde-base/smoke/smoke-4.5.9999.ebuild
index 9ce89625a4d..a6b4a9d1fec 100644
--- a/kde-base/smoke/smoke-4.5.9999.ebuild
+++ b/kde-base/smoke/smoke-4.5.9999.ebuild
@@ -30,18 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
 		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/smoke/smoke-9999.ebuild b/kde-base/smoke/smoke-9999.ebuild
index 9ce89625a4d..a6b4a9d1fec 100644
--- a/kde-base/smoke/smoke-9999.ebuild
+++ b/kde-base/smoke/smoke-9999.ebuild
@@ -30,18 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with qimageblitz)
-		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_with okular)
 		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
 		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_with okular)
-		$(cmake-utils_use_with webkit QT_QTWEBKIT)
-		$(cmake-utils_use_with multimedia QT_MULTIMEDIA)
+		$(cmake-utils_use_with qwt Qwt)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_disable webkit QtWebKit)
 	)
 	kde4-meta_src_configure
 }