remove old

Package-Manager: portage-2.1.4

6 files changed, 13 insertions, 323 deletions

diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index e87ec1ccf73a..cd5724e8b325 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.37 2008/01/15 19:44:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.38 2008/01/26 00:00:10 aballier Exp $
+
+  25 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/cinelerra-cvs-swscaler.patch, -files/recentffmpeg.patch,
+  -cinelerra-cvs-20070726.ebuild:
+  remove old
 
 *cinelerra-cvs-20080115 (15 Jan 2008)
 
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index ef4c166438bf..ce492fb8a1c7 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -9,42 +9,26 @@ AUX cinelerra-cvs-20080115-swscaler.patch 5012 RMD160 8ebc7520dc58b96fbe903964a0
 MD5 a55b13aec3ce849cdf67f88bd0aeb86b files/cinelerra-cvs-20080115-swscaler.patch 5012
 RMD160 8ebc7520dc58b96fbe903964a05b5884b496ee90 files/cinelerra-cvs-20080115-swscaler.patch 5012
 SHA256 acae0382cd23e8b4371151e5084aa0e0873f9e1c405f90fd7f2487fbb393ceb6 files/cinelerra-cvs-20080115-swscaler.patch 5012
-AUX cinelerra-cvs-swscaler.patch 5011 RMD160 99d2d021c77294f7a2605fa15ded1ca95e877db3 SHA1 9971dc37f2f040a82e62c0a4386d535a8df6bd18 SHA256 97ee3f2b3a62012bde912adcf4f0a8575b420feb65d2ff1bd4a3e35340e7eeb4
-MD5 e9607fb720b288553050b501a5cc5309 files/cinelerra-cvs-swscaler.patch 5011
-RMD160 99d2d021c77294f7a2605fa15ded1ca95e877db3 files/cinelerra-cvs-swscaler.patch 5011
-SHA256 97ee3f2b3a62012bde912adcf4f0a8575b420feb65d2ff1bd4a3e35340e7eeb4 files/cinelerra-cvs-swscaler.patch 5011
-AUX recentffmpeg.patch 656 RMD160 e11f653b08b7145feeff245d8aadb72b11b89ee9 SHA1 f84d2dd7cb52fc2f489bab2d2ecd5c72a3a43c33 SHA256 be61fc2c7a200b73370aa0f1fae7cd18a28b4d27c4667782c8ea4d6cb01c0d1e
-MD5 e1ff8ea5d792db64b9a120ffa4abdaec files/recentffmpeg.patch 656
-RMD160 e11f653b08b7145feeff245d8aadb72b11b89ee9 files/recentffmpeg.patch 656
-SHA256 be61fc2c7a200b73370aa0f1fae7cd18a28b4d27c4667782c8ea4d6cb01c0d1e files/recentffmpeg.patch 656
-DIST cinelerra-cvs-20070726.tar.bz2 23805203 RMD160 5705ab77481a03dbc1f69b029cb4d97c59de3b79 SHA1 4a9b5d2fee288e9ccc486c79e62a1d4a808a3712 SHA256 a43a832e2459fc9f9941dc57173373f5c22ae53a39ce16585bda2533608c8f22
 DIST cinelerra-cvs-20080115.tar.bz2 31231763 RMD160 41bc0a88e12f91aabca278ea05dde04d6632a3e0 SHA1 70eff234992d61d9a049ef7f26a04faefddb7671 SHA256 3ada71b7632379e9aca2ff335a038f73e36965e97df23551f788cc307081957c
