Cleanup. Strigi doenst support sqlite anymore

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

4 files changed, 20 insertions, 103 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 3b03bdd7ef7a..bdd30d3eed08 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2009/02/02 22:17:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.24 2009/02/07 19:19:07 alexxy Exp $
+
+  07 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> -strigi-0.6.3.ebuild,
+  strigi-0.6.4.ebuild:
+  Cleanup. Strigi doenst support sqlite anymore
 
 *strigi-0.6.4 (02 Feb 2009)
 
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index 901dc9ffb883..2a3ee436a949 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,15 +1,23 @@
+-----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.3.tar.bz2 881044 RMD160 c368ac4c362859c1c830ffaab025fecd12a71660 SHA1 216bd3f3f9f9b3ef715703db54c94ca3677c4e6e SHA256 5671cc0b8e98b59ffd809e59390d420f4650d6a298737af19fb2d32c2ad8fd99
 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.3.ebuild 2728 RMD160 375fcc136eeee5642c7be8c44992f4d5829bb4f9 SHA1 ca11b400955143fefc02b7e10456d9d7102e6407 SHA256 1af38aa1d75fb984991818b963481d348b8c2f08226640478541fecf378ed301
-EBUILD strigi-0.6.4.ebuild 2726 RMD160 b348c0a85bff64a0ffea107d2f9e36a05732ec2a SHA1 b6100c2ceb3283a5b96c1c7d4e2514ea487c06cf SHA256 50c95ff93060c5c78f6950f298cc266cfdd78a8ff18b68110685f3916768c9e1
-MISC ChangeLog 8452 RMD160 83804dc05454c49e9d2a74aa22a9a116da7068c6 SHA1 067701f27e15c5897027c0ec6f309164ea5c388b SHA256 db45ab1d512cf9ca46e5ebdaabc8cc6bbc356a36c1681aedccea045311312b8b
+EBUILD strigi-0.6.4.ebuild 2600 RMD160 4ed7584e50e6bc9d487a8defb28265a418b0e436 SHA1 2dd6cab847fdf674473cdb74506bed872de036a3 SHA256 5fef5e37fe5bb2639f269428456fd0db43fb06e27f342feba4a74c52f8d6cd4f
+MISC ChangeLog 8594 RMD160 ce175b7efded82a1d8d4628af4bd7b664e8daf7b SHA1 cbc9a1cc7d572cdb5ec70b760fee19a150f58c87 SHA256 408980910e06053d32e14c2f3ddebf4dba60d021b8e351c68710affb2093307a
 MISC metadata.xml 599 RMD160 50675af9daed30481c2243c0bb9011cbc0f70c6f SHA1 ba5aff49412da3e71b9763943cfe192a5e1c34aa SHA256 5c2626fbb7bb46ee6b317f154581d548679a506fd674f8a2d24354433448233b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmN3rwACgkQ5BmOA85PVLhkOACgj9w/tMmk5lF+jZuVERRzACdI
+FlAAn1QYHnNfcbey0+6YkBWTfBsvyOs5
+=8Uok
+-----END PGP SIGNATURE-----
diff --git a/app-misc/strigi/strigi-0.6.3.ebuild b/app-misc/strigi/strigi-0.6.3.ebuild
deleted file mode 100644
index 5c4e1c4ef130..000000000000
--- a/app-misc/strigi/strigi-0.6.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.6.3.ebuild,v 1.3 2009/02/01 23:00:48 jmbsvicetto Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://www.vandenoever.info/software/strigi"
-SRC_URI="http://www.vandenoever.info/software/strigi/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+clucene +dbus debug exif fam hyperestraier inotify log +qt4 test"
-
-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-0.17 )
-	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_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 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_compile
-}
-
-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.6.4.ebuild b/app-misc/strigi/strigi-0.6.4.ebuild
index f3cdb6b4f32e..7e3c2f2c5cc7 100644
--- a/app-misc/strigi/strigi-0.6.4.ebuild
+++ b/app-misc/strigi/strigi-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.6.4.ebuild,v 1.1 2009/02/02 22:17:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.6.4.ebuild,v 1.2 2009/02/07 19:19:07 alexxy Exp $
 
 EAPI="2"
 
@@ -40,7 +40,6 @@ COMMONDEPEND="
 		)
 	)
 "
-#	sqlite? ( dev-db/sqlite:3 )"
 DEPEND="${COMMONDEPEND}
 	test? ( dev-util/cppunit )"
 RDEPEND="${COMMONDEPEND}"
@@ -64,9 +63,8 @@ src_compile() {
 		$(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
+	if ! use clucene && ! use hyperestraier; then
 		mycmakeargs="${mycmakeargs} -DENABLE_CLUCENE=ON"
 	fi
 
@@ -83,7 +81,7 @@ src_test() {
 }
 
 pkg_postinst() {
-	if ! use clucene && ! use hyperestraier; then # && ! use sqlite; then
+	if ! use clucene && ! use hyperestraier; then
 		elog "Because you didn't enable any of the supported backends:"
 		elog "clucene, hyperestraier and sqlite"
 		elog "clucene support was silently installed."