Remove sesame2(java) backend support

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

3 files changed, 22 insertions, 33 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index cd114de00819..dba22f327902 100644
--- a/dev-libs/soprano/ChangeLog
+++ b/dev-libs/soprano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/soprano
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.63 2010/11/26 16:25:36 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.64 2011/01/12 20:36:31 tampakrap Exp $
+
+  12 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  files/soprano-2.4.4-make-broken-redland-fatal.cmake, soprano-2.5.2.ebuild:
+  Remove sesame2(java) backend support
 
   26 Nov 2010; Jeroen Roovers <jer@gentoo.org> soprano-2.4.4.ebuild:
   Stable for HPPA (bug #331761).
diff --git a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
index 84e7e0689da7..e63c5a487f1f 100644
--- a/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
+++ b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
@@ -1,6 +1,6 @@
-diff -ru ../soprano-2.4.4/cmake/modules/FindRedland.cmake ./cmake/modules/FindRedland.cmake
---- ../soprano-2.4.4/cmake/modules/FindRedland.cmake	2009-12-18 15:33:44.000000000 +0100
-+++ ./cmake/modules/FindRedland.cmake	2010-07-06 03:25:55.421484970 +0200
+diff -ru cmake/modules/FindRedland.cmake cmake/modules/FindRedland.cmake
+--- cmake/modules/FindRedland.cmake	2009-12-18 15:33:44.000000000 +0100
++++ cmake/modules/FindRedland.cmake	2010-07-06 03:25:55.421484970 +0200
 @@ -108,7 +108,7 @@
      if(NOT "${_TEST_EXITCODE}" EQUAL 0)
        set(_REDLAND_VERSION_OK)
diff --git a/dev-libs/soprano/soprano-2.5.2.ebuild b/dev-libs/soprano/soprano-2.5.2.ebuild
index 1343afa9ee8b..80840806c655 100644
--- a/dev-libs/soprano/soprano-2.5.2.ebuild
+++ b/dev-libs/soprano/soprano-2.5.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.5.2.ebuild,v 1.3 2010/12/30 23:48:04 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.5.2.ebuild,v 1.4 2011/01/12 20:36:31 tampakrap Exp $
 
-EAPI="2"
+EAPI="3"
 
 JAVA_PKG_OPT_USE="java"
-inherit base java-pkg-opt-2 cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
 HOMEPAGE="http://sourceforge.net/projects/soprano"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="clucene +dbus debug doc elibc_FreeBSD java +raptor +redland test +virtuoso"
+IUSE="clucene +dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso"
 
 RESTRICT="test" #331761
 
@@ -28,7 +28,6 @@ COMMON_DEPEND="
 		>=dev-libs/rasqal-0.9.15
 		>=dev-libs/redland-1.0.10
 	)
-	java? ( >=virtual/jdk-1.6.0 )
 	virtuoso? ( dev-db/libiodbc:0 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -46,8 +45,6 @@ PATCHES=(
 )
 
 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."
@@ -55,28 +52,16 @@ pkg_setup() {
 		echo
 	fi
 
-	if ! use java && ! use virtuoso; then
-		if ! use redland; then
-			echo
-			ewarn "You have explicitly disabled the default soprano backend and haven't chosen"
-			ewarn "a different one. Applications using soprano may need at least one backend"
-			ewarn "to be functional. If you experience any problems, enable any of those USE"
-			ewarn "flags:"
-			ewarn "java (deprecated), redland, virtuoso (recommended)"
-			echo
-		else
-			echo
-			ewarn "You selected redland as the only backend for soprano."
-			ewarn "Be advised that it's known to be broken (bug #275326)."
-			echo
-		fi
+	if ! use virtuoso; then
+		echo
+		ewarn "You have explicitly disabled the default soprano backend."
+		ewarn "Applications using soprano may need at least one backend"
+		ewarn "to be functional. If you experience any problems, enable"
+		ewarn "the virtuoso USE flag."
+		echo
 	fi
 }
 
-src_prepare() {
-	base_src_prepare
-}
-
 src_configure() {
 	# Fix for missing pthread.h linking
 	# NOTE: temporarily fix until a better cmake files patch will be provided.
@@ -85,12 +70,12 @@ src_configure() {
 	mycmakeargs=(
 		-DSOPRANO_BUILD_TESTS=OFF
 		-DCMAKE_SKIP_RPATH=OFF
+		-DSOPRANO_DISABLE_SESAME2_BACKEND=ON
 		$(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)
 		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
 		$(cmake-utils_use test SOPRANO_BUILD_TESTS)