Converted to toolchain-funcs eclass. Added for a check for at least gcc3. Moved nasm as a buildtime dependency on latest version.

Package-Manager: portage-2.0.51.21-r1

7 files changed, 58 insertions, 51 deletions

diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index 9367e191116c..4f0b96f6dea1 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/cinelerra-cvs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.8 2005/05/08 11:09:47 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.9 2005/05/15 14:42:17 flameeyes Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  cinelerra-cvs-20040917.ebuild, cinelerra-cvs-20050102.ebuild,
+  cinelerra-cvs-20050127.ebuild, cinelerra-cvs-20050315.ebuild,
+  cinelerra-cvs-20050506.ebuild:
+  Converted to toolchain-funcs eclass. Added for a check for at least gcc3.
+  Moved nasm as a buildtime dependency on latest version.
 
 *cinelerra-cvs-20050506 (06 May 2005)
 
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index fd7b503b6fe1..eb653020cef0 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3f38c89a58447d4d6a2fc0dbf16b5a76 cinelerra-cvs-20050102.ebuild 1799
-MD5 a1f45024982d6b1b2fe121953948b8af cinelerra-cvs-20050315.ebuild 1707
-MD5 c5a1dc1c8aa6a69f4d857051deed8f4b cinelerra-cvs-20050127.ebuild 1656
-MD5 9b85f81aa427365659faa08b3dbcd0fc ChangeLog 1418
-MD5 dfd9c9b2c6e77918c4ef5bdfaa4f402f cinelerra-cvs-20050506.ebuild 1632
+MD5 8bbf345cb9d4362490d8a3d6858017d3 ChangeLog 1770
+MD5 6d6d1b609bc03a74fc5e0bf8c22aa9fd cinelerra-cvs-20040917.ebuild 1752
+MD5 1bbac29486c297db44c0f4ac97134345 cinelerra-cvs-20050102.ebuild 1896
+MD5 35de604122897ebb2d39241de0229308 cinelerra-cvs-20050127.ebuild 1721
+MD5 4b56d5817874cf893e0f74f58c17e512 cinelerra-cvs-20050315.ebuild 1771
+MD5 0fef800ba0c1a2b995cce40b53174da9 cinelerra-cvs-20050506.ebuild 1686
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
-MD5 e06d71de0a01bcda83f64454a1bcb5f7 cinelerra-cvs-20040917.ebuild 1659
-MD5 6a608309dd1406724b18475452d2e410 files/libmpeg3-20050102-gcc3.4.patch 6060
-MD5 0a7a7d289ef0d57df644a1cc47144170 files/digest-cinelerra-cvs-20050506 77
-MD5 c1cbd9da3d0a404c1106af9bf1c31073 files/digest-cinelerra-cvs-20050127 77
-MD5 7405c9ce7abe2c26ad273a6da17789d2 files/digest-cinelerra-cvs-20050102 77
 MD5 a56da7b2ea792c89025790c53a2ed2c0 files/digest-cinelerra-cvs-20040917 77
+MD5 7405c9ce7abe2c26ad273a6da17789d2 files/digest-cinelerra-cvs-20050102 77
+MD5 c1cbd9da3d0a404c1106af9bf1c31073 files/digest-cinelerra-cvs-20050127 77
 MD5 3c7352138ef1f1d1af89814652cf6649 files/digest-cinelerra-cvs-20050315 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCffObpNOQ4DjaQW0RAtOjAJ9itKMS9DL4JAM2aeqhBjwm6zMOYwCfY7gR
-p55Mec2J4jzuetgeLGZpyIQ=
-=kjpV
------END PGP SIGNATURE-----
+MD5 0a7a7d289ef0d57df644a1cc47144170 files/digest-cinelerra-cvs-20050506 77
+MD5 6a608309dd1406724b18475452d2e410 files/libmpeg3-20050102-gcc3.4.patch 6060
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20040917.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20040917.ebuild
index b8f467d3def5..bae44ec15c06 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20040917.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20040917.ebuild
@@ -1,10 +1,8 @@
 # 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-20040917.ebuild,v 1.2 2005/01/11 23:15:46 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20040917.ebuild,v 1.3 2005/05/15 14:42:17 flameeyes Exp $
 
