Fixed test failure discovered in bug #193947, thanks to Markus Meier for reporting it and to Tobias Scherbaum for the fix. Various cleanups, some cosmetic, some not.

Package-Manager: portage-2.1.3.12

3 files changed, 36 insertions, 16 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 5d05a4222a4d..4bcc27233673 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kino
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.82 2007/08/30 08:08:57 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.83 2007/10/07 18:59:38 calchan Exp $
+
+  07 Oct 2007; Denis Dupeyron <calchan@gentoo.org> kino-1.1.1.ebuild:
+  Fixed test failure discovered in bug #193947, thanks to Markus Meier for
+  reporting it and to Tobias Scherbaum for the fix. Various cleanups, some
+  cosmetic, some not.
 
 *kino-1.1.1 (30 Aug 2007)
 
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 3fff2c6c68b7..12b1bf63c1ff 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -9,14 +9,14 @@ EBUILD kino-1.1.0.ebuild 2131 RMD160 c5fda7bc955ef3b48b0425b30a40255021f3192b SH
 MD5 353917a07dd04e38e74cef6af3968f98 kino-1.1.0.ebuild 2131
 RMD160 c5fda7bc955ef3b48b0425b30a40255021f3192b kino-1.1.0.ebuild 2131
 SHA256 8c5f4ea4499c0799b9b46531858b4f25e3610ecb0a2c0f2ae45d3390adafc68a kino-1.1.0.ebuild 2131
-EBUILD kino-1.1.1.ebuild 2131 RMD160 3f62743a696a7f9e59d3cb1b52afd2afa741c09f SHA1 10268c6e5e439a38ddb773f72ee4eb2cb9f9f02f SHA256 c7350074f98d40c4808789b534b0c6d64be9b2a51a2228708ca0949239c4e6d4
-MD5 a655532d0ec30954cc878fd54a5f766d kino-1.1.1.ebuild 2131
-RMD160 3f62743a696a7f9e59d3cb1b52afd2afa741c09f kino-1.1.1.ebuild 2131
-SHA256 c7350074f98d40c4808789b534b0c6d64be9b2a51a2228708ca0949239c4e6d4 kino-1.1.1.ebuild 2131
-MISC ChangeLog 11040 RMD160 1efb204679bd926bafd07bec522e3706ebeae44a SHA1 ad3d07a792168c26c788509bf70cce2f5e4891ce SHA256 4f4f63f04de6ce171386b8fbcb39db07530adfbf00095989e0fa227fdaf9a4da
-MD5 6e76fd8ef3a2111587516cf4d03b65de ChangeLog 11040
-RMD160 1efb204679bd926bafd07bec522e3706ebeae44a ChangeLog 11040
-SHA256 4f4f63f04de6ce171386b8fbcb39db07530adfbf00095989e0fa227fdaf9a4da ChangeLog 11040
+EBUILD kino-1.1.1.ebuild 2492 RMD160 cab060867b2dac89a412c9461319ee2a50ee5d8a SHA1 04328761a927d793acb5994b5cfb97c61d9a7d34 SHA256 8a5dc21843f30ce95ac8b0f5c0a206dcd704b6b93bbb78af5827dfecfe4fca03
+MD5 bc4af4fad25ca3d2ff4226c34d928485 kino-1.1.1.ebuild 2492
+RMD160 cab060867b2dac89a412c9461319ee2a50ee5d8a kino-1.1.1.ebuild 2492
+SHA256 8a5dc21843f30ce95ac8b0f5c0a206dcd704b6b93bbb78af5827dfecfe4fca03 kino-1.1.1.ebuild 2492
+MISC ChangeLog 11283 RMD160 3b40f238bd76fe1a7a89b1a31c7b6f5a82fe958e SHA1 f29ed19021b390be480018f6fbbcfd0d805575d2 SHA256 47f3ffe63e96ad50e8840b3e72db42d887d48208d08cbeb147f7722bdb846488
+MD5 ca0ae8da49700863a227fe73dc5094c1 ChangeLog 11283
+RMD160 3b40f238bd76fe1a7a89b1a31c7b6f5a82fe958e ChangeLog 11283
+SHA256 47f3ffe63e96ad50e8840b3e72db42d887d48208d08cbeb147f7722bdb846488 ChangeLog 11283
 MISC metadata.xml 260 RMD160 1c124fa0eacf34aa86bc9ebf04f32d32812207a7 SHA1 a7d442997f76dfdbeef7db2082ca36c2138ec02f SHA256 d6c6a294dd9551acddce431ae1742d42039163e4dd8230425a9b7720bcf187b1
 MD5 3741bf5ee14d8229dff71411bc028275 metadata.xml 260
 RMD160 1c124fa0eacf34aa86bc9ebf04f32d32812207a7 metadata.xml 260
diff --git a/media-video/kino/kino-1.1.1.ebuild b/media-video/kino/kino-1.1.1.ebuild
index 43759ce02767..5f8ad8c35fdf 100644
--- a/media-video/kino/kino-1.1.1.ebuild
+++ b/media-video/kino/kino-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.1.1.ebuild,v 1.1 2007/08/30 08:08:57 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.1.1.ebuild,v 1.2 2007/10/07 18:59:38 calchan Exp $
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -36,24 +36,39 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fix to link with --as-needed
-	sed -i -e 's:LIBS="-lXext:LIBS="-lXext -lX11:' configure || die "sed failed!"
+	sed -i -e 's:LIBS="-lXext:LIBS="-lXext -lX11:' configure || die "sed failed"
+
 	# Deactivating automagic alsa configuration, bug #134725
 	if ! use alsa ; then
-		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die "sed failed!"
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die "sed failed"
 	fi
+
 	# Fix bug #169590
 	sed -i \
 		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
 		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
 	\$(LIBQUICKTIME_LIBS) \\' \
-		src/Makefile.in
+		src/Makefile.in || die "sed failed"
+
 	# Fix bug #172687
 	sed -i \
 		-e 's/^install-exec-local:/install-exec-local: install-binPROGRAMS/' \
-		src/Makefile.in
+		src/Makefile.in || die "sed failed"
+
+	# Fix test failure discovered in bug #193947
+	sed -i -e '$a\
+\
+ffmpeg/libavcodec/ps2/idct_mmi.c\
+ffmpeg/libavcodec/sparc/dsputil_vis.c\
+ffmpeg/libavcodec/sparc/vis.h\
+ffmpeg/libavutil/bswap.h\
+ffmpeg/libswscale/yuv2rgb_template.c\
+src/export.h\
+src/message.cc\
+src/page_bttv.cc' po/POTFILES.in || die "sed failed"
 }
 
 src_compile() {
@@ -68,7 +83,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Installation failed"
+	emake DESTDIR="${D}" install || die "Installation failed"
 	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
 	# Fix bug #177378
 	fowners root:root -R /usr/share/kino/help