Version bump. Thanks to reavertm.

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

3 files changed, 276 insertions, 1 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index 9dfe329f6437..7aa9368602a4 100644
--- a/dev-libs/soprano/ChangeLog
+++ b/dev-libs/soprano/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/soprano
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.15 2009/02/01 23:04:13 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.16 2009/02/02 23:18:20 scarabeus Exp $
+
+*soprano-2.2.1 (02 Feb 2009)
+
+  02 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/soprano-make-optional-targets.patch, +soprano-2.2.1.ebuild:
+  Version bump. Thanks to reavertm.
 
   01 Feb 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   soprano-2.2.ebuild:
diff --git a/dev-libs/soprano/files/soprano-make-optional-targets.patch b/dev-libs/soprano/files/soprano-make-optional-targets.patch
new file mode 100644
index 000000000000..3a3b40edfd00
--- /dev/null
+++ b/dev-libs/soprano/files/soprano-make-optional-targets.patch
@@ -0,0 +1,191 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 918069)
++++ CMakeLists.txt	(working copy)
+@@ -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)
++option(ENABLE_Redland "Raptor RDF parser/serializer and Redland storage backend" OFF)
++if(ENABLE_Redland)
++  find_package(Redland)
++endif(ENABLE_Redland)
+ 
+-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)
++option(ENABLE_CLucene "CLucene-based full-text search index library" ON)
++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)
+-  file(READ ${JAVA_INCLUDE_PATH}/jni.h jni_header_data)
+-  string(REGEX MATCH "JNI_VERSION_1_4" JNI_1_4_FOUND "${jni_header_data}")
+-  if(JNI_1_4_FOUND)
+-    message(STATUS "Found Java JNI >= 1.4: ${JAVA_INCLUDE_PATH}, ${JAVA_JVM_LIBRARY}")
+-  else(JNI_1_4_FOUND)
+-    message( "Need JNI version 1.4 or higher for the Sesame2 backend.")
+-  endif(JNI_1_4_FOUND)
+-else(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
+-  message(STATUS "Could not find Java JNI")
+-  if("$ENV{JAVA_HOME}" STREQUAL "")
+-    message("Make sure JAVA_HOME is set")
+-  endif("$ENV{JAVA_HOME}" STREQUAL "")
+-endif(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
++option(ENABLE_Sesame2 "Sesame2 storage backend (java-based)" ON)
++if(ENABLE_Sesame2)
++  find_package(JNI)
++  if(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
++    file(READ ${JAVA_INCLUDE_PATH}/jni.h jni_header_data)
++    string(REGEX MATCH "JNI_VERSION_1_4" JNI_1_4_FOUND "${jni_header_data}")
++    if(JNI_1_4_FOUND)
++      message(STATUS "Found Java JNI >= 1.4: ${JAVA_INCLUDE_PATH}, ${JAVA_JVM_LIBRARY}")
++    else(JNI_1_4_FOUND)
++      message( "Need JNI version 1.4 or higher for the Sesame2 backend.")
++    endif(JNI_1_4_FOUND)
++  else(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
++    message(STATUS "Could not find Java JNI")
++    if("$ENV{JAVA_HOME}" STREQUAL "")
++      message("Make sure JAVA_HOME is set")
++    endif("$ENV{JAVA_HOME}" STREQUAL "")
++  endif(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
++endif(ENABLE_Sesame2)
+ 
+-
+ ##################  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-2.2.1.ebuild b/dev-libs/soprano/soprano-2.2.1.ebuild
new file mode 100644
index 000000000000..24ed03d2aed4
--- /dev/null
+++ b/dev-libs/soprano/soprano-2.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.2.1.ebuild,v 1.1 2009/02/02 23:18:20 scarabeus Exp $
+
+EAPI="2"
+
+JAVA_PKG_OPT_USE="sesame2"
+
+inherit base cmake-utils flag-o-matic 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+clucene debug doc elibc_FreeBSD redland +sesame2"
+
+COMMON_DEPEND="
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	clucene? ( dev-cpp/clucene )
+	redland? (
+		>=dev-libs/rasqal-0.9.15
+		>=dev-libs/redland-1.0.6
+		media-libs/raptor
+	)
+	sesame2? ( >=virtual/jdk-1.6.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-make-optional-targets.patch" )
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if ! use redland && ! use sesame2; then
+		ewarn "You explicitly disabled default soprano backend and haven't chosen other one."
+		ewarn "Applications using soprano may need at least one backend functional."
+		ewarn "If you experience any problems, enable any of those USE flags:"
+		ewarn "redland, sesame2"
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+}
+
+src_configure() {
+	# Fix for missing pthread.h linking
+	# NOTE: temporarely fix until a better cmake files patch will be provided.
+	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 doc docs)"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs="${mycmakeargs}
+		-DENABLE_tests=ON"
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	ctest --extra-verbose || die "Tests failed."
+}