Remove 0.5* versions as KDE 4.1 works with 0.6*

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 23 insertions, 411 deletions

diff --git a/app-misc/hal-info/Manifest b/app-misc/hal-info/Manifest
index 5371f4440384..42844c2599d6 100644
--- a/app-misc/hal-info/Manifest
+++ b/app-misc/hal-info/Manifest
@@ -10,14 +10,14 @@ DIST hal-info-20081219.tar.gz 235508 RMD160 2e81127e95050818121020c17ac34a2a8186
 DIST hal-info-20090202.tar.gz 241540 RMD160 c603a692a3384b07dc3ea39989493dd5e12ef9cc SHA1 6eeed8b4bd41822e24b5710a1b299833b810a386 SHA256 2c21551813567e4dd374acb0c33c7470f4bf7180f24a5a89f445510488c1ff2b
 EBUILD hal-info-20070618.ebuild 718 RMD160 5b4ed5eeec405640cafa105b977d5fe4103c5a0d SHA1 6b5cb40149a5f4870a50eaad1a896428a3cd14b5 SHA256 843310294d4fbe53aa30752910ebbc6eb96f0a17cf6cd59df1ad5a65622f295e
 EBUILD hal-info-20080508.ebuild 683 RMD160 4cf8cf3055013a71d11ce694b7bbf77dad7efe2c SHA1 817f8be370322e4dd6f668d873280dddc5b51588 SHA256 ee31bffe8777b2aca951b917cf442b34a5b209d1454752698a378c3446300cb8
-EBUILD hal-info-20081219.ebuild 686 RMD160 05d6c83de4aa6ba1587fcc816e2d0881741e09be SHA1 b9e0acf9dab6ce256488beacd77008537e3f795e SHA256 9c6ffa4f4b33680f47d3407f5beb0f3f99c28b2637ed815b24e7a756b9dc6822
+EBUILD hal-info-20081219.ebuild 685 RMD160 a11fcf6dfd50d96b0fb666a62fd09cf41120f512 SHA1 73e2b015003d499b16386a0929e33a16cd5adf2b SHA256 b787cfe48cfd859dc08f0061949dd6aba921366f5bfa16efff0a23aa0a8b8e99
 EBUILD hal-info-20090202.ebuild 686 RMD160 85120c7e97355d9844285d6ca814042e1deb0e1c SHA1 4e84a32e4995df2a14db6d7aab4b9ae6f5471ae8 SHA256 486d3d1c247aa4a01cc5337d2f16aff1f6196798845ef32257bc4491c547dfa0
-MISC ChangeLog 7120 RMD160 50d1079e30fba28000fb2238186382a6f5491fb1 SHA1 e4debe616b2401b4a56f01b82c515b6864a31289 SHA256 548091400a0b8562d9303527af1a38a89842095d6611ce283cb22595ec29169c
+MISC ChangeLog 7290 RMD160 e410ea77c1ab1c5f4ac321dec82b8a083a3afac2 SHA1 e7ea523960f8e62b5984d520ad7c73c461d08386 SHA256 16f059b33a360b5a8296e6fcde49931a85d44ef7a551e798dad18f85fdc4945b
 MISC metadata.xml 228 RMD160 66777190ef5d850d1d28e7a492391b0a0a909ba4 SHA1 80a14aeb519bd1dc784d6397e792e5c4f771cb66 SHA256 4e633a08dcc22e590609d7a9b5ce955dc38184e2761674eed4a898cd9d9cb17c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmJo8IACgkQp5vW4rUFj5oHxwCdEcSWxZZ3JWHhGQ9dQjAgb0Yi
-X+MAoJoNwjlATDwLSgm2ZKlk+yNOVZmk
-=2ZNa
+iEYEARECAAYFAkmZdRQACgkQp5vW4rUFj5qzZQCgoR8iHqhcMQodeRucvTkJWSHo
+mGUAn18RxOcUUqYUbjSzPs+9lD/ovXNZ
+=/eMS
 -----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index e9fe8fb973dd..359562c4186e 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.25 2009/02/10 15:20:37 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.26 2009/02/16 14:15:03 tampakrap Exp $
