Stable on x86 wrt bug #213488, fix a typo at line 87 - s/dies/die/ - Calchan fails

Package-Manager: portage-2.1.4.4

3 files changed, 10 insertions, 18 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 49cb740aa032..b6a211c8bf77 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,17 +1,9 @@
 # ChangeLog for media-video/kino
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.97 2008/03/15 12:52:47 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.98 2008/03/15 14:02:47 cla Exp $
 
-*kino-1.3.0 (15 Mar 2008)
-
-  15 Mar 2008; Denis Dupeyron <calchan@gentoo.org> +kino-1.3.0.ebuild:
-  Version bump, bug #211421.
-
-  21 Feb 2008; Denis Dupeyron <calchan@gentoo.org> kino-1.1.1.ebuild:
-  Bug #206759 fully fixed now.
-
-  20 Feb 2008; Denis Dupeyron <calchan@gentoo.org> kino-1.2.0.ebuild:
-  Partially fixed bug #206759. Stable kino will have to wait.
+  15 Mar 2008; Dawid Węgliński <cla@gentoo.org> kino-1.2.0.ebuild:
+  Stable on x86 (bug #213488). Fix typo - s/dies/die/ at line 87
 
 *kino-1.2.0 (23 Dec 2007)
 
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index bf66d537e66a..904b2db47da3 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -2,7 +2,7 @@ DIST kino-1.1.1.tar.gz 10623154 RMD160 05aded40ff37989941390a16a17527550082fa5c
 DIST kino-1.2.0.tar.gz 10637296 RMD160 2cfd0d0c3d4a797e8f8986cdbcb444aeb4bde3a6 SHA1 1401af8b9b024dc491eb0e85c48729c06ba2566f SHA256 e952622f7d5c1aa433947dff72948eeacb1c9a502ba297735e5fa81263c50197
 DIST kino-1.3.0.tar.gz 11054513 RMD160 6197dc1843184e9de3c37fa262dfe244b617ac6c SHA1 272860f89888a5e475a8dd792c6d8df2f7128695 SHA256 fa6e337e1055dea716f0f1d1f933cbdd77e04f961ac4c9277f20c0245dcb74b5
 EBUILD kino-1.1.1.ebuild 2464 RMD160 5220031cf84dd80cf4d970ba56b875af67ee8600 SHA1 f1a168d83efd592afb2ec967c5c649392c872e53 SHA256 aa5c2251ebb2ada81a7e1718f7016873746ab90f48ec7db481e7bf20719b04ac
-EBUILD kino-1.2.0.ebuild 3325 RMD160 1ee433e31e748b12ac406000b138c62e5580e596 SHA1 4ff57a1b09d521197a65dbb928aaa0340801a9cb SHA256 b633c1e5b456637ae83457a60bf176b23856e6693f82ac7ff91ca650f68ef838
+EBUILD kino-1.2.0.ebuild 3343 RMD160 2d630b5ec8298952945a2caef3df71d446be2330 SHA1 dd90ac2557480ebee01ede3beebbb6b74e1768c8 SHA256 10d4780879274181f53422ddd3c1b0b18aac0a4a42788f3daca3b7d0dd2f0a86
 EBUILD kino-1.3.0.ebuild 3325 RMD160 978e727e937352a8041ac110f0dd29c0b5604ba6 SHA1 fea5c8ecc25b9de25a0ba6d8d42a97e8654818c4 SHA256 63506f756a3def943de543421f98445663101f8fe61321f4f2bf4d5f6b55e331
-MISC ChangeLog 12527 RMD160 2950fa0b0257b0e5b7f626df8b1beb0e99fdc2df SHA1 a92b7dac6fbc15fab1eefe904ebffda87408d760 SHA256 3b7eb8fb8714f7a09ac43d6927abbfef97d99e18dfa259b1d4e176bce3c8c005
+MISC ChangeLog 12295 RMD160 383068772dd00a07b51617f3cfcc565173311fed SHA1 e6170b514ce1f48bf4bdafeea599155e6a441e7d SHA256 f18c5c8ce5644542c63722e318b548c19f66e69d293e32729f8258b1216d87f6
 MISC metadata.xml 260 RMD160 1c124fa0eacf34aa86bc9ebf04f32d32812207a7 SHA1 a7d442997f76dfdbeef7db2082ca36c2138ec02f SHA256 d6c6a294dd9551acddce431ae1742d42039163e4dd8230425a9b7720bcf187b1
diff --git a/media-video/kino/kino-1.2.0.ebuild b/media-video/kino/kino-1.2.0.ebuild
index 27a2276b4e26..d3692bd5560e 100644
--- a/media-video/kino/kino-1.2.0.ebuild
+++ b/media-video/kino/kino-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.2.0.ebuild,v 1.2 2008/02/20 13:18:00 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.2.0.ebuild,v 1.3 2008/03/15 14:02:47 cla Exp $
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa dvdr gpac lame gstreamer quicktime sox vorbis"
 
 # This ebuild would benefit a lot of USE dependencies but that has to wait for
@@ -32,7 +32,7 @@ DEPEND=">=x11-libs/gtk+-2.6.0
 	>=sys-libs/libavc1394-0.4.1
 	>=media-libs/libdv-0.103
 	media-libs/libsamplerate
-	media-libs/libiec61883
+	!sparc? ( media-libs/libiec61883 )
 	alsa? ( >=media-libs/alsa-lib-1.0.9 )
 	>=media-video/ffmpeg-0.4.9_p20061016
 	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}
 	media-sound/rawrec
 	dvdr? ( media-video/dvdauthor
 		app-cdr/dvd+rw-tools )
-	gpac? ( media-video/gpac )
+	gpac? ( !sparc? ( media-video/gpac ) )
 	lame? ( media-sound/lame )
 	gstreamer? ( media-libs/gst-plugins-base )
 	sox? ( media-sound/sox )
@@ -84,7 +84,7 @@ src/message.cc\
 src/page_bttv.cc' po/POTFILES.in || die "sed failed"
 
 	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
-		src/filehandler.h || dies "sed failed"
+		src/filehandler.h || die "sed failed"
 }
 
 src_compile() {