Bump to 0.5.8. Add support for split qt 4.4.

Package-Manager: portage-2.1.4.4

3 files changed, 117 insertions, 2 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 6d9b54377ebd..a428e1703a4e 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2008/01/13 18:18:23 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.2 2008/03/10 21:49:04 zlin Exp $
+
+*strigi-0.5.8 (10 Mar 2008)
+
+  10 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org> strigi-0.5.7.ebuild,
+  +strigi-0.5.8.ebuild:
+  Bump to 0.5.8. Add support for split qt 4.4.
 
 *strigi-0.5.7 (13 Jan 2008)
 
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index 9df67094240e..fce602cf999a 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX strigi-0.5.7-automagic-deps.patch 9387 RMD160 094556498166e077d545b4464e81ad748201395c SHA1 7234c6fcb8493a0993c0080e398884ceeb66c3c5 SHA256 4ade3906963b7f2027b52ce54be39a0aad8e9f6b86a6219cb72e58cf0714ac8f
 DIST strigi-0.5.7.tar.bz2 804440 RMD160 55d0c741140d9d67d87f60b06777c743c835df0a SHA1 d7e81f4e6e204129649473e00b20a6fcd7a76f65 SHA256 99da15b91b7703b141a5baf5165bdc33f9d9737da9a738f470b43acf4dd84ab6
+DIST strigi-0.5.8.tar.bz2 830822 RMD160 b07c9138b9562d1aa7532e56d13ba3db5d4eeb32 SHA1 7505527bd6724e054602b8ab6d1417f2d9bc1a6e SHA256 7b512461008152883289d3c5e9df4addc86944026ba3ba09f66a87698d3dd928
 EBUILD strigi-0.5.7.ebuild 2926 RMD160 945383d04a0d1e0ecb7ad2460baa1b3fb49699d9 SHA1 3c77e6f0e8163bfa00a23e2f23935700dc190f6d SHA256 e22fb3389cf123ae5e75e4ce14356a008200000671d9b49fbe842626998a3e44
-MISC ChangeLog 5471 RMD160 217444ba7ad11b25460f63370f0c81b7c9933fa5 SHA1 b334b161e860f37aa2cde026a57335b761f36908 SHA256 eac47188ea2a14aa9c7d6937c4222b37c377cc6a55a98cc2673d1ec93ee9336f
+EBUILD strigi-0.5.8.ebuild 3121 RMD160 24feaecbadbe2e73d32915b7b8204b1167c3808f SHA1 5d07ebc41901ddc6299f83241550a5b9a944092c SHA256 3275075df7eb1cc0614d684ffbcabbf8248504ef6d83084c97601187f175fa5c
+MISC ChangeLog 5640 RMD160 7d3474d168287e1576086c0428e04c6be3de77a7 SHA1 ddb8c7ee0bf6e65049142ad0ecd9ad535b2d1819 SHA256 71fe05d8bea5fb0359e425a84cf959291335452164d8024424f030308fc5e779
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1azYfxJ68Jl1NeERAuNAAKCkc+H/DryuQYFKHPiDLer+jEjmsQCdG0V2
+HkkH8EfKifo5iq75Hz0yp2s=
+=Y3wV
+-----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/strigi-0.5.8.ebuild b/app-misc/strigi/strigi-0.5.8.ebuild
new file mode 100644
index 000000000000..4069aeb23f4c
--- /dev/null
+++ b/app-misc/strigi/strigi-0.5.8.ebuild
@@ -0,0 +1,97 @@
+# 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.8.ebuild,v 1.1 2008/03/10 21:49:04 zlin 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 java +qt4 test"
+# log strigi
+RESTRICT="test"
+
+COMMONDEPEND="
+	dev-libs/libxml2
+	virtual/libiconv
+	clucene? ( >=dev-cpp/clucene-0.9.16a )
+	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 )
+	java? (
+		>=dev-libs/xerces-c-2.7.0-r1
+		>=virtual/jdk-1.4
+		)
+	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.
+	# Disabled: NEWXESAM (targetted at developers)
+	# Enabled: POLLING (only reliable way to check for files changed.)
+
+	mycmakeargs="${mycmakeargs}
+		-DENABLE_EXPAT=OFF -DENABLE_NEWXESAM=OFF -DENABLE_POLLING=ON
+		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=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 -j1
+	ctest --extra-verbose || die "Tests failed."
+}