Remove old; dont use invalid useflag xine, bug 378155

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

6 files changed, 22 insertions, 306 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/Manifest b/app-misc/strigi/Manifest
index 160da7ca4989..ac7300863ec7 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -7,29 +7,25 @@ AUX strigi-0.7.5-ffmpeg.patch 6617 RMD160 77bf30f16e3912330ce946b78bc3524bc9d249
 AUX strigi-0.7.5-no-qt4.patch 329 RMD160 e1e4904e4d907fcdd026d48aeeed86ee997a9797 SHA1 5f7f2a827990b59746204a0138a134bfba58ed33 SHA256 c98b889a6caf08f25eacc0e896968f6cbd2a8b317aa5aa441be4b5c49f315d38
 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
-DIST strigi-0.7.2.tar.bz2 936320 RMD160 7497195335f76f30922f5c6acaae383e144b33c7 SHA1 b4c1472ef068536acf9c5c4c8f033a97f9c69f9f SHA256 1ca421bbe420d1839bbe6bfe7c4b52a05590a9b7a7eda77924b554c98e602ab8
 DIST strigi-0.7.5.tar.bz2 801845 RMD160 2cf9fa372de2bc06abcee25d0f41fa5f4916fa3c SHA1 0aa3632e07c58f2ab5c515004b790bda6cfefbf5 SHA256 111f5e3ede171292302b906418af0175445ca01958d40fb54879f80620b5189b
 EBUILD strigi-0.7.1.ebuild 2777 RMD160 416a9ddb7778fc1fccc7b018be836e98280fe863 SHA1 25aa47b2d7bc7c464f2c7a9268fc67609fa37cdd SHA256 da6027c00e964e58d539f141ff147ce2d4c282d24b4317bbb1f8d4d440d73a61
-EBUILD strigi-0.7.2.ebuild 2783 RMD160 4e59248c19abab1bc5bd787099ae62895b1f1180 SHA1 037021fdbb43b24b75cd0af8f0e8728abef94ed8 SHA256 227c0e9072dcf2e717601e3d03476215dd4aaf83aab02a2467db7a6cc2cb2473
-EBUILD strigi-0.7.5-r1.ebuild 2510 RMD160 8f6983e611e44ebba9985440d184507909017edd SHA1 29ccd35e2679dfda47e00779083be8bf2e2a0c68 SHA256 73ff48db65fee5a951d83aa875a3dabe53d01869d52abf437a6fd140ecd243c8
-EBUILD strigi-0.7.5-r2.ebuild 2550 RMD160 22c5875c7eadfe43b4672783050474fcd6396977 SHA1 b7787f0f13c3672dfc9ca74bfd49b41fd72ad9ef SHA256 4782f5f5124f7914630d1ace60426f0393cbf3eb4a9b7dbfc79369397efe85a3
-EBUILD strigi-0.7.5.ebuild 2450 RMD160 804c4f19e81c311504f9f7c4d120dce220d93aa5 SHA1 d713a8dcc2116dac649d65f988d587e5fb996b8e SHA256 f549215139a01a86e8511c4e4b6080ade2e57696748bb0f7f6c042fcab28f3e0
-MISC ChangeLog 14422 RMD160 0528a2158c08321b954192c1d4fd2bbda5dd54b0 SHA1 3d0336b346565a48ccca4d4342fefaab90996d65 SHA256 656ee14f71dc6035beb27b80fec39d9d5242d46a961f6c361255569e71bac7cd
+EBUILD strigi-0.7.5-r2.ebuild 2536 RMD160 9aae7c717a3db49da32a3e2c5fb77b1a080e6038 SHA1 8d12ec2e978ec296428864c24e9f6567784b77e4 SHA256 7e7bfd86d89f2162dd35487d4491fe5af2398e639cd41f77473892df2c6937fe
+MISC ChangeLog 14631 RMD160 e883594e49cddef929ee5e08959ea6dd37b504fa SHA1 639a65ab5ef71733c12327c7c6aa0b91eeb28fb1 SHA256 27271ad446687b2d68470e0631ab088008cf492436a79264c8a6c15326401c83
 MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOOGyLAAoJENwGBM22xffevwQQAIsI68a8coY1AuqwbVr9iXcr
