remove old and remove keyword that shouldn't stay here

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 7 insertions, 186 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index ed60e872d854..b5a093b0cc5a 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/strigi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.98 2013/01/10 20:27:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.99 2013/01/29 17:11:29 ago Exp $
+
+  29 Jan 2013; Agostino Sarubbo <ago@gentoo.org> -strigi-0.7.7-r1.ebuild,
+  -strigi-0.7.7.ebuild, strigi-0.7.7-r2.ebuild:
+  remove old and remove keyword that shouldn't stay here
 
   10 Jan 2013; Agostino Sarubbo <ago@gentoo.org> strigi-0.7.7-r2.ebuild:
   Stable for alpha, wrt bug #451280
diff --git a/app-misc/strigi/strigi-0.7.7-r1.ebuild b/app-misc/strigi/strigi-0.7.7-r1.ebuild
deleted file mode 100644
index b84fb2c8b0cc..000000000000
--- a/app-misc/strigi/strigi-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r1.ebuild,v 1.3 2012/07/04 12:07:44 johu Exp $
-
-EAPI=4
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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="https://projects.kde.org/projects/kdesupport/strigi/strigi"
-
-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}
-	dev-libs/boost
-	test? ( dev-util/cppunit )"
-RDEPEND=${COMMONDEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc47.patch"
-	"${FILESDIR}/${P}-ffmpeg-0.11.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
-		-DENABLE_XINE=OFF
-		$(cmake-utils_use_enable clucene 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)
-	)
-
-	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.7-r2.ebuild b/app-misc/strigi/strigi-0.7.7-r2.ebuild
index 4ba609ffcf09..f417ea9d1ec6 100644
--- a/app-misc/strigi/strigi-0.7.7-r2.ebuild
+++ b/app-misc/strigi/strigi-0.7.7-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r2.ebuild,v 1.7 2013/01/10 20:27:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r2.ebuild,v 1.8 2013/01/29 17:11:29 ago Exp $
 
 EAPI=5
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	EGIT_REPO_URI="git://anongit.kde.org/strigi"
 	GIT_ECLASS="git-2"
diff --git a/app-misc/strigi/strigi-0.7.7.ebuild b/app-misc/strigi/strigi-0.7.7.ebuild
deleted file mode 100644
index 7480bbda3872..000000000000
--- a/app-misc/strigi/strigi-0.7.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7.ebuild,v 1.8 2012/06/14 07:12:40 yngwin Exp $
-
-EAPI=4
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-	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="https://projects.kde.org/projects/kdesupport/strigi/strigi"
-
-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}
-	dev-libs/boost
-	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
-		-DENABLE_XINE=OFF
-		$(cmake-utils_use_enable clucene 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)
-	)
-
-	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
-}