Cleanup.

Package-Manager: portage-2.1.2-r13

10 files changed, 17 insertions, 490 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index a86d46f47aba..f2c252722562 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.61 2007/02/18 15:58:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.62 2007/03/04 19:43:51 calchan Exp $
+
+  04 Mar 2007; <calchan@gentoo.org> -files/kino-0.7.5-ppc.diff,
+  -files/kino-0.8.1-alsa.patch, -files/kino-0.8.1-as-needed.patch,
+  kino-0.7.6.ebuild, -kino-0.8.1.ebuild, -kino-0.9.2.ebuild:
+  Cleanup.
 
   18 Feb 2007; Simon Stelling <blubb@gentoo.org> kino-0.9.5.ebuild:
   stable on amd64; bug 165836
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index da5fbed99f95..37af8bbf2e1e 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,43 +1,21 @@
-AUX kino-0.7.5-ppc.diff 8058 RMD160 78cd28a3c2c44e465b5d2dc98b0a6681d04e1729 SHA1 7cf2b4b0f8d685f33375d4ccd9f5dd866921a98d SHA256 dcab7aab30d2719e0e76d438e41f2e65edda9b26353ea1a142d68be0fe9e6e22
-MD5 3de7378299c687b8b3b8dec40d4f553c files/kino-0.7.5-ppc.diff 8058
-RMD160 78cd28a3c2c44e465b5d2dc98b0a6681d04e1729 files/kino-0.7.5-ppc.diff 8058
-SHA256 dcab7aab30d2719e0e76d438e41f2e65edda9b26353ea1a142d68be0fe9e6e22 files/kino-0.7.5-ppc.diff 8058
 AUX kino-0.7.6-configure.diff 913 RMD160 469121faba0d7aa6939171b9aa1a319dd91365b6 SHA1 c70c274949a35bb0a636374e51fbb7979302d20f SHA256 0bc5818f649d4fa33a9a35be727bb38ec72de723385033781214c2ff5d5d0383
 MD5 33d7b5aeacaf3400bbd60f827ca9515b files/kino-0.7.6-configure.diff 913
 RMD160 469121faba0d7aa6939171b9aa1a319dd91365b6 files/kino-0.7.6-configure.diff 913
 SHA256 0bc5818f649d4fa33a9a35be727bb38ec72de723385033781214c2ff5d5d0383 files/kino-0.7.6-configure.diff 913
-AUX kino-0.8.1-alsa.patch 1993 RMD160 fd63b384f8eece917e2af4f5475780ed970f54cc SHA1 f7f9cdc30d257ee2797672e0bea1ea6593de060b SHA256 9def2149fca2c0e289d4efc7d5caa4f09218ff15e51477103bd148aeb8dccb5d
-MD5 c03230ec7cd0743552270ebfe6657195 files/kino-0.8.1-alsa.patch 1993
-RMD160 fd63b384f8eece917e2af4f5475780ed970f54cc files/kino-0.8.1-alsa.patch 1993
-SHA256 9def2149fca2c0e289d4efc7d5caa4f09218ff15e51477103bd148aeb8dccb5d files/kino-0.8.1-alsa.patch 1993
-AUX kino-0.8.1-as-needed.patch 891 RMD160 2668a56bbea2e7341aaef4794c63bb23a0c28599 SHA1 e6ea4f8509098645ab010143285e9688ff36fd58 SHA256 fcc3fec25ab2b3f14bb8c05809442d6d816dbf31be624c263ba25ab5b912db6d
-MD5 2cd366b2db377bd08a4c90c17584714c files/kino-0.8.1-as-needed.patch 891
-RMD160 2668a56bbea2e7341aaef4794c63bb23a0c28599 files/kino-0.8.1-as-needed.patch 891
-SHA256 fcc3fec25ab2b3f14bb8c05809442d6d816dbf31be624c263ba25ab5b912db6d files/kino-0.8.1-as-needed.patch 891
 DIST kino-0.7.6.tar.gz 1089097 RMD160 6f527cc100877860765a9a9a1287c1998699bbb8 SHA1 0d1aad6874f26dfc22ea4ed467c2f0edebc7ba2a SHA256 d0a2f33a781233d0a5014eb4301c8aa9bb46893c27ef043e6bf19f7187857be1
