15 files changed, 30 insertions, 259 deletions
diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index dc5038cb4012..efc80ce77211 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/kino
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.31 2005/05/18 00:49:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.32 2005/05/20 14:53:55 luckyduck Exp $
+
+*kino-0.7.6 (20 May 2005)
+
+  20 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/kino-0.7.1-64bit-clean.patch, -files/kino_gcc33_fix,
+  -files/kino_gcc34_fix, -kino-0.6.4.ebuild, -kino-0.7.1.ebuild,
+  -kino-0.7.4.ebuild, -kino-0.7.5.ebuild, kino-0.7.5-r1.ebuild,
+  +kino-0.7.6.ebuild:
+  new upstream version, some cleanup. 0.7.5-r1 stable on x86
 
   18 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> kino-0.7.5-r1.ebuild:
   Stable on sparc wrt #87464
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 9a3937efa17c..1971eda8a3d3 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fec39e38854624a45025b76620d41ca4 ChangeLog 3797
-MD5 999c095f11407c2592cbf831365236a1 kino-0.6.4.ebuild 1177
-MD5 c13035952df55a94d77e93a65a53defa kino-0.7.1.ebuild 1154
-MD5 0c5acf3afcfd6b0a881d3dd85a37f20b kino-0.7.4.ebuild 1044
-MD5 0c8c8381824cd91949e309f4c78ad6eb kino-0.7.5.ebuild 1043
+MD5 94d6f5306cfe3f5894b93240d6bd4767 kino-0.7.5-r1.ebuild 1310
+MD5 5b402c7aa84b16c287c8fb84b8ece1a0 ChangeLog 4152
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 319f27d02aae08a6b49b7c826f2504a2 kino-0.7.5-r1.ebuild 1308
-MD5 6f060bac87a882af3e8b288aa9992cad files/digest-kino-0.6.4 62
-MD5 ce19651a229f27c1ca127df75dab851a files/digest-kino-0.7.1 62
-MD5 f0b7458b9be709096013e4190d1486a7 files/digest-kino-0.7.4 62
-MD5 30181ed68c1351c7b6eea135e5ee7ad3 files/digest-kino-0.7.5 63
-MD5 0eb9cc74af12c7b8fb6f597dfca76df4 files/kino-0.7.1-64bit-clean.patch 720
-MD5 b2f31fc5dee7c9c3bb0896e17d940d75 files/kino_gcc33_fix 1384
-MD5 05974c1dff66f3b5c33eb7fc34393373 files/kino_gcc34_fix 428
+MD5 82f4520bdd62a2d9847a926ff8ef95f2 kino-0.7.6.ebuild 1190
 MD5 30181ed68c1351c7b6eea135e5ee7ad3 files/digest-kino-0.7.5-r1 63
+MD5 2c7645b5cf0d9f0f221fb87ca44b46fe files/digest-kino-0.7.6 63
 MD5 3de7378299c687b8b3b8dec40d4f553c files/kino-0.7.5-ppc.diff 8058
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCipEzKRy60XGEcJIRAiBLAJ9V5fxNxCPHxCovpN29djfQrAwrvQCgg85a
-kPDZSD4hUmy7jNKo3b3fY3k=
-=/1sQ
+iD8DBQFCjfos06ebR+OMO78RAs1TAJ9uG1TirDB/umn+qApVmwEXZby4xQCfUR/C
+LIxj1y6c4VHTd3G6uFGs/AM=
+=U/N6
 -----END PGP SIGNATURE-----
