Remove old; dont use invalid useflag xine, bug 378155

(Portage version: 2.1.10.10/cvs/Linux x86_64)

5 files changed, 7 insertions, 287 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 90445cbe3098..dbddf4cdfc33 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.70 2011/08/02 21:30:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.71 2011/08/10 21:46:01 dilfridge Exp $
+
+  10 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -strigi-0.7.2.ebuild,
+  -strigi-0.7.5.ebuild, -strigi-0.7.5-r1.ebuild, strigi-0.7.5-r2.ebuild:
+  Remove old; dont use invalid useflag xine, bug 378155
 
 *strigi-0.7.5-r2 (02 Aug 2011)
 
diff --git a/app-misc/strigi/strigi-0.7.2.ebuild b/app-misc/strigi/strigi-0.7.2.ebuild
deleted file mode 100644
index b047524d65b2..000000000000
--- a/app-misc/strigi/strigi-0.7.2.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.2.ebuild,v 1.6 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
-}
diff --git a/app-misc/strigi/strigi-0.7.5-r1.ebuild b/app-misc/strigi/strigi-0.7.5-r1.ebuild
deleted file mode 100644
index d8dc31ac088c..000000000000
--- a/app-misc/strigi/strigi-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.5-r1.ebuild,v 1.1 2011/07/17 12:17:12 dilfridge Exp $
-
-EAPI=4
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/strigi"
-	GIT_ECLASS="git-2"
-	EGIT_HAS_SUBMODULES="true"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
-
-COMMONDEPEND="
-	app-arch/bzip2:0
-	dev-libs/libxml2:2
-	sys-libs/zlib:0
-	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 )
-	ffmpeg? ( virtual/ffmpeg )
-	hyperestraier? ( app-text/hyperestraier )
-	log? ( >=dev-libs/log4cxx-0.10.0 )
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-	)
-"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
-)
-
-src_configure() {
-	# Enabled: POLLING (only reliable way to check for files changed.)
-	# Disabled: xine - recommended upstream to keep it this way
-	mycmakeargs=(
-		-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 ffmpeg)
-		$(cmake-utils_use_enable hyperestraier)
-		$(cmake-utils_use_enable inotify)
-		$(cmake-utils_use_enable log LOG4CXX)
-		$(cmake-utils_use_enable qt4)
-		$(cmake-utils_use_enable test CPPUNIT)
-		$(cmake-utils_use_disable xine)
-	)
-
-	if use qt4; then
-		mycmakeargs+=(-DENABLE_DBUS=ON)
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use clucene && ! use hyperestraier; then
-		echo
-		elog "Because you didn't enable either of the available backends:"
-		elog "clucene or hyperestraier, strigi may not be functional."
-		elog "If you intend to use standalone strigi indexer (not needed for KDE),"
-		elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
-		elog "or hyperestraier (unreliable) USE flag enabled."
-		echo
-	fi
-}
diff --git a/app-misc/strigi/strigi-0.7.5-r2.ebuild b/app-misc/strigi/strigi-0.7.5-r2.ebuild
index 8edb4fbcdb87..a593881df631 100644
--- a/app-misc/strigi/strigi-0.7.5-r2.ebuild
+++ b/app-misc/strigi/strigi-0.7.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.5-r2.ebuild,v 1.1 2011/08/02 21:30:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.5-r2.ebuild,v 1.2 2011/08/10 21:46:01 dilfridge Exp $
 
 EAPI=4
 
@@ -60,6 +60,7 @@ src_configure() {
 		-DFORCE_DEPS=ON
 		-DENABLE_CPPUNIT=OFF
 		-DENABLE_REGENERATEXSD=OFF
+		-DENABLE_XINE=OFF
 		$(cmake-utils_use_enable clucene)
 		$(cmake-utils_use_enable dbus)
 		$(cmake-utils_use_enable exif EXIV2)
@@ -70,7 +71,6 @@ src_configure() {
 		$(cmake-utils_use_enable log LOG4CXX)
 		$(cmake-utils_use_enable qt4)
 		$(cmake-utils_use_enable test CPPUNIT)
-		$(cmake-utils_use_disable xine)
 	)
 
 	if use qt4; then
diff --git a/app-misc/strigi/strigi-0.7.5.ebuild b/app-misc/strigi/strigi-0.7.5.ebuild
deleted file mode 100644
index 916b9d5e7454..000000000000
--- a/app-misc/strigi/strigi-0.7.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.5.ebuild,v 1.1 2011/07/12 20:26:34 dilfridge Exp $
-
-EAPI=4
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/strigi"
-	GIT_ECLASS="git-2"
-	EGIT_HAS_SUBMODULES="true"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
-
-COMMONDEPEND="
-	app-arch/bzip2:0
-	dev-libs/libxml2:2
-	sys-libs/zlib:0
-	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 )
-	ffmpeg? ( virtual/ffmpeg )
-	hyperestraier? ( app-text/hyperestraier )
-	log? ( >=dev-libs/log4cxx-0.10.0 )
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-	)
-"
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-src_configure() {
-	# Enabled: POLLING (only reliable way to check for files changed.)
-	# Disabled: xine - recommended upstream to keep it this way
-	mycmakeargs=(
-		-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 ffmpeg)
-		$(cmake-utils_use_enable hyperestraier)
-		$(cmake-utils_use_enable inotify)
-		$(cmake-utils_use_enable log LOG4CXX)
-		$(cmake-utils_use_enable qt4)
-		$(cmake-utils_use_enable test CPPUNIT)
-		$(cmake-utils_disable xine)
-	)
-
-	if use qt4; then
-		mycmakeargs+=(-DENABLE_DBUS=ON)
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use clucene && ! use hyperestraier; then
-		echo
-		elog "Because you didn't enable either of the available backends:"
-		elog "clucene or hyperestraier, strigi may not be functional."
-		elog "If you intend to use standalone strigi indexer (not needed for KDE),"
-		elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
-		elog "or hyperestraier (unreliable) USE flag enabled."
-		echo
-	fi
-}