Remove kdevplatform USE flag, drop old patch.

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

diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index ea7441e2b18e6ed7c6f82d0fc44a938746180d52..977335c7c24e511da6ed436cafbe791b27a54e05 100644 (file)
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,11 @@
 # 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.101 2010/05/17 15:31:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.102 2010/05/20 03:54:41 reavertm Exp $
+
+  20 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -files/smoke-4.4.1-webkit-cmake.patch, smoke-4.4.2-r1.ebuild,
+  smoke-4.4.3-r1.ebuild, metadata.xml:
+  Remove kdevplatform USE flag, drop old patch.
 
 *smoke-4.4.3-r1 (17 May 2010)
 *smoke-4.4.2-r1 (17 May 2010)

diff --git a/kde-base/smoke/files/smoke-4.4.1-webkit-cmake.patch b/kde-base/smoke/files/smoke-4.4.1-webkit-cmake.patch
deleted file mode 100644 (file)
index 9833149..0000000
--- a/kde-base/smoke/files/smoke-4.4.1-webkit-cmake.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: smoke/plasma/CMakeLists.txt
-===================================================================
---- smoke/plasma/CMakeLists.txt        (revision 1107565)
-+++ smoke/plasma/CMakeLists.txt        (working copy)
-@@ -3,14 +3,14 @@
- 
- ########### next target ###############
- 
--add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp 
--    ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp 
-+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
-     ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
-     ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
-     ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
-@@ -22,8 +22,8 @@
- 
- macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
- 
--set(smokeplasma_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp  
--                ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp 
-+set(smokeplasma_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
-+                ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
-                 ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
-                 ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
-                 ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
-@@ -41,12 +41,11 @@
- 
- kde4_add_library(smokeplasma SHARED ${smokeplasma_LIB_SRCS})
- 
--target_link_libraries(smokeplasma 
-+target_link_libraries(smokeplasma
-     ${KDE4_KDEUI_LIBS}
-     ${KDE4_PLASMA_LIBS}
-     smokeqtcore
-     smokeqtgui
--    smokeqtwebkit
-     smokekdecore
-     smokekdeui
- )

diff --git a/kde-base/smoke/metadata.xml b/kde-base/smoke/metadata.xml
index 8c504369eee63bc7fdbdf5d8b19ec15abf0093a8..c78d4590a3562dc26a6476a00e1a0493b99cb6ff 100644 (file)
--- a/kde-base/smoke/metadata.xml
+++ b/kde-base/smoke/metadata.xml
@@ -4,7 +4,6 @@
 <herd>kde</herd>
 <use>
        <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 Phonon.</flag>

diff --git a/kde-base/smoke/smoke-4.4.2-r1.ebuild b/kde-base/smoke/smoke-4.4.2-r1.ebuild
index 032e7b2bc9ae58c2eebb6211d6d110dde0b3eb21..663b576e9091584d6b59883312f2ca9aea45d9b0 100644 (file)
--- a/kde-base/smoke/smoke-4.4.2-r1.ebuild
+++ b/kde-base/smoke/smoke-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/05/17 15:31:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.2-r1.ebuild,v 1.2 2010/05/20 03:54:41 reavertm Exp $
 
 EAPI="3"
 
@@ -11,12 +11,11 @@ inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="akonadi kdevplatform okular +phonon qimageblitz qscintilla qwt semantic-desktop"
+IUSE="akonadi okular +phonon qimageblitz qscintilla qwt semantic-desktop"
 
 COMMON_DEPEND="
        $(add_kdebase_dep kdelibs 'semantic-desktop?')
        akonadi? ( $(add_kdebase_dep kdepimlibs) )
-       kdevplatform? ( dev-util/kdevplatform:4 )
        okular? ( $(add_kdebase_dep okular) )
        phonon? ( >=media-sound/phonon-4.3.80[xcb] )
        qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
@@ -32,7 +31,6 @@ src_configure() {
        mycmakeargs=(
                $(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)

diff --git a/kde-base/smoke/smoke-4.4.3-r1.ebuild b/kde-base/smoke/smoke-4.4.3-r1.ebuild
index bd28b83883f2d17dd7d2b7ad6ed38ac985c1ad72..c39464d5ab7f183243c6012a5aaf1d494887b275 100644 (file)
--- a/kde-base/smoke/smoke-4.4.3-r1.ebuild
+++ b/kde-base/smoke/smoke-4.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/05/17 15:31:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-4.4.3-r1.ebuild,v 1.2 2010/05/20 03:54:41 reavertm Exp $
 
 EAPI="3"
 
@@ -11,12 +11,11 @@ inherit kde4-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="akonadi kdevplatform okular +phonon qimageblitz qscintilla qwt semantic-desktop"
+IUSE="akonadi okular +phonon qimageblitz qscintilla qwt semantic-desktop"
 
 COMMON_DEPEND="
        $(add_kdebase_dep kdelibs 'semantic-desktop?')
        akonadi? ( $(add_kdebase_dep kdepimlibs) )
-       kdevplatform? ( dev-util/kdevplatform:4 )
        okular? ( $(add_kdebase_dep okular) )
        phonon? ( >=media-sound/phonon-4.3.80[xcb] )
        qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
@@ -32,7 +31,6 @@ src_configure() {
        mycmakeargs=(
                $(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)