Fix typo in eclass call, add patch for compilation without qt4

(Portage version: 2.1.10.5/cvs/Linux x86_64)

3 files changed, 110 insertions, 1 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 2da548cefd0b..80094b052ef0 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.68 2011/07/12 20:26:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.69 2011/07/17 12:17:12 dilfridge Exp $
+
+*strigi-0.7.5-r1 (17 Jul 2011)
+
+  17 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +strigi-0.7.5-r1.ebuild, +files/strigi-0.7.5-no-qt4.patch:
+  Fix typo in eclass call, add patch for compilation without qt4
 
 *strigi-0.7.5 (12 Jul 2011)
 
diff --git a/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
new file mode 100644
index 000000000000..3f9944a27fe5
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
@@ -0,0 +1,11 @@
+--- strigiclient/lib/CMakeLists.txt.orig	2011-07-13 19:57:19.000000000 +0200
++++ strigiclient/lib/CMakeLists.txt	2011-07-13 19:59:15.000000000 +0200
+@@ -1,4 +1,7 @@
+ if(NOT WIN32)
+     add_subdirectory(htmlgui)
+ endif(NOT WIN32)
+-add_subdirectory(searchclient)
++
++if(QT4_FOUND)
++ add_subdirectory(searchclient)
++endif(QT4_FOUND)
diff --git a/app-misc/strigi/strigi-0.7.5-r1.ebuild b/app-misc/strigi/strigi-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..d8dc31ac088c
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.5-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.5-r1.ebuild,v 1.1 2011/07/17 12:17:12 dilfridge Exp $
+
+EAPI=4
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	EGIT_REPO_URI="git://anongit.kde.org/strigi"
+	GIT_ECLASS="git-2"
+	EGIT_HAS_SUBMODULES="true"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="http://strigi.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
+
+COMMONDEPEND="
+	app-arch/bzip2:0
+	dev-libs/libxml2:2
+	sys-libs/zlib:0
+	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 )
+	ffmpeg? ( virtual/ffmpeg )
+	hyperestraier? ( app-text/hyperestraier )
+	log? ( >=dev-libs/log4cxx-0.10.0 )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+"
+DEPEND="${COMMONDEPEND}
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
+)
+
+src_configure() {
+	# Enabled: POLLING (only reliable way to check for files changed.)
+	# Disabled: xine - recommended upstream to keep it this way
+	mycmakeargs=(
+		-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 ffmpeg)
+		$(cmake-utils_use_enable hyperestraier)
+		$(cmake-utils_use_enable inotify)
+		$(cmake-utils_use_enable log LOG4CXX)
+		$(cmake-utils_use_enable qt4)
+		$(cmake-utils_use_enable test CPPUNIT)
+		$(cmake-utils_use_disable xine)
+	)
+
+	if use qt4; then
+		mycmakeargs+=(-DENABLE_DBUS=ON)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use clucene && ! use hyperestraier; then
+		echo
+		elog "Because you didn't enable either of the available backends:"
+		elog "clucene or hyperestraier, strigi may not be functional."
+		elog "If you intend to use standalone strigi indexer (not needed for KDE),"
+		elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
+		elog "or hyperestraier (unreliable) USE flag enabled."
+		echo
+	fi
+}