+
+  16 Feb 2009; Theo Chatzimichos <tampakrap@gentoo.org> metadata.xml,
+  -strigi-0.5.8.ebuild, -strigi-0.5.9.ebuild, -strigi-0.5.10.ebuild,
+  -strigi-0.5.11.ebuild:
+  Remove 0.5* versions as KDE 4.1 works with 0.6*
 
   10 Feb 2009; Carsten Lohrke <carlo@gentoo.org> strigi-0.6.4.ebuild:
   clucene related build issue, bug #257659.
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index d0c70f94472f..d7b26ca48179 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,13 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX strigi-0.5.8-gcc-4.3.patch 517 RMD160 f4bdf97eb31b44142ae3caaabb3fc9af3415a8c4 SHA1 b714e123de1a79de9179c6862999ab22c0c427be SHA256 d0376fb18afe292f1db3beb2cf926fe58db07be38e36fa196e6523c3cbb8ad74
-DIST strigi-0.5.10.tar.bz2 876957 RMD160 2af9870ccd86744450e0ab93e0c34a1aefb01e1a SHA1 02efd6bd7c815148fa9c9134287175b8aec0409b SHA256 3851f803de3759490073c1d682d018592b010437b9ac2b85394eaddc63621faf
-DIST strigi-0.5.11.tar.bz2 877002 RMD160 558f7b25dd1bab784898ae470595c763fef0f579 SHA1 5ee022f2b154cd6f6e98872ed92db390980f4274 SHA256 29c3a1d6151e5b6984897dc89570380b9caa600c34982285d43998dae9479279
-DIST strigi-0.5.8.tar.bz2 830822 RMD160 b07c9138b9562d1aa7532e56d13ba3db5d4eeb32 SHA1 7505527bd6724e054602b8ab6d1417f2d9bc1a6e SHA256 7b512461008152883289d3c5e9df4addc86944026ba3ba09f66a87698d3dd928
-DIST strigi-0.5.9.tar.bz2 871926 RMD160 85619916df3c89ede991f67875c1cbd5b82575e0 SHA1 8e192f09efbba26a1191036740e77e7dd191627d SHA256 7608c180312c63fda346e3407b219b3706d4ff35e693dbf0042e2b6ca0e39369
 DIST strigi-0.6.4.tar.bz2 895552 RMD160 4b72de166b077778caa2b3ff31c2168a62155bd1 SHA1 e91f31cc59fdfc303b662a8af899efe1365643bf SHA256 1e07476c3b38dbff6af73e223cf52ff4f8e40a44450f66f87c10323e15df7488
-EBUILD strigi-0.5.10.ebuild 3050 RMD160 dc6b6ee391f4c4a82c0549b6d59095b7c94c3a71 SHA1 9034a68d55a78ec80c459380b58cf2ae7cfbc7f0 SHA256 d3e9bebb782308a3d4727e363013a0a1b2d64dd710f4b8a18554bacaeeabaffb
-EBUILD strigi-0.5.11.ebuild 2746 RMD160 ea2ee4446d6b80a7b49b1ea434bc29b597e4a981 SHA1 b86cc39875e4c5a4fa79c5a68ef27f97d205b35f SHA256 d32fe9b3e5ce09c8a573757c16db8ec544c611e3688902620148349c43a9e0b4
-EBUILD strigi-0.5.8.ebuild 3194 RMD160 71e4356084aa230937e04b012c4fe0bdf76f0c5f SHA1 f9fc97553be70367a68b114355ee53e573456c73 SHA256 42ffe0f28c44c5c9d1b73fef56c7d6ddc20d68867962b8c3a9bca6271b80c942
-EBUILD strigi-0.5.9.ebuild 3092 RMD160 8872ebde21eb99d71f4c4cf53963df81fd741b8c SHA1 801bf0da5452901f450490e2694d8323f550837c SHA256 c7e32055c4623901224cc497e91e59dddd277de6003579ce7d3ca2922614c698
 EBUILD strigi-0.6.4.ebuild 2615 RMD160 9fbf05331d201f607b3c5ff641be3e77641ea69f SHA1 03ba46c62cf06cf20916af36dd0576af608728c8 SHA256 33260967058e589669b43025467c3deb8a29db7bcd5d7f9e68815d110bb53ae9
