Handle broken Altivec support differently.

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

5 files changed, 27 insertions, 45 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index aac51e081a39..a34c9ffbeb16 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.72 2009/05/21 01:41:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.73 2009/05/21 12:45:38 ssuominen Exp $
+
+  21 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -ffmpegthumbnailer-1.3.0.ebuild, ffmpegthumbnailer-1.5.0.ebuild,
+  ffmpegthumbnailer-1.5.1.ebuild:
+  Handle broken Altivec support differently.
 
   21 May 2009; Jeroen Roovers <jer@gentoo.org>
   ffmpegthumbnailer-1.5.0.ebuild:
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index c83b843787f6..2f6e5dc22106 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,8 +1,6 @@
-DIST ffmpegthumbnailer-1.3.0.tar.gz 322063 RMD160 343ecee23543beb23030655942d381e390010454 SHA1 8b29dde56dece30ebc351611ea40fcff83e1d317 SHA256 587a95b5babd3f90893b3a936ba9a0d2bf5dbf095861e3e7d807ed50830ffb4f
 DIST ffmpegthumbnailer-1.5.0.tar.gz 314289 RMD160 679ded3bb49cb73d71a6adb02232b9fa6cc0eb68 SHA1 7a84ac7bbc03bf62b44031dee58301aedc26aeef SHA256 eda42e942a746ab17977b13ce9222c67286a59984bb4557ba41f8c708bcfc540
 DIST ffmpegthumbnailer-1.5.1.tar.gz 326752 RMD160 fafadab033bd759ca2ae19bb6cf7ff0d51b11b3b SHA1 49848d7bc9cb80dd6f264cbd905134f3593fd8b4 SHA256 4dae04721bc27fc8b018ebb4cf4d98c7506eec94d01fdfee9f5b896220b10351
-EBUILD ffmpegthumbnailer-1.3.0.ebuild 979 RMD160 5df63ad6f6b8d5555e0de5a1d35b3b5ff8bfdfba SHA1 6d31efd929568035de5bfc6c63e4abe47b05879c SHA256 f6e765d570d3631378d1b8cb8854f9f67e2945940a541381a8ee76ab0f0ce9ea
-EBUILD ffmpegthumbnailer-1.5.0.ebuild 849 RMD160 199f92769ce9a12994785458b579698b32274c58 SHA1 18dbb45bcee078365cfca3aca79fa6551688a17f SHA256 6b7c741fb5ce3955d508f0c19016d72c6457d8ca3319a34174fc299f77fe1d62
-EBUILD ffmpegthumbnailer-1.5.1.ebuild 989 RMD160 c4ebbc7f3bfc862a4711ac62e7efb8a343cb5636 SHA1 ec161150014a84d9326c80da9f7b4c3368a363f5 SHA256 3e233b44dd7bf206556f008302076c0b7e3448282d60ac1e9cb92618d318783f
-MISC ChangeLog 10717 RMD160 e4f4d203efb69fefa0b653da755f79f86c108796 SHA1 56ccb37aea22e4303b20645d0caae93b4479ca31 SHA256 d703de7a270f9e1aeb7c325855bd1aeca70a5e81892336f58cc31e772d1036b5
+EBUILD ffmpegthumbnailer-1.5.0.ebuild 974 RMD160 27fb975d591a88591caacd89741b8a27fc0b9603 SHA1 1eaba4a1668c8a80d17d56cb663efa6cb8015474 SHA256 588ff302dd73c1e662534386622b9df3ef5f7e4fd5f50e8a9384c5ad958a6bb6
+EBUILD ffmpegthumbnailer-1.5.1.ebuild 1038 RMD160 72390e47c32aab32ec328b2e0747fbb4e74034c1 SHA1 1b273c490274b2465746a1b9093c0f32502d9600 SHA256 ec8bcc537c503ef65ca127c6ebe83abf934a64754646b16d3b3ec9c069f1f5a0
+MISC ChangeLog 10924 RMD160 820b46f2e3a51432700c97576563fe6f4d1dc084 SHA1 88ea0e3919c1763bdc76bfb1b440af4ca5837453 SHA256 7c4fd62a6194f5a181135d50e65c33121139eed7bd1cee9f523f2c31dc360ffc
 MISC metadata.xml 257 RMD160 77deff120c2aad50bc9b62c3b24c67cfbe15c1ce SHA1 61fdd16534463e801e095a21cd46ca7ca77ef5b2 SHA256 c1f8984e243bd5f7824eacc472f2efa96297f979e0761b8de3be169768815a9e
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.3.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.3.0.ebuild
deleted file mode 100644
index 51a60707bd44..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.3.0.ebuild,v 1.6 2008/12/17 14:40:24 beandog Exp $
-
-inherit multilib
-
-DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
-HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libpng
-	media-libs/jpeg
-	>=media-video/ffmpeg-0.4.9_p20070330"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf	--disable-dependency-tracking \
-		--disable-static
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README TODO
-	rm -f "${D}"/usr/$(get_libdir)/libffmpegthumbnailer.la || die "removal failed"
-}
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild
index 275b861da97b..c594279c6421 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.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/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild,v 1.9 2009/05/21 01:41:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild,v 1.10 2009/05/21 12:45:38 ssuominen Exp $
 
 EAPI=2
 
@@ -11,11 +11,11 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="altivec"
 
 RDEPEND="media-libs/libpng
 	media-libs/jpeg
-	>=media-video/ffmpeg-0.4.9_p20070330[-altivec]"
+	>=media-video/ffmpeg-0.4.9_p20070330[altivec?]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -28,3 +28,9 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
 }
+
+pkg_postinst() {
+	if use altivec; then
+		ewarn "Altivec support is known to be broken wrt bug #252641."
+	fi
+}
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild
index b6a2dfa838dd..f4730ed17a12 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.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/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild,v 1.2 2009/05/20 13:04:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild,v 1.3 2009/05/21 12:45:38 ssuominen Exp $
 
 EAPI=2
 
@@ -11,10 +11,9 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="jpeg png"
+IUSE="altivec jpeg png"
 
-# See bug 252641, please try to remove the -altivec soon as possible.
-RDEPEND=">=media-video/ffmpeg-0.5[-altivec]
+RDEPEND=">=media-video/ffmpeg-0.5[altivec?]
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )"
 DEPEND="${RDEPEND}
@@ -31,3 +30,9 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README
 }
+
+pkg_postinst() {
+	if use altivec; then
+		ewarn "Altivec support is known to be broken wrt bug #252641."
+	fi
+}