[dev-libs/soprano] Version bump 2.3.1

4 files changed, 170 insertions, 1 deletions

diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index a1836b4c2f7..76d7e0cf369 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,2 +1,5 @@
-EBUILD soprano-9999.ebuild 2753 RMD160 30c9c61e91c374608428ac1c91d869da73162174 SHA1 e15d05262afbfddb1e9ddf5cce4d2d3313803937 SHA256 beb941cdcea2398f47f4a0d9a40ecbd063486253336b065f37e246131fe6e346
+AUX soprano-fix-raptor-serializer-automagic.patch 3275 RMD160 d7bd8a8c81dabcdb1d2cdef05953dfe82a92e062 SHA1 6d816dad5e0e7fe4cfcfec9cacb06800cc245d08 SHA256 bda7e4e75dda8b3b452ccefebe83f7c9f893e948c3c5db622561be4fa3e743d8
+DIST soprano-2.3.1.tar.bz2 1919103 RMD160 51d36d21241423da1766b876dee6acd5ef4cc5d8 SHA1 25871876ed83a4a3863585deee4d63b882ff7c9e SHA256 13e8b123bbbaea55f0a89495de6b08bb09945cd983f525a63c60f3345726be95
+EBUILD soprano-2.3.1.ebuild 2865 RMD160 81a487325c97e522906f869b4054cf3d1da8ee9f SHA1 0f966032977f3795da32e8846b5bdebc632d19ad SHA256 af44d5d48b3da464f5e5f6b38868bba22af5e5839e5ed8615fce0196746651c4
+EBUILD soprano-9999.ebuild 2891 RMD160 2a5d46683f59e0d1e320e6eb989a878fdfff65fd SHA1 b0cc24e1993c769147c5d70da8e56c599dd3a9c7 SHA256 7a41f0cbe5837c09d12e4e18b6b05d1e41534b25caab40f3e94b1b2da0cc8455
 MISC metadata.xml 677 RMD160 c3d102763d9ae9256b2035cfd906fef4e8762154 SHA1 2fa48dee5364b0ec8b3a741ef72240e5998ccf40 SHA256 e7a7e956887cecd8886ac7e60ee5eacf59daec9f17e61c7f5b84fb43ff8077f5