diff --git a/media-video/kino/files/digest-kino-0.6.4 b/media-video/kino/files/digest-kino-0.6.4
deleted file mode 100644
index 9cc5b40d7eab..000000000000
--- a/media-video/kino/files/digest-kino-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7e504c5f44a16bee106428690c860f2 kino-0.6.4.tar.gz 768611
diff --git a/media-video/kino/files/digest-kino-0.7.1 b/media-video/kino/files/digest-kino-0.7.1
deleted file mode 100644
index b80b8218695e..000000000000
--- a/media-video/kino/files/digest-kino-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0980dd4ccf2d2282578f6bcb51d768e8 kino-0.7.1.tar.gz 769247
diff --git a/media-video/kino/files/digest-kino-0.7.4 b/media-video/kino/files/digest-kino-0.7.4
deleted file mode 100644
index c855524f3b66..000000000000
--- a/media-video/kino/files/digest-kino-0.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bea618e226812446960c94f2fbf8a331 kino-0.7.4.tar.gz 930081
diff --git a/media-video/kino/files/digest-kino-0.7.5 b/media-video/kino/files/digest-kino-0.7.5
deleted file mode 100644
index 485c86625d6a..000000000000
--- a/media-video/kino/files/digest-kino-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 592f90be63feb7e63940cedd68edcf79 kino-0.7.5.tar.gz 1227042
diff --git a/media-video/kino/files/digest-kino-0.7.6 b/media-video/kino/files/digest-kino-0.7.6
new file mode 100644
index 000000000000..54a94f0bf1a5
--- /dev/null
+++ b/media-video/kino/files/digest-kino-0.7.6
@@ -0,0 +1 @@
+MD5 c1fa929096f5a754455f5a3dd33dd203 kino-0.7.6.tar.gz 1089097
diff --git a/media-video/kino/files/kino-0.7.1-64bit-clean.patch b/media-video/kino/files/kino-0.7.1-64bit-clean.patch
deleted file mode 100644
index fea7ade86fdd..000000000000
--- a/media-video/kino/files/kino-0.7.1-64bit-clean.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/image_filters.cc.orig	2004-05-30 21:43:30.933654616 +0200
-+++ src/image_filters.cc	2004-05-30 21:42:57.000813192 +0200
-@@ -558,6 +558,7 @@
- 	// Store these for future reference
- 	this->menu = menu;
- 	this->container = container;
-+	this->selected_filter = 0;
- 
- 	// Add the filters to the menu
- 	GtkMenu *menu_new = GTK_MENU( gtk_menu_new( ) );
---- src/image_transitions.cc.orig	2004-05-30 21:52:45.700317264 +0200
-+++ src/image_transitions.cc	2004-05-30 21:53:14.978866248 +0200
-@@ -471,6 +471,7 @@
- 	// Store these for future reference
- 	this->menu = menu;
- 	this->container = container;
-+	this->selected_transition = 0;
- 
- 	// Add the transitions to the menu
- 	GtkMenu *menu_new = GTK_MENU( gtk_menu_new( ) );
diff --git a/media-video/kino/files/kino_gcc33_fix b/media-video/kino/files/kino_gcc33_fix
deleted file mode 100644
index 71b7d41baaed..000000000000
--- a/media-video/kino/files/kino_gcc33_fix
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur kino-0.6.4-orig/src/avi.cc kino-0.6.4/src/avi.cc
---- kino-0.6.4-orig/src/avi.cc	2003-02-21 20:17:58.000000000 +0200
-+++ kino-0.6.4/src/avi.cc	2003-08-17 21:50:07.000000000 +0300
-@@ -112,6 +112,7 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <assert.h>
- 
- // local includes
- 
-diff -Naur kino-0.6.4-orig/src/filehandler.cc kino-0.6.4/src/filehandler.cc
---- kino-0.6.4-orig/src/filehandler.cc	2003-02-20 23:17:47.000000000 +0200
-+++ kino-0.6.4/src/filehandler.cc	2003-08-17 21:48:52.000000000 +0300
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <assert.h>
- 
- #include "filehandler.h"
- #include "error.h"
-diff -Naur kino-0.6.4-orig/src/page_export_1394.cc kino-0.6.4/src/page_export_1394.cc
---- kino-0.6.4-orig/src/page_export_1394.cc	2003-02-18 23:03:14.000000000 +0200
-+++ kino-0.6.4/src/page_export_1394.cc	2003-08-17 21:52:02.000000000 +0300
-@@ -28,6 +28,7 @@
- #include <gnome.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <assert.h>
- 
- #include "page_export_1394.h"
- #include "preferences.h"
-diff -Naur kino-0.6.4-orig/src/riff.cc kino-0.6.4/src/riff.cc
---- kino-0.6.4-orig/src/riff.cc	2003-01-28 17:28:47.000000000 +0200
-+++ kino-0.6.4/src/riff.cc	2003-08-17 21:49:21.000000000 +0300
-@@ -74,6 +74,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
-+#include <assert.h>
- 
- // local includes
- 
diff --git a/media-video/kino/files/kino_gcc34_fix b/media-video/kino/files/kino_gcc34_fix
deleted file mode 100644
index 62f3f3e1bb18..000000000000
--- a/media-video/kino/files/kino_gcc34_fix
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kino-0.7.1-orig/src/ieee1394io.h kino-0.7.1/src/ieee1394io.h
---- kino-0.7.1-orig/src/ieee1394io.h	2004-05-30 09:30:00.195549632 +0100
-+++ kino-0.7.1/src/ieee1394io.h	2004-05-30 09:30:20.897402472 +0100
-@@ -33,7 +33,7 @@
- 
- class IEEE1394Reader
- {
--private:
-+protected:
- 	/// the number of frames that had to be thrown away because
- 	/// our inFrames queue did not contain available frames
- 	static int droppedFrames;
diff --git a/media-video/kino/kino-0.6.4.ebuild b/media-video/kino/kino-0.6.4.ebuild
deleted file mode 100644
index a25654abdac9..000000000000
--- a/media-video/kino/kino-0.6.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.6.4.ebuild,v 1.9 2005/01/16 12:17:23 malc Exp $
-
-inherit eutils
-
-DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
-HOMEPAGE="http://kino.schirmacher.de/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE="quicktime"
-
-DEPEND="x11-libs/gtk+
-	dev-libs/glib
-	gnome-base/gnome-libs
-	media-libs/imlib
-	dev-libs/libxml2
-	media-libs/audiofile
-	media-sound/esound
-	sys-libs/libraw1394
-	sys-libs/libavc1394
-	media-libs/libdv
-	quicktime? ( virtual/quicktime )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/kino_gcc33_fix
-}
-
-src_compile() {
-	local myconf
-	use quicktime && myconf="--with-quicktime"
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--disable-dependency-tracking \
-		--disable-debug || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo "To use kino, it is recommed that you also install"
-	echo "media-video/mjpegtools"
-}
diff --git a/media-video/kino/kino-0.7.1.ebuild b/media-video/kino/kino-0.7.1.ebuild
deleted file mode 100644
index ec574b6856a4..000000000000
--- a/media-video/kino/kino-0.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.1.ebuild,v 1.8 2005/01/16 12:17:23 malc Exp $
-
-inherit eutils
-
-DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
-HOMEPAGE="http://kino.schirmacher.de/"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE="quicktime"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc amd64 ~ppc"
-
-DEPEND="x11-libs/gtk+
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/glib-2
-	media-libs/imlib
-	dev-libs/libxml2
-	media-libs/audiofile
-	media-sound/esound
-	sys-libs/libraw1394
-	sys-libs/libavc1394
-	>=media-libs/libdv-0.102
-	media-libs/libsamplerate
-	quicktime? ( virtual/quicktime )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/kino_gcc34_fix
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debug \
-		`use_with quicktime` || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo "To use kino, it is recommed that you also install"
-	echo "media-video/mjpegtools"
-}
diff --git a/media-video/kino/kino-0.7.5-r1.ebuild b/media-video/kino/kino-0.7.5-r1.ebuild
index f4039df0830e..f07bd14ee84c 100644
--- a/media-video/kino/kino-0.7.5-r1.ebuild
+++ b/media-video/kino/kino-0.7.5-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.5-r1.ebuild,v 1.5 2005/05/18 00:49:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.5-r1.ebuild,v 1.6 2005/05/20 14:53:55 luckyduck Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
 SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-RESTRICT="nomirror"
