Version bump. Dep fixes. Removed older versions.

Package-Manager: portage-2.1_pre5-r3

8 files changed, 70 insertions, 105 deletions

diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index f1a2e0913ea8..e7b1604bc4ac 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for media-video/cinelerra-cvs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.16 2006/01/26 08:17:40 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.17 2006/03/05 17:33:30 zypher Exp $
 
-  25 Jan 2006; Marc Hildebrand <zypher@gentoo.org>
-  cinelerra-cvs-20051005.ebuild:
-  Ported to modular X
+*cinelerra-cvs-20060219 (19 Feb 2006)
+
+  05 Mar 2006; Marc Hildebrand <zypher@gentoo.org>
+  cinelerra-cvs-20060219.ebuild:
+  Version bump. Dep fixes. Removed old versions.
+  Closes bugs #108526, #109846, #116179, #123724, #73006
 
   23 Jan 2006; Luca Barbato <lu_zero@gentoo.org>
   cinelerra-cvs-20051005.ebuild:
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index 02a6e57e61b6..9da5f1fe72c8 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -1,20 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c619925591ba3ee1832db4a3d2b3281d ChangeLog 2658
-MD5 52bb20649b74c2aa7f6f9204cec3f7f8 cinelerra-cvs-20050506.ebuild 1688
-MD5 3e962f56ba898d0261d3569f4bf277db cinelerra-cvs-20050801.ebuild 1784
-MD5 b174f8d0552619c73d1218a2999798f5 cinelerra-cvs-20051005.ebuild 2158
+MD5 193a389415a1629304feea06462d6b26 ChangeLog 2781
+RMD160 c0e69913ab0e6d0ec2a4c4d231c95079f920ef86 ChangeLog 2781
+SHA256 c7aabd97b96fcaa602ff2bf12bf84690a96731fe324b1d74e5614459d574db8b ChangeLog 2781
+MD5 199fad034a7474e03645d4ba2e0515d7 cinelerra-cvs-20051005.ebuild 2160
+RMD160 067063b12909fcd900431016397a875856ae1696 cinelerra-cvs-20051005.ebuild 2160
+SHA256 e296ea411f002ab7ca3c0209a33506aac416c911612c5520cd7fcb6b2ac59abb cinelerra-cvs-20051005.ebuild 2160
+MD5 df9d50420794907e9020c7140515ac88 cinelerra-cvs-20060219.ebuild 2054
+RMD160 c1170f328d39c5bcd1c6d0e6de0e11b9dc6ca114 cinelerra-cvs-20060219.ebuild 2054
+SHA256 85c1c902ef6f6382540d032dac70dc3e7ff3777933ff9a8868aaaed695675480 cinelerra-cvs-20060219.ebuild 2054
 MD5 b775c5b9f768f5e27002063c6693a623 files/20051005-nox264.patch 3391
-MD5 0a7a7d289ef0d57df644a1cc47144170 files/digest-cinelerra-cvs-20050506 77
-MD5 4bd71d15accb4c84eda25a5266c82112 files/digest-cinelerra-cvs-20050801 77
+RMD160 92ce9ebb3794d2e6a660d07c14f7e294f289469c files/20051005-nox264.patch 3391
+SHA256 6bb77862c208cc6acf30e9ccfd055daf4cfa0a9566e27f286929296b76113fd1 files/20051005-nox264.patch 3391
 MD5 af930f0191a6c60306ce736e62c6db74 files/digest-cinelerra-cvs-20051005 77
+RMD160 b3bb6380715b42d3f5b02dd34f62f48b0a7fa180 files/digest-cinelerra-cvs-20051005 77
+SHA256 a03b95e67db5dac658c01f4431c0880e45dd1b34986494289be3d4c41863f48c files/digest-cinelerra-cvs-20051005 77
+MD5 1c041bb3e78ebc6fadebf70816b9f863 files/digest-cinelerra-cvs-20060219 277
+RMD160 d4d1773f99c3c9159b975c8edcb4c2db5e1a09ed files/digest-cinelerra-cvs-20060219 277
+SHA256 7da9fedfe73c035e30f715776760e02abf795991b957f180b6a5e951fcf9dfd8 files/digest-cinelerra-cvs-20060219 277
 MD5 6a608309dd1406724b18475452d2e410 files/libmpeg3-20050102-gcc3.4.patch 6060
