Fixed bug 307995 (patch by Iain Oliver), also fixed USE flags handling and removed clucene bindings

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

5 files changed, 68 insertions, 109 deletions

diff --git a/kde-base/kdebindings-csharp/ChangeLog b/kde-base/kdebindings-csharp/ChangeLog
index ac0af748977d..b30ef471cfdd 100644
--- a/kde-base/kdebindings-csharp/ChangeLog
+++ b/kde-base/kdebindings-csharp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebindings-csharp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.24 2010/03/02 16:21:36 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.25 2010/03/26 21:12:07 reavertm Exp $
+
+  26 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  kdebindings-csharp-4.4.1.ebuild,
+  +files/kdebindings-csharp-4.4.1-make-stuff-optional.patch,
+  -files/kdebindings-csharp-4.4-build-fixes.patch, metadata.xml:
+  Fixed bug 307995 (patch by Iain Oliver), also fixed USE flags handling and
+  removed clucene bindings
 
 *kdebindings-csharp-4.4.1 (02 Mar 2010)
 
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
deleted file mode 100644
index 01c17d4110e4..000000000000
--- a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- csharp/qtscript/CMakeLists.txt
-+++ csharp/qtscript/CMakeLists.txt
-@@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(qtscript-sharp MODULE ${SRC_CPP})
--TARGET_LINK_LIBRARIES(qtscript-sharp smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtscript-sharp smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qtscript "${SRC_CS}" ALL)
---- csharp/qtwebkit/CMakeLists.txt
-+++ csharp/qtwebkit/CMakeLists.txt
-@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(qtwebkit-sharp MODULE ${SRC_CPP})
--TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qtwebkit "${SRC_CS}" ALL)
---- csharp/qyoto/CMakeLists.txt
-+++ csharp/qyoto/CMakeLists.txt
-@@ -39,13 +39,13 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CM
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- 
- ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
- TARGET_LINK_LIBRARIES (qyotoshared smokeqtcore smokeqtgui smokeqtxml smokeqtopengl smokeqtsql smokeqtnetwork smokeqtnetwork smokeqtdbus smokeqtsvg
--                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QNETWORK_LIBRARY})
- set_target_properties(qyotoshared PROPERTIES VERSION 1.0.0 SOVERSION 1 COMPILE_DEFINITIONS QYOTOSHARED_BUILDING)
- 
- ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
- TARGET_LINK_LIBRARIES (qyoto qyotoshared
-                        smokeqtcore smokeqtgui smokeqtxml smokeqtopengl smokeqtsql smokeqtnetwork smokeqtnetwork smokeqtdbus smokeqtsvg
--                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
- 
- CSHARP_ADD_LIBRARY(qt-dotnet ${SRC_CS_QYOTO} COMPILE_FLAGS /warn:0 "/keyfile:${KEYFILE}" UNSAFE)
- SET_PROPERTY(TARGET qt-dotnet PROPERTY pkg-config_template_basename "qyoto")
---- csharp/soprano/CMakeLists.txt
-+++ csharp/soprano/CMakeLists.txt
-@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(soprano-sharp MODULE ${SRC_CPP})
- ADD_DEPENDENCIES(soprano-sharp smokesoprano)
--TARGET_LINK_LIBRARIES(soprano-sharp smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(soprano-sharp smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${SOPRANO_LIBRARIES})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(soprano "${SRC_CS}" ALL)
---- csharp/CMakeLists.txt	2009-09-02 13:30:38.045355025 +0300
-+++ csharp/CMakeLists.txt	2009-09-02 13:31:40.426071410 +0300
-@@ -3,6 +3,7 @@
- OPTION(ENABLE_QTTEST "build QtTest" ON)
- OPTION(ENABLE_QTUITOOLS_SHARP "build QtUiTools" ON)
- OPTION(ENABLE_QTWEBKIT_SHARP "build QtWebKit" ON)
-+OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" ON)
- OPTION(ENABLE_PHONON_SHARP "build PhononSharp" OFF)
- OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
- OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
-@@ -15,7 +16,8 @@
- set(QTTEST_ENABLED "no")
- SET(QTWEBKIT_ENABLED "no")
- SET(QTUITOOLS_ENABLED "no")
--SET(QTWEBKIT_ENABLED "no")
-+SET(QTWEBKIT_SHARP_ENABLED "no")
-+SET(PLASMA_SHARP_ENABLED "no")
- SET(PHONON_SHARP_ENABLED "no")
- SET(QSCINTILLA_SHARP_ENABLED "no")
- SET(AKONADI_ENABLED "no")
-@@ -102,8 +104,10 @@
-             set(AKONADI_ENABLED "yes")
-         endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- 
--        SET(PLASMA_SHARP_ENABLED "yes")
--        ADD_SUBDIRECTORY(plasma)
-+        IF(ENABLE_PLASMA_SHARP)
-+         SET(PLASMA_SHARP_ENABLED "yes")
-+         ADD_SUBDIRECTORY(plasma)
-+        ENDIF(ENABLE_PLASMA_SHARP)
- 
-     ENDIF (CMAKE_CSharp_COMPILER_LOADED)
- endif(ENABLE_QYOTO)
-@@ -114,6 +118,7 @@
- message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
- message(STATUS "Build NepomukSharp... " ${NEPOMUK_SHARP_ENABLED})
- message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
-+message(STATUS "Build QtWebkitSharp... " ${QTWEBKIT_SHARP_ENABLED})
- message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
- message(STATUS "Build KHTMLSharp... " ${KHTML_SHARP_ENABLED})
- message(STATUS "Build KTextEditorSharp... " ${KHTML_SHARP_ENABLED})
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.1-make-stuff-optional.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.1-make-stuff-optional.patch
new file mode 100644
index 000000000000..2dc071ab25d9
--- /dev/null
+++ b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.1-make-stuff-optional.patch
@@ -0,0 +1,41 @@
+--- csharp/CMakeLists.txt	2009-09-02 13:30:38.045355025 +0300
++++ csharp/CMakeLists.txt	2009-09-02 13:31:40.426071410 +0300
+@@ -3,6 +3,7 @@
+ OPTION(ENABLE_QTTEST "build QtTest" ON)
+ OPTION(ENABLE_QTUITOOLS_SHARP "build QtUiTools" ON)
+ OPTION(ENABLE_QTWEBKIT_SHARP "build QtWebKit" ON)
++OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" ON)
+ OPTION(ENABLE_PHONON_SHARP "build PhononSharp" OFF)
+ OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
+ OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
+@@ -15,7 +16,8 @@
+ set(QTTEST_ENABLED "no")
+ SET(QTWEBKIT_ENABLED "no")
+ SET(QTUITOOLS_ENABLED "no")
+-SET(QTWEBKIT_ENABLED "no")
++SET(QTWEBKIT_SHARP_ENABLED "no")
++SET(PLASMA_SHARP_ENABLED "no")
+ SET(PHONON_SHARP_ENABLED "no")
+ SET(QSCINTILLA_SHARP_ENABLED "no")
+ SET(AKONADI_ENABLED "no")
+@@ -102,8 +104,10 @@
+             set(AKONADI_ENABLED "yes")
+         endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+ 
+-        SET(PLASMA_SHARP_ENABLED "yes")
+-        ADD_SUBDIRECTORY(plasma)
++        IF(ENABLE_PLASMA_SHARP)
++         SET(PLASMA_SHARP_ENABLED "yes")
++         ADD_SUBDIRECTORY(plasma)
++        ENDIF(ENABLE_PLASMA_SHARP)
+ 
+     ENDIF (CMAKE_CSharp_COMPILER_LOADED)
+ endif(ENABLE_QYOTO)
+@@ -114,6 +118,7 @@
+ message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
+ message(STATUS "Build NepomukSharp... " ${NEPOMUK_SHARP_ENABLED})
+ message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
++message(STATUS "Build QtWebkitSharp... " ${QTWEBKIT_SHARP_ENABLED})
+ message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
+ message(STATUS "Build KHTMLSharp... " ${KHTML_SHARP_ENABLED})
+ message(STATUS "Build KTextEditorSharp... " ${KHTML_SHARP_ENABLED})
diff --git a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.1.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.1.ebuild
index 51341f7d2051..cb5c76f48b2d 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.1.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.1.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/kdebindings-csharp/kdebindings-csharp-4.4.1.ebuild,v 1.1 2010/03/02 16:21:36 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.1.ebuild,v 1.2 2010/03/26 21:12:07 reavertm Exp $
 
 EAPI="3"
 
@@ -11,17 +11,17 @@ inherit kde4-meta mono
 
 DESCRIPTION="C# bindings for KDE and Qt"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="akonadi +phonon plasma qscintilla webkit"
+IUSE="akonadi +phonon plasma qimageblitz qscintilla semantic-desktop webkit"
 
 DEPEND="
 	dev-lang/mono
-	$(add_kdebase_dep smoke 'akonadi?,phonon?,qscintilla?,webkit?')
+	$(add_kdebase_dep smoke 'akonadi?,phonon?,qimageblitz?,qscintilla?,semantic-desktop?,webkit?')
 "
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="smoke/"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.4-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.4.1-make-stuff-optional.patch )
 
 pkg_setup() {
 	kde4-meta_pkg_setup
@@ -38,23 +38,26 @@ pkg_setup() {
 src_prepare() {
 	kde4-meta_src_prepare
 
-	sed -i "/add_subdirectory( examples )/ s:^:#:" csharp/plasma/CMakeLists.txt
+	# Disable soprano index (clucene) bindings
+	rm -f csharp/soprano/soprano/Soprano_Index_{CLuceneIndex,IndexFilterModel}.cs || die
+	sed -e 's/\${SOPRANO_INDEX_LIBRARIES}//g' \
+		-i csharp/soprano/CMakeLists.txt || die 'failed to remove clucene from link'
+
+	sed -e "/add_subdirectory( examples )/ s:^:#:" \
+		-i csharp/plasma/CMakeLists.txt || die 'failed to disable examples'
 }
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_enable plasma PLASMA_SHARP)
 		$(cmake-utils_use_enable phonon PHONON_SHARP)
+		$(cmake-utils_use_enable qimageblitz QIMAGEBLITZ_SHARP)
 		$(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP)
-		$(cmake-utils_use_enable akonadi KdepimLibs)
-		$(cmake-utils_use_enable akonadi)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_enable webkit QTWEBKIT_SHARP)
 	)
 	kde4-meta_src_configure
 }
