[dev-libs/soprano] Added back virtuoso support (hey, it's live ebuild)

4 files changed, 8 insertions, 120 deletions

diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 6072fe9e744..a10c26b3fdd 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,4 +1,2 @@
-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 2833 RMD160 8591c31f1e09f47f2b4adbe550ae268955f27743 SHA1 3ce5bce2263ee564aa257d6003cfbb4d2c7e929c SHA256 2fc6ef4ab0465658658e6d7c61922193c9325913a47079929d4540d5dd869ad3
-MISC metadata.xml 677 RMD160 c3d102763d9ae9256b2035cfd906fef4e8762154 SHA1 2fa48dee5364b0ec8b3a741ef72240e5998ccf40 SHA256 e7a7e956887cecd8886ac7e60ee5eacf59daec9f17e61c7f5b84fb43ff8077f5
+EBUILD soprano-9999.ebuild 2782 RMD160 957dd0871cd35c0edf906ebea9f65f856776f46e SHA1 6c7ae9196636804e8b00e877d3accdf021d5a406 SHA256 d363a55b25da36c679a12142782aebebb67fec6b691240062fec52804b931e79
+MISC metadata.xml 639 RMD160 52a9e540247eecc73e7f2156f357c9dfafb48b4a SHA1 bf832fde5c3fe64cbcbe262fe3a81a0a2c130779 SHA256 c2da646d00c1eb6e43b1b2dd8dc048424ea9f9340d006db6710171ec6631f922
diff --git a/dev-libs/soprano/metadata.xml b/dev-libs/soprano/metadata.xml
index 499221a6f0f..3daaf303921 100644
--- a/dev-libs/soprano/metadata.xml
+++ b/dev-libs/soprano/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>kde</herd>
 <use>
 	<flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag>
 	<flag name="raptor">Enables support for <pkg>media-libs/raptor</pkg> RDF parser/serializer.</flag>
 	<flag name="redland">Enables support for <pkg>dev-libs/redland</pkg> storage backend.</flag>
 	<flag name="java">Enables support for <pkg>virtual/jre-1.6.0</pkg> (sesame2) storage backend.</flag>
-	<!-- Not used yet in any ebuild
 	<flag name="virtuoso">Enables support for <pkg>dev-db/virtuoso</pkg> storage backend.</flag>
-	-->
 </use>
-<herd>kde</herd>
 </pkgmetadata>
diff --git a/dev-libs/soprano/soprano-2.3.1.ebuild b/dev-libs/soprano/soprano-2.3.1.ebuild
deleted file mode 100644
index 2c22ba258ca..00000000000
--- a/dev-libs/soprano/soprano-2.3.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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 61f24f8086f..e3b02a4127a 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -14,8 +14,7 @@ ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${PN}"
 LICENSE="LGPL-2"
 KEYWORDS=""
 SLOT="0"
-# virtuoso disabled for now
-IUSE="+clucene +dbus debug doc elibc_FreeBSD +java +raptor redland"
+IUSE="+clucene +dbus debug doc elibc_FreeBSD +java +raptor redland virtuoso"
 
 COMMON_DEPEND="
 	>=x11-libs/qt-core-4.5.0:4
@@ -27,15 +26,14 @@ COMMON_DEPEND="
 		>=dev-libs/redland-1.0.6
 	)
 	java? ( >=virtual/jdk-1.6.0 )
+	virtuoso? ( dev-db/libiodbc:0 )
 "
-#	virtuoso? ( dev-db/libiodbc )
-
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
 "
 RDEPEND="${COMMON_DEPEND}
+	virtuoso? ( >=dev-db/virtuoso-server-5.0.12 )
 "
-#	virtuoso? ( dev-db/virtuoso )
 
 CMAKE_IN_SOURCE_BUILD="1"
 
@@ -73,7 +71,7 @@ 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"
+	use elibc_FreeBSD && append-flags -pthread
 
 	mycmakeargs="${mycmakeargs}
 		-DSOPRANO_BUILD_TESTS=OFF
@@ -84,10 +82,9 @@ src_configure() {
 		$(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
+		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
 	"
-		# $(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 
 	cmake-utils_src_configure
 }