Fix CLucene automagic wrt bug #448116.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 117 insertions, 2 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 6daad0d824b3..e59315f408ef 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.91 2012/07/04 12:07:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.92 2012/12/26 15:09:14 kensington Exp $
+
+*strigi-0.7.7-r2 (26 Dec 2012)
+
+  26 Dec 2012; Michael Palimaka <kensington@gentoo.org> +strigi-0.7.7-r2.ebuild:
+  Fix CLucene automagic wrt bug #448116.
 
   04 Jul 2012; Johannes Huber <johu@gentoo.org>
   +files/strigi-0.7.7-ffmpeg-0.11.patch, strigi-0.7.7-r1.ebuild:
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index 55ae48164cd7..74f57a21b7bb 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX strigi-0.7.7-ffmpeg-0.11.patch 5112 SHA256 c3a3cdbd603091e0cc99201ea8221b068c4a7ae35d2241b1763d6b0ffab41ccd SHA512 467bf77dd43b62fd70a7e02346c5cab8e685ad73ffc018e926301f05b12399a3244f75dd3fb4615048898a029162ebb1e13759847926528dfef164c783d4309f WHIRLPOOL bd3b385d8f6493a4509901f27dc5be5d42e6b8428f064c3e39f450220e282ad3d0e0a20e47eeeb931d44a82cf4d53e9da417152f30dffd2433f788ec8b731ecc
 AUX strigi-0.7.7-gcc47.patch 646 SHA256 5803f646ee063dc397bf47164584aaac91f877f0195f80d027baa8e2571cf6bc SHA512 a6a70deb4d6f1a5756714bfa0b33cccb842940d01d786ef943199e91a7ccccb82d8acb629a01be82b6a8a86db378af2e2766f3a781a533fb05373a3b0d0634ed WHIRLPOOL a27a3d79de6bff3b45f343356de547ebc05ea9f546bfb261be3926aef213542fd97f0a42c1ae149e9adfb65ed457ee2504ab20eb70ecdd861f940e141d3fe801
 DIST strigi-0.7.7.tar.xz 698312 SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817 SHA512 00498e5248cbaf676054e40dba877a326b4da322b6624bd5f06b48d0b8567a45c8efadf1d7522bbd8ca6e50d4d9d7c4b4beccb25ccd84feb894be0e206818c78 WHIRLPOOL 404961425f99986956871978906a6defa447060a90bbdb9d755a8322e3616741cb6e4c922865857d5c9227d45aaca5cd30972dd8abcd34d43475178352b1403f
 EBUILD strigi-0.7.7-r1.ebuild 2577 SHA256 4a3abdb5117e81442c6654de2750209fb94305fd7a4bebeab52b704f344fe403 SHA512 8d3d141f6f4dbbb70bf473d34da8e71b739e35e00e968070b468f26dcda12caa689d1ec27b4ccdc707d6237a6529454169e37c12951afa503ce30587385d6882 WHIRLPOOL e07d4737cc80bb933e90f3e4c78f0eb3bd01a2aa3778cb4d2ea67237b7fd5f43ddcd216e4b0d13a45051ab0027c6f69fe6a08c030e7ea9a3ea80f04434b1c5da
+EBUILD strigi-0.7.7-r2.ebuild 2630 SHA256 d0e91175f996e72a7a902f69347387bafb7c85ef7c9538a51450312e35bce542 SHA512 e9d4b0b19d3ffb2f481b1d2e56e766140f4b56775f83b0617f158d09d3f735f533af876ab31369909af843b5ea4f74bef1d2a90b485c537bb3aa0ec4183309b8 WHIRLPOOL a34cbba3327edb80695b8c032c79ba608650a58d7d546bc0fd928c77d9e9fe9b64e3cde5ef185f13a2428abe6ed0f25831ae7dc66324ce76ab6b2328fe481396
 EBUILD strigi-0.7.7.ebuild 2475 SHA256 9b661f37b8da4157f10009843322a4f4728e9b9d38fbadf89e669ded109d1ddc SHA512 525c92dbb24ebfaf9c1e7a611c80bcf8d3edf65c8bd7358300602fae1722485551775b90e8d565c80417789192dd5c730e205107ca82aac36f7ab128a82f1102 WHIRLPOOL 3a94c410d0a04012764cd7736868d9e29997fcb09aae89d1d807adc9a5c6522c1753a952de0e73d2b23b0675b53c709510698907e6274454ff3817bebe6a8665
