From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R7u8Q-0002vI-Tt for garchives@archives.gentoo.org; Sun, 25 Sep 2011 19:13:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA42121C0EF; Sun, 25 Sep 2011 19:12:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 65D7C21C0EF for ; Sun, 25 Sep 2011 19:12:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5CB51B4009 for ; Sun, 25 Sep 2011 19:12:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 08C7D80042 for ; Sun, 25 Sep 2011 19:12:58 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <0195fa404fd0e817362440f398da05245ac9c6a4.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/ X-VCS-Repository: proj/kde X-VCS-Files: app-misc/strigi/ChangeLog app-misc/strigi/files/strigi-0.7.5-clucene23.patch app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch app-misc/strigi/strigi-0.7.5-r3.ebuild app-misc/strigi/strigi-9999.ebuild X-VCS-Directories: app-misc/strigi/ app-misc/strigi/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 0195fa404fd0e817362440f398da05245ac9c6a4 Date: Sun, 25 Sep 2011 19:12:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 313c6f0066ecfe6a1ec01a939ad36c3a commit: 0195fa404fd0e817362440f398da05245ac9c6a4 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Sep 25 19:13:15 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Sep 25 19:13:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D0195fa40 Version bump to main tree. Should be packaged from git tags in the future= . (Portage version: 2.1.10.19/git/Linux x86_64, signed Manifest commit with= key B6C5F7DE) --- app-misc/strigi/ChangeLog | 9 + app-misc/strigi/files/strigi-0.7.5-clucene23.patch | 207 --------------= ------ app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch | 166 --------------= -- app-misc/strigi/strigi-0.7.5-r3.ebuild | 94 --------- app-misc/strigi/strigi-9999.ebuild | 10 +- 5 files changed, 16 insertions(+), 470 deletions(-) diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog new file mode 100644 index 0000000..b90d22c --- /dev/null +++ b/app-misc/strigi/ChangeLog @@ -0,0 +1,9 @@ +# ChangeLog for app-misc/strigi +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 25 Sep 2011; Andreas K. Huettel + -strigi-0.7.5-r3.ebuild, -files/strigi-0.7.5-clucene23.patch, + -files/strigi-0.7.5-ffmpeg.patch, strigi-9999.ebuild: + Version bump to main tree. Should be packaged from git tags in the fut= ure. + diff --git a/app-misc/strigi/files/strigi-0.7.5-clucene23.patch b/app-mis= c/strigi/files/strigi-0.7.5-clucene23.patch deleted file mode 100644 index 0316671..0000000 --- a/app-misc/strigi/files/strigi-0.7.5-clucene23.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/cluceneng= indexer/cluceneindexreader.cpp strigi-0.7.5/libstreamanalyzer/plugins/ind= exers/clucenengindexer/cluceneindexreader.cpp ---- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexe= r/cluceneindexreader.cpp 2011-06-02 11:29:26.000000000 +0200 -+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/clu= ceneindexreader.cpp 2011-08-18 02:43:46.000000000 +0200 -@@ -56,7 +56,6 @@ using lucene::document::DocumentFieldEnu - using Strigi::IndexedDocument; - using Strigi::Variant; - using Strigi::FieldRegister; --typedef boost::shared_ptr LuceneTerm; -=20 - using namespace std; -=20 -@@ -101,9 +100,9 @@ public: - CLuceneIndexReader& reader; - Private(CLuceneIndexReader& r) :reader(r) {} -=20 -- static LuceneTerm createTerm(const wchar_t* name, const string& val= ue); -- static LuceneTerm createKeywordTerm(const wchar_t* name, const stri= ng& value); -- static LuceneTerm createWildCardTerm(const wchar_t* name, const str= ing& value); -+ static Term* createTerm(const wchar_t* name, const string& value); -+ static Term* createKeywordTerm(const wchar_t* name, const string& v= alue); -+ static Term* createWildCardTerm(const wchar_t* name, const string& = value); - Query* createQuery(const Strigi::Query& query); - Query* createSimpleQuery(const Strigi::Query& query); - static Query* createSingleFieldQuery(const string& field, -@@ -187,12 +186,12 @@ CLuceneIndexReader::mapId(const char* id - } - #endif -=20 --LuceneTerm -+Term* - CLuceneIndexReader::Private::createWildCardTerm(const wchar_t* name, - const string& value) { -- return LuceneTerm(_CLNEW Term(name, utf8toucs2(value).c_str())); -+ return _CLNEW Term(name, utf8toucs2(value).c_str()); - } --LuceneTerm -+Term* - CLuceneIndexReader::Private::createTerm(const wchar_t* name, - const string& value) { - wstring v =3D utf8toucs2(value); -@@ -206,16 +205,15 @@ CLuceneIndexReader::Private::createTerm( - } else { - tv =3D v.c_str(); - } -- LuceneTerm t(_CLNEW Term(name, tv)); -+ Term* t =3D _CLNEW Term(name, tv); - _CLDELETE(ts); - return t; - } --LuceneTerm -+Term* - CLuceneIndexReader::Private::createKeywordTerm(const wchar_t* name, - const string& value) { - wstring v =3D utf8toucs2(value); -- LuceneTerm t(_CLNEW Term(name, v.c_str())); -- return t; -+ return _CLNEW Term(name, v.c_str()); - } - BooleanQuery* - CLuceneIndexReader::Private::createBooleanQuery(const Strigi::Query& qu= ery) { -@@ -249,25 +247,24 @@ CLuceneIndexReader::Private::createSingl - const Strigi::Query& query) { - wstring fieldname =3D mapId(field.c_str()); - Query* q; -- LuceneTerm t; -- LuceneTerm nullTerm; -+ Term* t; - const string& val =3D query.term().string(); - switch (query.type()) { - case Strigi::Query::LessThan: - t =3D createTerm(fieldname.c_str(), val.c_str()); -- q =3D _CLNEW RangeQuery(nullTerm, t, false); -+ q =3D _CLNEW RangeQuery(0, t, false); - break; - case Strigi::Query::LessThanEquals: - t =3D createTerm(fieldname.c_str(), query.term().string()); -- q =3D _CLNEW RangeQuery(nullTerm, t, true); -+ q =3D _CLNEW RangeQuery(0, t, true); - break; - case Strigi::Query::GreaterThan: - t =3D createTerm(fieldname.c_str(), query.term().string()); -- q =3D _CLNEW RangeQuery(t, nullTerm, false); -+ q =3D _CLNEW RangeQuery(t, 0, false); - break; - case Strigi::Query::GreaterThanEquals: - t =3D createTerm(fieldname.c_str(), query.term().string()); -- q =3D _CLNEW RangeQuery(t, nullTerm, true); -+ q =3D _CLNEW RangeQuery(t, 0, true); - break; - case Strigi::Query::Keyword: - t =3D createKeywordTerm(fieldname.c_str(), query.term().strin= g()); -@@ -282,6 +279,7 @@ CLuceneIndexReader::Private::createSingl - q =3D _CLNEW TermQuery(t); - } - } -+ _CLDECDELETE(t); - return q; - } - Query* -@@ -584,12 +582,13 @@ CLuceneIndexReader::documentId(const str - if (reader =3D=3D NULL) return -1; - int64_t id =3D -1; -=20 -- LuceneTerm term(_CLNEW Term(mapId(Private::systemlocation()), utf8t= oucs2( uri ).c_str())); -+ Term* term =3D _CLNEW Term(mapId(Private::systemlocation()), utf8to= ucs2( uri ).c_str()); - TermDocs* docs =3D reader->termDocs(term); - if (docs->next()) { - id =3D docs->doc(); - } - _CLDELETE(docs); -+ _CLDECDELETE(term); -=20 - if (id !=3D -1 && reader->isDeleted((int32_t)id)) { - id =3D -1; -@@ -770,12 +769,13 @@ CLuceneIndexReader::keywords(const strin - const wchar_t* prefixtext =3D prefix.c_str(); - string::size_type prefixLen =3D prefix.length(); - vector::const_iterator i; -- LuceneTerm lastTerm; -+ Term* lastTerm; - for (i =3D fn.begin(); i !=3D fn.end() && s.size() << max; ++i) { - wstring fieldname(utf8toucs2(*i)); -- LuceneTerm term(_CLNEW Term(fieldname.c_str(), prefix.c_str())= ); -+ Term* term =3D _CLNEW Term(fieldname.c_str(), prefix.c_str()); - TermEnum* enumerator =3D reader->terms(term); - do { -+ _CLDECDELETE(lastTerm); - lastTerm =3D enumerator->term(); - if (lastTerm) { - if (prefixLen > lastTerm->textLength() -@@ -786,7 +786,9 @@ CLuceneIndexReader::keywords(const strin - s.insert(lastTerm->text()); - } - } while (enumerator->next() && s.size() < max); -+ _CLDECDELETE(term); - } -+ _CLDECDELETE(lastTerm); -=20 - k.reserve(s.size()); - set::const_iterator j; -diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/cluceneng= indexer/cluceneindexwriter.cpp strigi-0.7.5/libstreamanalyzer/plugins/ind= exers/clucenengindexer/cluceneindexwriter.cpp ---- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexe= r/cluceneindexwriter.cpp 2011-06-02 11:29:26.000000000 +0200 -+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/clu= ceneindexwriter.cpp 2011-08-18 02:43:46.000000000 +0200 -@@ -45,7 +45,6 @@ using lucene::util::BitSet; - using lucene::util::Reader; - using namespace std; - using namespace Strigi; --typedef boost::shared_ptr LuceneTerm; -=20 - struct CLuceneDocData { - lucene::document::Document doc; -@@ -219,18 +218,19 @@ void - CLuceneIndexWriter::deleteEntry(const string& entry, lucene::index::Ind= exWriter* writer, lucene::index::IndexReader* reader) { - wstring path(utf8toucs2(entry)); - { -- LuceneTerm t(_CLNEW Term(systemlocation(), path.c_str())); -+ Term* t =3D _CLNEW Term(systemlocation(), path.c_str()); - writer->deleteDocuments(t); -+ _CLDECDELETE(t); - } - { -- LuceneTerm t(_CLNEW Term(parentlocation(), path.c_str())); -+ Term* t =3D _CLNEW Term(parentlocation(), path.c_str()); - writer->deleteDocuments(t); -- -+ _CLDECDELETE(t); - } - { - // delete all deeper nested files - wstring v =3D utf8toucs2(entry+"/"); -- LuceneTerm t(_CLNEW Term(parentlocation(), v.c_str())); -+ Term* t(_CLNEW Term(parentlocation(), v.c_str())); - PrefixFilter* filter =3D _CLNEW PrefixFilter(t); - BitSet* b =3D filter->bits(reader); - _CLDELETE(filter); -@@ -241,6 +241,7 @@ CLuceneIndexWriter::deleteEntry(const st - } - } - _CLDELETE(b); -+ _CLDECDELETE(t); - } - } - void -diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/cluceneng= indexer/indexdump/indexdump.cpp strigi-0.7.5/libstreamanalyzer/plugins/in= dexers/clucenengindexer/indexdump/indexdump.cpp ---- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexe= r/indexdump/indexdump.cpp 2011-06-02 11:29:26.000000000 +0200 -+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/ind= exdump/indexdump.cpp 2011-08-18 02:43:46.000000000 +0200 -@@ -40,7 +40,6 @@ using lucene::search::HitCollector; - using lucene::util::BitSet; - using lucene::document::DocumentFieldEnumeration; - using lucene::index::IndexReader; --typedef boost::shared_ptr LuceneTerm; -=20 - std::string - t2a(const TCHAR* t) { -@@ -68,10 +67,11 @@ indexdump(const char* dir) { - } - } - TermEnum* terms =3D indexreader->terms(); -- LuceneTerm t; -+ Term* t =3D 0; - while (terms->next()) { - t =3D terms->term(); - printf("%s: %s\n", t2a(t->field()).c_str(), t2a(t->text()).c_st= r()); -+ _CLDECDELETE(t); - } - } - int diff --git a/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch b/app-misc/s= trigi/files/strigi-0.7.5-ffmpeg.patch deleted file mode 100644 index ee1bfc0..0000000 --- a/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff -ruN strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpege= ndanalyzer.cpp strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegen= danalyzer.cpp ---- strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanal= yzer.cpp 2011-06-02 11:29:26.000000000 +0200 -+++ strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.= cpp 2011-08-02 23:25:04.936181179 +0200 -@@ -1,6 +1,7 @@ - /* This file is part of Strigi Desktop Search - * - * Copyright (C) 2010 Evgeny Egorochkin -+ * Copyright (C) 2011 Tirtha Chatterjee - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public -@@ -348,7 +349,7 @@ - if ((size =3D in->size()) >=3D 0) - ar.addValue(factory->durationProperty, (uint32_t)(size/(fc->bit_r= ate/8))); - } -- if(fc->nb_streams=3D=3D1 && fc->streams[0]->codec->codec_type =3D=3D = CODEC_TYPE_AUDIO) { -+ if(fc->nb_streams=3D=3D1 && fc->streams[0]->codec->codec_type =3D=3D = AVMEDIA_TYPE_AUDIO) { - ar.addValue(factory->typeProperty, NFO "Audio"); - ar.addValue(factory->typeProperty, NMM_DRAFT "MusicPiece"); - } else { -@@ -359,7 +360,7 @@ - const AVStream &stream =3D *fc->streams[i]; - const AVCodecContext &codec =3D *stream.codec; - =20 -- if (codec.codec_type =3D=3D CODEC_TYPE_AUDIO || codec.codec_type =3D= =3D CODEC_TYPE_VIDEO) { -+ if (codec.codec_type =3D=3D AVMEDIA_TYPE_AUDIO || codec.codec_type = =3D=3D AVMEDIA_TYPE_VIDEO) { - const string streamuri =3D ar.newAnonymousUri(); - ar.addValue(factory->hasPartProperty, streamuri); - ar.addTriplet(streamuri, partOfPropertyName, ar.path()); -@@ -370,8 +371,16 @@ - outs << (stream.duration * stream.time_base.num / stream.time_b= ase.den); - ar.addTriplet(streamuri, durationPropertyName,outs.str()); - } -- if (size_t len =3D strlen(stream.language)) { -- ar.addTriplet(streamuri, languagePropertyName, string(stream.la= nguage, len)); -+ -+ //FIXME we must stop using the deprecated fuction av_metadata_get= and use -+ // av_dict_get once we are able to detect the version of FFMpeg b= eing used -+ // using version macros. same goes for all occurences of this fun= ction. -+ AVMetadataTag *entry =3D av_metadata_get(stream.metadata, "langua= ge", NULL, 0); -+ if (entry !=3D NULL) { -+ const char *languageValue =3D entry->value; -+ if (size_t len =3D strlen(languageValue)) { -+ ar.addTriplet(streamuri, languagePropertyName, string(languag= eValue, len)); -+ } - } - const AVCodec *p =3D avcodec_find_decoder(codec.codec_id); - if (p) { -@@ -408,7 +417,7 @@ - ar.addTriplet(streamuri, bitratePropertyName, outs.str()); - } -=20 -- if (codec.codec_type =3D=3D CODEC_TYPE_AUDIO) { -+ if (codec.codec_type =3D=3D AVMEDIA_TYPE_AUDIO) { - =20 - ar.addTriplet(streamuri, typePropertyName, audioClassName); - if (codec.channels) { -@@ -458,36 +467,83 @@ - } -=20 - // Tags -- =20 -- if (int32_t len =3D strlen(fc->title)) { -- ar.addValue(factory->titleProperty, string(fc->title, len) ); -+ -+ AVMetadataTag *entry =3D av_metadata_get(fc->metadata, "title", NULL,= 0); -+ if (entry !=3D NULL) -+ { -+ const char *titleValue =3D entry->value; -+ if (int32_t len =3D strlen(titleValue)) { -+ ar.addValue(factory->titleProperty, string(titleValue, len) ); -+ } -+ } -+ -+ entry =3D av_metadata_get(fc->metadata, "author", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *authorValue =3D entry->value; -+ if (int32_t len =3D strlen(authorValue)) { -+ const string creatoruri =3D ar.newAnonymousUri(); -+ ar.addValue(factory->creatorProperty, creatoruri); -+ ar.addTriplet(creatoruri, typePropertyName, contactClassName); -+ ar.addTriplet(creatoruri, fullnamePropertyName, string(authorValu= e, len) ); -+ } -+ } -+ -+ entry =3D av_metadata_get(fc->metadata, "copyright", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *copyrightValue =3D entry->value; -+ if (int32_t len =3D strlen(copyrightValue)) { -+ ar.addValue(factory->copyrightProperty, string(copyrightValue, le= n) ); -+ } - } -- if (int32_t len =3D strlen(fc->author)) { -- const string creatoruri =3D ar.newAnonymousUri(); -- ar.addValue(factory->creatorProperty, creatoruri); -- ar.addTriplet(creatoruri, typePropertyName, contactClassName); -- ar.addTriplet(creatoruri, fullnamePropertyName, string(fc->author, = len) ); -- } -- if (int32_t len =3D strlen(fc->copyright)) { -- ar.addValue(factory->copyrightProperty, string(fc->copyright, len) = ); -- } -- if (int32_t len =3D strlen(fc->comment)) { -- ar.addValue(factory->commentProperty, string(fc->comment, len) ); -- } -- if (int32_t len =3D strlen(fc->album)) { -- const string album =3D ar.newAnonymousUri(); -- ar.addValue(factory->albumProperty, album); -+ -+ entry =3D av_metadata_get(fc->metadata, "comment", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *commentValue =3D entry->value; -+ if (int32_t len =3D strlen(commentValue)) { -+ ar.addValue(factory->commentProperty, string(commentValue, len) )= ; -+ } -+ } -+ -+ entry =3D av_metadata_get(fc->metadata, "album", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *albumValue =3D entry->value; -+ if (int32_t len =3D strlen(albumValue)) { -+ const string album =3D ar.newAnonymousUri(); -+ ar.addValue(factory->albumProperty, album); - ar.addTriplet(album, typePropertyName, albumClassName); -- ar.addTriplet(album, titlePropertyName, string(fc->album, len) ); -+ ar.addTriplet(album, titlePropertyName, string(albumValue, len) ); -+ } - } -- if (int32_t len =3D strlen(fc->genre)) { -- ar.addValue(factory->genreProperty, string(fc->genre, len) ); -+ -+ entry =3D av_metadata_get(fc->metadata, "genre", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *genreValue =3D entry->value; -+ if (int32_t len =3D strlen(genreValue)) { -+ ar.addValue(factory->genreProperty, string(genreValue, len) ); -+ } - } -- if (fc->track) { -- ar.addValue(factory->trackProperty, fc->track); -+ -+ entry =3D av_metadata_get(fc->metadata, "track", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *trackValue =3D entry->value; -+ if (int32_t len =3D strlen(trackValue)) { -+ ar.addValue(factory->trackProperty, string(trackValue, len) ); -+ } - } -- if (fc->year) { -- ar.addValue(factory->createdProperty, fc->year); -+ -+ entry =3D av_metadata_get(fc->metadata, "year", NULL, 0); -+ if (entry !=3D NULL) -+ { -+ const char *yearValue =3D entry->value; -+ if (int32_t len =3D strlen(yearValue)) { -+ ar.addValue(factory->createdProperty, string(yearValue, len) ); -+ } - } -=20 - av_close_input_stream(fc); diff --git a/app-misc/strigi/strigi-0.7.5-r3.ebuild b/app-misc/strigi/str= igi-0.7.5-r3.ebuild deleted file mode 100644 index b80205a..0000000 --- a/app-misc/strigi/strigi-0.7.5-r3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D4 - -if [[ "${PV}" !=3D "9999" ]]; then - SRC_URI=3D"http://www.vandenoever.info/software/${PN}/${P}.tar.bz2" - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~amd64-linux ~x86-linux" -else - EGIT_REPO_URI=3D"git://anongit.kde.org/strigi" - GIT_ECLASS=3D"git-2" - EGIT_HAS_SUBMODULES=3D"true" - KEYWORDS=3D"" -fi - -inherit cmake-utils ${GIT_ECLASS} - -DESCRIPTION=3D"Fast crawling desktop search engine with Qt4 GUI" -HOMEPAGE=3D"http://strigi.sourceforge.net/" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -IUSE=3D"clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +q= t4 test" - -COMMONDEPEND=3D" - app-arch/bzip2:0 - dev-libs/libxml2:2 - sys-libs/zlib:0 - virtual/libiconv - clucene? ( >=3Ddev-cpp/clucene-0.9.21[-debug] ) - dbus? ( - sys-apps/dbus - qt4? ( x11-libs/qt-dbus:4 ) - ) - exif? ( >=3Dmedia-gfx/exiv2-0.17 ) - fam? ( virtual/fam ) - ffmpeg? ( virtual/ffmpeg ) - hyperestraier? ( app-text/hyperestraier ) - log? ( >=3Ddev-libs/log4cxx-0.10.0 ) - qt4? ( - x11-libs/qt-core:4 - x11-libs/qt-gui:4 - ) -" -DEPEND=3D"${COMMONDEPEND} - test? ( dev-util/cppunit )" -RDEPEND=3D"${COMMONDEPEND}" - -PATCHES=3D( - "${FILESDIR}/${PN}-0.7.5-no-qt4.patch" - "${FILESDIR}/${PN}-0.7.5-ffmpeg.patch" - "${FILESDIR}/${PN}-0.7.5-clucene23.patch" -) - -src_configure() { - # Enabled: POLLING (only reliable way to check for files changed.) - # Disabled: xine - recommended upstream to keep it this way - mycmakeargs=3D( - -DENABLE_POLLING=3DON - -DFORCE_DEPS=3DON - -DENABLE_CPPUNIT=3DOFF - -DENABLE_REGENERATEXSD=3DOFF - -DENABLE_XINE=3DOFF - $(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) - ) - - if use qt4; then - mycmakeargs+=3D(-DENABLE_DBUS=3DON) - 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 K= DE)," - elog "be sure to reinstall app-misc/strigi with either clucene (recomm= ended)" - elog "or hyperestraier (unreliable) USE flag enabled." - echo - fi -} diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-= 9999.ebuild index d9dae36..41ed4e1 100644 --- a/app-misc/strigi/strigi-9999.ebuild +++ b/app-misc/strigi/strigi-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.6.ebuild,v= 1.1 2011/09/25 19:11:25 dilfridge Exp $ =20 EAPI=3D4 =20 if [[ "${PV}" !=3D "9999" ]]; then - SRC_URI=3D"http://www.vandenoever.info/software/${PN}/${P}.tar.bz2" + SRC_URI=3D"http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~amd64-linux ~x86-linux" else EGIT_REPO_URI=3D"git://anongit.kde.org/strigi" @@ -17,7 +17,7 @@ fi inherit cmake-utils ${GIT_ECLASS} =20 DESCRIPTION=3D"Fast crawling desktop search engine with Qt4 GUI" -HOMEPAGE=3D"http://strigi.sourceforge.net/" +HOMEPAGE=3D"https://projects.kde.org/projects/kdesupport/strigi/strigi" =20 LICENSE=3D"GPL-2" SLOT=3D"0" @@ -47,6 +47,10 @@ DEPEND=3D"${COMMONDEPEND} test? ( dev-util/cppunit )" RDEPEND=3D"${COMMONDEPEND}" =20 +PATCHES=3D( + "${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