-inherit gcc eutils flag-o-matic
-
-export WANT_GCC_3="yes"
+inherit toolchain-funcs eutils flag-o-matic
 
 filter-flags "-fPIC -fforce-addr"
 
@@ -30,6 +28,12 @@ DEPEND="!media-video/cinelerra
 	>=sys-libs/libraw1394-0.9.0
 	>=media-libs/openexr-1.2.1"
 
+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
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050102.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050102.ebuild
index 5e4c63af64a1..3d6622166be6 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050102.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20050102.ebuild
@@ -1,10 +1,8 @@
 # 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-20050102.ebuild,v 1.4 2005/01/15 11:08:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050102.ebuild,v 1.5 2005/05/15 14:42:17 flameeyes Exp $
 
-inherit gcc eutils flag-o-matic
-
-export WANT_GCC_3="yes"
+inherit toolchain-funcs eutils flag-o-matic
 
 #filter-flags "-fPIC -fforce-addr"
 
@@ -30,12 +28,20 @@ DEPEND="!media-video/cinelerra
 	>=media-libs/openexr-1.2.1
 	!media-video/cinelerra
 	x86? ( dev-lang/nasm )"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/libmpeg3
 	[ "`gcc-version`" == "3.4" ] && \
 		epatch ${FILESDIR}/libmpeg3-${PV}-gcc3.4.patch
 }
+
+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
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050127.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050127.ebuild
index ba6bd8682c07..d3b3e4028e70 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050127.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20050127.ebuild
@@ -1,10 +1,8 @@
 # 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-20050127.ebuild,v 1.1 2005/01/28 10:26:36 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050127.ebuild,v 1.2 2005/05/15 14:42:17 flameeyes Exp $
 
-inherit gcc eutils flag-o-matic
-
-export WANT_GCC_3="yes"
+inherit toolchain-funcs eutils flag-o-matic
 
 #filter-flags "-fPIC -fforce-addr"
 
@@ -31,8 +29,10 @@ DEPEND="!media-video/cinelerra
 	!media-video/cinelerra
 	x86? ( dev-lang/nasm )"
 
-src_unpack() {
-	unpack ${A}
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "3" ]]; then
+		die "You must use gcc 3 or better."
+	fi
 }
 
 src_compile() {
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050315.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050315.ebuild
index 77993995d6cb..0482332431c6 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050315.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20050315.ebuild
@@ -1,10 +1,8 @@
 # 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-20050315.ebuild,v 1.2 2005/03/30 10:49:39 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050315.ebuild,v 1.3 2005/05/15 14:42:17 flameeyes Exp $
 
-inherit gcc eutils flag-o-matic
-
-export WANT_GCC_3="yes"
+inherit toolchain-funcs eutils flag-o-matic
 
 #filter-flags "-fPIC -fforce-addr"
 
@@ -34,8 +32,10 @@ DEPEND="!media-video/cinelerra
 	!media-video/cinelerra
 	x86? ( dev-lang/nasm )"
 
-src_unpack() {
-	unpack ${A}
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "3" ]]; then
+		die "You must use gcc 3 or better."
+	fi
 }
 
 src_compile() {
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
index 635a66bcaa67..2fa9c2b8bc4e 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
@@ -1,10 +1,8 @@
 # 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.1 2005/05/08 11:09:47 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild,v 1.2 2005/05/15 14:42:17 flameeyes Exp $
 
-inherit gcc eutils flag-o-matic
-
-export WANT_GCC_3="yes"
+inherit toolchain-funcs eutils flag-o-matic
 
 #filter-flags "-fPIC -fforce-addr"
 
@@ -19,10 +17,8 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="alsa ffmpeg oss static"
 
-DEPEND="!media-video/cinelerra
+RDEPEND="!media-video/cinelerra
 	virtual/x11
-	virtual/libc
-	=sys-devel/gcc-3*
 	media-libs/libpng
 	media-libs/libdv
 	media-libs/faad2
@@ -31,11 +27,15 @@ DEPEND="!media-video/cinelerra
 	>=sys-libs/libraw1394-0.9.0
 	>=media-sound/esound-0.2.34
 	>=media-libs/openexr-1.2.1
-	!media-video/cinelerra
+	!media-video/cinelerra"
+
+DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-src_unpack() {
-	unpack ${A}
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "3" ]]; then
+		die "You must use gcc 3 or better."
+	fi
 }
 
 src_compile() {