Add back 0.7.1. It seems 0.7.2 is way too unstable (at least with KDE SC 4.5)

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

3 files changed, 112 insertions, 12 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 58957de485f5..d5c2f21faa24 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.58 2010/06/27 08:39:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.59 2010/07/29 01:09:37 reavertm Exp $
+
+  29 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org> +strigi-0.7.1.ebuild:
+  Add back 0.7.1. It seems 0.7.2 is way too unstable (at least with KDE SC
+  4.5)
 
   27 Jun 2010; Christian Faulhammer <fauli@gentoo.org> strigi-0.7.2.ebuild:
   x86 stable, bug 322791
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index fab48fec0d7c..f4b9b15e41ae 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX strigi-0.6.4-gcc44.patch 1024 RMD160 194d69ba906c4da9ead9349545f26567dadc8ed2 SHA1 37c4622dd3b3b96de268e8ef15f52d8dea284d49 SHA256 94c594b16c0189706d0b0d565648b685a53910721f2340251ce7197ad5c213df
 AUX strigi-0.6.5-gcc4.4-missing-headers.patch 1020 RMD160 91e447323303315a1f8fe282afce6add0f4c802a SHA1 308c03e5fd1b1671ea2690ceaff2426050390f92 SHA256 a16029a8caaede0c0427865a06a308fd6de0f526840b88274fab5ada0233c3c8
 AUX strigi-disable_java.patch 784 RMD160 870decf02f7bda63bae9a6f7df0b26caed753fdc SHA1 09dc828ecef7287e7286277713d07f84d6ff72bf SHA256 f267a0a804d96e9ef4cac1138f98572bec17906021282b4db905b804c33b956d
 DIST strigi-0.7.0.tar.bz2 937446 RMD160 f96faa83c0955e3a665a38b1d84dff1b3ace9405 SHA1 c8f299ae3b5778c6891b58a1966b7342fb5e9e32 SHA256 2b31d24e1de57b82c391af8a6eefb87d40fff06a5c1b43c14aa91f75eaba7efa
+DIST strigi-0.7.1.tar.bz2 936454 RMD160 4dac3c3e8937dc1e0ea5cc759c95d64ba4e24898 SHA1 9e05a875a1c62ebb5c0c59bf2114253cd1bc2a07 SHA256 d1830506da50262c80d5a3b55ee7821b132184cbd251c527db8d9d76a9242ab3
 DIST strigi-0.7.2.tar.bz2 936320 RMD160 7497195335f76f30922f5c6acaae383e144b33c7 SHA1 b4c1472ef068536acf9c5c4c8f033a97f9c69f9f SHA256 1ca421bbe420d1839bbe6bfe7c4b52a05590a9b7a7eda77924b554c98e602ab8
 EBUILD strigi-0.7.0.ebuild 2720 RMD160 6bea4bcc53c1208fc0579059d664e14ebc0d233d SHA1 555ef822cecb0d13a1921ee7171c32aa6ffd9c9a SHA256 d4321641842d625068c105f741738a5c248ce690418e0346158a743b16b23609
+EBUILD strigi-0.7.1.ebuild 2794 RMD160 e69868453b2308c44ce50aa7b8b2f1abcbf6c7f2 SHA1 bd891501f5990cc793616752197c6d4847c6d382 SHA256 b17e20a58ef8409e65585a2658cdbc217d290517b3a98746fced38a75bf184dd
 EBUILD strigi-0.7.2.ebuild 2789 RMD160 ffaaa205d210371cacfe6a7d0023c7d9a05850e9 SHA1 98ce58b745ac3aa8f59460cadb0f72ef04d456ee SHA256 905ea51cceae35a211d25b269a43d3bb7c09891921402d1b71ac6a880a516e2e
-MISC ChangeLog 12728 RMD160 78d54f0b40c5004d2cc631f929ce340617c305da SHA1 98251f7d683cbe816875f2f467cc342ce090504c SHA256 b72735105603dd995360310cd56ab7047cec3e3d7a52b81136062c3f747d3dda
+MISC ChangeLog 12890 RMD160 f052b64913c2a7312b476bfeb87079889fefe103 SHA1 8b449806258636ce2944b266e1815aa67f03f881 SHA256 a704c70bf46d96eecc8730fe5cb6d26283aaaf3abf98d2d3aaabd6b51a0a90ed
 MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwnDnoACgkQNQqtfCuFneNHHwCffWZFddYVVljyiG/a8DJdMQMr
-n4UAoJhyAkYiE2KK3nlDyk5FmcqYBRYA
-=mJhM
------END PGP SIGNATURE-----
diff --git a/app-misc/strigi/strigi-0.7.1.ebuild b/app-misc/strigi/strigi-0.7.1.ebuild
new file mode 100644
index 000000000000..a8a80560df77
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.1.ebuild,v 1.4 2010/07/29 01:09:37 reavertm Exp $
+
+EAPI="2"
+
+inherit base cmake-utils
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="http://strigi.sourceforge.net/"
+SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+clucene +dbus debug exif fam hyperestraier inotify log +qt4 test"
+
+COMMONDEPEND="
+	dev-libs/libxml2
+	virtual/libiconv
+	clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+	dbus? (
+		sys-apps/dbus
+		qt4? ( x11-libs/qt-dbus:4 )
+	)
+	exif? ( >=media-gfx/exiv2-0.17 )
+	fam? ( virtual/fam )
+	hyperestraier? ( app-text/hyperestraier )
+	log? ( >=dev-libs/log4cxx-0.10.0 )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+	!clucene? (
+		!hyperestraier? (
+			>=dev-cpp/clucene-0.9.21[-debug]
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.4-gcc44.patch"
+	"${FILESDIR}/${PN}-0.6.5-gcc4.4-missing-headers.patch"
+	"${FILESDIR}/${PN}-disable_java.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	rm cmake/FindQt4.cmake || die "unable to remove obsolete FindQt4 macro."
+}
+
+src_configure() {
+	# 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=(
+		-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
+		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
+		-DENABLE_REGENERATEXSD=OFF
+		$(cmake-utils_use_enable clucene)
+		$(cmake-utils_use_enable dbus)
+		$(cmake-utils_use_enable exif EXIV2)
+		$(cmake-utils_use_enable fam)
+		$(cmake-utils_use_enable hyperestraier)
+		$(cmake-utils_use_enable inotify)
+		$(cmake-utils_use_enable log LOG4CXX)
+		$(cmake-utils_use_enable qt4)
+	)
+
+	if use qt4; then
+		mycmakeargs+=(-DENABLE_DBUS=ON)
+	fi
+
+	if ! use clucene && ! use hyperestraier; then
+		mycmakeargs+=(-DENABLE_CLUCENE=ON)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	mycmakeargs+=(-DENABLE_CPPUNIT=ON)
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+	ctest --extra-verbose || die "Tests failed."
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	if ! use clucene && ! use hyperestraier; then
+		elog "Because you didn't enable either of the supported backends:"
+		elog "clucene or hyperestraier"
+		elog "clucene support was silently installed."
+		elog "If you prefer another backend, be sure to reinstall strigi"
+		elog "and to enable that backend use flag"
+	fi
+}