fix the bug better in cmake-utils eclass

3 files changed, 11 insertions, 11 deletions

diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 132be9cac7..152ba9fc9e 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,5 +1,5 @@
 DIST soprano-2.2.2.tar.bz2 1849380 RMD160 31d8dce6cf5972b433b1b69e4027ef7650b9aa14 SHA1 a660637d6ce05ce4a107628d4e95a37f96a53c5e SHA256 ac3f4f36a947dc38857e930c5be504a41cbeb3cd931632ffeb4b70555a4bbc72
-EBUILD soprano-2.2.2.ebuild 2202 RMD160 58fb456444d25cf696ac7b7705aea565b0e8555b SHA1 59f7df3a85ed4a3f7f14d01bc0399c19d744c700 SHA256 7eb51c086bf2bd27c3eb5dd1cde0ef904dd2ab312f4e8590b61e2493ea4a9593
-EBUILD soprano-9999.ebuild 2581 RMD160 faf0db3bbd735a973433e02a0e1cfb2b9894b61c SHA1 4c4918e3a5ad814e1c0d7ec8eb3b034f9bbfbdd6 SHA256 1ec383bae144204f3ba93e499bf2b63de925296160931817526e902c35f6ce69
+EBUILD soprano-2.2.2.ebuild 2189 RMD160 386c14858e77f5c6c42e8f8940e64d5ae9181858 SHA1 96532185b88ce26c5b740c131172aef15a2d765d SHA256 cf97988f198974417ffb4b87245c1b54758b909cbdcb2c5805aa08b9b91ced30
+EBUILD soprano-9999.ebuild 2585 RMD160 eabe7e32e9843da4251dd78c68ded7ee63dffa1e SHA1 375e7b0fc757324fb8b8060fa309a5fdefe57467 SHA256 fc73091377973a5f325500b15f4e339294de4bf682752454435f215aa2f34eb1
 MISC ChangeLog 2049 RMD160 2317714aabaa9c37fcb65705b8430b4fb9abe54c SHA1 bee8f175784a32d090c0d7db1c5427394aa154c5 SHA256 cffe251653ed9a429edbda57a49bc5cdb25c82825043eff3287dfbbab90d0d66
 MISC metadata.xml 642 RMD160 218c0209f1145c0a1ac8628a0e585e87217125bc SHA1 73f78061a1f31ad6230b203dbc5d39a1c416b908 SHA256 e945b88fcc641ef00fa4907ed3e43a6f5f40a26e963f520231ed767a68c4d880
diff --git a/dev-libs/soprano/soprano-2.2.2.ebuild b/dev-libs/soprano/soprano-2.2.2.ebuild
index 3ff04dd887..5f82777944 100644
--- a/dev-libs/soprano/soprano-2.2.2.ebuild
+++ b/dev-libs/soprano/soprano-2.2.2.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 		>=dev-libs/rasqal-0.9.15
 		>=dev-libs/redland-1.0.6
 	)
-	sesame2? ( >=virtual/jdk-1.6.0 )
+	java? ( >=virtual/jdk-1.6.0 )
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
@@ -40,12 +40,12 @@ pkg_setup() {
 		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"
+		ewarn "redland, java"
 	fi
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	base_src_prepare
 }
 
 src_configure() {
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index de2f7b639c..2417c4b76c 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-JAVA_PKG_OPT_USE="sesame2"
+JAVA_PKG_OPT_USE="java"
 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."
@@ -15,7 +15,7 @@ LICENSE="LGPL-2"
 KEYWORDS=""
 SLOT="0"
 # virtuoso disabled for now
-IUSE="+clucene +dbus debug doc elibc_FreeBSD +raptor +redland sesame2"
+IUSE="+clucene +dbus debug doc elibc_FreeBSD java +raptor +redland"
 
 COMMON_DEPEND="
 	x11-libs/qt-core:4
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 		>=dev-libs/rasqal-0.9.15
 		>=dev-libs/redland-1.0.6
 	)
-	sesame2? ( >=virtual/jdk-1.6.0 )
+	java? ( >=virtual/jdk-1.6.0 )
 	virtuoso? ( dev-db/libiodbc )
 "
 DEPEND="${COMMON_DEPEND}
@@ -43,11 +43,11 @@ pkg_setup() {
 	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
-	if ! use redland && ! use sesame2; then
+	if ! use redland && ! use sesame2 && ! use virtuoso ; 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, virtuoso"
+		ewarn "redland, java, virtuoso"
 	fi
 }
 
@@ -67,7 +67,7 @@ src_configure() {
 	! use dbus && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_DBUS=ON"
 	! use raptor && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_RAPTOR_PARSER=ON"
 	! use redland && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_REDLAND_BACKEND=ON"
-	! use sesame2 && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_SESAME2_BACKEND=ON"
+	! use java && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_SESAME2_BACKEND=ON"
 	! use virtuoso && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_VIRTUOSO_BACKEND=ON"
 	use doc && mycmakeargs="${mycmakeargs} -DSOPRANO_BUILD_API_DOCS=ON"