-DIST kino-0.8.1.tar.gz 1575423 RMD160 5f28e12b133887922526a0b1bb0e6659c7e793cf SHA1 32f57dfe9a7cfafc3645776e25c76e744e0ad258 SHA256 7ba26632e15b936eb21b4dc67716fccf2ca1b878bca558a41ea7a614d14d33e1
-DIST kino-0.9.2.tar.gz 1580036 RMD160 5c16318f061d83bab8051da3d23917da7a8c1ca2 SHA1 c54a2603b2f13ba9d9eb28e2eef47e092b73ee30 SHA256 2df8937eff8ac2848bf5d5d533bb2b322fbd17d455b5a7d56794026008074ce1
 DIST kino-0.9.5.tar.gz 2449937 RMD160 b616347a298c188cb3c3ec1373d5da2fb7a3aeb3 SHA1 251e7b1a501994f04d6d4b812d63b48abd8de4f1 SHA256 0b0a9e879ae77b795e962c5a0272c8e387ce19e4a832d27b8d5a836ef9efcebe
-EBUILD kino-0.7.6.ebuild 1347 RMD160 7825913d43a4ecf0ef3e879879ab8edaa89274f5 SHA1 a8f98e9232d0397463b39b451ff75fd3158c4c25 SHA256 a0e78f4a96e054dc378d59a7a59af94bd46f467c457bc0524688376a8c942532
-MD5 c2792c93926dd4e77427e9b3b8126835 kino-0.7.6.ebuild 1347
-RMD160 7825913d43a4ecf0ef3e879879ab8edaa89274f5 kino-0.7.6.ebuild 1347
-SHA256 a0e78f4a96e054dc378d59a7a59af94bd46f467c457bc0524688376a8c942532 kino-0.7.6.ebuild 1347
-EBUILD kino-0.8.1.ebuild 1548 RMD160 e160af6be7ee780f898c160b341e7ac3c0fe76c5 SHA1 5ff6ad7587c904cdf7500d0563c38f20683d7ed6 SHA256 b066242c7797558ecc8ea8628709d581214403b57425a24022945b3dfea05feb
-MD5 4eada2ca13572ddaadb12a3819a43003 kino-0.8.1.ebuild 1548
-RMD160 e160af6be7ee780f898c160b341e7ac3c0fe76c5 kino-0.8.1.ebuild 1548
-SHA256 b066242c7797558ecc8ea8628709d581214403b57425a24022945b3dfea05feb kino-0.8.1.ebuild 1548
-EBUILD kino-0.9.2.ebuild 1747 RMD160 f25173484e94b8d0fae263353ed6f037ceab21ac SHA1 38828112c2f95aa2dc2dbfe80c54db37572c0375 SHA256 020bac21c41099704657e12dbff7fc75ac96293ceebf6d847bd17391e42b699c
-MD5 0e4d1956b1312b9b7f68a7ec713d4b68 kino-0.9.2.ebuild 1747
-RMD160 f25173484e94b8d0fae263353ed6f037ceab21ac kino-0.9.2.ebuild 1747
-SHA256 020bac21c41099704657e12dbff7fc75ac96293ceebf6d847bd17391e42b699c kino-0.9.2.ebuild 1747
+EBUILD kino-0.7.6.ebuild 1331 RMD160 d867376571ec3c7e07d58cf5486fd91454852eee SHA1 0ca6e4e7f979888c0d630e918342d057c55ed134 SHA256 7821c74c840c59f8e8f4d3d8edc7959fa79d7d7b99c98a5b808f9fbbc029b761
+MD5 eae41863593519ecb25743c77b8782d1 kino-0.7.6.ebuild 1331
+RMD160 d867376571ec3c7e07d58cf5486fd91454852eee kino-0.7.6.ebuild 1331
+SHA256 7821c74c840c59f8e8f4d3d8edc7959fa79d7d7b99c98a5b808f9fbbc029b761 kino-0.7.6.ebuild 1331
 EBUILD kino-0.9.5.ebuild 1723 RMD160 0ce6e95f261c8ce745f63e42248803b0a3d3670e SHA1 44f612c0cb57e6126e490824f673b513a1d59040 SHA256 0c79a0b2b9dd79cde4e8510dafb5ae1d2504aa3feb5720f70a6396609d538112
 MD5 8cab78ab400db6302e62ddc1a782e260 kino-0.9.5.ebuild 1723
 RMD160 0ce6e95f261c8ce745f63e42248803b0a3d3670e kino-0.9.5.ebuild 1723
 SHA256 0c79a0b2b9dd79cde4e8510dafb5ae1d2504aa3feb5720f70a6396609d538112 kino-0.9.5.ebuild 1723
