Revision bump adds upstream patch to fix build with gcc 4.7 spotted by Alphat-PC <AlphatPC@gmail.com> wrt bug #412361.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

4 files changed, 129 insertions, 9 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index ecf0acbdac9b..6259a644d549 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.87 2012/03/12 10:01:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.88 2012/04/17 18:42:22 johu Exp $
+
+*strigi-0.7.7-r1 (17 Apr 2012)
+
+  17 Apr 2012; Johannes Huber <johu@gentoo.org> +files/strigi-0.7.7-gcc47.patch,
+  +strigi-0.7.7-r1.ebuild:
+  Revision bump adds upstream patch to fix build with gcc 4.7 spotted by Alphat-
+  PC <AlphatPC@gmail.com> wrt bug #412361.
 
   12 Mar 2012; Johannes Huber <johu@gentoo.org> -files/strigi-0.6.4-gcc44.patch,
   -files/strigi-0.6.5-gcc4.4-missing-headers.patch,
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index b6970be71d19..029af910a2be 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX strigi-0.7.7-gcc47.patch 646 RMD160 8f515112485db8b410770bd3fb34f5d99d04b76b SHA1 7556289edf2c15c18066bbcb8773c07a74cbfeed SHA256 5803f646ee063dc397bf47164584aaac91f877f0195f80d027baa8e2571cf6bc
 DIST strigi-0.7.7.tar.xz 698312 RMD160 473fc190c003ea07b74b0e309052d65b220ec635 SHA1 31e80a5d762ab20391d07080ddb035f9b91a233f SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817
+EBUILD strigi-0.7.7-r1.ebuild 2526 RMD160 0e40cb737866720283a0d0e568b63286292ddb1f SHA1 b0fb56e54624ae4b0f295b488ad69b65c0061cb3 SHA256 6836e575f3b261e8cd31443068ff95419f6c2bf4da76129ae189d519f32a68f4
 EBUILD strigi-0.7.7.ebuild 2474 RMD160 ffb83b465fa0f055b8f6233400e4fb56a0cd503f SHA1 d8d09eb6463343197a96acb66e97bf3fde497f46 SHA256 e68dd749ac0ec258348888d55ffb59fd7d2d7fe537d52cc88a3ccbd6ffc12538
-MISC ChangeLog 16801 RMD160 c39fa5bab2fb7988f9cf18f56cd403c179560ea5 SHA1 a0d857ae3042b7766295dd8d341e552bd40846f5 SHA256 24b8d05c684a20f6b82b3caa15679f2e4b0009a52c9a598168855b8ba80b4c3e
+MISC ChangeLog 17066 RMD160 723db190205295ffe0d2c3ff7b78d31b5cd2616e SHA1 0d87dfb4112da355310446bea1a790b3fa13ce36 SHA256 9d9aabe3d042b6693bc4b014cf7752899ac750d008e5b08931b7dca1806e8919
 MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPXcrbAAoJEO+t9ga+3I3aj6sIAIaGIj+ZmztYjZPTR9VeQSxc
-QLMKYiq/p8dpGCCETJp6GsMjKUqxXlPEtVg+E265yakal42LjkcGyt9BZouiBlDi
-vH8KVCSCuyO48NxkWg3OoU0fEoD5rTqkEsCP+BQszmJm2btxyABAWT4gnjr5UBzI
-RgJly/DrFM4jAkWnWfH7tMvdR5J4K81A2Ni53/LbwVU7HIvCKopo6A5knE32qd1t
-dHm2bmOZvshuzNBz8GZPbQeH9GN/4mZwm4wppqKy/m98FO/3zcVyab6y4G+7oFhD
-VJx1LEAG7PsY3SksEBSjdRXaZ1sm0vBNPXVxDzBJNDuNpVSAtbVazXiTN2WbQxU=
-=jaeO
+iQEcBAEBCgAGBQJPjbnBAAoJEO+t9ga+3I3awz8H/2f9L8IHX7UUU4GhanADRIss
+6XtoAnUdF62OyduGzU/DwfFZnMMFTgYVLMaDBMbV389TzEc9+s04FnGXn7OphwIF
+Wv0r95G1l3/MYbamvzCW/l3SApSKmxgh6L5MG/v0mRIPeZDBPVT97an9SJinNfsz
+pxYcwXnf3nvCyBRZ2SfgSl0z/fjlxG0Dr12FM4rmeKm4OlFJQFZq471zNgmhXRmF
+ftR51B/4Rna95pTQGxVpsyR8+W9mgCISyBiOZA8AAqL/DFRy0AJq5uwPsFgLViIi
+lhRewJj5bOVGm90HQ37ufO10+63Qdey6DlZCjVm60J95/Fpdaki7Vdhpm90M1Lw=
+=6yMa
 -----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/files/strigi-0.7.7-gcc47.patch b/app-misc/strigi/files/strigi-0.7.7-gcc47.patch
new file mode 100644
index 000000000000..3e3d31835f67
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.7-gcc47.patch
@@ -0,0 +1,20 @@
+commit a8e97f672325557b3fbc84b987299350ec5ac10b
+Author: Rex Dieter <rdieter@fedoraproject.org>
+Date:   Mon Jan 9 11:13:25 2012 -0600
+
+    gcc47 fix, unistd.h header required unconditionally for 'sleep'
+
+diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+index 9fcdcb1..1e97599 100644
+--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
++++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+@@ -27,9 +27,7 @@
+ #include <iostream>
+ #include <stdio.h>
+ 
+-#if defined(__SUNPRO_CC)
+ #include <unistd.h>
+-#endif
+ 
+ using namespace std;
+ 
diff --git a/app-misc/strigi/strigi-0.7.7-r1.ebuild b/app-misc/strigi/strigi-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..6b14b1d4ef66
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.7-r1.ebuild
@@ -0,0 +1,91 @@
+# 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-r1.ebuild,v 1.1 2012/04/17 18:42:22 johu Exp $
+
+EAPI=4
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+	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="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" )
+
+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 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
+}