Version bump 2.4.4, backport qt-test deps to 2.3.1, add patch to make broken Redland fatal (bug 318861)

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

5 files changed, 135 insertions, 15 deletions

diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog
index 62c10b424e68..dae5252372bb 100644
--- a/dev-libs/soprano/ChangeLog
+++ b/dev-libs/soprano/ChangeLog
@@ -1,6 +1,14 @@
 # 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.51 2010/06/27 08:52:40 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.52 2010/07/06 01:40:04 reavertm Exp $
+
+*soprano-2.4.4 (06 Jul 2010)
+
+  06 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  soprano-2.3.1-r1.ebuild, +soprano-2.4.4.ebuild,
+  +files/soprano-2.4.4-make-broken-redland-fatal.cmake:
+  Version bump 2.4.4, backport qt-test deps to 2.3.1, add patch to make
+  broken Redland fatal (bug 318861)
 
   27 Jun 2010; Christian Faulhammer <fauli@gentoo.org> soprano-2.4.3.ebuild:
   x86 stable, bug 322791
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 79da73c2f7c6..f82d15c8504e 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX soprano-2.4.4-make-broken-redland-fatal.cmake 664 RMD160 cc2ad8117dd3202f38c7c3273506671a31c7a55b SHA1 64550959420cb2ec429c77a7f7ba6a1813343c6d SHA256 cabff4156ec94222573bdd7be5c387298ab89838b682cfb7ce0a59f4949a31ae
 DIST soprano-2.3.1.tar.bz2 1919103 RMD160 51d36d21241423da1766b876dee6acd5ef4cc5d8 SHA1 25871876ed83a4a3863585deee4d63b882ff7c9e SHA256 13e8b123bbbaea55f0a89495de6b08bb09945cd983f525a63c60f3345726be95
 DIST soprano-2.4.3.tar.bz2 1944785 RMD160 52eb443791cc093c5a069f5a244fe0f1d63147db SHA1 3c0e93d2b662d3407da33b8c066a03e662d187db SHA256 390c529bd1f46a00362ed9ab932933d24d264b4b8988048549558f5ad52caa08
-EBUILD soprano-2.3.1-r1.ebuild 2855 RMD160 c75054853fd51be05aa032cd1955347570bb4e60 SHA1 b5f020ca8f6b126f478bdc5b4fa274302e4e3623 SHA256 bd27c035d0fb80ff3ff45f78319bd027094a4249603b83ad1e74f50ed64707fb
+DIST soprano-2.4.4.tar.bz2 1945464 RMD160 05fe6fa3e49e15e23131f7e0f495d7cc350ac87c SHA1 5c5dfc694fdba566af67fa6b3bc2e6d8211236ba SHA256 78ca3b0e2c9092b88c486c380a158ad0f4ab116272e7b96239914ec34d30110b
+EBUILD soprano-2.3.1-r1.ebuild 2896 RMD160 a38d078e6e0503224f2c3b066a6bc0c4007dc0cd SHA1 28bf89a56946e25fc42ea5b7cc3167c2f696dbb7 SHA256 86099b7129d35fc3101015b3970797a1a6124401b60fdc8de924f966cffa3e03
 EBUILD soprano-2.4.3.ebuild 3022 RMD160 fa0573d25ec1cfd310988a3078a91e64cc4833b9 SHA1 3b455710b25ca5b81286d9758d0c9c40e2d3beee SHA256 7688766872bcdda65827aa0417c0798bd1ab0f42e74b6715a61636a0470d1e7f
