Version bump, remove old

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 37 insertions, 96 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/Manifest b/dev-libs/soprano/Manifest
index fee7c64d00c7..ed46fde3e2ca 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,8 +1,5 @@
-DIST soprano-2.2.2.tar.bz2 1849380 RMD160 31d8dce6cf5972b433b1b69e4027ef7650b9aa14 SHA1 a660637d6ce05ce4a107628d4e95a37f96a53c5e SHA256 ac3f4f36a947dc38857e930c5be504a41cbeb3cd931632ffeb4b70555a4bbc72
-DIST soprano-2.2.4.tar.bz2 1849345 RMD160 f8bb20c988c287351eeaeb857947d53398934301 SHA1 55af2c0a1f62ea038814e35b8effe2436d47ebe8 SHA256 47a2f5f54ea97f556156def6d0faceaee9c07c89d2e4154a9468851f82b9819b
 DIST soprano-2.3.0.tar.bz2 1910821 RMD160 7d42e97e04de5f0ebdfd4fb58d1a159a9223a51b SHA1 7452957588be84e212c46b54034e907e61c277c9 SHA256 8a563a5a4b00169ef84fb1b69e76d3657ee7f5a94a6a35c9600f510f55fa275c
-EBUILD soprano-2.2.2.ebuild 2335 RMD160 f3fbf3a430b10ce01ae127545846b99475ee908c SHA1 1314d6a3d9fb7770fb759eeb6c75610730f08564 SHA256 e017847396117b891010987f94ad2e82ebd3c783891b946c509068f8f5a25a3e
-EBUILD soprano-2.2.4.ebuild 2215 RMD160 019abdd65b1b9dd8d32272f0ecd51e6f229474ba SHA1 c44277eeccf7efd48962a9064cd2970c6f3186d9 SHA256 361b588a7867d214104fe422a914a7e0a02fa590f690fa5ee9c1a7527e45d436
+EBUILD soprano-2.3.0-r1.ebuild 2658 RMD160 0025f5600b2a1b51b12dda9e55a9102debd6460e SHA1 f9716d653dd6506a898e97b42fbab2697a62db18 SHA256 51a7673882b0471df4864a2dabbefc84d4da83d86bc9800a4339c95a316be73b
 EBUILD soprano-2.3.0.ebuild 2208 RMD160 83e301f8f617e180243ecf781b427a3f73d0897c SHA1 b75691df8f74bfd55114f4001ee2774f0c009e1e SHA256 716abb1380517bbfb3bc5844c84ead9c2d73e381f1b370e3efe74efa4d361983
-MISC ChangeLog 3592 RMD160 4716215b322ba399054b685b59b54d4674b5e1d8 SHA1 9a21663fb94e8b7b9785496f2e7ea8bca575f061 SHA256 3a76420a109ba73464b0849dc521298df9f0cba3575611ef88e65dae12ed7a17
+MISC ChangeLog 3787 RMD160 d9f6def14ec25a2fe33c8eea27b4a521a443e9e0 SHA1 a467d6375443befff97615366c0a6a313fd6a93a SHA256 8b13808bd6e070559c598afb8f10a0c6eb687530ce0bf96a3e394222cda724e9
 MISC metadata.xml 468 RMD160 5a4ba54904482310979eb98c0dfd930cd1738270 SHA1 9d8ab4472b27751e79a455b661d3f247d19d8aa0 SHA256 4bb45c481c0df8267828968c47f69c8129d10fa8dbc51b864a84f97c17478578
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}