+RESTRICT="primaryuri"
 IUSE="quicktime dvdr ffmpeg"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 sparc amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ~ppc"
 
 DEPEND="x11-libs/gtk+
 	>=gnome-base/libglade-2
diff --git a/media-video/kino/kino-0.7.5.ebuild b/media-video/kino/kino-0.7.5.ebuild
deleted file mode 100644
index 5244afc3e0bc..000000000000
--- a/media-video/kino/kino-0.7.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.5.ebuild,v 1.2 2005/01/16 12:17:23 malc Exp $
-
-inherit eutils
-
-DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
-HOMEPAGE="http://kino.schirmacher.de/"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE="quicktime dvdr"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc amd64 ~ppc"
-
-DEPEND="x11-libs/gtk+
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	media-libs/audiofile
-	media-sound/esound
-	sys-libs/libraw1394
-	sys-libs/libavc1394
-	>=media-libs/libdv-0.102
-	media-libs/libsamplerate
-	media-video/mjpegtools
-	media-sound/rawrec
-	quicktime? ( virtual/quicktime )
-	dvdr? ( media-video/dvdauthor )"
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debug \
-		`use_with quicktime` || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-video/kino/kino-0.7.4.ebuild b/media-video/kino/kino-0.7.6.ebuild
index f8d2611f0985..5a01d0bb8d7c 100644
--- a/media-video/kino/kino-0.7.4.ebuild
+++ b/media-video/kino/kino-0.7.6.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.4.ebuild,v 1.3 2005/01/16 12:17:23 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.6.ebuild,v 1.1 2005/05/20 14:53:55 luckyduck Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
 SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 RESTRICT="nomirror"
-IUSE="quicktime dvdr"
+IUSE="quicktime dvdr ffmpeg"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
@@ -27,6 +27,7 @@ DEPEND="x11-libs/gtk+
 	media-libs/libsamplerate
 	media-video/mjpegtools
 	media-sound/rawrec
+	ffmpeg? ( media-video/ffmpeg )
 	quicktime? ( virtual/quicktime )
 	dvdr? ( media-video/dvdauthor )"
 
@@ -34,11 +35,11 @@ src_compile() {
 	econf \
 		--disable-dependency-tracking \
 		--disable-debug \
-		`use_with quicktime` || die
-
-	emake || die
+		$(use_with quicktime) \
+		$(use_with ffmpeg avcodec) || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 }