-MISC ChangeLog 7178 RMD160 a48b85e5408289689b7fdb96de6c4ff05c5ef830 SHA1 c7d17f68379568155d57b4d9556699975a54272a SHA256 0b7f5258a81d19da1b7b626a991d11896e54f27f67052851cba359f12ab195ca
+EBUILD soprano-2.4.4.ebuild 3099 RMD160 a43fbe3b56383e01fb9a1b0f71dc3d45c69ba1b0 SHA1 0cf0e1a6927258fa7e0056a914a4fa50f186d53e SHA256 8c648023cbf39dc2b45d36b2bd8234d147260355d72afe5a132b8af7103c35aa
+MISC ChangeLog 7480 RMD160 7dfca7ec526c9dd2cf7a102d1d8963d0d2679902 SHA1 b0970086dcfe7ecce55cecbf34da7423df234bc0 SHA256 99d81411e41aa9930d45edac6436383adf706a83822b51f41ff471bf0cd895ed
 MISC metadata.xml 661 RMD160 4cc052a1f0507d9ea45b3dc36c0d1319cd5d6801 SHA1 ccb365c5b898290244b5ea3c66fa938fb327cce6 SHA256 e06e233e003c202ac8257cdc080eb6380dc6b78166554c54fe72cee5ba39619b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwnEZAACgkQNQqtfCuFneNMogCfcLORPOZmUhjxDQ7J7Iup3HTa
-/u4An3GvICtjHV+z248Xr/afFYm0Ihqp
-=KmTK
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..84e7e0689da7
--- /dev/null
+++ b/dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake
@@ -0,0 +1,12 @@
+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
+@@ -108,7 +108,7 @@
+     if(NOT "${_TEST_EXITCODE}" EQUAL 0)
+       set(_REDLAND_VERSION_OK)
+       message(STATUS "${_OUTPUT}")
+-      message(STATUS "Redland with broken NEEDED section detected, disabling")
++      message(SEND_ERROR "Broken Redland detected, rebuild it now. If problem persists, report bug at bugs.gentoo.org.")
+     endif(NOT "${_TEST_EXITCODE}" EQUAL 0)
+   endif(_REDLAND_STORAGE_LIBS)
+ 
diff --git a/dev-libs/soprano/soprano-2.3.1-r1.ebuild b/dev-libs/soprano/soprano-2.3.1-r1.ebuild
index 4d79074500b1..f9205dbf339a 100644
--- a/dev-libs/soprano/soprano-2.3.1-r1.ebuild
+++ b/dev-libs/soprano/soprano-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.3.1-r1.ebuild,v 1.6 2010/01/18 18:52:21 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.3.1-r1.ebuild,v 1.7 2010/07/06 01:40:04 reavertm Exp $
 
 EAPI="2"
 
@@ -27,9 +27,9 @@ COMMON_DEPEND="
 	)
 	java? ( >=virtual/jdk-1.6.0 )
 "
-
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
+	test? ( >=x11-libs/qt-test-4.5.0:4 )
 "
 RDEPEND="${COMMON_DEPEND}
 "
diff --git a/dev-libs/soprano/soprano-2.4.4.ebuild b/dev-libs/soprano/soprano-2.4.4.ebuild
new file mode 100644
index 000000000000..66271b58cb67
--- /dev/null
+++ b/dev-libs/soprano/soprano-2.4.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.4.4.ebuild,v 1.1 2010/07/06 01:40:04 reavertm 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="clucene +dbus debug doc elibc_FreeBSD java +raptor +redland test +virtuoso"
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.5.0:4
+	clucene? ( dev-cpp/clucene )
+	dbus? ( >=x11-libs/qt-dbus-4.5.0:4 )
+	raptor? ( >=media-libs/raptor-1.4.16 )
+	redland? (
+		>=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}
+	doc? ( app-doc/doxygen )
+	test? ( >=x11-libs/qt-test-4.5.0:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtuoso? ( >=dev-db/virtuoso-server-6.1.0 )
+"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+)
+
+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 && ! 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
+	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.
+	use elibc_FreeBSD && append-flags -pthread
+
+	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_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_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs+=(-DSOPRANO_BUILD_TESTS=ON)
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	ctest --extra-verbose || die "Tests failed."
+}