-EBUILD cinelerra-cvs-20070726.ebuild 2976 RMD160 21bed4b78a666b138d60e15601e95bd0ffb49cef SHA1 cfbf0ef9674af31545f564b6318ae6342294b4b1 SHA256 65c0ac1cc1313c4eb87b050f38bc50925393d488ef5ddd3e432482b7da4c9a1b
-MD5 07b0989f4299fa4aa883082440b1ed72 cinelerra-cvs-20070726.ebuild 2976
-RMD160 21bed4b78a666b138d60e15601e95bd0ffb49cef cinelerra-cvs-20070726.ebuild 2976
-SHA256 65c0ac1cc1313c4eb87b050f38bc50925393d488ef5ddd3e432482b7da4c9a1b cinelerra-cvs-20070726.ebuild 2976
 EBUILD cinelerra-cvs-20080115.ebuild 2934 RMD160 64b3ec15a6515de4e4f2f8a7db1ab8d3cbf3d7b9 SHA1 bbaaa40ff14a679fc16e4a6b13e17d986df07f73 SHA256 d51c8f2734110983d419afdc6817ee3835df63b558234d89e5e1c8a5e364cb3c
 MD5 56cd8139bcee31cd70ccf537928be508 cinelerra-cvs-20080115.ebuild 2934
 RMD160 64b3ec15a6515de4e4f2f8a7db1ab8d3cbf3d7b9 cinelerra-cvs-20080115.ebuild 2934
 SHA256 d51c8f2734110983d419afdc6817ee3835df63b558234d89e5e1c8a5e364cb3c cinelerra-cvs-20080115.ebuild 2934
-MISC ChangeLog 5888 RMD160 f817f0c2085d1a7aba6881e89f9453bb14c9721e SHA1 6b2a7d1119153f60b4d87687b835f9599f42c153 SHA256 cc9dd7b6a039f39f41bf74bf69bdf70692ddcb990207837bd2869b4008203c46
-MD5 904673222de2438ffc1be48ca49bef85 ChangeLog 5888
-RMD160 f817f0c2085d1a7aba6881e89f9453bb14c9721e ChangeLog 5888
-SHA256 cc9dd7b6a039f39f41bf74bf69bdf70692ddcb990207837bd2869b4008203c46 ChangeLog 5888
+MISC ChangeLog 6054 RMD160 51767c20e56b19949e9cc9d6dc4a8bb4dbc24a2a SHA1 14d3083d1dbdf444c5afa832f01fb63d845230c0 SHA256 27a4b6b4de08a048bdd6cdbc7d5a20bf9d48af4eb97251c906127074322e4fe5
+MD5 5fc1d294421ea11198eb799ca905a9ca ChangeLog 6054
+RMD160 51767c20e56b19949e9cc9d6dc4a8bb4dbc24a2a ChangeLog 6054
+SHA256 27a4b6b4de08a048bdd6cdbc7d5a20bf9d48af4eb97251c906127074322e4fe5 ChangeLog 6054
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 MD5 dc09902c6f418a17f6b695df093e36c6 metadata.xml 159
 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e metadata.xml 159
 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb metadata.xml 159
-MD5 437be30d17e1151c0651f4fcd986d330 files/digest-cinelerra-cvs-20070726 277
-RMD160 57acca75f443cda1cd8983dfb3cbc285d8426585 files/digest-cinelerra-cvs-20070726 277
-SHA256 614b69cdfacb52a8b06114b44699577509aa7e467b7782dc7c06cbf2ee83463a files/digest-cinelerra-cvs-20070726 277
 MD5 2bb77afd816c54d92fa4d453d971ff13 files/digest-cinelerra-cvs-20080115 277
 RMD160 4556461eed92a0b2ab5305359afe0903eb444c4a files/digest-cinelerra-cvs-20080115 277
 SHA256 d6ed5d29e6158aea0246d190dd23928c6f2225c7e4b6d21cea0db60ef99af742 files/digest-cinelerra-cvs-20080115 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHjQ14vFcC4BYPU0oRAqUOAJ97xCltlFUyl6Vk6R/nwNUllOT2UACfajdP
