Version bump. Fix src_test(), also compile tests in parallel, all tests pass for me. Tighten dev-cpp/clucene dependency. GCC-4.3 patch accepted upstream.

(Portage version: 2.1.5.4)

2 files changed, 104 insertions, 1 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 2f9d9d8a6c9a..d6fb569e3554 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.7 2008/05/15 12:46:15 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.8 2008/06/13 02:49:53 ingmar Exp $
+
+*strigi-0.5.10 (13 Jun 2008)
+
+  13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> +strigi-0.5.10.ebuild:
+  Version bump. Fix src_test(), also compile tests in parallel, all tests
+  pass for me. Tighten dev-cpp/clucene dependency. GCC-4.3 patch accepted
+  upstream.
 
   15 May 2008; Ingmar Vanhassel <ingmar@gentoo.org> strigi-0.5.9.ebuild:
   Re-add gcc 4.3.0 patch.
diff --git a/app-misc/strigi/strigi-0.5.10.ebuild b/app-misc/strigi/strigi-0.5.10.ebuild
new file mode 100644
index 000000000000..ec05997fbc82
--- /dev/null
+++ b/app-misc/strigi/strigi-0.5.10.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.5.10.ebuild,v 1.1 2008/06/13 02:49:53 ingmar Exp $
+
+EAPI="1"
+inherit eutils cmake-utils
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="http://www.vandenoever.info/software/strigi"
+SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+clucene +dbus debug +exiv2 fam hyperestraier inotify +qt4 test"
+# IUSE="log sqlite": fails to compile
+
+COMMONDEPEND="
+	dev-libs/libxml2
+	virtual/libiconv
+	clucene? ( >=dev-cpp/clucene-0.9.19 )
+	dbus? ( sys-apps/dbus
+		|| ( ( x11-libs/qt-dbus:4
+			x11-libs/qt-gui:4 )
+			>=x11-libs/qt-4.3.0:4 )
+		)
+	exiv2? ( media-gfx/exiv2 )
+	fam? ( virtual/fam )
+	hyperestraier? ( app-text/hyperestraier )
+	qt4? (
+		|| ( ( x11-libs/qt-core:4
+			x11-libs/qt-gui:4 )
+			>=x11-libs/qt-4.3.0:4 )
+		)"
+#	log? ( >=dev-libs/log4cxx-0.9.7 )
+#	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${COMMONDEPEND}
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+pkg_setup() {
+	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
+		ewarn "It's highly recommended to enable one of the supported backends:"
+		ewarn "clucene, hyperestraier and sqlite"
+		ewarn "Clucene is currently the recommended backend."
+		ewarn "Without a backend you'll only be able to use deepgrep."
+	fi
+
+	if use dbus && use qt4; then
+		if ( has version "<x11-libs/qt-4.4.0_alpha:4" && ! built_with_use x11-libs/qt:4 dbus ) || \
+			( has version "x11-libs/qt-gui:4" && ! built_with_use x11-libs/qt-gui:4 dbus); then
+			eerror "You are building Strigi with qt4 and dbus, but qt4 wasn't built with dbus support."
+			eerror "Please re-emerge qt4 with dbus, or disable dbus in Strigi."
+			die
+		fi
+	fi
+
+	if use qt4 && ! use dbus; then
+		eerror "You are building Strigi with qt4 but without dbus."
+		eerror "Strigiclient needs dbus to detect a running Strigi daemon."
+		eerror "Please enable both qt4 and dbus."
+		die
+	fi
+}
+
+src_compile() {
+	# Strigi needs either expat or libxml2.
+	# However libxml2 seems to be required in both cases, linking to 2 xml parsers
+	# is just silly, so we forcefully disable linking to expat.
+	# Enabled: POLLING (only reliable way to check for files changed.)
+
+	mycmakeargs="${mycmakeargs}
+		-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
+		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
+		-DENABLE_REGENERATEXSD=OFF
+		$(cmake-utils_use_enable clucene CLUCENE)
+		$(cmake-utils_use_enable dbus DBUS)
+		$(cmake-utils_use_enable exiv2 EXIV2)
+		$(cmake-utils_use_enable fam FAM)
+		$(cmake-utils_use_enable hyperestraier HYPERESTRAIER)
+		$(cmake-utils_use_enable inotify INOTIFY)
+		$(cmake-utils_use_enable qt4 QT4)"
+#		$(cmake-utils_use_enable log LOG4CXX)
+#		$(cmake-utils_use_enable sqlite SQLITE)
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs="${mycmakeargs} -DENABLE_CPPUNIT=ON"
+	cmake-utils_src_compile
+
+	pushd "${WORKDIR}/${PN}_build"
+	ctest --extra-verbose || die "Tests failed."
+	popd
+}
+