soprano patch updated, tests need cmake in-source build, hacks removed

4 files changed, 163 insertions, 304 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index 9cee5f7335..bd79b2a84b 100644
--- a/dev-libs/soprano/ChangeLog
+++ b/dev-libs/soprano/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   29 Jan 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  files/soprano-make-optional-targets.patch, soprano-9999.ebuild:
+  soprano patch updated, tests need cmake in-source build
+
+  29 Jan 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   -soprano-2.1.64.ebuild:
   Removed old soprano (2.2 in portage now)
 
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 145940c12d..6c81067c33 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,4 +1,4 @@
-AUX soprano-make-optional-targets.patch 14110 RMD160 7ddf2df74417bfffd33fdb3496def0d951e278f0 SHA1 5da9e4e3cff9af5b2d6255fd2b6e95c28ee5ace5 SHA256 e65be0a4ca275f78fc2b3c592433cb6e2d7ea8649d1a3bcd3b816b39a03e0285
-EBUILD soprano-9999.ebuild 2354 RMD160 c25433026bf1399c628236b2bd5d0c221443cb2f SHA1 105fe98b3fa06f8ce86b3321eb8273f1db602d99 SHA256 7240823036b69a336878b05caa0f1a2507cf0cb60b3acb19e665860ba13407c9
-MISC ChangeLog 1119 RMD160 de78fcdac8fc4590c7c48e172cfdf79f606862f2 SHA1 d6f0aebb10faddc1b2da4ef35e494f103c55cf93 SHA256 ac8406055130e314b806c521f2a76da572cc37e7fe31f22a4263abc76d3024f0
+AUX soprano-make-optional-targets.patch 7769 RMD160 cadf6db4d8c38c0f4879838ea049695dca48af4e SHA1 4489d50c89788d41746921cf890da6bf46bf7ce8 SHA256 32e55e17e6519947f877d63174e41ee033af05470d4a252031d1165c579e0872
+EBUILD soprano-9999.ebuild 2111 RMD160 62bc731e0871645718780c93ca7802eb4c7ba174 SHA1 2cd693b523e32e47217a2da5926af73c3bef40d3 SHA256 10a90f7e3730728b7787299dd4ed2527bc8fde96fa86dbf66c9b4ad0dec609cb
+MISC ChangeLog 1308 RMD160 cfeeb7d15826b448bf84c8ea22f1d05df07abb9e SHA1 a53ba3f2989094293a910921f2f6ee39ef97bb80 SHA256 bbf1efb8e2b98f3fd49f463eec17278d92eb159f7e6f0dc680c5ba4c6a2f233d
 MISC metadata.xml 440 RMD160 290571f5152906ed32eacad5ce6138f510b2a361 SHA1 6ed3b3208cefbbc0b1463be20e7ec173834b8109 SHA256 d805c4de395442d3e76d1937d4033d2cef5723e175630d8497e681e3901fde4c