-eeG1lm4iibDTaufwuz5OEaA=
-=LLg2
+iD8DBQFHmngXvFcC4BYPU0oRAlTAAKCUWX5o89Yv/I0KM/KoP0hepDHbjACfcE1d
+gpoX/QkCE5RNY76NseMqntc=
+=OadU
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20070726.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20070726.ebuild
deleted file mode 100644
index 83f6e8f58a91..000000000000
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20070726.ebuild
+++ /dev/null
@@ -1,108 +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/cinelerra-cvs/cinelerra-cvs-20070726.ebuild,v 1.3 2008/01/13 18:28:47 aballier Exp $
-
-WANT_AUTOMAKE=1.9
-WANT_AUTOCONF=2.5
-
-inherit toolchain-funcs eutils flag-o-matic autotools
-
-#filter-flags "-fPIC -fforce-addr"
-
-DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version"
-HOMEPAGE="http://cvs.cinelerra.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3dnow alsa esd mmx oss static truetype ieee1394 css altivec opengl"
-RDEPEND="media-libs/libpng
-	>=media-libs/libdv-1.0.0
-	media-libs/faad2
-	media-libs/faac
-	media-libs/a52dec
-	media-libs/libsndfile
-	media-libs/tiff
-	media-video/ffmpeg
-	media-sound/lame
-	>=sci-libs/fftw-3.0.1
-	>=media-libs/x264-svn-20060302
-	ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 \
-		>=sys-libs/libavc1394-0.5.0 )
-	media-video/mjpegtools
-	alsa? ( media-libs/alsa-lib )
-	esd? ( >=media-sound/esound-0.2.34 )
-	truetype? ( >=media-libs/freetype-2.1.10 )
-	opengl? ( virtual/opengl )
-	>=media-libs/openexr-1.2.2
-	>=media-libs/libvorbis-1.1.0
-	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.0_alpha4-r1
-	x11-libs/libX11
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	x11-libs/libXvMC
-	x11-libs/libXft"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	if [[ "$(gcc-major-version)" -lt "4" ]]; then
-		eerror "You need to have gcc 4 or better"
-		eerror "Please follow : http://www.gentoo.org/doc/en/gcc-upgrading.xml"
-		eerror "And have a look at bug #128659"
-		die "You must use gcc 4 or better."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/recentffmpeg.patch"
-	epatch "${FILESDIR}/${PN}-swscaler.patch"
-	epatch "${FILESDIR}/cinelerra-compilewarnings.diff"
-}
-
-src_compile() {
-	AT_M4DIR="m4" eautoreconf
-	econf \
-	`use_enable static` \
-	`use_enable alsa` \
-	`use_enable esd` \
-	`use_enable oss` \
-	`use_enable mmx` \
-	`use_enable 3dnow` \
-	--with-plugindir=/usr/$(get_libdir)/cinelerra \
-	`use_enable truetype freetype2` \
-	`use_enable ieee1394 firewire` \
-	`use_enable css` \
-	`use_enable opengl` \
-	`use_enable altivec` \
-	--with-external-ffmpeg \
-	--with-buildinfo=cust/"Gentoo - SVN r1015" \
-	|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dohtml -a png,html,texi,sdw -r doc/*
-	# workaround
-	rm -fR "${D}/usr/include"
-	mv "${D}/usr/bin/mpeg3cat" "${D}/usr/bin/mpeg3cat.hv"
-	mv "${D}/usr/bin/mpeg3dump" "${D}/usr/bin/mpeg3dump.hv"
-	mv "${D}/usr/bin/mpeg3toc" "${D}/usr/bin/mpeg3toc.hv"
-	ln -s /usr/bin/mpeg2enc "${D}/usr/$(get_libdir)/cinelerra/mpeg2enc.plugin"
-}
-
-pkg_postinst () {
-	elog "Please note that this is unofficial and somewhat experimental code."
-	elog "See cvs.cinelerra.org for a list of changes to the official cinelerra"
-	elog "release."
-}
diff --git a/media-video/cinelerra-cvs/files/cinelerra-cvs-swscaler.patch b/media-video/cinelerra-cvs/files/cinelerra-cvs-swscaler.patch
deleted file mode 100644
index a478e3670ae7..000000000000
--- a/media-video/cinelerra-cvs/files/cinelerra-cvs-swscaler.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Index: cinelerra-cvs/cinelerra/ffmpeg.C
-===================================================================
---- cinelerra-cvs.orig/cinelerra/ffmpeg.C
-+++ cinelerra-cvs/cinelerra/ffmpeg.C
-@@ -140,6 +140,11 @@ int FFMPEG::convert_cmodel(VFrame *frame
- 	PixelFormat pix_fmt_out = 
- 		color_model_to_pix_fmt(frame_out->get_color_model());
- 
-+#ifdef HAVE_SWSCALER
-+	// We need a context for swscale
-+	struct SwsContext *convert_ctx;
-+#endif
-+
- 	// do conversion within libavcodec if possible
- 	if (pix_fmt_in != PIX_FMT_NB && pix_fmt_out != PIX_FMT_NB) {
- 		// set up a temporary pictures from frame_in and frame_out
-@@ -147,7 +152,9 @@ int FFMPEG::convert_cmodel(VFrame *frame
- 		init_picture_from_frame(&picture_in, frame_in);
- 		init_picture_from_frame(&picture_out, frame_out);
- 
--		int result = img_convert(&picture_out,
-+		int result;
-+#ifndef HAVE_SWSCALER
-+		result = img_convert(&picture_out,
- 					 pix_fmt_out,
- 					 &picture_in,
- 					 pix_fmt_in,
-@@ -156,6 +163,28 @@ int FFMPEG::convert_cmodel(VFrame *frame
- 		if (result) {
- 			printf("FFMPEG::convert_cmodel img_convert() failed\n");
- 		}
-+#else
-+		convert_ctx = sws_getContext(frame_in->get_w(), frame_in->get_h(),pix_fmt_in,
-+				frame_out->get_w(),frame_out->get_h(),pix_fmt_out,
-+				SWS_BICUBIC, NULL, NULL, NULL);
-+
-+		if(convert_ctx == NULL){
-+			printf("FFMPEG::convert_cmodel : swscale context initialization failed\n");
-+			return 1;
-+		}
-+
-+		result = sws_scale(convert_ctx, 
-+				picture_in.data, picture_in.linesize,
-+				0, 0,
-+				picture_out.data, picture_out.linesize);
-+
-+	
-+		sws_freeContext(convert_ctx);
-+
-+		if(result){
-+			printf("FFMPEG::convert_cmodel sws_scale() failed\n");
-+		}
-+#endif
- 		return result;
- 	}
- 
-@@ -203,13 +232,19 @@ int FFMPEG::convert_cmodel(AVPicture *pi
- 
- 	// set up a temporary picture_out from frame_out
- 	AVPicture picture_out;
-+#ifdef HAVE_SWSCALER
-+	// We need a context for swscale
-+	struct SwsContext *convert_ctx;
-+#endif
- 	init_picture_from_frame(&picture_out, frame_out);
- 	int cmodel_out = frame_out->get_color_model();
- 	PixelFormat pix_fmt_out = color_model_to_pix_fmt(cmodel_out);
- 
- 	// do conversion within libavcodec if possible
- 	if (pix_fmt_out != PIX_FMT_NB) {
--		int result = img_convert(&picture_out,
-+		int result;
-+#ifndef HAVE_SWSCALER
-+		result = img_convert(&picture_out,
- 					 pix_fmt_out,
- 					 picture_in,
- 					 pix_fmt_in,
-@@ -218,6 +253,28 @@ int FFMPEG::convert_cmodel(AVPicture *pi
- 		if (result) {
- 			printf("FFMPEG::convert_cmodel img_convert() failed\n");
- 		}
-+#else
-+		convert_ctx = sws_getContext(width_in, height_in,pix_fmt_in,
-+				frame_out->get_w(),frame_out->get_h(),pix_fmt_out,
-+				SWS_BICUBIC, NULL, NULL, NULL);
-+
-+		if(convert_ctx == NULL){
-+			printf("FFMPEG::convert_cmodel : swscale context initialization failed\n");
-+			return 1;
-+		}
-+
-+		result = sws_scale(convert_ctx, 
-+				picture_in->data, picture_in->linesize,
-+				0, 0,
-+				picture_out.data, picture_out.linesize);
-+
-+	
-+		sws_freeContext(convert_ctx);
-+
-+		if(result){
-+			printf("FFMPEG::convert_cmodel sws_scale() failed\n");
-+		}
-+#endif
- 		return result;
- 	}
- 	
-Index: cinelerra-cvs/cinelerra/ffmpeg.h
-===================================================================
---- cinelerra-cvs.orig/cinelerra/ffmpeg.h
-+++ cinelerra-cvs/cinelerra/ffmpeg.h
-@@ -3,6 +3,9 @@
- 
- extern "C" {
- #include <avcodec.h>
-+#ifdef HAVE_SWSCALER
-+#include <swscale.h>
-+#endif
- }
- 
- #include "asset.h"
-Index: cinelerra-cvs/configure.in
-===================================================================
---- cinelerra-cvs.orig/configure.in
-+++ cinelerra-cvs/configure.in
-@@ -341,10 +341,33 @@ AC_SUBST(CPU_CFLAGS)
- ############ external ffmpeg
- AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
- 
-+AH_TEMPLATE(HAVE_SWSCALER, [Define to 1 if swscaler is available in ffmpeg.])
-+
- if test "x$with_external_ffmpeg" = "xyes"; then
--     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
-+     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
-      FFMPEG_FOLDER=""
-      FFMPEG_EXTERNALTEXT="External ffmpeg"
-+     
-+     dnl --------------------------------------------------------------
-+     dnl check if libavcodec contains img_convert
-+     dnl that means that libswscale is compiled in
-+     
-+     AC_MSG_CHECKING(for ffmpeg swscale support)
-+     saved_LIBS="$LIBS"
-+     LIBS="$saved_LIBS $FFMPEG_TEMP_LIBS"
-+     AC_TRY_LINK([#include <ffmpeg/avcodec.h>],
-+                 [img_convert(0, 0, 0,0,0,0)],
-+                 enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes)
-+     LIBS="$saved_LIBS"
-+     AC_MSG_RESULT($enable_ffmpeg_swscale)
-+     
-+     if test x"$enable_ffmpeg_swscale" == xyes; then
-+                 AC_DEFINE(HAVE_SWSCALER)
-+                 PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
-+     else
-+                 PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
-+     fi
-+
- else
-      FFMPEG_FOLDER=ffmpeg
-      FFMPEG_CFLAGS="-I\$(top_srcdir)/quicktime/ffmpeg/libavcodec"
diff --git a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20070726 b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20070726
deleted file mode 100644
index 33aab6055c66..000000000000
--- a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20070726
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 082eb4266f783357993ca903ff81a847 cinelerra-cvs-20070726.tar.bz2 23805203
-RMD160 5705ab77481a03dbc1f69b029cb4d97c59de3b79 cinelerra-cvs-20070726.tar.bz2 23805203
-SHA256 a43a832e2459fc9f9941dc57173373f5c22ae53a39ce16585bda2533608c8f22 cinelerra-cvs-20070726.tar.bz2 23805203
diff --git a/media-video/cinelerra-cvs/files/recentffmpeg.patch b/media-video/cinelerra-cvs/files/recentffmpeg.patch
deleted file mode 100644
index 99f986966365..000000000000
--- a/media-video/cinelerra-cvs/files/recentffmpeg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: cinelerra-cvs/cinelerra/ffmpeg.h
-===================================================================
---- cinelerra-cvs.orig/cinelerra/ffmpeg.h
-+++ cinelerra-cvs/cinelerra/ffmpeg.h
-@@ -1,7 +1,9 @@
- #ifndef FFMPEG_H
- #define FFMPEG_H
- 
-+extern "C" {
- #include <avcodec.h>
-+}
- 
- #include "asset.h"
- #include "guicast.h"
-Index: cinelerra-cvs/cinelerra/fileac3.h
-===================================================================
---- cinelerra-cvs.orig/cinelerra/fileac3.h
-+++ cinelerra-cvs/cinelerra/fileac3.h
-@@ -1,8 +1,9 @@
- #ifndef FILEAC3_H
- #define FILEAC3_H
- 
--
-+extern "C" {
- #include <avcodec.h>
-+}
- #include "filebase.h"
- #include <stdio.h>
-