Remove old.

(Portage version: 2.2.0_alpha90/cvs/Linux i686)

5 files changed, 6 insertions, 186 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index e271936b2519..ecf0acbdac9b 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.86 2012/03/09 15:07:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.87 2012/03/12 10:01:56 johu Exp $
+
+  12 Mar 2012; Johannes Huber <johu@gentoo.org> -files/strigi-0.6.4-gcc44.patch,
+  -files/strigi-0.6.5-gcc4.4-missing-headers.patch,
+  -files/strigi-disable_java.patch, -strigi-0.7.1.ebuild:
+  Remove old.
 
   09 Mar 2012; Brent Baude <ranger@gentoo.org> strigi-0.7.7.ebuild:
   Marking strigi-0.7.7 ppc64 for bug 399667
diff --git a/app-misc/strigi/files/strigi-0.6.4-gcc44.patch b/app-misc/strigi/files/strigi-0.6.4-gcc44.patch
deleted file mode 100644
index e209a930f651..000000000000
--- a/app-misc/strigi/files/strigi-0.6.4-gcc44.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- strigi-0.6.4.orig/src/daemon/dbus/dbuscpp/dbusmessagereader.h
-+++ strigi-0.6.4/src/daemon/dbus/dbuscpp/dbusmessagereader.h
-@@ -23,6 +23,7 @@
- #define DBUS_API_SUBJECT_TO_CHANGE 1
- #include <dbus/dbus.h>
- 
-+#include <stdint.h>
- #include <set>
- #include <map>
- #include <string>
---- strigi-0.6.4.orig/src/daemon/eventlistener/inotifylistener.h
-+++ strigi-0.6.4/src/daemon/eventlistener/inotifylistener.h
-@@ -24,6 +24,7 @@
- #include "strigi_thread.h"
- #include <map>
- #include <vector>
-+#include <stdio.h>
- 
- class Event;
- class PollingListener;
---- strigi-0.6.4.orig/src/daemon/strigithread.h
-+++ strigi-0.6.4/src/daemon/strigithread.h
-@@ -22,6 +22,7 @@
- 
- #include <strigi_thread.h>
- #include <string>
-+#include <stdio.h>
- 
- extern "C" void *threadstarter(void *);
- 
---- strigi-0.6.4.orig/src/streamanalyzer/indexpluginloader.h
-+++ strigi-0.6.4/src/streamanalyzer/indexpluginloader.h
-@@ -25,6 +25,7 @@
- #include <vector>
- #include <map>
- #include <string>
-+#include <stdio.h>
- 
- namespace Strigi {
-   class IndexManager;
diff --git a/app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch b/app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch
deleted file mode 100644
index c4eef570f46a..000000000000
--- a/app-misc/strigi/files/strigi-0.6.5-gcc4.4-missing-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nuar strigi-0.6.5.orig/src/estraierindexer/estraierindexmanager.cpp strigi-0.6.5/src/estraierindexer/estraierindexmanager.cpp
---- strigi-0.6.5.orig/src/estraierindexer/estraierindexmanager.cpp	2008-05-19 22:30:35.000000000 +0200
-+++ strigi-0.6.5/src/estraierindexer/estraierindexmanager.cpp	2009-05-18 11:06:21.296581521 +0200
-@@ -23,6 +23,7 @@
- #include "estraierindexwriter.h"
- #include "strigi_thread.h"
- #include "indexplugin.h"
-+#include <cstdio>
- #include <cstring>
- #include <iostream>
- #include <assert.h>
-diff -Nuar strigi-0.6.5.orig/src/estraierindexer/estraierindexreader.cpp strigi-0.6.5/src/estraierindexer/estraierindexreader.cpp
---- strigi-0.6.5.orig/src/estraierindexer/estraierindexreader.cpp	2008-05-19 22:30:35.000000000 +0200
-+++ strigi-0.6.5/src/estraierindexer/estraierindexreader.cpp	2009-05-18 11:17:30.476583471 +0200
-@@ -21,6 +21,7 @@
- #include "estraierindexmanager.h"
- #include "query.h"
- #include <estraier.h>
-+#include <cstdio>
- #include <cstring>
- #include <set>
- #include <sstream>
diff --git a/app-misc/strigi/files/strigi-disable_java.patch b/app-misc/strigi/files/strigi-disable_java.patch
deleted file mode 100644
index 496ef577b187..000000000000
--- a/app-misc/strigi/files/strigi-disable_java.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/xsd/CMakeLists.txt.orig	2009-02-28 23:23:33.000000000 +0300
-+++ src/xsd/CMakeLists.txt	2009-03-01 00:08:08.000000000 +0300
-@@ -22,6 +22,8 @@ endif (LIBXML2_FOUND)
- # javac >= 1.5 is required to compile the xsd parser
- OPTION(ENABLE_REGENERATEXSD
-   "regenerate xsd parser from *.xsd files(not normally required)" ON)
-+
-+if(${ENABLE_REGENERATEXSD})
- find_package(Java)
- if (JAVA_COMPILE)
-   execute_process(COMMAND ${JAVA_COMPILE} "-version" ERROR_VARIABLE
-@@ -31,6 +33,7 @@ if (JAVA_COMPILE)
-   endif (JAVAC_VERSION MATCHES " 1\\.[56]" AND NOT JAVAC_VERSION MATCHES "g[ci]j")
-   MESSAGE("Java5 found ${JAVAC5_FOUND}")
- endif (JAVA_COMPILE)
-+endif(${ENABLE_REGENERATEXSD})
- 
- # loop over all xsd files
- set(XSDFILES "${CMAKE_CURRENT_SOURCE_DIR}/strigidaemonconfiguration.xsd" 
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 0ac1ef027730..000000000000
--- a/app-misc/strigi/strigi-0.7.1.ebuild
+++ /dev/null
@@ -1,104 +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.1.ebuild,v 1.10 2010/09/27 20:46:53 jer 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 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-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_prepare() {
-	base_src_prepare
-	rm cmake/FindQt4.cmake || die "unable to remove obsolete FindQt4 macro."
-}
-
-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
-}