Initial import to the tree as per bug 147553.

(Portage version: 2.1.4)

6 files changed, 531 insertions, 0 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
new file mode 100644
index 000000000000..6d9b54377ebd
--- /dev/null
+++ b/app-misc/strigi/ChangeLog
@@ -0,0 +1,132 @@
+# ChangeLog for app-misc/strigi
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.1 2008/01/13 18:18:23 philantrop Exp $
+
+*strigi-0.5.7 (13 Jan 2008)
+
+  13 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/strigi-0.5.7-automagic-deps.patch, +metadata.xml,
+  +strigi-0.5.7.ebuild:
+  Initial import to the tree as per bug 147553.
+
+  08 Jan 2008; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.7.ebuild:
+  Fix src_test so that tests are actually run. RESTRICT=test, only 30% passes
+  for me. Unrestrict mirror. Better comments.
+
+  09 Dec 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.7.ebuild:
+  Removed USE="log sqlite" from non-live strigi ebuild, they're known broken.
+
+  10 Nov 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.7.ebuild, strigi-9999.ebuild:
+  Correct IUSE-defaults usage.
+
+  10 Nov 2007; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  strigi-0.5.7.ebuild, strigi-9999.ebuild:
+  Disabled the hyperestraier in IUSE defaults and fixed a few QA issues.
+
+  31 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  +strigi-0.5.7.ebuild, +strigi-0.5.7-automagic-deps.patch,
+  -strigi-0.5.5-r1.ebuild, -strigi-0.5.5-automagic.patch:
+  Added strigi-0.5.7.ebuild. Added patch by Evgeny Egorochkin
+  <phreedom.stdin@gmail.com>, to fix strigi's automagic deps.
+  Removed old version.
+
+  25 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.5-r1.ebuild, strigi-9999.ebuild:
+  Add EAPI=1, since we're using IUSE-defaults now.
+
+  24 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.5-r1.ebuild, strigi-9999.ebuild:
+  Added some IUSE-defaults.
+
+  04 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.5-r1.ebuild, strigi-9999.ebuild:
+  inotify != libnotify (thanks Zephyrus).
+
+  03 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.5-r1.ebuild:
+  Apply the relevant fixes from the previous commit to
+  app-misc/strigi-0.5.5-r1.
+
+  02 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-9999.ebuild, -strigi-9999-sqliteindexer-fix.patch:
+  Depend on dev-cpp/clucene-0.9.16a or higher.
+  Removed app-arch/bzip2 & sys-libs/zlib from $DEPEND (part of base-system).
+  Removed DEPEND="!kde-misc/strigi".
+  Added USE-conditional (USE="java") dep on dev-libs/expat.
+
+  Updated USE-descriptions.
+  Remove warning about USE="libnotify" being unstable, add '(experimental)'
+    to USE descriptions of libnotify & hyperestraier.
+  Renamed inotify USE flag to libnotify, cfr the official tree.
+    Added USE-conditional depend on x11-libs/libnotify.
+  Renamed sqlite3 USE flag to sqlite, see relevant thread on gentoo-dev.
+  Removed xerces-c USE flag, xerces-c is only needed with USE="java".
+  Removed xattr USE flag, until upstream re-enables it.
+  die on 'use qt4 && ! use dbus', instead of only showing a warning.
+
+  Don't use subshells for '! use $useflag'.
+  Don't build tests for USE="-test".
+  Removed references to an obsolete (accepted upstream) patch.
+  Moved credits to ChangeLog.
+
+  02 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-9999.ebuild:
+  Revert previous commit, fixed upstream.
+
+  01 Oct 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+  strigi-0.5.5-r1.ebuild, strigi-9999.ebuild:
+  Revert upstream change that broke finding CLucene. Fix typos.
+
+  28 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  -strigi-0.5.1.ebuild:
+  Removed ebuild for the old strigi 0.5.1.
+
+  22 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  +files/strigi-0.5.5-automagic.patch, -strigi-0.5.5.ebuild,
+  +strigi-0.5.5-r1.ebuild:
+  Added patch to remove automagic from CMakeLists.txt scripts of
+  strigi-0.5.5. Removed hyperestraier use flag from the same ebuild since
+  hyperestrayer support is broken.
+
+  05 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild, strigi-0.5.5.ebuild, strigi-9999.ebuild:
+  Fixed xattr use flag handling on g/fbsd, thanks to Mauro [equilibrium]
+  Toffanin.
+
+  29 Aug 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild, strigi-0.5.5.ebuild, strigi-9999.ebuild:
+  QA fixes.
+
+  29 Aug 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild, strigi-0.5.5.ebuild, strigi-9999.ebuild:
+  Added debug to IUSE because of cmake-utils eclass changes.
+
+  27 Aug 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild, strigi-0.5.5.ebuild, strigi-9999.ebuild:
+  The java dependency is now optional and it's controlled by the java use flag.
+
+  13 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> +strigi-0.5.5.ebuild:
+  Version bump to 0.5.5 with some bug fixes for the ebuild itself.
+
+  22 Jul 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild, strigi-9999.ebuild:
+  Modified ebuilds to reflect cmake-utils eclass changes.
+  Removed PATH and LIB_SUFFIX handling from the ebuild.
+
+  19 Jul 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild, strigi-9999.ebuild:
+  Strigi is officialy moved to app-misc and now this package is the dependency
+  required for kde4 ebuilds.
+
+  18 Jul 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
+  strigi-0.5.1.ebuild:
+  Fixed RESTRICT
+
+  18 Jul 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it> +metadata.xml,
+  strigi-0.5.1.ebuild, strigi-9999.ebuild:
+  Added metadata.xml and Changelog. Thanks to Franz Fellner for the initial
+  ebuild.
+
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
new file mode 100644
index 000000000000..2416ea2b458f
--- /dev/null
+++ b/app-misc/strigi/Manifest
@@ -0,0 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX strigi-0.5.7-automagic-deps.patch 9387 RMD160 094556498166e077d545b4464e81ad748201395c SHA1 7234c6fcb8493a0993c0080e398884ceeb66c3c5 SHA256 4ade3906963b7f2027b52ce54be39a0aad8e9f6b86a6219cb72e58cf0714ac8f
+MD5 06833e3c9464241523a5953d0798d03f files/strigi-0.5.7-automagic-deps.patch 9387
+RMD160 094556498166e077d545b4464e81ad748201395c files/strigi-0.5.7-automagic-deps.patch 9387
+SHA256 4ade3906963b7f2027b52ce54be39a0aad8e9f6b86a6219cb72e58cf0714ac8f files/strigi-0.5.7-automagic-deps.patch 9387
+DIST strigi-0.5.7.tar.bz2 804440 RMD160 55d0c741140d9d67d87f60b06777c743c835df0a SHA1 d7e81f4e6e204129649473e00b20a6fcd7a76f65 SHA256 99da15b91b7703b141a5baf5165bdc33f9d9737da9a738f470b43acf4dd84ab6
+EBUILD strigi-0.5.7.ebuild 2825 RMD160 fe39f05a9de93196372560290afdbd1856781ef1 SHA1 98ec797d83219615846eb4997e93bbbc53e4e88e SHA256 4d4837e65d270072b8ac9fd3c1cfad5eaf13506ae27cd197cc68ddd7d98f9cc6
+MD5 12c0dbd3a4691b3fb315e57144b2c564 strigi-0.5.7.ebuild 2825
+RMD160 fe39f05a9de93196372560290afdbd1856781ef1 strigi-0.5.7.ebuild 2825
+SHA256 4d4837e65d270072b8ac9fd3c1cfad5eaf13506ae27cd197cc68ddd7d98f9cc6 strigi-0.5.7.ebuild 2825
+MISC ChangeLog 5380 RMD160 8a23641e02a1baecac14fd5fbb2a67079c8e8bec SHA1 616b85504e64d94f64be3bd56b4a6d191b39a9cc SHA256 1a839e1d3c9b9ade5e1f13e91a1d48d06b8f639242e3336498fb572ef218e341
+MD5 5156d37aa900560ad5de882164ddc0bd ChangeLog 5380
+RMD160 8a23641e02a1baecac14fd5fbb2a67079c8e8bec ChangeLog 5380
+SHA256 1a839e1d3c9b9ade5e1f13e91a1d48d06b8f639242e3336498fb572ef218e341 ChangeLog 5380
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+MD5 c8f1514cce71c93b6079581c38c2ffed files/digest-strigi-0.5.7 241
+RMD160 888f1dd0c5d630b5f292b4a8cfa0ef73d3faa1b4 files/digest-strigi-0.5.7 241
+SHA256 6f333771b0b57a7a1f2668e846b230ba36d0113334612f6364044a6ec2eb081f files/digest-strigi-0.5.7 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHilUcCkvF58q80IkRAlbEAJ9k/h03KtRZL8hIAeEs36inxw483ACdH8p9
+4sEsaGr9loUmN/ZBsOmBpHo=
+=yheM
+-----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/files/digest-strigi-0.5.7 b/app-misc/strigi/files/digest-strigi-0.5.7
new file mode 100644
index 000000000000..ef833033a0aa
--- /dev/null
+++ b/app-misc/strigi/files/digest-strigi-0.5.7
@@ -0,0 +1,3 @@
+MD5 01015166eb49a523219d3b1d7e46b672 strigi-0.5.7.tar.bz2 804440
+RMD160 55d0c741140d9d67d87f60b06777c743c835df0a strigi-0.5.7.tar.bz2 804440
+SHA256 99da15b91b7703b141a5baf5165bdc33f9d9737da9a738f470b43acf4dd84ab6 strigi-0.5.7.tar.bz2 804440
diff --git a/app-misc/strigi/files/strigi-0.5.7-automagic-deps.patch b/app-misc/strigi/files/strigi-0.5.7-automagic-deps.patch
new file mode 100644
index 000000000000..cac9d3054935
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.5.7-automagic-deps.patch
@@ -0,0 +1,261 @@
+Patch by Evgeny Egorochkin <phreedom.stdin@gmail.com>
+
+Index: cmake/MacroFindOptionalDep.cmake
+===================================================================
+--- a/cmake/MacroFindOptionalDep.cmake	(revision 0)
++++ b/cmake/MacroFindOptionalDep.cmake	(revision 0)
+@@ -0,0 +1,35 @@
++# if ON, requested optional deps become required
++# if OFF, requested optional deps are linked to if found
++
++# macro name changed from FIND_OPTIONAL_PACKAGE to FIND_OPTIONAL_DEP due to clash with a macro from KDE4
++
++OPTION(FORCE_DEPS "Enforce strict dependencies" OFF)
++
++macro(FIND_OPTIONAL_DEP _package _enabled _found _description)
++
++    if(${_enabled})
++        if(FORCE_DEPS)
++            find_package(${_package} REQUIRED)
++        else(FORCE_DEPS)
++            find_package(${_package})
++        endif(FORCE_DEPS)
++    endif(${_enabled})
++
++    REPORT_OPTIONAL_PACKAGE_STATUS(${_package} ${_enabled} ${_found} ${_description})
++
++endmacro(FIND_OPTIONAL_DEP)
++
++
++macro(REPORT_OPTIONAL_PACKAGE_STATUS _package _enabled _found _description)
++
++    if(${_enabled})
++        if(${_found})
++            MESSAGE("** ${_package} is found. Support for ${_description} is enabled")
++        else(${_found})
++            MESSAGE("** ${_package} not found. Support for ${_description} is disabled")
++        endif(${_found})
++    else(${_enabled})
++        MESSAGE("** ${_package} is disabled. No support for ${_description}")
++    endif(${_enabled})
++
++endmacro(REPORT_OPTIONAL_PACKAGE_STATUS)
+\ No newline at end of file
+Index: src/xsd/CMakeLists.txt
+===================================================================
+--- a/src/xsd/CMakeLists.txt	(revision 730316)
++++ b/src/xsd/CMakeLists.txt	(working copy)
+@@ -20,7 +20,8 @@
+ endif (LIBXML2_FOUND)
+ 
+ # java is required to compile the xsd parser
+-find_package(Java REQUIRED)
++OPTION(ENABLE_REGENERATEXSD "regenerate xsd parser from *.xsd files(not normally required)" ON)
++FIND_OPTIONAL_DEP(Java ENABLE_REGENERATEXSD JAVA_COMPILE "generating xsd parser from *.xsd files")
+ 
+ # loop over all xsd files, the next line does not work everywhere,
+ # so we dont use it currently
+@@ -57,4 +58,3 @@
+   target_link_libraries(${XSDNAME}test ${XSDNAME} xmlstream)
+ 
+ endforeach (XSDFILE ${XSDFILES})
+-
+Index: src/streamanalyzer/endplugins/CMakeLists.txt
+===================================================================
+--- a/src/streamanalyzer/endplugins/CMakeLists.txt	(revision 730316)
++++ b/src/streamanalyzer/endplugins/CMakeLists.txt	(working copy)
+@@ -22,9 +22,9 @@
+   install(TARGETS ${libname} LIBRARY DESTINATION ${LIB_DESTINATION}/strigi)
+ ENDMACRO(ADD_STRIGIEA)
+ 
+-if(EXIV2_FOUND)
++if(Exiv2_FOUND)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+   include_directories(${EXIV2_INCLUDE_DIR})
+   ADD_STRIGIEA(jpeg jpegendanalyzer.cpp)
+   target_link_libraries(jpeg ${EXIV2_LIBRARIES})
+-endif(EXIV2_FOUND)
++endif(Exiv2_FOUND)
+Index: src/CMakeLists.txt
+===================================================================
+--- a/src/CMakeLists.txt	(revision 730316)
++++ b/src/CMakeLists.txt	(working copy)
+@@ -32,7 +32,7 @@
+ 
+ if (NOT CLucene_FOUND)
+   message("** No CLucene libraries were found, so Strigi cannot use indexes.")
+-  message("** It is recommended to install CLucene >= 0.9.16.")
++  message("** It is recommended to install CLucene >= 0.9.16a.")
+   message("** You will still be able to use deepfind, deepgrep and xmlindexer.")
+ endif (NOT CLucene_FOUND)
+ 
+Index: CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt	(revision 730316)
++++ b/CMakeLists.txt	(working copy)
+@@ -16,6 +16,7 @@
+ # include general modules
+ include(UsePkgConfig)
+ include(MacroCheckGccVisibility)
++include(MacroFindOptionalDep)
+ 
+ # compile in debug mode
+ IF(NOT CMAKE_BUILD_TYPE)
+@@ -67,52 +68,48 @@
+     REMOVE_DEFINITIONS(-fPIC)
+ ENDIF(CMAKE_SYSTEM MATCHES "SunOS-5*.")
+ 
+-OPTION(ENABLE_INOTIFY
+-  "enable inotify support (unstable)"
+-  OFF)
++OPTION(ENABLE_INOTIFY "enable inotify support (unstable)" OFF)
++OPTION(ENABLE_DBUS "enable dbus support" ON)
++OPTION(ENABLE_NEWXESAM "enable new xesam support" OFF)
++OPTION(ENABLE_LOG4CXX "enable log4cxx support for advanced logging" OFF)
++OPTION(ENABLE_CPPUNIT "enable CppUnit for unit tests" ON)
++OPTION(ENABLE_QT4 "enable Qt4 GUI" ON)
++OPTION(ENABLE_EXIV2
++	"enable exiv2 support. This allows you to index EXIF/IPTC metadata." ON)
+ 
+-OPTION(ENABLE_DBUS
+-  "enable dbus support"
+-  ON)
++# backends
++OPTION(ENABLE_CLUCENE "enable CLucene support (recommended)" ON)
++OPTION(ENABLE_HYPERESTRAIER "enable Hyper Estraier support(unreliable)" OFF)
++OPTION(ENABLE_SQLITE "enable SQLite support(unreliable)" OFF)
+ 
+-OPTION(ENABLE_NEWXESAM
+-  "enable new xesam support"
+-  OFF)
++#OPTION(ENABLE_LIBXML2 "enable libxml2 support" ON)
++OPTION(ENABLE_EXPAT "enable expat support" OFF)
+ 
+-OPTION(ENABLE_SQLITE "enable sqlite support" OFF)
+ 
+-OPTION(ENABLE_LOG4CXX
+-  "enable log4cxx support for advanced logging"
+-  OFF)
+-
+ find_package(ZLIB REQUIRED)
+ find_package(BZip2 REQUIRED)
+ find_package(Threads REQUIRED)
+ find_package(Iconv REQUIRED)
+ 
+ # use either expat or libxml2
+-find_package(Expat)
++FIND_OPTIONAL_DEP(Expat ENABLE_EXPAT Expat_FOUND "XML via Expat")
++# libxml seems to be required regardless of what because it's used by streamanalyzer
++#FIND_OPTIONAL_DEP(LibXml2 ENABLE_LIBXML2 LIBXML2_FOUND "XML via LibXml2")
+ find_package(LibXml2 REQUIRED)
++
+ if (NOT LIBXML2_FOUND AND NOT Expat_FOUND)
+-  MESSAGE(FATAL "You need libxml2 or libexpat")
++  MESSAGE(FATAL_ERROR "You need libxml2 or libexpat")
+ endif (NOT LIBXML2_FOUND AND NOT Expat_FOUND)
+ 
+-find_package(CLucene)
+-if(NOT CLucene_FOUND)
+-  MESSAGE("Could not find CLucene. Please install CLucene = 0.9.16a (http://clucene.sf.net)")
+-endif(NOT CLucene_FOUND)
++FIND_OPTIONAL_DEP(CLucene ENABLE_CLUCENE CLucene_FOUND "CLucene backend")
++FIND_OPTIONAL_DEP(HyperEstraier ENABLE_HYPERESTRAIER HyperEstraier_FOUND "HyperEstraier backend")
++FIND_OPTIONAL_DEP(SQLite ENABLE_SQLITE SQLite_FOUND "SQLite backend")
+ 
+-find_package(HyperEstraier)
+-find_package(Exiv2)
+-if(ENABLE_SQLITE)
+-  find_package(SQLite)
+-endif(ENABLE_SQLITE)
++FIND_OPTIONAL_DEP(Exiv2 ENABLE_EXIV2 EXIV2_FOUND "indexing of EXIF/IPTC metadata")
++
+ #find_package(XAttr)
+ set(QT_MIN_VERSION "4.2.0")
+-find_package(Qt4)
+-if (NOT QT4_FOUND)
+-    MESSAGE("** Qt4 was not found. No GUI will be built.")
+-endif (NOT QT4_FOUND)
++FIND_OPTIONAL_DEP(Qt4 ENABLE_QT4 QT4_FOUND "QT4 GUI client")
+ 
+ check_include_files(strings.h     HAVE_STRINGS_H)                      # various
+ 
+@@ -129,35 +126,40 @@
+   ELSE(WIN32)
+     include(UsePkgConfig)
+     PKGCONFIG(dbus-1 DBUS_INCLUDE_DIR DBUS_LIBRARY_DIR DBUS_LDFLAGS DBUS_CFLAGS)
+-    if (NOT DBUS_INCLUDE_DIR)
+-      MESSAGE(FATAL_ERROR "Could not find DBus")
+-    endif (NOT DBUS_INCLUDE_DIR)
+     
+-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=1.0 dbus-1 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+-    if(_return_VALUE STREQUAL "0")
+-         message(STATUS "Found dbus-1 release >= 1.0")
+-    else(_return_VALUE STREQUAL "0")
+-         message(STATUS "Found dbus-1 release < 1.0 support for dbus client will be disable")
+-         set(ENABLE_DBUS "OFF")
+-    endif(_return_VALUE STREQUAL "0")
++    if (DBUS_INCLUDE_DIR)
++      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=1.0 dbus-1 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
++      if(_return_VALUE STREQUAL "0")
++        message(STATUS "Found dbus-1 release >= 1.0")
++        set(DBUS_FOUND "ON") 
++      else(_return_VALUE STREQUAL "0")
++         message(STATUS "Found dbus-1 release < 1.0. Release >=1.0 is needed")
++      endif(_return_VALUE STREQUAL "0")
++    endif (DBUS_INCLUDE_DIR)
+ 
++    REPORT_OPTIONAL_PACKAGE_STATUS(DBus-1 ENABLE_DBUS DBUS_FOUND "DBus interface in Strigi daemon")
++    if(NOT DBUS_FOUND)
++      set(ENABLE_DBUS "OFF")
++      if(FORCE_DEPS)
++        MESSAGE(FATAL_ERROR "Aborting")
++      endif(FORCE_DEPS)
++    endif(NOT DBUS_FOUND)
++
+   ENDIF(WIN32)
+ ENDIF(ENABLE_DBUS)
+ 
+-find_program (BISON
+-              bison
+-              DOC "Path to bison command, used for xesam userlanguage parser generation"
+-)
++# Don't delete bison section, but only micron seems to need this
++#find_program (BISON
++#              bison
++#              DOC "Path to bison command, used for xesam userlanguage parser generation")
+ 
+-if (BISON)
+-  MESSAGE (STATUS "Found bison: ${BISON}")
+-else (BISON)
+-  MESSAGE ("** GNU bison not found. This affects the xesam parser.")
+-endif (BISON)
++#if (BISON)
++#  MESSAGE (STATUS "Found bison: ${BISON}")
++#else (BISON)
++#  MESSAGE ("** GNU bison not found. This affects the xesam parser.")
++#endif (BISON)
+ 
+-if (ENABLE_LOG4CXX)
+-    find_package (Log4cxx)
+-endif (ENABLE_LOG4CXX)
++FIND_OPTIONAL_DEP(Log4cxx ENABLE_LOG4CXX LOG4CXX_FOUND "advanced logging")
+ 
+ #
+ # AC_CHECK_LIB(dl, dlopen, DL_LIBRARY="-ldl", DL_LIBRARY="") for cmake by
+@@ -189,13 +191,10 @@
+ 
+ SET (DIRS ${DIRS} src)
+ 
+-find_package(CppUnit)
+-if (NOT CppUnit_FOUND)
+-    MESSAGE("** CppUnit was not found. Strigi unit tests will not be built.")
+-else (NOT CppUnit_FOUND)
+-    MESSAGE(STATUS "CppUnit found. Strigi unit tests will be built.")
++FIND_OPTIONAL_DEP(CppUnit ENABLE_CPPUNIT CppUnit_FOUND "Strigi unit tests")
++if (CppUnit_FOUND)
+     SET (DIRS ${DIRS} tests)
+-endif (NOT CppUnit_FOUND)
++endif (CppUnit_FOUND)
+ 
+ ENABLE_TESTING()
+ SUBDIRS (${DIRS})
diff --git a/app-misc/strigi/metadata.xml b/app-misc/strigi/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/app-misc/strigi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/app-misc/strigi/strigi-0.5.7.ebuild b/app-misc/strigi/strigi-0.5.7.ebuild
new file mode 100644
index 000000000000..749fe6aebd3f
--- /dev/null
+++ b/app-misc/strigi/strigi-0.5.7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.5.7.ebuild,v 1.1 2008/01/13 18:18:23 philantrop Exp $
+
+EAPI="1"
+inherit eutils cmake-utils
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="http://www.vandenoever.info/software/strigi"
+SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+clucene +dbus +exiv2 debug hyperestraier java inotify +qt4 test"
+# log sqlite
+RESTRICT="test"
+
+COMMONDEPEND="
+	dev-libs/libxml2
+	virtual/libiconv
+	clucene? ( >=dev-cpp/clucene-0.9.16a )
+	dbus? ( sys-apps/dbus )
+	exiv2? ( media-gfx/exiv2 )
+	hyperestraier? ( app-text/hyperestraier )
+	java? (
+		>=dev-libs/xerces-c-2.7.0-r1
+		>=virtual/jdk-1.4
+		)
+	qt4? ( >=x11-libs/qt-4.2.1-r1 )"
+#	log? ( >=dev-libs/log4cxx-0.9.7 )
+#	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${COMMONDEPEND}
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+pkg_setup() {
+	# & ! use sqlite
+	if ! use clucene && ! use hyperestraier; then
+		echo ""
+		ewarn "It's highly recommended to enable one of the supported backends:"
+		ewarn "clucene, hyperestraier and sqlite3"
+		ewarn "Clucene is currently the recommended backend."
+		ewarn "Without a backend you'll only be able to use deepgrep."
+		echo ""
+	fi
+
+	if use dbus && use qt4 && ! built_with_use x11-libs/qt:4 dbus; then
+		echo ""
+		eerror "You are building Strigi with qt4 and dbus, but qt4 wasn't built with dbus support."
+		eerror "Please re-emerge qt4 with dbus, or disable dbus in Strigi."
+		echo ""
+		die
+	fi
+
+	if use qt4 && ! use dbus; then
+		echo ""
+		eerror "You are building Strigi with qt4 but without dbus."
+		eerror "Strigiclient needs dbus to detect a running Strigi daemon."
+		eerror "Please enable both qt4 and dbus."
+		echo ""
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-automagic-deps.patch"
+}
+
+src_compile() {
+	# Strigi needs either expat or libxml2.
+	# However libxml2 seems to be required in both cases, linking to 2 xml parsers is
+	# just silly, so we forcefully disable linking to expat.
+
+	# Disabled: NEWXESAM (targetted at developers)
+
+	# Enabled: POLLING (only reliable way to check for files changed.)
+
+	mycmakeargs="${mycmakeargs}
+		-DENABLE_EXPAT=OFF -DENABLE_NEWXESAM=OFF -DENABLE_POLLING=ON
+		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
+		$(cmake-utils_use_enable clucene CLUCENE)
+		$(cmake-utils_use_enable dbus DBUS)
+		$(cmake-utils_use_enable exiv2 EXIV2)
+		$(cmake-utils_use_enable hyperestraier HYPERESTRAIER)
+		$(cmake-utils_use_enable inotify INOTIFY)
+		$(cmake-utils_use_enable qt4 QT4)"
+	#	$(cmake-utils_use_enable log LOG4CXX)
+	#	$(cmake-utils_use_enable sqlite SQLITE)
+	cmake-utils_src_compile
+}
+
+src_test() {
+	mycmakeargs="${mycmakeargs} -DENABLE_CPPUNIT=ON"
+	cmake-utils_src_compile -j1
+	ctest --extra-verbose || die "Tests failed."
+}