-MISC ChangeLog 8708 RMD160 573cc9a08e91117cb8c4c51fcbfbe7bbd38ce9ed SHA1 1df216529e513e7a8e094a8ded59dc5818357e5c SHA256 7f55e12cbadd10c132329706fc3ed28d1563025b2d529398697ace80299dcf4e
-MISC metadata.xml 599 RMD160 50675af9daed30481c2243c0bb9011cbc0f70c6f SHA1 ba5aff49412da3e71b9763943cfe192a5e1c34aa SHA256 5c2626fbb7bb46ee6b317f154581d548679a506fd674f8a2d24354433448233b
+MISC ChangeLog 8927 RMD160 4a5424d940b5c2b94dab04c3bc6544db0a76e206 SHA1 17c8af65219637749778a522f46c59fb7a17b5d4 SHA256 9bf896b829415d17c8711d6c49eaa6654b9293eb82a5de41be1af240c094cffe
+MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmZdMEACgkQjDdoMVfcAHjm6wCfWqrfPnfCGqoq22Th6h0+sKhm
+E7oAn2fMI5kk89Q86De9isIoiHqytG2S
+=6P84
+-----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/metadata.xml b/app-misc/strigi/metadata.xml
index 9616e01bd00c..8e6ee8e0004c 100644
--- a/app-misc/strigi/metadata.xml
+++ b/app-misc/strigi/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 <use>
 	<flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag>