-TQ60z1skmwwAQM6dRXLYQqTqo61/m+c+Yr7NgM6B4iy84u8KuzEyQ6CkaZLjqrwt
-/jNLi5PMRLFqz5tE7XyxsIXYEI7oVmHj4iqJTgZyfJn7ZFjN7unf+lJ0UTFb/di1
-ACYl+t/Cyw5j+U3mL2M9+SrQOitu4s3Mh/dsgR0BPCSlRmBIb1nIfA+OuUE6WkOf
-ahT8gQpjhqquddQ4rQn0uD4P1Ak9t1fNd4MmmO+qRVR3uqMshoKdSfPSVUhnXY3z
-wZzoJe3e0LnMKIOA2+s29l/Mx8CcayWKD7lDqBZmr8JtGJ+c7lxpr8UCkm5AyCsF
-UWxlEYpk5LHGYmd1uD9kkM3K7E7Hpg8VBfzEmdyYly+yF7jmzaHlKW8SQmbRyDze
-tFvk68VaQgFwrcapnAxaAKAHT5y1kccT5Jey66JXaOjU+4b+GSMuNXk6S453SJwc
-qK13tFERrXrJ4dY+OdvN3wV+BG+PDMJmGG+csrtiinoKl7vNSlqjIzVt8EZFLGfk
-YD3BN6FvTu3RX+EcsY7KKIVHs9VriVu6qJq6ES4w64X3QU//FFFJdIag33uxz8Mm
-yDRdE9BSiiWjy4X7DH0SO4IzT3Rz8dL+A1ByKgtyZ6HQpwM5ZOVHUHDD8Z08gUmQ
-fO3uRWQoqNoxvverOuui
-=UCgJ
+iQIcBAEBCgAGBQJOQvwtAAoJENwGBM22xffeFRQQAInDYM0LHHozpix9VhFXYQSC
+QQw0tI4Z15j7YlbPudkyE59y7tb2UHEPqaawawpA/0/NaRWnQz7TwtpfKUWE1A0z
+LS7PWJPeI4RC+AA5Q0t40oqzLxXdTWflnLJG4o2GdbsHkDRcIuEbjN21C0DCspQY
+fE7p0HHyEoOIOLZaRBRmvAXpkEDchtMFwC9daHi5wMlkAgxRkaYYVl/kvH01czM6
+6tU6ZnhyJb+UswFmovDKM9uaeSgj2usxgNRHSs9OYhBJe5jr2bHazXemOnls/AF5
+7jFmnGq86WzBnhJouXRH77q+zU8hJpVfFR9fx2enVZkJsBexa+b562bXFnYjTLNK
+FAmeCNA8ShAGS/xhGYORii3qiTgwHxB6/c3Z0fOigMSanaNvhlwRrQYJvx5L61Xo
+ztiT5k4fcB9sqyEAHbgL9XXjjyCrFik2He+g/kAa+G7wEKvKh22UPxRoKv1YUfX/
+Dfcgg6nO/m7Xgq2Eh6+5bnJGQhZ0XfG161tJOofYT3Ww7xGZhiKGgYIenxePreCq
+KHPN1raNH9+fowUTzp0qOSKM52JY1OjAWbF+xghhhkl5ddsjOwXE5ezVkds9YPVr
+tg5ZxxGGUoxrqcwNkhXOIQ+A68jMCfw2f4tCSH5muBlAI4U7+souP+g2ZG+zqTV+
+N4GGiypraODsMMbMREum
+=MEpU
 -----END PGP SIGNATURE-----
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
-}