-
-src_compile() {
-	# Parallel builds seem broken, check later
-	MAKEOPTS=-j1
-	kde4-meta_src_compile
-}
diff --git a/kde-base/kdebindings-csharp/metadata.xml b/kde-base/kdebindings-csharp/metadata.xml
index 902140174f47..8e20b56f0552 100644
--- a/kde-base/kdebindings-csharp/metadata.xml
+++ b/kde-base/kdebindings-csharp/metadata.xml
@@ -4,8 +4,9 @@
 <herd>kde</herd>
 <use>
 	<flag name="akonadi">Compile bindings for <pkg>kde-base/akonadi</pkg>.</flag>
-	<flag name="phonon">Compile bindings for <pkg>media-sound/phonon</pkg>.</flag>
 	<flag name="plasma">Compile bindings for kde's plasma.</flag>
+	<flag name="phonon">Compile bindings for <pkg>media-sound/phonon</pkg>.</flag>
+	<flag name="qimageblitz">Compile bindings for <pkg>kde-base/qimageblitz</pkg>.</flag>
 	<flag name="qscintilla">Compile bindings for <pkg>x11-libs/qscintilla</pkg>.</flag>
 	<flag name="webkit">Compile bindings for <pkg>x11-libs/webkit</pkg>.</flag>
 </use>