+RMD160 33fd3c19f1a9e46301dbdfeda511a3d2bbd2902f files/libmpeg3-20050102-gcc3.4.patch 6060
+SHA256 1799d8a6c2bbe9e4ae2937c9e722d511a4b92bef5f42a1294cdb20f52bf921fb files/libmpeg3-20050102-gcc3.4.patch 6060
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
+SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f metadata.xml 251
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD2IYqK6zgPxRBWYQRAlqyAJ0bi9pi+PUp87VJqEm+YEx3jGLI9ACdHmYJ
-COmncCTj64iq6GAPHIIVHAY=
-=MCqB
+iD8DBQFECyD7K6zgPxRBWYQRAjUQAJ9RWu1UaVa+3YTv3R06E5+Q9ck5cgCfQj8J
+daPIFaGPoDUYRKBa3kaMFO0=
+=cPCD
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
deleted file mode 100644
index b8dab1f0389b..000000000000
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
+++ /dev/null
@@ -1,71 +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/cinelerra-cvs/cinelerra-cvs-20050506.ebuild,v 1.3 2005/05/18 10:59:44 zypher Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-#filter-flags "-fPIC -fforce-addr"
-
-RESTRICT="nostrip"
-
-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="~x86 ~amd64 ~ppc"
-IUSE="alsa ffmpeg oss static"
-
-RDEPEND="!media-video/cinelerra
-	virtual/x11
-	media-libs/libpng
-	media-libs/libdv
-	media-libs/faad2
-	media-video/mjpegtools
-	>=sys-libs/libavc1394-0.4.1
-	>=sys-libs/libraw1394-0.9.0
-	>=media-sound/esound-0.2.34
-	>=media-libs/openexr-1.2.1
-	!media-video/cinelerra"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-
-pkg_setup() {
-	if [[ "$(gcc-major-version)" -lt "3" ]]; then
-		die "You must use gcc 3 or better."
-	fi
-}
-
-src_compile() {
-	cd ${S}
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-
-	cd ${S}
-	./autogen.sh
-	econf \
-	`use_enable static` \
-	`use_enable alsa` \
-	`use_enable oss` \
-	`use_with ffmpeg` \
-	|| die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dohtml -a png,html,texi,sdw -r doc/*
-}
-
-pkg_postinst () {
-
-einfo "Please note that this is unofficial and somewhat experimental code."
-einfo "See cvs.cinelerra.org for a list of changes to the official cinelerra"
-einfo "release."
-einfo "To change to the blue dot theme, enter settings, choose interface from"
-einfo "the pull down list in the upper left and change the theme accordingly."
-
-}
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
index 8684c9bc9cbc..7526205bbbeb 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild,v 1.4 2006/01/26 08:17:40 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild,v 1.5 2006/03/05 17:33:31 zypher Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -18,11 +18,12 @@ KEYWORDS="~x86 ~amd64"
 IUSE="3dnow alsa esd mmx oss static"
 
 RDEPEND="!media-video/cinelerra
-	virtual/x11
 	media-libs/libpng
 	media-libs/libdv
 	media-libs/faad2
 	media-libs/faac
+	media-libs/a52dec
+	media-video/ffmpeg
 	x86? ( media-libs/x264-svn )
 	media-libs/libiec61883
 	media-video/mjpegtools
@@ -33,7 +34,6 @@ RDEPEND="!media-video/cinelerra
 	>=media-libs/libvorbis-1.1.0
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_alpha4-r1
-	!media-video/cinelerra
 	|| ( (
 			x11-libs/libX11
 			x11-libs/libXv
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20060219.ebuild
index f879ecd48be1..fc58aae34713 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20060219.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild,v 1.2 2005/08/01 18:44:30 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20060219.ebuild,v 1.1 2006/03/05 17:33:31 zypher Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -14,23 +14,35 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="alsa ffmpeg oss static"
+KEYWORDS="~amd64 ~x86"
+IUSE="3dnow alsa esd mmx oss static"
 
 RDEPEND="!media-video/cinelerra
-	virtual/x11
 	media-libs/libpng
 	media-libs/libdv
 	media-libs/faad2
+	media-libs/faac
+	media-libs/a52dec
+	media-video/ffmpeg
+	sci-libs/fftw
+	>=media-libs/x264-svn-20060302
+	media-libs/libiec61883
 	media-video/mjpegtools
-	>=sys-libs/libavc1394-0.4.1
+	>=sys-libs/libavc1394-0.5.0
 	>=sys-libs/libraw1394-0.9.0
-	>=media-sound/esound-0.2.34
-	>=media-libs/openexr-1.2.1
-	>=media-libs/libvorbis-1.0.1-r2
-	>=media-libs/libogg-1.0
+	esd? ( >=media-sound/esound-0.2.34 )
+	>=media-libs/openexr-1.2.2
+	>=media-libs/libvorbis-1.1.0
+	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_alpha4-r1
-	!media-video/cinelerra"
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXv
+			x11-libs/libXxf86vm
+			x11-libs/libXext
+			x11-libs/libXvMC
+			x11-libs/libXft
+		) virtual/x11 )"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
@@ -41,6 +53,10 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+}
+
 src_compile() {
 	cd ${S}
 	export WANT_AUTOMAKE=1.7
@@ -51,8 +67,10 @@ src_compile() {
 	econf \
 	`use_enable static` \
 	`use_enable alsa` \
+	`use_enable esd` \
 	`use_enable oss` \
-	`use_with ffmpeg` \
+	`use_enable mmx` \
+	`use_enable 3dnow` \
 	|| die "configure failed"
 	make || die "make failed"
 }
@@ -61,6 +79,8 @@ src_install() {
 
 	make DESTDIR=${D} install || die
 	dohtml -a png,html,texi,sdw -r doc/*
+	# workaround
+	rm -fR ${D}/usr/include
 }
 
 pkg_postinst () {
@@ -68,7 +88,5 @@ pkg_postinst () {
 einfo "Please note that this is unofficial and somewhat experimental code."
 einfo "See cvs.cinelerra.org for a list of changes to the official cinelerra"
 einfo "release."
-einfo "To change to the blue dot theme, enter settings, choose interface from"
-einfo "the pull down list in the upper left and change the theme accordingly."
-
+einfo "The blue dot theme has not (yet) been merged into the new release."
 }
diff --git a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20050506 b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20050506
deleted file mode 100644
index b7d45fe4c0a9..000000000000
--- a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20050506
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6f916bedce93b6a0224b46cfa5a5628 cinelerra-cvs-20050506.tar.bz2 14901719
diff --git a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20050801 b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20050801
deleted file mode 100644
index b5825940f9df..000000000000
--- a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20050801
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28211fd9501da0d2f3b2f174c8a3994b cinelerra-cvs-20050801.tar.bz2 14917302
diff --git a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20060219 b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20060219
new file mode 100644
index 000000000000..8ebccca08ef2
--- /dev/null
+++ b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20060219
@@ -0,0 +1,3 @@
+MD5 e1128ac34ee62df4b69b2e9b32ac1dc6 cinelerra-cvs-20060219.tar.bz2 32137434
+RMD160 93e96c30c2588cde6810894e3e75e15483ee6636 cinelerra-cvs-20060219.tar.bz2 32137434
+SHA256 466bf2fb51027ac56aaf8d636ea1aa1daa21f2801a495957520d1354c1d94a60 cinelerra-cvs-20060219.tar.bz2 32137434