-MISC ChangeLog 17544 SHA256 83837c9250535b46348f497081bc92eac184e4a6ff05d26b318ff4557756b032 SHA512 315658f27fbc0ea4fa5431643ff21eb8b768b9602a93aabfdc88fcca618a62a49219de5fd0d6d1cb9d508d88c05c1f6f7c35cb6165bbe7f9be1a9699fb5620f0 WHIRLPOOL 2a595ae85d7f868133b6addc73ad3f045766e24d712f1cfb26c096c19f71ab6fb7c4b1b3e0fd3f38d9142ed394972399fe47cf3b6e561414e39840124cf98d5c
+MISC ChangeLog 17705 SHA256 4dbed51c0917f62a684f9fabdf5a4e5f908ec89eee912c2f2be9e5c2da74d872 SHA512 e73df87297bc7cd1b0da3480b1b45ca1506036e262ea5a25a34b9dbfcf60172aee41a8296350e2a33e370bc08fd6f89d8986ab067375f07eaa74795853acc0cf WHIRLPOOL 869263b9d0a751bc357acf679853fa036d3efa4b8de66114ad4556c07569eaf7611723bf8fd999b0fb72f059a8ba0d5fa44235002ba76ac2ca2826cfaca0898b
 MISC metadata.xml 486 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12 SHA512 d7b0cb1f16777eaa062327d6584e69ddc90842ea1d867ec06ceb0a03515fa107fc66d3a94806bf9cf2aaeef300024eb384a70f6fcbe26b2d6f008751f92c17ac WHIRLPOOL 87bd369ade6d7cb4d188aea272b239916d7a19040e5b2dd0965f4c63e657699e8509f2ca0d66dc9e83bcb5e6a9afe1dae4f97e957ce2436bc7a2e811ab1bf46f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ2xJiAAoJEMbwO6tnXQ0s/noIAJgovY0RRg67/EwYT4J1ZW22
+d8uEyk3KxpL8UAOKDCS7pYZ6Zfe+HNeWXykQOvyAZNQGK+iWYtD8+7Wm2UaO8gyK
+UY5BoKvdLja3rfT4bkp0dfvXksUaUaSkht3WyiEmT2cUGFj1nPNF+Et/ZxRA87Dx
+0DYH2hYyhrosuHXlMqgV7fimIITsNtk98L5IAHpX6LsNWhcboLnkIydc84D9B59A
+AR/vgJ9LiqWrhurvbBMMrgRWRk8YuUXKuzAeX+SdINM3J1mV0dCKBsAGLRI188xl
+beeSBBppqx9JiSIgXqtgSWGVcBnyaeoS/eO8aVGbjNBaf8a4IIC9kI3STKG5imQ=
+=iN/s
+-----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/strigi-0.7.7-r2.ebuild b/app-misc/strigi/strigi-0.7.7-r2.ebuild
new file mode 100644
index 000000000000..d0349f63684a
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.7-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r2.ebuild,v 1.1 2012/12/26 15:09:14 kensington Exp $
+
+EAPI=5
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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="https://projects.kde.org/projects/kdesupport/strigi/strigi"
+
+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}
+	dev-libs/boost
+	test? ( dev-util/cppunit )"
+RDEPEND=${COMMONDEPEND}
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-ffmpeg-0.11.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
+		-DENABLE_XINE=OFF
+		$(cmake-utils_use_enable clucene CLUCENE)
+		$(cmake-utils_use_enable clucene CLUCENE_NG)
+		$(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)
+	)
+
+	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
+}