diff --git a/dev-libs/soprano/files/soprano-fix-raptor-serializer-automagic.patch b/dev-libs/soprano/files/soprano-fix-raptor-serializer-automagic.patch
new file mode 100644
index 00000000000..46bb9330838
--- /dev/null
+++ b/dev-libs/soprano/files/soprano-fix-raptor-serializer-automagic.patch
@@ -0,0 +1,56 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 1023395)
++++ CMakeLists.txt	(working copy)
+@@ -14,13 +14,14 @@
+ ##################  User options  ################################
+ 
+ option(SOPRANO_BUILD_TESTS "Build all unit tests")
+-option(SOPRANO_DISABLE_REDLAND_BACKEND "Disable the compilation of the redland backend")
+-option(SOPRANO_DISABLE_SESAME2_BACKEND "Disable the compilation of the sesame2 backend")
+-option(SOPRANO_DISABLE_VIRTUOSO_BACKEND "Disable the compilation of the Virtuoso backend")
+-option(SOPRANO_DISABLE_CLUCENE_INDEX "Disable the compilation of the clucene-based full-text index")
+-option(SOPRANO_DISABLE_RAPTOR_PARSER "Disable the compilation of the raptor parser and serializer plugins (provides most Soprano parsers and serializers)")
+-option(SOPRANO_DISABLE_DBUS "Disable the D-Bus integration")
+-option(SOPRANO_BUILD_API_DOCS "Build the Soprano API documentation")
++option(SOPRANO_DISABLE_REDLAND_BACKEND "Disable compilation of Redland storage backend")
++option(SOPRANO_DISABLE_SESAME2_BACKEND "Disable compilation of Sesame2 storage backend")
++option(SOPRANO_DISABLE_VIRTUOSO_BACKEND "Disable compilation of Virtuoso storage backend")
++option(SOPRANO_DISABLE_CLUCENE_INDEX "Disable compilation of Clucene-based full-text index")
++option(SOPRANO_DISABLE_RAPTOR_PARSER "Disable compilation of Raptor parser plugin")
++option(SOPRANO_DISABLE_RAPTOR_SERIALIZER "Disable compilation of Raptor RDF serializer plugin")
++option(SOPRANO_DISABLE_DBUS "Disable D-Bus integration")
++option(SOPRANO_BUILD_API_DOCS "Build Soprano API documentation")
+ 
+ if(SOPRANO_BUILD_TESTS)
+   enable_testing()
+@@ -39,7 +40,7 @@
+ # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
+ include(${QT_USE_FILE})
+ 
+-if(NOT SOPRANO_DISABLE_RAPTOR_PARSER OR NOT SOPRANO_DISABLE_REDLAND_BACKEND)
++if(NOT SOPRANO_DISABLE_RAPTOR_PARSER OR NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER OR NOT SOPRANO_DISABLE_REDLAND_BACKEND)
+   find_package(Rasqal)
+   find_package(Raptor)
+   find_package(Redland)
+@@ -50,7 +51,7 @@
+       message(STATUS "Windows currently only has Redland version 1.0.3")
+     endif(NOT REDLAND_VERSION)
+   endif(WIN32)
+-endif(NOT SOPRANO_DISABLE_RAPTOR_PARSER OR NOT SOPRANO_DISABLE_REDLAND_BACKEND)
++endif(NOT SOPRANO_DISABLE_RAPTOR_PARSER OR NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER OR NOT SOPRANO_DISABLE_REDLAND_BACKEND)
+ 
+ if(NOT SOPRANO_DISABLE_CLUCENE_INDEX)
+   find_package(CLucene)
+@@ -98,9 +99,9 @@
+ if(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
+   set(BUILD_RAPTOR_PARSER TRUE)
+ endif(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
+-if(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
++if(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+   set(BUILD_RAPTOR_SERIALIZER TRUE)
+-endif(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
++endif(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+ if(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)
+   set(BUILD_DBUS_SUPPORT TRUE)
+ endif(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)
diff --git a/dev-libs/soprano/soprano-2.3.1.ebuild b/dev-libs/soprano/soprano-2.3.1.ebuild
new file mode 100644
index 00000000000..2c22ba258ca
--- /dev/null
+++ b/dev-libs/soprano/soprano-2.3.1.ebuild
@@ -0,0 +1,105 @@
+# 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.3.0-r1.ebuild,v 1.2 2009/09/12 10:13:15 armin76 Exp $
+
+EAPI="2"
+
+JAVA_PKG_OPT_USE="java"
+inherit base cmake-utils flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="Library that 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="+clucene +dbus debug doc elibc_FreeBSD +java +raptor redland"
+
+COMMON_DEPEND="
+	x11-libs/qt-core:4
+	clucene? ( dev-cpp/clucene )
+	dbus? ( x11-libs/qt-dbus:4 )
+	raptor? ( >=media-libs/raptor-1.4.16 )
+	redland? (
+		>=dev-libs/rasqal-0.9.15
+		>=dev-libs/redland-1.0.6
+	)
+	java? ( >=virtual/jdk-1.6.0 )
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+
+	if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
+		echo
+		ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk."
+		ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+		echo
+	fi
+
+	if ! use java; then
+		if ! use redland; then
+			echo
+			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 "java (recommended), redland"
+			echo
+		else
+			echo
+			ewarn "You selected redland as default backend for soprano."
+			ewarn "Be advised that it's known to be broken (bug #275326)."
+			echo
+		fi
+	fi
+}
+
+src_prepare() {
+	# Temporarily disable raptor serializer automagic
+	if ! use redland; then
+		sed -e '/set(BUILD_RAPTOR_SERIALIZER TRUE)/d' \
+			-i CMakeLists.txt || die "failed to disable raptor serializer"
+	fi
+
+	base_src_prepare
+}
+
+src_configure() {
+	# Fix for missing pthread.h linking
+	# NOTE: temporarily fix until a better cmake files patch will be provided.
+	use elibc_FreeBSD && append-ldflags "-lpthread"
+
+	mycmakeargs="${mycmakeargs}
+		-DSOPRANO_BUILD_TESTS=OFF
+		-DCMAKE_SKIP_RPATH=OFF
+		$(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX)
+		$(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
+		$(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
+		$(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND)
+		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+	"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs="${mycmakeargs}
+		-DSOPRANO_BUILD_TESTS=ON"
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	ctest --extra-verbose || die "Tests failed."
+}
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index bc253590b4a..7cf76fd73c2 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -39,6 +39,10 @@ RDEPEND="${COMMON_DEPEND}
 
 CMAKE_IN_SOURCE_BUILD="1"
 
+PATCHES=(
+	"${FILESDIR}/soprano-fix-raptor-serializer-automagic.patch"
+)
+
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 
@@ -81,6 +85,7 @@ src_configure() {
 		$(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX)
 		$(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
 		$(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER)
 		$(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
 		$(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND)
 		-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=ON