[app-misc/strigi] Drop moved in main tree, update live ebuild.

(Portage version: 2.2_rc61/git/Linux x86_64)
 (Unsigned Manifest commit)

3 files changed, 14 insertions, 104 deletions

diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index ca51aa54c5b..84dbc4dfe9a 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,7 +1,5 @@
 AUX strigi-0.6.4-gcc44.patch 1024 RMD160 194d69ba906c4da9ead9349545f26567dadc8ed2 SHA1 37c4622dd3b3b96de268e8ef15f52d8dea284d49 SHA256 94c594b16c0189706d0b0d565648b685a53910721f2340251ce7197ad5c213df
 AUX strigi-0.6.5-gcc4.4-missing-headers.patch 1020 RMD160 91e447323303315a1f8fe282afce6add0f4c802a SHA1 308c03e5fd1b1671ea2690ceaff2426050390f92 SHA256 a16029a8caaede0c0427865a06a308fd6de0f526840b88274fab5ada0233c3c8
 AUX strigi-disable_java.patch 784 RMD160 870decf02f7bda63bae9a6f7df0b26caed753fdc SHA1 09dc828ecef7287e7286277713d07f84d6ff72bf SHA256 f267a0a804d96e9ef4cac1138f98572bec17906021282b4db905b804c33b956d
-DIST strigi-0.7.1.tar.bz2 936454 RMD160 4dac3c3e8937dc1e0ea5cc759c95d64ba4e24898 SHA1 9e05a875a1c62ebb5c0c59bf2114253cd1bc2a07 SHA256 d1830506da50262c80d5a3b55ee7821b132184cbd251c527db8d9d76a9242ab3
-EBUILD strigi-0.7.1.ebuild 2646 RMD160 668069f218b41f0543caf1963cda0e06436e8854 SHA1 70f37c5e511ebe9ec4cc25b7056aeb8e95efb093 SHA256 965249ea2498444be3907c81e945d648e9162cb191c00048398bb16797d3ad1b
-EBUILD strigi-9999.ebuild 2448 RMD160 ac09a247bb215d960fb38136d90164be92c5361a SHA1 9b4b8b28fddb3f7d96e0a0b225e99f28192a0394 SHA256 cf5e105e7aac8f69fa05dcd4ed77f165a15441b8be108094226313d1b0d221e3
+EBUILD strigi-9999.ebuild 2665 RMD160 a31a278071904f477383e6242f6c49c6ab3147db SHA1 95b00b3b614398ec3e94877aa7df01ceab40e51c SHA256 27cf7b575c71d67eb1f501655b413bdcfd65e34bb489e732c36bc79184a1bb49
 MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
diff --git a/app-misc/strigi/strigi-0.7.1.ebuild b/app-misc/strigi/strigi-0.7.1.ebuild
deleted file mode 100644
index 4113b505678..00000000000
--- a/app-misc/strigi/strigi-0.7.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.0.ebuild,v 1.10 2010/01/08 06:33:14 abcd Exp $
-
-EAPI="2"
-
-inherit base 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+clucene +dbus debug exif fam hyperestraier inotify log +qt4 test"
-
-COMMONDEPEND="
-	dev-libs/libxml2
-	virtual/libiconv
-	clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
-	dbus? (
-		sys-apps/dbus
-		qt4? ( x11-libs/qt-dbus:4 )
-	)
-	exif? ( >=media-gfx/exiv2-0.17 )
-	fam? ( virtual/fam )
-	hyperestraier? ( app-text/hyperestraier )
-	log? ( >=dev-libs/log4cxx-0.10.0 )
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-	)
-	!clucene? (
-		!hyperestraier? (
-			>=dev-cpp/clucene-0.9.21[-debug]
-		)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.4-gcc44.patch"
-	"${FILESDIR}/${PN}-0.6.5-gcc4.4-missing-headers.patch"
-	"${FILESDIR}/${PN}-disable_java.patch"
-)
-
-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=(
-		-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
-		-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
-		-DENABLE_REGENERATEXSD=OFF
-		$(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 hyperestraier)
-		$(cmake-utils_use_enable inotify)
-		$(cmake-utils_use_enable log LOG4CXX)
-		$(cmake-utils_use_enable qt4)
-	)
-
-	if use qt4; then
-		mycmakeargs+=(-DENABLE_DBUS=ON)
-	fi
-
-	if ! use clucene && ! use hyperestraier; then
-		mycmakeargs+=(-DENABLE_CLUCENE=ON)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mycmakeargs+=(-DENABLE_CPPUNIT=ON)
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	ctest --extra-verbose || die "Tests failed."
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	if ! use clucene && ! use hyperestraier; then
-		elog "Because you didn't enable either of the supported backends:"
-		elog "clucene or hyperestraier"
-		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-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 50c8012bc32..bfe8c1c4545 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -6,11 +6,10 @@ EAPI="2"
 
 ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${PN}"
 ESVN_PROJECT="${PN}"
-inherit cmake-utils eutils subversion
+inherit base cmake-utils eutils subversion
 
 DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
 HOMEPAGE="http://strigi.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -44,6 +43,18 @@ DEPEND="${COMMONDEPEND}
 	test? ( dev-util/cppunit )"
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.4-gcc44.patch"
+	"${FILESDIR}/${PN}-0.6.5-gcc4.4-missing-headers.patch"
+	"${FILESDIR}/${PN}-disable_java.patch"
+)
+
+src_prepare() {
+	# subverison has own src_prepare
+	# so this is not required on stable ebuild
+	base_src_prepare
+}
+
 src_configure() {
 	# Strigi needs either expat or libxml2.
 	# However libxml2 seems to be required in both cases, linking to 2 xml parsers