-MISC ChangeLog 8422 RMD160 94be19ad98c4deed58b053b96edb7872e5d4c5e6 SHA1 2b28913e69194d34df2d98546a82317c360ca9dc SHA256 7477884ce3e7858e55869ea2ce7ac35bf63e75f7419ca8e2867e804e2dc13607
-MD5 e6a2ba86eeee55811ba4fb4144d8a483 ChangeLog 8422
-RMD160 94be19ad98c4deed58b053b96edb7872e5d4c5e6 ChangeLog 8422
-SHA256 7477884ce3e7858e55869ea2ce7ac35bf63e75f7419ca8e2867e804e2dc13607 ChangeLog 8422
+MISC ChangeLog 8628 RMD160 c05f4350e6e8e60f11fc6197748d775f2b20acae SHA1 fb44d94634f33fd1886a893b3e0afe7a0228b320 SHA256 b554c540586902794a8a2ea66e1ef29f4c66e462ab17900e474a9b66bee0b3c9
+MD5 7f3a0711b7a5d460828aae19a21c283b ChangeLog 8628
+RMD160 c05f4350e6e8e60f11fc6197748d775f2b20acae ChangeLog 8628
+SHA256 b554c540586902794a8a2ea66e1ef29f4c66e462ab17900e474a9b66bee0b3c9 ChangeLog 8628
 MISC metadata.xml 327 RMD160 617e7747f5cb20cf1ca590b1a888f1f9f283e0da SHA1 1645d3e168dbad229e2db9a8511ee568c2c27812 SHA256 46c50f00675aa7e8350bee197f6fce91419ee4dca4d12a970d5c09855318558f
 MD5 09bd2596b64cb4b2e5fe3cd0d6629059 metadata.xml 327
 RMD160 617e7747f5cb20cf1ca590b1a888f1f9f283e0da metadata.xml 327
@@ -45,12 +23,6 @@ SHA256 46c50f00675aa7e8350bee197f6fce91419ee4dca4d12a970d5c09855318558f metadata
 MD5 d359d3188901bb2af19dbf0d0638e742 files/digest-kino-0.7.6 235
 RMD160 68ff5a5a209de8353175fd85c14a52778c1127af files/digest-kino-0.7.6 235
 SHA256 f061d01f47dac7f09b70e369060278ef37a1e4beddfa1ae971083e28d371da9b files/digest-kino-0.7.6 235
-MD5 7925df540be098e3f6eb18865703dd71 files/digest-kino-0.8.1 235
-RMD160 c44a2bacc5ec3843c336fba7e1a6d703187306f5 files/digest-kino-0.8.1 235
-SHA256 05151df94d108dc3986f2af90f0c834f10aa590f21e155e92db2ee016824084f files/digest-kino-0.8.1 235
-MD5 f3888661b5764e1de58eacb563dce187 files/digest-kino-0.9.2 235
-RMD160 ac03d13aa7bfa828da3717ec09fe9ca18fbb3158 files/digest-kino-0.9.2 235
-SHA256 8bf782985d5a8bbc8b758c75969f2f36ca1c56b01bf1ea3638660c6d90b7a4f1 files/digest-kino-0.9.2 235
 MD5 1cdf2ce5e2e7bf39e4e5947f78bd1d67 files/digest-kino-0.9.5 235
 RMD160 a96d1ac11dfe5c3cfd0cc18055285266ed23e3f1 files/digest-kino-0.9.5 235
 SHA256 97a89f3b6cbff555ed6da941595505490ae735b3ffac40fe87cd470ec356808a files/digest-kino-0.9.5 235
