Version bump, remove old

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

3 files changed, 35 insertions, 91 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index ba3f0bb8c5f9..a5a3a924f7d5 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.22 2009/08/04 05:27:04 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.23 2009/09/01 18:18:14 tampakrap Exp $
+
+*soprano-2.3.0-r1 (01 Sep 2009)
+
+  01 Sep 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -soprano-2.2.2.ebuild, -soprano-2.2.4.ebuild, +soprano-2.3.0-r1.ebuild:
+  Version bump, remove old
 
 *soprano-2.3.0 (04 Aug 2009)
 
diff --git a/dev-libs/soprano/soprano-2.2.2.ebuild b/dev-libs/soprano/soprano-2.2.2.ebuild
deleted file mode 100644
index f5339c7ac64b..000000000000
--- a/dev-libs/soprano/soprano-2.2.2.ebuild
+++ /dev/null
@@ -1,80 +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.2.2.ebuild,v 1.1 2009/03/15 14:14:47 scarabeus Exp $
-
-EAPI="2"
-
-JAVA_PKG_OPT_USE="java"
-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"
-KEYWORDS="~amd64 ~hppa ~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
-	echo
-	if ! use redland && ! use java; 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, java"
-	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}
-		-DSOPRANO_BUILD_TESTS=OFF"
-
-	! use clucene && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_CLUCENE_INDEX=ON"
-	! 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 java && mycmakeargs="${mycmakeargs} -DSOPRANO_DISABLE_SESAME2_BACKEND=ON"
-	use doc && mycmakeargs="${mycmakeargs} -DSOPRANO_BUILD_API_DOCS=ON"
-
-	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-2.2.4.ebuild b/dev-libs/soprano/soprano-2.3.0-r1.ebuild
index 94c949dd42f3..f93bd3b2a038 100644
--- a/dev-libs/soprano/soprano-2.2.4.ebuild
+++ b/dev-libs/soprano/soprano-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2009/06/28 23:08:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.3.0-r1.ebuild,v 1.1 2009/09/01 18:18:14 tampakrap Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 SLOT="0"
-IUSE="+clucene +dbus debug doc elibc_FreeBSD java +raptor +redland"
+IUSE="+clucene +dbus debug doc elibc_FreeBSD +java +raptor redland"
 
 COMMON_DEPEND="
 	x11-libs/qt-core:4
@@ -27,21 +27,39 @@ COMMON_DEPEND="
 	)
 	java? ( >=virtual/jdk-1.6.0 )
 "
+
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+"
 
 CMAKE_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
-	echo
-	if ! use redland && ! use java; 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, java"
+
+	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
 }
 
@@ -51,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	# Fix for missing pthread.h linking
-	# NOTE: temporarely fix until a better cmake files patch will be provided.
+	# NOTE: temporarily fix until a better cmake files patch will be provided.
 	use elibc_FreeBSD && append-ldflags "-lpthread"
 
 	mycmakeargs="${mycmakeargs}