Version bump, with a backported patch from upstream fixing build with GCC 4.8 (bug #483006).

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

4 files changed, 117 insertions, 16 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 6937dfbfc84f..4276a80221dd 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.102 2013/04/02 20:55:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.103 2013/09/01 16:46:27 kensington Exp $
+
+*strigi-0.7.8 (01 Sep 2013)
+
+  01 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/strigi-0.7.8-gcc-4.8.patch, +strigi-0.7.8.ebuild:
+  Version bump, with a backported patch from upstream fixing build with GCC 4.8
+  (bug #483006).
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> strigi-0.7.7-r2.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index aab17e73b2e5..73a8ca6f3c45 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -3,24 +3,21 @@ 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
+AUX strigi-0.7.8-gcc-4.8.patch 357 SHA256 e140389f6e61f7822fb609acd04d300704b76d5c9949fff75371a0677663f0b3 SHA512 d9c3616a553dabe2e3c60030cba658365258b0c279e80e4a2afce34a25ead3fc5afc4dbb7559e3114b61beee9c3b09e07540b1c994a45f99d09fc3127f0b5862 WHIRLPOOL a5434a729626aea2deed0267782c443638ff27d220269aa3b809d9848e087cb8ecedbcab5d23af8b3c2a08accc5c8117d18dc2584478d922ccdf5b7dcf8ad0b3
 DIST strigi-0.7.7.tar.xz 698312 SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817 SHA512 00498e5248cbaf676054e40dba877a326b4da322b6624bd5f06b48d0b8567a45c8efadf1d7522bbd8ca6e50d4d9d7c4b4beccb25ccd84feb894be0e206818c78 WHIRLPOOL 404961425f99986956871978906a6defa447060a90bbdb9d755a8322e3616741cb6e4c922865857d5c9227d45aaca5cd30972dd8abcd34d43475178352b1403f
+DIST strigi-0.7.8.tar.bz2 810574 SHA256 43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989 SHA512 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043 WHIRLPOOL 6853025cee89811dadb6e7f6309a6a8dfec1863cb75ab8af04a9a21b228b74723de06c4f787342ce7a0d6087303ecc0c4f599c2a3978838675678343d0b84ae4
 EBUILD strigi-0.7.7-r2.ebuild 2591 SHA256 c6bfa3ce0c15c61981766a3c6fe3ee3282669d8e6f9baf1c52a949fed914597d SHA512 e7c0a1ce861cf7e2a88956e92e58c00c9df57cebe8edd404568900fbc662088254b577f600566fe3a6bb4c20ed67c41abb8f16a4e8311f545519e242464d0c3c WHIRLPOOL c8b3c86b0d4caaa96c23108f48b7a55295cc3d6a58aedc126bd09dd3f4212dfc8fe1889adac9ab78ed102e91eba388c17e98125b3ed42ab7299a59de2ed4dfbb
-MISC ChangeLog 18870 SHA256 de344131660dee80dc74dfb454631b42eb8edfee9a367cb2b7d366b02f1ed8a8 SHA512 0dc8c6d60dbe0d131399a4570b5951051cda3bd7f2e881f75210c3f6c68d38fff736bab45b4bde468d439a380efd8300cb70ccd41c7ca774eb9119f284e74178 WHIRLPOOL ec3d5a8c49f0ea1332559bd00f79559da8d00842d0b5998be791cf90f89c064dc1cefb7607c227752b2156a630bd2f5b0d01966483a68cad3281b94c3047ec4a
+EBUILD strigi-0.7.8.ebuild 2268 SHA256 8629ff98913671a44938f366964161455e0c3e750ea644e7cb3d9b292e3af546 SHA512 574e8630624fd015452d648422b3b0d27a1a41a78fe25abded0b9bb84b5c01aee02a493759ab2ba38528f83be63e1a0d498f1996181a1cf96e9f0e100a3d144d WHIRLPOOL 11f4d4584dc85d8e53de32132378a193936f8532585088867834a183c35de8ac8ac3ab3a6adca4631bdcca1a8a67cb9cbb5ea3e432c7a546a78bdd34ebbe0e94
+MISC ChangeLog 19119 SHA256 0187ae12de07f1435979b24acdf7d03e1117eefe23befa99b2a82b2445cb494a SHA512 c1e7f186fbc53788b14b69e8cd243aec5de7a69a4619941f9912002507dd61c303b571edae7587eef46252d37ff97a63835f292e645f5f8e7be82b5669a94a5e WHIRLPOOL 11404eee45c25f13dfee26e9078778e2e40ee1a6aa8e2fdbcb169d89c81783915fd0e4266efcebfcbb0ef0bd3ec3056d24d6ea9c688b007491db3f7323b289db
 MISC metadata.xml 486 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12 SHA512 d7b0cb1f16777eaa062327d6584e69ddc90842ea1d867ec06ceb0a03515fa107fc66d3a94806bf9cf2aaeef300024eb384a70f6fcbe26b2d6f008751f92c17ac WHIRLPOOL 87bd369ade6d7cb4d188aea272b239916d7a19040e5b2dd0965f4c63e657699e8509f2ca0d66dc9e83bcb5e6a9afe1dae4f97e957ce2436bc7a2e811ab1bf46f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRW0XWAAoJELp701BxlEWfEgIP/0BsL50Yv9rNgcL+XtMUM6wB
-Zr1sDd5DrL7WoZgMytwEMRcwC3sc2mjkL5Nw3dMF3RnfXkYPRLHqaXTGyiZMbQR6
-m3AGZOoqY9keoIRdHxjhekXwEIWaKQiXL2y8RoHJ3BSmqNMe4cMHzL4Z9TWGDfEz
-2YY76JzEUYbSoFELVqzeXzoaP30CipUq2gYN/ULZd20VWIyCEVKMs4GSEsFSTqbn
-s0dxOpHrLbnOVZzxPbfvUpA6m4klEP5TQkBepaBeuuVzM6YRF1ABP9yccPPLBp4x
-/O6WqnpxR+KVBukEkkGLZOdmZS+afY0G/iFH/7AW+aBwJBvs2l4CCY0mB04K+q7H
-2yymn9z7CNCbGgJ17pnfNFrVqsSc3PPiqeAIXiDfD+ZLzL7Ic8BYJfWAZmIC7qon
-o06E40OkclU6ivaON4cbkqz2LLtXZ13iEowuK8dXBkzqtvnkB09XNWLHv0E++C4q
-OxTVi4DvWY425HazSzGb3IqJ4zz1A2G4hQCxKv9zuJ0cb5X8ZKDo6NpHxIymwewG
-iC51CMNDIsV4TFCbHUXeTnbPWoy/ybRtj6BXQocCKcsLRsDoeoXnG+YdqHDYX08b
-sxfgBe/OPwce+iqeMSZ3fx/vOTsLaew7ZsORdMnVJQS1YKMxXlq2H27TyJ5XnH7l
-bjQD9N8Tc/jJx1xdBPvH
-=rwbc
+iQEcBAEBCAAGBQJSI27OAAoJEMbwO6tnXQ0s3RcIALq6WMmSXiSLKcOTD6pGej24
+74Dytq8O5EStMl03jMTaL2MALWJn3k3FhVD15pay2OLNpUaZBt3pTeRyPLOkT7vN
+Y4Eb10/wMjj2UwM+oo4q5uXmzGhe/PkTtWmjN0Ew8/n0HQFJDLRDa9ngBwCKfNhM
+KFJrioOK3KvpF2rygGQFYgPO+W+gXz/DjulK/IyQsisFLrjZfjZ/xgUlDaz48tAn
+hrHGesPVyxJZ/HaUNkvblxD+8fNs+5mlfQU2KB4pc/zIlhKj+fa/fITTyT3wxH3E
+XYi/2gASSs2ibcKQUCHkE/DdbQaTZWBiAHP0UrbqXyV1XSeh8W6M5Khz/Iuiyw0=
+=u8Ik
 -----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/files/strigi-0.7.8-gcc-4.8.patch b/app-misc/strigi/files/strigi-0.7.8-gcc-4.8.patch
new file mode 100644
index 000000000000..f525a71627a6
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.8-gcc-4.8.patch
@@ -0,0 +1,11 @@
+--- libstreams/include/strigi/bufferedstream.h
++++ libstreams/include/strigi/bufferedstream.h
+@@ -34,7 +34,7 @@
+  * BufferedStream will do the rest.
+  */
+ template <class T>
+-class BufferedStream : public StreamBase<T> {
++class STREAMS_EXPORT BufferedStream : public StreamBase<T> {
+ private:
+     StreamBuffer<T> buffer;
+     bool finishedWritingToBuffer;
diff --git a/app-misc/strigi/strigi-0.7.8.ebuild b/app-misc/strigi/strigi-0.7.8.ebuild
new file mode 100644
index 000000000000..9eebee0030c9
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.8.ebuild,v 1.1 2013/09/01 16:46:27 kensington Exp $
+
+EAPI=5
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://www.vandenoever.info/software/strigi/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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 inotify log +qt4 test"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2:2
+	sys-libs/zlib
+	virtual/libiconv
+	clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+	dbus? (
+		sys-apps/dbus
+		qt4? ( dev-qt/qtdbus:4 )
+	)
+	exif? ( >=media-gfx/exiv2-0.17 )
+	fam? ( virtual/fam )
+	ffmpeg? ( virtual/ffmpeg )
+	log? ( >=dev-libs/log4cxx-0.10.0 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-4.8.patch"
+)
+
+src_configure() {
+	# Enabled: POLLING (only reliable way to check for files changed.)
+	# Disabled: xine - recommended upstream to keep it this way
+	local mycmakeargs=(
+		-DENABLE_POLLING=ON
+		-DFORCE_DEPS=ON
+		-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 inotify)
+		$(cmake-utils_use_enable log LOG4CXX)
+		$(cmake-utils_use_enable qt4)
+		$(cmake-utils_use_find_package test CPPUNIT)
+	)
+
+	if use qt4; then
+		mycmakeargs+=( -DENABLE_DBUS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use clucene ; then
+		elog "Because you didn't enable the clucene backend, 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 the clucene USE flag enabled."
+	fi
+}