[kde-base/kdebindings-csharp:4.4] Make it work, fix bug 307995

5 files changed, 62 insertions, 110 deletions

diff --git a/kde-base/kdebindings-csharp/Manifest b/kde-base/kdebindings-csharp/Manifest
index 997012d0b7e..ec3c60d2695 100644
--- a/kde-base/kdebindings-csharp/Manifest
+++ b/kde-base/kdebindings-csharp/Manifest
@@ -1,4 +1,4 @@
-AUX kdebindings-csharp-4.4-build-fixes.patch 4750 RMD160 a0a7ff494851da27f34af84f40375cdeaf0b2fb8 SHA1 3c2bee22445c6ebd748c1262ed3ebeb798331dea SHA256 62c21602db7a44cf6c058a89de892074581091f3096627663f46302dadd683d4
-EBUILD kdebindings-csharp-4.4.9999.ebuild 1337 RMD160 45669ffb2db8fbbe283f9ab8feaaf11b21bdcaeb SHA1 88b3c99b5418e79c508f1293dc083120ec629af3 SHA256 070d48e40395d1212030530c4332486aeeff4bfcc9ff1fb979287ff6a624f7c3
+AUX kdebindings-csharp-4.4.1-make-stuff-optional.patch 1660 RMD160 fcb7f8fb159383180560517463df81d2c964c9ae SHA1 d373fd84c63225f1fd41b96ffa492c5f1da3d71a SHA256 88dabb10a0aa38a2c28b69a3ed15f93a6ce0ee0d7984a5909967cbd174924f9c
+EBUILD kdebindings-csharp-4.4.9999.ebuild 1761 RMD160 278e2606a761ad6cbf9008c2b00b6c48286b0ade SHA1 439a9eab8148967b6435ab14a059ece6aa5fd205 SHA256 3437aecd635bbe41ff2d325fc7314e869427647edce90490abe4656effc56fae
 EBUILD kdebindings-csharp-9999.ebuild 1337 RMD160 45669ffb2db8fbbe283f9ab8feaaf11b21bdcaeb SHA1 88b3c99b5418e79c508f1293dc083120ec629af3 SHA256 070d48e40395d1212030530c4332486aeeff4bfcc9ff1fb979287ff6a624f7c3
-MISC metadata.xml 553 RMD160 07bd37da27f0090d0a4a2b2972a0345810590eda SHA1 1062f220972b268718182c5cc282a81546403037 SHA256 771ea1c1f71de07e2b1ea4304a79ba9e0dab1234c2e2a0889cf6944a5d0e3f87
+MISC metadata.xml 640 RMD160 902c500171df7253d149de25abf58ff3e6a86d94 SHA1 9c7297d6ba77f1cb2010b0a92c8825ec1c89c61e SHA256 543c8b4c9bdc232aba5beecd538f80b7e5392db0791d9b3271a6a81373d0f045
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 01c17d4110e..00000000000
--- 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 00000000000..2dc071ab25d
--- /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.9999.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild
index cca8df01826..4f0712d976d 100644
--- a/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild
+++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.9999.ebuild
@@ -11,17 +11,17 @@ inherit kde4-meta mono
 
 DESCRIPTION="C# bindings for KDE and Qt"
 KEYWORDS=""
-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 902140174f4..8e20b56f055 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>