[kde-base/smoke] As yet untested cleanup after reading CMake files

5 files changed, 44 insertions, 48 deletions

diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 6bc59b8c0d3..ccbd1adb6f5 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 1480 RMD160 a7165dbd7ba562aa0d5a3a17687249f777887050 SHA1 007e3bd33513e421fbefc9f3aa89945902600356 SHA256 0ae566f0a5522da762872a49e21348f203780119bdcd151453a23e7f4f05a419
-EBUILD smoke-4.4.90.ebuild 1480 RMD160 a7165dbd7ba562aa0d5a3a17687249f777887050 SHA1 007e3bd33513e421fbefc9f3aa89945902600356 SHA256 0ae566f0a5522da762872a49e21348f203780119bdcd151453a23e7f4f05a419
+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.9999.ebuild 1457 RMD160 f9e0fa681e4f3b43e3088c60ceedcbfcc2fe3f17 SHA1 f22529917cece17030df2ddda31bc338b6ee9aea SHA256 e73cd15601807cd3bbf932626df47fcece7ca7b58941bfdc82af46b62dea5f73
-EBUILD smoke-4.5.9999.ebuild 1457 RMD160 f9e0fa681e4f3b43e3088c60ceedcbfcc2fe3f17 SHA1 f22529917cece17030df2ddda31bc338b6ee9aea SHA256 e73cd15601807cd3bbf932626df47fcece7ca7b58941bfdc82af46b62dea5f73
-EBUILD smoke-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
 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 3790051388a..7ff570a20ba 100644
--- a/kde-base/smoke/smoke-4.4.85.ebuild
+++ b/kde-base/smoke/smoke-4.4.85.ebuild
@@ -30,19 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_enable attica ATTICA_SMOKE)
-		$(cmake-utils_use_enable multimedia QTMULTIMEDIA_SMOKE)
-		$(cmake-utils_use_with okular)
+		$(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_enable phonon PHONON_SMOKE)
-		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SMOKE)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
+		$(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)
 	)
 	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 3790051388a..7ff570a20ba 100644
--- a/kde-base/smoke/smoke-4.4.90.ebuild
+++ b/kde-base/smoke/smoke-4.4.90.ebuild
@@ -30,19 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_enable attica ATTICA_SMOKE)
-		$(cmake-utils_use_enable multimedia QTMULTIMEDIA_SMOKE)
-		$(cmake-utils_use_with okular)
+		$(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_enable phonon PHONON_SMOKE)
-		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SMOKE)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
+		$(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)
 	)
 	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 8ef04e66bea..9ce89625a4d 100644
--- a/kde-base/smoke/smoke-4.5.9999.ebuild
+++ b/kde-base/smoke/smoke-4.5.9999.ebuild
@@ -30,19 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_enable attica ATTICA_SMOKE)
-		$(cmake-utils_use_enable multimedia QTMULTIMEDIA_SMOKE)
-		$(cmake-utils_use_with okular)
+		$(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_enable phonon PHONON_SMOKE)
-		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SMOKE)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
+		$(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)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/smoke/smoke-9999.ebuild b/kde-base/smoke/smoke-9999.ebuild
index 8ef04e66bea..9ce89625a4d 100644
--- a/kde-base/smoke/smoke-9999.ebuild
+++ b/kde-base/smoke/smoke-9999.ebuild
@@ -30,19 +30,18 @@ KMEXTRA="generator/"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
-		$(cmake-utils_use_enable attica ATTICA_SMOKE)
-		$(cmake-utils_use_enable multimedia QTMULTIMEDIA_SMOKE)
-		$(cmake-utils_use_with okular)
+		$(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_enable phonon PHONON_SMOKE)
-		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SMOKE)
-		$(cmake-utils_use_with qscintilla QScintilla)
-		$(cmake-utils_use_enable qwt QWT_SMOKE)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable webkit QTWEBKIT_SMOKE)
+		$(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)
 	)
 	kde4-meta_src_configure
 }