Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

5 files changed, 6 insertions, 272 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 9288818455ce..6dcf60567647 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2013/12/22 12:01:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.108 2013/12/22 12:09:17 johu Exp $
+
+  22 Dec 2013; Johannes Huber <johu@gentoo.org>
+  -files/strigi-0.7.7-ffmpeg-0.11.patch, -files/strigi-0.7.7-gcc47.patch,
+  -strigi-0.7.7-r2.ebuild, metadata.xml:
+  Remove old.
 
   22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> strigi-0.7.8.ebuild:
   Stable for ppc64, wrt bug #489496
diff --git a/app-misc/strigi/files/strigi-0.7.7-ffmpeg-0.11.patch b/app-misc/strigi/files/strigi-0.7.7-ffmpeg-0.11.patch
deleted file mode 100644
index 465eda4c71c5..000000000000
--- a/app-misc/strigi/files/strigi-0.7.7-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Source: Mandriva patch
-Upstream: No bug report on bugs.kde.org
-Reason: libstreamanalyzer uses deprecated symbols from ffmpeg removed in 0.11
---- strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.bero	2012-06-08 16:49:40.846877030 +0200
-+++ strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2012-06-08 17:27:40.416888115 +0200
-@@ -305,13 +305,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-   uint8_t pDataBuffer[32768];//65536];
-   long lSize = 32768;
- 
--  ByteIOContext ByteIOCtx;
--  if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL, seek_data) < 0)
--    return -1;
--
--  //pAVInputFormat->flags |= AVFMT_NOFILE;
--  ByteIOCtx.is_streamed = 0;
--
-   AVProbeData pd;
-   const char *buf;
-   pd.filename ="";
-@@ -324,14 +317,27 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-   if(fmt == NULL)
-     return 1;
- 
--  AVFormatContext *fc = NULL;
--  if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0)
-+  AVFormatContext *fc = avformat_alloc_context();
-+  if(!fc)
-+    return -1;
-+
-+  AVIOContext *pb = avio_alloc_context(pDataBuffer, lSize, 0, in, read_data, NULL, seek_data);
-+  if(!fc->pb) {
-+    av_free(fc);
-     return -1;
-+  }
-+
-+  fc->pb = pb;
-+
-+  if(avformat_open_input(&fc, "", fmt, NULL) < 0) {
-+    av_free(fc);
-+    return -1;
-+  }
- 
--  av_find_stream_info(fc);
-+  avformat_find_stream_info(fc, NULL);
-   
-   // Dump information about file onto standard error
--  dump_format(fc, 0, ar.path().c_str(), false);
-+  av_dump_format(fc, 0, ar.path().c_str(), false);
- 
-   if(fc->bit_rate)
-     ar.addValue(factory->bitrateProperty, fc->bit_rate);
-@@ -372,10 +378,10 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-         ar.addTriplet(streamuri, durationPropertyName,outs.str());
-       }
- 
--      //FIXME we must stop using the deprecated fuction av_metadata_get and use
-+      //FIXME we must stop using the deprecated fuction av_dict_get and use
-       // av_dict_get once we are able to detect the version of FFMpeg being used
-       // using version macros. same goes for all occurences of this function.
--      AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
-+      AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0);
-       if (entry != NULL) {
-         const char *languageValue = entry->value;
-         if (size_t len = strlen(languageValue)) {
-@@ -430,7 +436,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-           outs << codec.sample_rate;
-           ar.addTriplet(streamuri, sampleratePropertyName, outs.str());
-         }
--        if (codec.sample_fmt != SAMPLE_FMT_NONE) {}//FIXME sample format
-+        if (codec.sample_fmt != AV_SAMPLE_FMT_NONE) {}//FIXME sample format
-           
-       } else { // video stream
-         
-@@ -469,7 +475,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
- 
-   // Tags
- 
--  AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
-+  AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *titleValue = entry->value;
-@@ -478,7 +484,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "author", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "author", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *authorValue = entry->value;
-@@ -490,7 +496,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "copyright", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *copyrightValue = entry->value;
-@@ -499,7 +505,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "comment", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *commentValue = entry->value;
-@@ -508,7 +514,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "album", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "album", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *albumValue = entry->value;
-@@ -520,7 +526,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "genre", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *genreValue = entry->value;
-@@ -529,7 +535,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "track", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "track", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *trackValue = entry->value;
-@@ -538,7 +544,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "year", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "year", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *yearValue = entry->value;
-@@ -547,7 +553,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  av_close_input_stream(fc);
-+  avformat_close_input(&fc);
-+  av_free(pb);
-   //url_fclose(&ByteIOCtx);
-   
-   return 0;
diff --git a/app-misc/strigi/files/strigi-0.7.7-gcc47.patch b/app-misc/strigi/files/strigi-0.7.7-gcc47.patch
deleted file mode 100644
index 3e3d31835f67..000000000000
--- a/app-misc/strigi/files/strigi-0.7.7-gcc47.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/metadata.xml b/app-misc/strigi/metadata.xml
index 8e6ee8e0004c..3adfa35457f8 100644
--- a/app-misc/strigi/metadata.xml
+++ b/app-misc/strigi/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <use>
 	<flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag>
-	<flag name="hyperestraier">Enable <pkg>app-text/hyperestraier</pkg> backend support.</flag>
 	<flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg>.</flag>
 	<flag name="inotify">Enable support for inotify.</flag>
 </use>
diff --git a/app-misc/strigi/strigi-0.7.7-r2.ebuild b/app-misc/strigi/strigi-0.7.7-r2.ebuild
deleted file mode 100644
index d529f02d5d65..000000000000
--- a/app-misc/strigi/strigi-0.7.7-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.7-r2.ebuild,v 1.11 2013/04/02 20:55:47 ago Exp $
-
-EAPI=5
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-	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 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? ( dev-qt/qtdbus: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? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui: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
-}