-	<flag name="exiv2">
-		Enable support for exif/iptc metadata (<pkg>media-gfx/exiv2</pkg>) (recommended)
-	</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>
diff --git a/app-misc/strigi/strigi-0.5.10.ebuild b/app-misc/strigi/strigi-0.5.10.ebuild
deleted file mode 100644
index 80046b172d01..000000000000
--- a/app-misc/strigi/strigi-0.5.10.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.10.ebuild,v 1.7 2008/12/14 23:15:38 jmbsvicetto Exp $
-
-EAPI="1"
-inherit eutils cmake-utils
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+clucene +dbus debug +exiv2 fam hyperestraier inotify +qt4 test"
-# IUSE="log sqlite": fails to compile
-
-COMMONDEPEND="
-	dev-libs/libxml2
-	virtual/libiconv
-	clucene? ( >=dev-cpp/clucene-0.9.19 )
-	dbus? ( sys-apps/dbus
-		|| ( ( x11-libs/qt-dbus:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-		)
-	exiv2? ( media-gfx/exiv2 )
-	fam? ( virtual/fam )
-	hyperestraier? ( app-text/hyperestraier )
-	qt4? (
-		|| ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-		)"
-#	log? ( >=dev-libs/log4cxx-0.9.7 )
-#	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-pkg_setup() {
-	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
-		ewarn "It's highly recommended to enable one of the supported backends:"
-		ewarn "clucene, hyperestraier and sqlite"
-		ewarn "Clucene is currently the recommended backend."
-		ewarn "Without a backend you'll only be able to use deepgrep."
-	fi
-
-	if use dbus && use qt4; then
-		if ( has_version "<x11-libs/qt-4.4.0_alpha:4" && ! built_with_use x11-libs/qt:4 dbus ) || \
-			( has_version "x11-libs/qt-gui:4" && ! built_with_use x11-libs/qt-gui:4 dbus); then
-			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."
-			die
-		fi
-	fi
-
-	if use qt4 && ! use dbus; then
-		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."
-		die
-	fi
-}
-
-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.
-	# Enabled: POLLING (only reliable way to check for files changed.)
-
-	mycmakeargs="${mycmakeargs}
-		-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
-		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
-		-DENABLE_REGENERATEXSD=OFF
-		$(cmake-utils_use_enable clucene CLUCENE)
-		$(cmake-utils_use_enable dbus DBUS)
-		$(cmake-utils_use_enable exiv2 EXIV2)
-		$(cmake-utils_use_enable fam FAM)
-		$(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
-
-	pushd "${WORKDIR}/${PN}_build"
-	ctest --extra-verbose || die "Tests failed."
-	popd
-}
diff --git a/app-misc/strigi/strigi-0.5.11.ebuild b/app-misc/strigi/strigi-0.5.11.ebuild
deleted file mode 100644
index 696d851615da..000000000000
--- a/app-misc/strigi/strigi-0.5.11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.11.ebuild,v 1.3 2008/12/14 23:15:38 jmbsvicetto Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+clucene +dbus debug exif fam hyperestraier inotify log +qt4 test"
-# IUSE="sqlite": fails to compile
-
-COMMONDEPEND="
-	dev-libs/libxml2
-	virtual/libiconv
-	clucene? ( >=dev-cpp/clucene-0.9.19 )
-	dbus? ( sys-apps/dbus
-		|| ( ( x11-libs/qt-dbus:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4[dbus] )
-		)
-	exif? ( media-gfx/exiv2 )
-	fam? ( virtual/fam )
-	hyperestraier? ( app-text/hyperestraier )
-	log? ( >=dev-libs/log4cxx-0.9.7 )
-	qt4? (
-		|| ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-			x11-libs/qt-dbus:4 )
-			=x11-libs/qt-4.3*:4[dbus] )
-		)
-	!clucene? (
-		!hyperestraier? (
-			>=dev-cpp/clucene-0.9.19
-		)
-	)
-"
-#	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-src_configure() {
-	# 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.
-	# Enabled: POLLING (only reliable way to check for files changed.)
-
-	mycmakeargs="${mycmakeargs}
-		-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
-		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
-		-DENABLE_REGENERATEXSD=OFF
-		$(cmake-utils_use_enable clucene CLUCENE)
-		$(cmake-utils_use_enable dbus DBUS)
-		$(cmake-utils_use_enable exif EXIV2)
-		$(cmake-utils_use_enable fam FAM)
-		$(cmake-utils_use_enable hyperestraier HYPERESTRAIER)
-		$(cmake-utils_use_enable inotify INOTIFY)
-		$(cmake-utils_use_enable log LOG4CXX)
-		$(cmake-utils_use_enable qt4 DBUS)
-		$(cmake-utils_use_enable qt4 QT4)"
-#		$(cmake-utils_use_enable sqlite SQLITE)"
-
-	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
-		mycmakeargs="${mycmakeargs} -DENABLE_CLUCENE=ON"
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mycmakeargs="${mycmakeargs} -DENABLE_CPPUNIT=ON"
-	cmake-utils_src_compile
-
-	pushd "${WORKDIR}/${PN}_build"
-	ctest --extra-verbose || die "Tests failed."
-	popd
-}
-
-pkg_postinst() {
-	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
-		elog "Because you didn't enable any of the supported backends:"
-		elog "clucene, hyperestraier and sqlite"
-		elog "clucene support was silently installed."
-		elog "If you prefer another backend, be sure to reinstall strigi"
-		elog "and to enable that backend use flag"
-	fi
-}
diff --git a/app-misc/strigi/strigi-0.5.8.ebuild b/app-misc/strigi/strigi-0.5.8.ebuild
deleted file mode 100644
index 97b50649096e..000000000000
--- a/app-misc/strigi/strigi-0.5.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.8.ebuild,v 1.6 2008/12/14 23:15:38 jmbsvicetto Exp $
-
-EAPI="1"
-inherit eutils cmake-utils
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+clucene +dbus debug +exiv2 fam hyperestraier inotify java +qt4 test"
-# log strigi
-RESTRICT="test"
-
-COMMONDEPEND="
-	dev-libs/libxml2
-	virtual/libiconv
-	clucene? ( >=dev-cpp/clucene-0.9.16a )
-	dbus? ( sys-apps/dbus
-		|| ( ( x11-libs/qt-dbus:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-		)
-	exiv2? ( media-gfx/exiv2 )
-	fam? ( virtual/fam )
-	hyperestraier? ( app-text/hyperestraier )
-	java? (
-		>=dev-libs/xerces-c-2.7.0-r1
-		>=virtual/jdk-1.4
-		)
-	qt4? (
-		|| ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-		)"
-#	log? ( >=dev-libs/log4cxx-0.9.7 )
-#	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-pkg_setup() {
-	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
-		ewarn "It's highly recommended to enable one of the supported backends:"
-		ewarn "clucene, hyperestraier and sqlite"
-		ewarn "Clucene is currently the recommended backend."
-		ewarn "Without a backend you'll only be able to use deepgrep."
-	fi
-
-	if use dbus && use qt4; then
-		if ( has_version "<x11-libs/qt-4.4.0_alpha:4" && ! built_with_use x11-libs/qt:4 dbus ) || \
-			( has_version "x11-libs/qt-gui:4" && ! built_with_use x11-libs/qt-gui:4 dbus); then
-			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."
-			die
-		fi
-	fi
-
-	if use qt4 && ! use dbus; then
-		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."
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc-4.3.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 fam FAM)
-		$(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."
-}
diff --git a/app-misc/strigi/strigi-0.5.9.ebuild b/app-misc/strigi/strigi-0.5.9.ebuild
deleted file mode 100644
index 9725b22c42c6..000000000000
--- a/app-misc/strigi/strigi-0.5.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.9.ebuild,v 1.7 2008/12/14 23:15:38 jmbsvicetto Exp $
-
-EAPI="1"
-inherit eutils cmake-utils
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+clucene +dbus debug +exiv2 fam hyperestraier inotify +qt4 test"
-# log strigi
-RESTRICT="test"
-
-COMMONDEPEND="
-	dev-libs/libxml2
-	virtual/libiconv
-	clucene? ( >=dev-cpp/clucene-0.9.16a )
-	dbus? ( sys-apps/dbus
-		|| ( ( x11-libs/qt-dbus:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-		)
-	exiv2? ( media-gfx/exiv2 )
-	fam? ( virtual/fam )
-	hyperestraier? ( app-text/hyperestraier )
-	qt4? (
-		|| ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-		)"
-#	log? ( >=dev-libs/log4cxx-0.9.7 )
-#	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-pkg_setup() {
-	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
-		ewarn "It's highly recommended to enable one of the supported backends:"
-		ewarn "clucene, hyperestraier and sqlite"
-		ewarn "Clucene is currently the recommended backend."
-		ewarn "Without a backend you'll only be able to use deepgrep."
-	fi
-
-	if use dbus && use qt4; then
-		if ( has_version "<x11-libs/qt-4.4.0_alpha:4" && ! built_with_use x11-libs/qt:4 dbus ) || \
-			( has_version "x11-libs/qt-gui:4" && ! built_with_use x11-libs/qt-gui:4 dbus); then
-			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."
-			die
-		fi
-	fi
-
-	if use qt4 && ! use dbus; then
-		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."
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.5.8-gcc-4.3.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.
-	# Enabled: POLLING (only reliable way to check for files changed.)
-
-	mycmakeargs="${mycmakeargs}
-		-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
-		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
-		-DENABLE_REGENERATEXSD=OFF
-		$(cmake-utils_use_enable clucene CLUCENE)
-		$(cmake-utils_use_enable dbus DBUS)
-		$(cmake-utils_use_enable exiv2 EXIV2)
-		$(cmake-utils_use_enable fam FAM)
-		$(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."
-}