Remove 0.5* versions as KDE 4.1 works with 0.6*

(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 6 insertions, 396 deletions

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/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."
-}