diff --git a/media-video/kino/files/digest-kino-0.8.1 b/media-video/kino/files/digest-kino-0.8.1
deleted file mode 100644
index 5f0ed90ab6bc..000000000000
--- a/media-video/kino/files/digest-kino-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd4fca3b879aaa91754fd2e0234db345 kino-0.8.1.tar.gz 1575423
-RMD160 5f28e12b133887922526a0b1bb0e6659c7e793cf kino-0.8.1.tar.gz 1575423
-SHA256 7ba26632e15b936eb21b4dc67716fccf2ca1b878bca558a41ea7a614d14d33e1 kino-0.8.1.tar.gz 1575423
diff --git a/media-video/kino/files/digest-kino-0.9.2 b/media-video/kino/files/digest-kino-0.9.2
deleted file mode 100644
index 3fcdc96e8a37..000000000000
--- a/media-video/kino/files/digest-kino-0.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9c0d5a4d2fb04896c719e44df44a2622 kino-0.9.2.tar.gz 1580036
-RMD160 5c16318f061d83bab8051da3d23917da7a8c1ca2 kino-0.9.2.tar.gz 1580036
-SHA256 2df8937eff8ac2848bf5d5d533bb2b322fbd17d455b5a7d56794026008074ce1 kino-0.9.2.tar.gz 1580036
diff --git a/media-video/kino/files/kino-0.7.5-ppc.diff b/media-video/kino/files/kino-0.7.5-ppc.diff
deleted file mode 100644
index 4afc801d3ce3..000000000000
--- a/media-video/kino/files/kino-0.7.5-ppc.diff
+++ /dev/null
@@ -1,225 +0,0 @@
-diff -urN kino-0.7.5/src/frame.cc kino-0.7.5-ppc/src/frame.cc
---- kino-0.7.5/src/frame.cc	2004-09-28 04:35:52.000000000 +0200
-+++ kino-0.7.5-ppc/src/frame.cc	2005-03-14 12:56:46.000000000 +0100
-@@ -54,6 +54,7 @@
- // local includes
- #include "frame.h"
- #include "preferences.h"
-+#include "kino_common.h"
- 
- extern Preferences prefs;
- 
-@@ -1052,7 +1053,11 @@
- 
- 			for ( int x = 0; x < width; x += 2 )
- 			{
-+#if 0
- 				*reinterpret_cast<uint32_t*>( dest ) = Y[ 0 ] + ( Cb[ 0 ] << 8 ) + ( Y[ 1 ] << 16 ) + ( Cr[ 0 ] << 24 );
-+#else
-+				*reinterpret_cast<uint32_t*>( dest ) = Cr[ 0 ] + ( Y[ 0 ] << 8 ) + ( Cb[ 1 ] << 16 ) + ( Y[ 0 ] << 24 );
-+#endif
- 
- 				dest += 4;
- 				Y += 2;
-@@ -1071,8 +1076,13 @@
- 
- 			for ( int x = 0; x < width; x += 4 )
- 			{
-+#if 0
- 				*reinterpret_cast<uint32_t*>( dest ) = Y[ 0 ] + ( Cb[ 0 ] << 8 ) + ( Y[ 1 ] << 16 ) + ( Cr[ 0 ] << 24 );
- 				*reinterpret_cast<uint32_t*>( dest + 4 ) = Y[ 2 ] + ( Cb[ 0 ] << 8 ) + ( Y[ 3 ] << 16 ) + ( Cr[ 0 ] << 24 );
-+#else
-+				*reinterpret_cast<uint32_t*>( dest ) = Cr[ 0 ] + ( Y[ 0 ] << 8 ) + ( Cb[ 1 ] << 16 ) + ( Y[ 0 ] << 24 );
-+				*reinterpret_cast<uint32_t*>( dest + 4 ) = Cr[ 2 ] + ( Y[ 0 ] << 8 ) + ( Cb[ 3 ] << 16 ) + ( Y[ 0 ] << 24 );
-+#endif
- 
- 				dest += 8;
- 				Y += 4;
-@@ -1298,6 +1308,11 @@
- 	encoder->samples_this_frame = info.samples;
- #endif
- 
-+	/* Do byte swap on pcm - libdv BUG ??? */
-+	for ( int n = 0; n < info.samples ; ++n )
-+		for ( int i = 0; i < info.channels; i++ )
-+			channels[ i ][ n ] = bswap16(channels[ i ][ n ]);
-+
- 	int result = dv_encode_full_audio( encoder, channels, info.channels, info.frequency, data );
- 	dv_encoder_free( encoder );
- 	return ( result != -1 );
-diff -urN kino-0.7.5/src/kino_av_pipe.cc kino-0.7.5-ppc/src/kino_av_pipe.cc
---- kino-0.7.5/src/kino_av_pipe.cc	2004-02-09 05:40:47.000000000 +0100
-+++ kino-0.7.5-ppc/src/kino_av_pipe.cc	2005-03-14 12:59:46.000000000 +0100
-@@ -28,6 +28,19 @@
- 
- #include "kino_av_pipe.h"
- 
-+#define bswap32(x) \
-+({ \
-+	uint32_t __x = (x); \
-+	((uint32_t)( \
-+		(((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
-+		(((uint32_t)(__x) & (uint32_t)0x0000ff00UL) <<  8) | \
-+		(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >>  8) | \
-+		(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) )); \
-+})
-+
-+#include "kino_common.h"
-+
-+
- /*
-  * C Functions for generating a WAV output. Should be rewritten in C++ 
-  * rather than just wrapped...
-@@ -75,7 +88,7 @@
- {
- 	RIFFChunk chunk = ( RIFFChunk ) malloc( sizeof( RIFFChunkType ) );
- 	memcpy( chunk->riff, "RIFF", 4 );
--	chunk->length = 4 + sizeof( FORMATChunkType ) + sizeof( DATAChunkType );
-+	chunk->length = bswap32(4 + sizeof( FORMATChunkType ) + sizeof( DATAChunkType ));
- 	memcpy( chunk->type, "WAVE", 4 );
- 	return chunk;
- }
-@@ -85,13 +98,13 @@
- 	FORMATChunk format = ( FORMATChunk ) malloc( sizeof( FORMATChunkType ) );
- 	memset( format, 0, sizeof( FORMATChunkType ) );
- 	memcpy( format->format, "fmt ", 4 );
--	format->length = 0x10;
--	format->filler = 0x01;
--	format->channels = channels;
--	format->rate = rate;
--	format->bytespersecond = rate * channels * bytespersample;
--	format->bytespersample = bytespersample * channels;
--	format->bitspersample = bytespersample * 8;
-+	format->length = bswap32(0x10);
-+	format->filler = bswap16(0x01);
-+	format->channels = bswap16(channels);
-+	format->rate = bswap32(rate);
-+	format->bytespersecond = bswap32(rate * channels * bytespersample);
-+	format->bytespersample = bswap16(bytespersample * channels);
-+	format->bitspersample = bswap16(bytespersample * 8);
- 	return format;
- }
- 
-@@ -128,8 +141,11 @@
- 
- static int WAVStruct_WriteData( WAVStruct wav, void *data, int length )
- {
--	wav->riff->length += length;
--	wav->data->length += length;
-+	wav->riff->length += length; //bswap32(bswap32(wav->riff->length) + length);
-+	wav->data->length += length; //bswap32(bswap32(wav->data->length) + length);
-+	uint16_t *p = (uint16_t *) data;
-+	for (int i=0; i < length/2; i++, p++)
-+		*p = bswap16(*p);
- 	int written = fwrite( data, length, 1, wav->file );
- 	fflush( wav->file );
- 	return written == 1;
-@@ -137,6 +153,8 @@
- 
- static void WAVStruct_Close( WAVStruct wav )
- {
-+	wav->riff->length = bswap32(wav->riff->length);
-+	wav->data->length = bswap32(wav->riff->length);
- 	if ( !wav->isapipe )
- 	{
- 		rewind( wav->file );
-@@ -212,24 +230,24 @@
- 		// Bad... temporary code
- 		fread( wav.riff, sizeof( RIFFChunkType ), 1, wav.file );
- 		fread( wav.format, sizeof( FORMATChunkType ), 1, wav.file );
--		int remainder = wav.format->length - sizeof( FORMATChunkType );
-+		int remainder = bswap32(wav.format->length) - sizeof( FORMATChunkType );
- 		if ( remainder > 0 )
- 			fseek( wav.file, remainder, SEEK_CUR );
- 		fread( wav.data, sizeof( DATAChunkType ), 1, wav.file );
- 		if ( strncasecmp( wav.data->data, "JUNK", 4 ) == 0 )
- 		{
--			fseek( wav.file, wav.data->length, SEEK_CUR );
-+			fseek( wav.file, bswap32(wav.data->length), SEEK_CUR );
- 			fread( wav.data, sizeof( DATAChunkType ), 1, wav.file );
- 		}
- 
- 		if ( !strncmp( wav.riff->riff, "RIFF", 4 ) && !strncmp( wav.riff->type, "WAVE", 4 ) )
- 		{
- 			iswav = true;
--			channels = wav.format->channels;
--			frequency = wav.format->rate;
--			bytespersample = wav.format->bytespersample / channels;
-+			channels = bswap16(wav.format->channels);
-+			frequency = bswap32(wav.format->rate);
-+			bytespersample = bswap16(wav.format->bytespersample) / channels;
- 			start = ftell( wav.file );
--			length = wav.data->length;
-+			length = bswap32(wav.data->length);
- 		}
- 	}
- 
-diff -urN kino-0.7.5/src/kino_common.h kino-0.7.5-ppc/src/kino_common.h
---- kino-0.7.5/src/kino_common.h	2004-07-11 20:55:59.000000000 +0200
-+++ kino-0.7.5-ppc/src/kino_common.h	2005-03-14 12:56:46.000000000 +0100
-@@ -31,6 +31,13 @@
- #include "filehandler.h"
- #include "smiltime.h"
- 
-+#define bswap16(x) \
-+({ \
-+	uint16_t __x = (x); \
-+	((uint16_t)( \
-+		(((uint16_t)(__x) & (uint16_t)0x00ffU) << 8) | \
-+		(((uint16_t)(__x) & (uint16_t)0xff00U) >> 8) )); \
-+})
- 
- /** Component enumeration. This defines all the main window widgets that can be
-     activated and deactivated by a notebook page.
-diff -urN kino-0.7.5/src/page_export_pipe.cc kino-0.7.5-ppc/src/page_export_pipe.cc
---- kino-0.7.5/src/page_export_pipe.cc	2004-10-23 04:16:13.000000000 +0200
-+++ kino-0.7.5-ppc/src/page_export_pipe.cc	2005-03-14 13:04:14.000000000 +0100
-@@ -451,7 +451,23 @@
- 				// Get the frame
- 				playlist->GetFrame( i, frame );
- 	
--				// Resample
-+			AudioInfo fa_info;
-+			frame.GetAudioInfo(fa_info);
-+			if (fa_info.frequency != info.frequency)
-+			{
-+				// Resample needed
-+				resampler->Resample( frame );
-+				info.samples = resampler->size / info.channels / 2;
-+				int16_t *p = resampler->output;
-+				for ( int s = 0; s < info.samples; s++ )
-+					for ( int c = 0; c < info.channels; c++ )
-+						audio_buffers[ c ][ s ] = *p++;
-+
-+				frame.EncodeAudio( info, ( int16_t ** ) audio_buffers );
-+			}
-+			// Write the frame
-+			success = tool->output( frame );
-+/*				// Resample
- 				resampler->Resample( frame );
- 				info.samples = resampler->size / info.channels / 2;
- 				int16_t *p = resampler->output;
-@@ -461,7 +477,7 @@
- 				frame.EncodeAudio( info, ( int16_t ** ) audio_buffers );
- 	
- 				// Write the frame
--				success = tool->output( frame );
-+				success = tool->output( frame );*/
- 			}
- 			// Close the tool
- 			tool->close( );
-diff -urN kino-0.7.5/src/page_magick.cc kino-0.7.5-ppc/src/page_magick.cc
---- kino-0.7.5/src/page_magick.cc	2004-09-29 06:38:32.000000000 +0200
-+++ kino-0.7.5-ppc/src/page_magick.cc	2005-03-14 12:56:46.000000000 +0100
-@@ -1867,6 +1867,11 @@
- 			encoder->samples_this_frame = samples;
- #endif
- 
-+			/* Do byte swap on pcm - libdv BUG ??? */
-+			for ( int n = 0; n < samples ; ++n )
-+				for ( int i = 0; i < info->channels; i++ )
-+					audio_buffers[ i ][ n ] = bswap16(audio_buffers[ i ][ n ]);
-+
- 			dv_encode_full_audio( encoder, audio_buffers, info->channels, info->frequency, dv_buffer );
- 			dv_encode_metadata( dv_buffer, encoder->isPAL, encoder->is16x9, &datetime, frameNum );
- 			dv_encode_timecode( dv_buffer, encoder->isPAL, frameNum++ );
diff --git a/media-video/kino/files/kino-0.8.1-alsa.patch b/media-video/kino/files/kino-0.8.1-alsa.patch
deleted file mode 100644
index 5652ac6623a6..000000000000
--- a/media-video/kino/files/kino-0.8.1-alsa.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nadurp kino-0.8.1.orig/configure kino-0.8.1/configure
---- kino-0.8.1.orig/configure	2006-05-29 23:36:07.000000000 +0200
-+++ kino-0.8.1/configure	2006-05-29 23:39:58.000000000 +0200
-@@ -22702,68 +22702,9 @@ fi
- 
- # ALSA
- 
--pkg_failed=no
--echo "$as_me:$LINENO: checking for ALSA" >&5
--echo $ECHO_N "checking for ALSA... $ECHO_C" >&6
--
--if test -n "$PKG_CONFIG"; then
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.9\"") >&5
--  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.9") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.9" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.9\"") >&5
--  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.9") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.9" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--else
--	pkg_failed=untried
--fi
--
--if test $pkg_failed = yes; then
--	ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 1.0.9"`
--	# Put the nasty error message in config.log where it belongs
--	echo "$ALSA_PKG_ERRORS" 1>&5
--
--
--	{ echo "$as_me:$LINENO: WARNING: $ALSA_PKG_ERRORS" >&5
--echo "$as_me: WARNING: $ALSA_PKG_ERRORS" >&2;}
--
--elif test $pkg_failed = untried; then
--
--	{ echo "$as_me:$LINENO: WARNING: $ALSA_PKG_ERRORS" >&5
--echo "$as_me: WARNING: $ALSA_PKG_ERRORS" >&2;}
--
--else
--	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
--	ALSA_LIBS=$pkg_cv_ALSA_LIBS
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ALSA 1
--_ACEOF
--
-+echo "Not using ALSA" >&5
-+echo "Not using ALSA" >&6
- 
--fi
- 
- # LIBQUICKTIME
- 
diff --git a/media-video/kino/files/kino-0.8.1-as-needed.patch b/media-video/kino/files/kino-0.8.1-as-needed.patch
deleted file mode 100644
index 402afd8c0b9e..000000000000
--- a/media-video/kino/files/kino-0.8.1-as-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nadurp kino-0.8.1/configure kino-0.8.1-gentoo/configure
---- kino-0.8.1/configure	2006-04-13 07:58:31.000000000 +0200
-+++ kino-0.8.1-gentoo/configure	2006-05-07 23:36:40.000000000 +0200
-@@ -25562,20 +25562,12 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XInitExtension" >&5
- echo "${ECHO_T}$ac_cv_lib_Xext_XInitExtension" >&6
--if test $ac_cv_lib_Xext_XInitExtension = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBXEXT 1
- _ACEOF
- 
-   LIBS="-lXext $LIBS"
- 
--else
--  { { echo "$as_me:$LINENO: error: Could not link with libXext. Check that you have libXext installed" >&5
--echo "$as_me: error: Could not link with libXext. Check that you have libXext installed" >&2;}
--   { (exit 1); exit 1; }; }
--
--fi
--
- 
- echo "$as_me:$LINENO: checking for XvQueryAdaptors in -lXv" >&5
- echo $ECHO_N "checking for XvQueryAdaptors in -lXv... $ECHO_C" >&6
diff --git a/media-video/kino/kino-0.7.6.ebuild b/media-video/kino/kino-0.7.6.ebuild
index e88b38d8ee70..e6fbf5256ab8 100644
--- a/media-video/kino/kino-0.7.6.ebuild
+++ b/media-video/kino/kino-0.7.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-0.7.6.ebuild,v 1.7 2006/09/25 18:12:06 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.6.ebuild,v 1.8 2007/03/04 19:43:51 calchan Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="ppc"
 IUSE="quicktime dvdr ffmpeg"
 
 DEPEND="x11-libs/gtk+
diff --git a/media-video/kino/kino-0.8.1.ebuild b/media-video/kino/kino-0.8.1.ebuild
deleted file mode 100644
index c134f3b57e7c..000000000000
--- a/media-video/kino/kino-0.8.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.8.1.ebuild,v 1.5 2006/09/25 18:12:06 calchan Exp $
-
-inherit eutils
-
-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 ~sparc ~x86"
-IUSE="alsa dvdr ffmpeg quicktime"
-
-DEPEND=">=x11-libs/gtk+-2.6.0
-	>=gnome-base/libglade-2.5.0
-	>=dev-libs/glib-2
-	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-video/mjpegtools
-	media-sound/rawrec
-	=dev-libs/lzo-1*
-	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
-	quicktime? ( || ( >=media-libs/libquicktime-0.9.5 media-video/cinelerra-cvs ) )
-	dvdr? ( media-video/dvdauthor )"
-
-RESTRICT="primaryuri"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Shameful hack to link with --as-needed
-	epatch ${FILESDIR}/${P}-as-needed.patch || die "epatch failed!"
-
-	# Deactivating automagic alsa configuration, bug #134725
-	if ! use alsa ; then
-		epatch ${FILESDIR}/${P}-alsa.patch || die "epatch failed!"
-	fi
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debug \
-		$(use_with quicktime) \
-		$(use_with ffmpeg avcodec) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-}
diff --git a/media-video/kino/kino-0.9.2.ebuild b/media-video/kino/kino-0.9.2.ebuild
deleted file mode 100644
index 529360755b7a..000000000000
--- a/media-video/kino/kino-0.9.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-0.9.2.ebuild,v 1.4 2007/02/07 22:15:33 blubb 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 ~sparc ~x86"
-IUSE="alsa dvdr ffmpeg quicktime sox vorbis"
-
-DEPEND=">=x11-libs/gtk+-2.6.0
-	>=gnome-base/libglade-2.5.0
-	>=dev-libs/glib-2
-	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
-	=dev-libs/lzo-1*
-	!sparc? ( media-libs/libiec61883 )
-	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
-	quicktime? ( || ( >=media-libs/libquicktime-0.9.5 media-video/cinelerra-cvs ) )"
-RDEPEND="${DEPEND}
-	media-video/mjpegtools
-	media-sound/rawrec
-	dvdr? ( media-video/dvdauthor )
-	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
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debug \
-		$(use_enable quicktime) \
-		$(use_with ffmpeg avcodec) \
-		$(use_with sparc dv1394) \
-		|| die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "Installation failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
-}