diff --git a/dev-libs/soprano/files/soprano-make-optional-targets.patch b/dev-libs/soprano/files/soprano-make-optional-targets.patch
index 780493ab8b..3a3b40edfd 100644
--- a/dev-libs/soprano/files/soprano-make-optional-targets.patch
+++ b/dev-libs/soprano/files/soprano-make-optional-targets.patch
@@ -1,299 +1,57 @@
-Index: cmake/modules/MacroFindOptionalDep.cmake
-===================================================================
---- cmake/modules/MacroFindOptionalDep.cmake	(revision 0)
-+++ cmake/modules/MacroFindOptionalDep.cmake	(revision 0)
-@@ -0,0 +1,268 @@
-+# FIND_OPTIONAL_DEP macro implements two typical optional dependency handling
-+# approaches:
-+#
-+# Best-effort approach(FORCE_DEPS=OFF):
-+#	Link to all enabled optional dependencies if found. Turn off not found
-+# ones, and keep compiling. This greatly benefits hand-compiling from source
-+# if all suggested dependencies are turned on by default. Newly installed
-+# software conveniently integrates with whatever environment it's compiled in.
-+#
-+# Strict dependencies approach(FORCE_DEPS=ON):
-+#	All enabled optional dependencies must be found, or compilation aborts.
-+# This approach lets request and ensure specific functionality. The compilation
-+# is deterministic in the sense that everything that's requested is provided
-+# or the process fails. This is the preferred behaviour for automated building
-+# by package managers/distro maintainers.
-+#
-+# Parameters:
-+# _package:	the package to load
-+# _found:	the name of *_FOUND variable which is set by find_package()
-+#               if ${_package} is found.
-+# _enabled:	option/variable name which along with FORCE_DEPS options
-+#               controls macro behaviour:
-+#	${_enabled}	FORCE_DEPS	Behaviour
-+#		OFF	any		${_package} is not loaded
-+#		ON	ON		Try loading ${_package}. If package is
-+#                                       not found, abort(fatal error).
-+#		ON	OFF		Try loading ${_package}. If package is
-+#                                       not found, continue.
-+# _description:	a short description of features provided by ${_package}.
-+#		Used to display human-readable diagnostic messages
-+
-+# macro name changed from FIND_OPTIONAL_PACKAGE to FIND_OPTIONAL_DEP due to
-+# clash with a macro from KDE4
-+
-+# if ON, requested optional deps become required
-+# if OFF, requested optional deps are linked to if found
-+
-+OPTION(FORCE_DEPS "Enforce strict dependencies" OFF)
-+
-+macro(FIND_OPTIONAL_DEP _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(FORCE_DEPS)
-+            find_package(${_package} REQUIRED)
-+        else(FORCE_DEPS)
-+            find_package(${_package})
-+        endif(FORCE_DEPS)
-+    endif(${_enabled})
-+
-+    REPORT_OPTIONAL_PACKAGE_STATUS(${_package} ${_enabled} ${_found} ${_description})
-+
-+endmacro(FIND_OPTIONAL_DEP)
-+
-+
-+macro(REPORT_OPTIONAL_PACKAGE_STATUS _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(${_found})
-+            MESSAGE("** ${_package} is found. Support for ${_description} is enabled")
-+        else(${_found})
-+            MESSAGE("** ${_package} not found. Support for ${_description} is disabled")
-+        endif(${_found})
-+    else(${_enabled})
-+        MESSAGE("** ${_package} is disabled. No support for ${_description}")
-+    endif(${_enabled})
-+
-+endmacro(REPORT_OPTIONAL_PACKAGE_STATUS)
-+# FIND_OPTIONAL_DEP macro implements two typical optional dependency handling
-+# approaches:
-+#
-+# Best-effort approach(FORCE_DEPS=OFF):
-+#	Link to all enabled optional dependencies if found. Turn off not found
-+# ones, and keep compiling. This greatly benefits hand-compiling from source
-+# if all suggested dependencies are turned on by default. Newly installed
-+# software conveniently integrates with whatever environment it's compiled in.
-+#
-+# Strict dependencies approach(FORCE_DEPS=ON):
-+#	All enabled optional dependencies must be found, or compilation aborts.
-+# This approach lets request and ensure specific functionality. The compilation
-+# is deterministic in the sense that everything that's requested is provided
-+# or the process fails. This is the preferred behaviour for automated building
-+# by package managers/distro maintainers.
-+#
-+# Parameters:
-+# _package:	the package to load
-+# _found:	the name of *_FOUND variable which is set by find_package()
-+#               if ${_package} is found.
-+# _enabled:	option/variable name which along with FORCE_DEPS options
-+#               controls macro behaviour:
-+#	${_enabled}	FORCE_DEPS	Behaviour
-+#		OFF	any		${_package} is not loaded
-+#		ON	ON		Try loading ${_package}. If package is
-+#                                       not found, abort(fatal error).
-+#		ON	OFF		Try loading ${_package}. If package is
-+#                                       not found, continue.
-+# _description:	a short description of features provided by ${_package}.
-+#		Used to display human-readable diagnostic messages
-+
-+# macro name changed from FIND_OPTIONAL_PACKAGE to FIND_OPTIONAL_DEP due to
-+# clash with a macro from KDE4
-+
-+# if ON, requested optional deps become required
-+# if OFF, requested optional deps are linked to if found
-+
-+OPTION(FORCE_DEPS "Enforce strict dependencies" OFF)
-+
-+macro(FIND_OPTIONAL_DEP _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(FORCE_DEPS)
-+            find_package(${_package} REQUIRED)
-+        else(FORCE_DEPS)
-+            find_package(${_package})
-+        endif(FORCE_DEPS)
-+    endif(${_enabled})
-+
-+    REPORT_OPTIONAL_PACKAGE_STATUS(${_package} ${_enabled} ${_found} ${_description})
-+
-+endmacro(FIND_OPTIONAL_DEP)
-+
-+
-+macro(REPORT_OPTIONAL_PACKAGE_STATUS _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(${_found})
-+            MESSAGE("** ${_package} is found. Support for ${_description} is enabled")
-+        else(${_found})
-+            MESSAGE("** ${_package} not found. Support for ${_description} is disabled")
-+        endif(${_found})
-+    else(${_enabled})
-+        MESSAGE("** ${_package} is disabled. No support for ${_description}")
-+    endif(${_enabled})
-+
-+endmacro(REPORT_OPTIONAL_PACKAGE_STATUS)
-+# FIND_OPTIONAL_DEP macro implements two typical optional dependency handling
-+# approaches:
-+#
-+# Best-effort approach(FORCE_DEPS=OFF):
-+#	Link to all enabled optional dependencies if found. Turn off not found
-+# ones, and keep compiling. This greatly benefits hand-compiling from source
-+# if all suggested dependencies are turned on by default. Newly installed
-+# software conveniently integrates with whatever environment it's compiled in.
-+#
-+# Strict dependencies approach(FORCE_DEPS=ON):
-+#	All enabled optional dependencies must be found, or compilation aborts.
-+# This approach lets request and ensure specific functionality. The compilation
-+# is deterministic in the sense that everything that's requested is provided
-+# or the process fails. This is the preferred behaviour for automated building
-+# by package managers/distro maintainers.
-+#
-+# Parameters:
-+# _package:	the package to load
-+# _found:	the name of *_FOUND variable which is set by find_package()
-+#               if ${_package} is found.
-+# _enabled:	option/variable name which along with FORCE_DEPS options
-+#               controls macro behaviour:
-+#	${_enabled}	FORCE_DEPS	Behaviour
-+#		OFF	any		${_package} is not loaded
-+#		ON	ON		Try loading ${_package}. If package is
-+#                                       not found, abort(fatal error).
-+#		ON	OFF		Try loading ${_package}. If package is
-+#                                       not found, continue.
-+# _description:	a short description of features provided by ${_package}.
-+#		Used to display human-readable diagnostic messages
-+
-+# macro name changed from FIND_OPTIONAL_PACKAGE to FIND_OPTIONAL_DEP due to
-+# clash with a macro from KDE4
-+
-+# if ON, requested optional deps become required
-+# if OFF, requested optional deps are linked to if found
-+
-+OPTION(FORCE_DEPS "Enforce strict dependencies" OFF)
-+
-+macro(FIND_OPTIONAL_DEP _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(FORCE_DEPS)
-+            find_package(${_package} REQUIRED)
-+        else(FORCE_DEPS)
-+            find_package(${_package})
-+        endif(FORCE_DEPS)
-+    endif(${_enabled})
-+
-+    REPORT_OPTIONAL_PACKAGE_STATUS(${_package} ${_enabled} ${_found} ${_description})
-+
-+endmacro(FIND_OPTIONAL_DEP)
-+
-+
-+macro(REPORT_OPTIONAL_PACKAGE_STATUS _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(${_found})
-+            MESSAGE("** ${_package} is found. Support for ${_description} is enabled")
-+        else(${_found})
-+            MESSAGE("** ${_package} not found. Support for ${_description} is disabled")
-+        endif(${_found})
-+    else(${_enabled})
-+        MESSAGE("** ${_package} is disabled. No support for ${_description}")
-+    endif(${_enabled})
-+
-+endmacro(REPORT_OPTIONAL_PACKAGE_STATUS)
-+# FIND_OPTIONAL_DEP macro implements two typical optional dependency handling
-+# approaches:
-+#
-+# Best-effort approach(FORCE_DEPS=OFF):
-+#	Link to all enabled optional dependencies if found. Turn off not found
-+# ones, and keep compiling. This greatly benefits hand-compiling from source
-+# if all suggested dependencies are turned on by default. Newly installed
-+# software conveniently integrates with whatever environment it's compiled in.
-+#
-+# Strict dependencies approach(FORCE_DEPS=ON):
-+#	All enabled optional dependencies must be found, or compilation aborts.
-+# This approach lets request and ensure specific functionality. The compilation
-+# is deterministic in the sense that everything that's requested is provided
-+# or the process fails. This is the preferred behaviour for automated building
-+# by package managers/distro maintainers.
-+#
-+# Parameters:
-+# _package:	the package to load
-+# _found:	the name of *_FOUND variable which is set by find_package()
-+#               if ${_package} is found.
-+# _enabled:	option/variable name which along with FORCE_DEPS options
-+#               controls macro behaviour:
-+#	${_enabled}	FORCE_DEPS	Behaviour
-+#		OFF	any		${_package} is not loaded
-+#		ON	ON		Try loading ${_package}. If package is
-+#                                       not found, abort(fatal error).
-+#		ON	OFF		Try loading ${_package}. If package is
-+#                                       not found, continue.
-+# _description:	a short description of features provided by ${_package}.
-+#		Used to display human-readable diagnostic messages
-+
-+# macro name changed from FIND_OPTIONAL_PACKAGE to FIND_OPTIONAL_DEP due to
-+# clash with a macro from KDE4
-+
-+# if ON, requested optional deps become required
-+# if OFF, requested optional deps are linked to if found
-+
-+OPTION(FORCE_DEPS "Enforce strict dependencies" OFF)
-+
-+macro(FIND_OPTIONAL_DEP _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(FORCE_DEPS)
-+            find_package(${_package} REQUIRED)
-+        else(FORCE_DEPS)
-+            find_package(${_package})
-+        endif(FORCE_DEPS)
-+    endif(${_enabled})
-+
-+    REPORT_OPTIONAL_PACKAGE_STATUS(${_package} ${_enabled} ${_found} ${_description})
-+
-+endmacro(FIND_OPTIONAL_DEP)
-+
-+
-+macro(REPORT_OPTIONAL_PACKAGE_STATUS _package _enabled _found _description)
-+
-+    if(${_enabled})
-+        if(${_found})
-+            MESSAGE("** ${_package} is found. Support for ${_description} is enabled")
-+        else(${_found})
-+            MESSAGE("** ${_package} not found. Support for ${_description} is disabled")
-+        endif(${_found})
-+    else(${_enabled})
-+        MESSAGE("** ${_package} is disabled. No support for ${_description}")
-+    endif(${_enabled})
-+
-+endmacro(REPORT_OPTIONAL_PACKAGE_STATUS)
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(revision 917610)
+--- CMakeLists.txt	(revision 918069)
 +++ CMakeLists.txt	(working copy)
-@@ -24,9 +24,13 @@
+@@ -1,4 +1,4 @@
+-project(soprano) 
++project(soprano)
+ 
+ cmake_minimum_required(VERSION 2.6.2)
+ 
+@@ -9,10 +9,8 @@
+ set(CMAKE_SOPRANO_VERSION_RELEASE 60)
+ set(CMAKE_SOPRANO_VERSION_STRING "${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}")
+ 
+-enable_testing()
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) 
+-
+ if(WIN32)
+   set(CMAKE_DEBUG_POSTFIX "d")
+ endif(WIN32)
+@@ -20,37 +18,45 @@
+ ##################  find packages  ################################
+ 
+ set(QT_MIN_VERSION "4.4.0")
+-find_package(Qt4 REQUIRED) 
++find_package(Qt4 REQUIRED)
  # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
  include(${QT_USE_FILE})
  
 -find_package(Redland)
-+include(MacroFindOptionalDep)
++option(ENABLE_Redland "Raptor RDF parser/serializer and Redland storage backend" OFF)
++if(ENABLE_Redland)
++  find_package(Redland)
++endif(ENABLE_Redland)
  
 -find_package(CLucene)
-+option(ENABLE_Redland "Raptor RDF parser/serializer and Redland storage backend" OFF)
-+find_optional_dep(Redland ENABLE_Redland REDLAND_FOUND "Raptor RDF parser/serializer and Redland storage backend")
-+
+-if(CLucene_FOUND)
+-  if(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19")
+-    set(CL_VERSION_19_OR_GREATER TRUE)
+-  endif(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19")
+-  set(SOPRANO_BUILD_INDEX_LIB 1 CACHE INTERNAL "Soprano Index is built" FORCE)
+-endif(CLucene_FOUND)
 +option(ENABLE_CLucene "CLucene-based full-text search index library" ON)
-+find_optional_dep(CLucene ENABLE_CLucene CLucene_FOUND "CLucene-based full-text search index library")
- if(CLucene_FOUND)
-   if(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19")
-     set(CL_VERSION_19_OR_GREATER TRUE)
-@@ -34,23 +38,25 @@
-   set(SOPRANO_BUILD_INDEX_LIB 1 CACHE INTERNAL "Soprano Index is built" FORCE)
- endif(CLucene_FOUND)
++if(ENABLE_CLucene)
++  find_package(CLucene)
++  if(CLucene_FOUND)
++    if(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19")
++      set(CL_VERSION_19_OR_GREATER TRUE)
++    endif(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19")
++    set(SOPRANO_BUILD_INDEX_LIB 1 CACHE INTERNAL "Soprano Index is built" FORCE)
++  endif(CLucene_FOUND)
++endif(ENABLE_CLucene)
  
 -find_package(JNI)
 -if(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
@@ -333,3 +91,101 @@ Index: CMakeLists.txt
  ##################  setup install directories  ################################
  set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
  set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
+@@ -63,40 +69,47 @@
+ # By default cmake builds the targets with full RPATH to everything in the build directory,
+ # but then removes the RPATH when installing.
+ # These two options below make it set the RPATH of the installed targets to all
+-# RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
++# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+ # install directory. Alex
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-set(CMAKE_INSTALL_RPATH                ${LIB_DESTINATION} )
++set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION})
+ 
+ if(APPLE)
+-   set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
++  set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
+ endif(APPLE)
+ 
+ 
+ ##################  some compiler settings ################################
+ if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 )
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
++  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
+ endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 )
+ if(MSVC)
+-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Zc:wchar_t-)
++  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Zc:wchar_t-)
+ endif(MSVC)
+ if(MINGW)
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
++  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
+ endif(MINGW)
+ 
+ 
+ ##################  add subdirectories ################################
+ if(CLucene_FOUND)
+-   add_subdirectory(index)
++  add_subdirectory(index)
+ endif(CLucene_FOUND)
+-add_subdirectory(soprano) 
++
++add_subdirectory(soprano)
+ add_subdirectory(backends)
+ add_subdirectory(parsers)
+ add_subdirectory(serializers)
+ #add_subdirectory(queryparsers)
+ add_subdirectory(server)
+ add_subdirectory(tools)
+-add_subdirectory(test) 
++
++option(ENABLE_tests "Parser/storage backend tests)" ON)
++if(ENABLE_tests)
++  enable_testing()
++  add_subdirectory(test)
++endif(ENABLE_tests)
++
+ add_subdirectory(rules)
+ add_subdirectory(includes)
+ 
+@@ -109,24 +122,26 @@
+ 
+ 
+ ##################  apidox ################################
+-find_package(Doxygen)
++option(ENABLE_docs "API documentation" ON)
++if(ENABLE_docs)
++  find_package(Doxygen)
+ 
+-if(DOXYGEN_EXECUTABLE)
+-  configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake ${soprano_BINARY_DIR}/Doxyfile)
++  if(DOXYGEN_EXECUTABLE)
++    configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake ${soprano_BINARY_DIR}/Doxyfile)
+ 
+-  if(EXISTS ${QT_DOC_DIR}/html)
+-    set(QTDOCS "${QT_DOC_DIR}/html")
+-  else(EXISTS ${QT_DOC_DIR}/html)
+-    set(QTDOCS "http://doc.trolltech.com/4.3/")
+-  endif(EXISTS ${QT_DOC_DIR}/html)
++    if(EXISTS ${QT_DOC_DIR}/html)
++      set(QTDOCS "${QT_DOC_DIR}/html")
++    else(EXISTS ${QT_DOC_DIR}/html)
++      set(QTDOCS "http://doc.trolltech.com/4.3/")
++    endif(EXISTS ${QT_DOC_DIR}/html)
+ 
+-  add_custom_target(
+-    apidox
+-    COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
+-    COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html)
+-endif(DOXYGEN_EXECUTABLE)
++    add_custom_target(
++      apidox
++      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
++      COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html)
++  endif(DOXYGEN_EXECUTABLE)
++endif(ENABLE_docs)
+ 
+-
+ ##################  status messages ################################
+ message("---------------------------------------------------------------------------------------")
+ message("-- Soprano Components that will be built:")
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index d3e0a402e3..b5f2632cb2 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="2"
 
-JAVA_PKG_OPT_USE=sesame2
-inherit base cmake-utils eutils flag-o-matic subversion java-pkg-opt-2
+JAVA_PKG_OPT_USE="sesame2"
+inherit base cmake-utils flag-o-matic subversion java-pkg-opt-2
 
 DESCRIPTION="Soprano is a library which provides a nice QT interface to RDF storage solutions."
 HOMEPAGE="http://sourceforge.net/projects/soprano"
@@ -34,6 +34,8 @@ RDEPEND="${COMMON_DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-make-optional-targets.patch" )
 
+CMAKE_IN_SOURCE_BUILD="1"
+
 pkg_setup() {
 	echo
 	ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk."
@@ -49,16 +51,6 @@ pkg_setup() {
 
 src_prepare() {
 	base_src_prepare
-
-	if ! use doc; then
-		sed -e '/find_package(Doxygen)/s/^/#DONOTFIND /' \
-			-i "${S}/CMakeLists.txt" || die "Sed to disable api-docs failed."
-	fi
-
-	sed -e '/add_subdirectory(test)/s/^/#DONOTCOMPILE /' \
-		-e '/enable_testing/s/^/#DONOTENABLE /' \
-		-i "${S}"/CMakeLists.txt || die "Disabling of ${PN} tests failed."
-	einfo "Disabled building of ${PN} tests."
 }
 
 src_configure() {
@@ -67,16 +59,23 @@ src_configure() {
 	use elibc_FreeBSD && append-ldflags "-lpthread"
 
 	mycmakeargs="${mycmakeargs}
+		-DENABLE_tests=OFF
 		$(cmake-utils_use_enable clucene CLucene)
 		$(cmake-utils_use_enable redland Redland)
-		$(cmake-utils_use_enable sesame2 Sesame2)"
+		$(cmake-utils_use_enable sesame2 Sesame2)
+		$(cmake-utils_use_enable doc docs)"
 
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+}
+
 src_test() {
-	sed -e 's/#NOTESTS//' \
-		-i "${S}"/CMakeLists.txt || die "Enabling tests failed."
+	mycmakeargs="${mycmakeargs}
+		-DENABLE_tests=ON"
+	cmake-utils_src_configure
 	cmake-utils_src_compile
 	ctest --extra-verbose || die "Tests failed."
 }