Fix ffmpeg dep. to >=media-video/ffmpeg-0.4.9_p20080326 wrt #235838.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27.7 i686

4 files changed, 8 insertions, 118 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 39778d960b4c..10a38cfa38fc 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +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.108 2008/08/16 17:42:41 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.109 2008/12/12 11:31:50 ssuominen Exp $
+
+  12 Dec 2008; <ssuominen@gentoo.org> kino-1.3.1.ebuild:
+  Fix ffmpeg dep. to >=media-video/ffmpeg-0.4.9_p20080326 wrt #235838.
 
 *kino-1.3.1 (16 Aug 2008)
 
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index ba87b42a9857..d0534e91c51a 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,8 +1,6 @@
 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
 DIST kino-1.3.1.tar.gz 11064057 RMD160 c4cba3645b731f5306d9aac7ffff7263be19822d SHA1 187dcb19e66b2642c7ce3bba2ad87a3aa4a6caab SHA256 177270f34130991f72e6b684661ccf636b1e32e7139526eb1bf7299d8e1886a0
 EBUILD kino-1.2.0.ebuild 3481 RMD160 63f92111eb2c777a54208c894cfb8925a23fde79 SHA1 63bcced49b0168f048d80495a1066d08c6de1fc1 SHA256 a31d88128cfaf62a02da3829115e3be048b70f8037fb8bb337cd3607640df68a
-EBUILD kino-1.3.0.ebuild 3574 RMD160 bb4847f56397b261285275e5953d27f948fb9853 SHA1 e273641bcc2a371e32b4714930a217f13a938f6b SHA256 339dcd5908ddc97a8ddffb248bd0767f5c22c0ec6acfa125496fdc1cf8e7e517
-EBUILD kino-1.3.1.ebuild 3554 RMD160 c04b0e82d9046d9506ee2ee307bd75d347ff92f7 SHA1 d01d77ad1626b32073197cf1ae203ab964554429 SHA256 dd7bbc3bc710cc5ac9d8574a91608cfda67f6a50515cd6a5201f3268161708f1
-MISC ChangeLog 13355 RMD160 dddefb103ff0469c8f479d27b168ddb6f83a577f SHA1 3cd324a9f788cbc1e9a887c4832848ee79dd2b08 SHA256 64530e2d53f43496eaa3975fe4ed60dd59e18caed7b35937f10bee8171b7de53
+EBUILD kino-1.3.1.ebuild 3556 RMD160 1255884bb774ecb9eb9e715f69f132a47ad34120 SHA1 41313ee3cab24ea21dfb05b06684c8ea12a23b05 SHA256 00adee448efecc47212c44c2773604fc9701849ade25fe1e851aa8e38e5f5454
+MISC ChangeLog 13486 RMD160 2df9c0a70313914dfe28ccb90d2f9112e20e1e8d SHA1 821c10b888005cf74b7c1f4b14cf184d9aa5898b SHA256 e1d1d1928490d1ca3194d31478549a1d1f649cd1f3368864261d10c270c5772b
 MISC metadata.xml 357 RMD160 dd1c7bc14c6911c1d29578d5b6046afbb5c07465 SHA1 b25dcc68c187c3712dc29bcf8d423635ffc24beb SHA256 52f4fba0d026c7f3bb1247fdec2fb26a581206fd44c764234e41609aafb460eb
diff --git a/media-video/kino/kino-1.3.0.ebuild b/media-video/kino/kino-1.3.0.ebuild
deleted file mode 100644
index aea5b93934ed..000000000000
--- a/media-video/kino/kino-1.3.0.ebuild
+++ /dev/null
@@ -1,111 +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/kino/kino-1.3.0.ebuild,v 1.4 2008/04/22 13:40:49 calchan Exp $
-
-DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
-HOMEPAGE="http://www.kinodv.org/"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-# EAPI 2. The usual fix is to issue built_with_use checks but in that particu-
-# lar case it would make the ebuild rather complicated to write and maintain
-# (certain features can be enabled in various different ways). Also it would
-# also force the emerge process to stop a bit too often for users not to comp-
-# lain. Thus, if you need features like theora, x264, xvid and maybe others,
-# make sure you activate the required support where it should be (ffmpeg, mostly).
-
-# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
-# dropped because kino may run with it but won't build anymore.
-
-DEPEND=">=x11-libs/gtk+-2.6.0
-	>=gnome-base/libglade-2.5.0
-	>=dev-libs/glib-2
-	x11-libs/libXv
-	dev-libs/libxml2
-	media-libs/audiofile
-	>=sys-libs/libraw1394-1.0.0
-	>=sys-libs/libavc1394-0.4.1
-	>=media-libs/libdv-0.103
-	media-libs/libsamplerate
-	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 )"
-RDEPEND="${DEPEND}
-	media-video/mjpegtools
-	media-sound/rawrec
-	dvdr? ( media-video/dvdauthor
-		app-cdr/dvd+rw-tools )
-	gpac? ( media-video/gpac )
-	lame? ( media-sound/lame )
-	gstreamer? ( media-libs/gst-plugins-base )
-	sox? ( media-sound/sox )
-	vorbis? ( media-sound/vorbis-tools )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix to link with --as-needed
-	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"
-	fi
-
-	# Fix bug #169590
-	sed -i \
-		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
-		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
-	\$(LIBQUICKTIME_LIBS) \\' \
-		src/Makefile.in || die "sed failed"
-
-	# Fix bug #172687
-	sed -i \
-		-e 's/^install-exec-local:/install-exec-local: install-binPROGRAMS/' \
-		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"
-
-	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
-		src/filehandler.h || die "sed failed"
-
-	# Fix compilation with gcc-4.3, see bug #215160
-	sed -i -e '/C++ includes/ a\
-#include <algorithm>' src/playlist.cc || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debug \
-		--disable-local-ffmpeg \
-		$(use_enable quicktime) \
-		$(use_with sparc dv1394) \
-		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale" \
-		|| die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	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
-}
diff --git a/media-video/kino/kino-1.3.1.ebuild b/media-video/kino/kino-1.3.1.ebuild
index 75112d409e64..f8443516cca0 100644
--- a/media-video/kino/kino-1.3.1.ebuild
+++ b/media-video/kino/kino-1.3.1.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.3.1.ebuild,v 1.1 2008/08/16 17:42:41 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.1.ebuild,v 1.2 2008/12/12 11:31:50 ssuominen Exp $
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -34,7 +34,7 @@ DEPEND=">=x11-libs/gtk+-2.6.0
 	media-libs/libsamplerate
 	media-libs/libiec61883
 	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	>=media-video/ffmpeg-0.4.9_p20061016
+	>=media-video/ffmpeg-0.4.9_p20080326
 	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
 RDEPEND="${DEPEND}
 	media-video/mjpegtools