dont access $CC !

3 files changed, 19 insertions, 32 deletions

diff --git a/media-libs/xvid/xvid-0.9.1.ebuild b/media-libs/xvid/xvid-0.9.1.ebuild
index 954989d39ed1..b0b4b88ca615 100644
--- a/media-libs/xvid/xvid-0.9.1.ebuild
+++ b/media-libs/xvid/xvid-0.9.1.ebuild
@@ -1,26 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Author Georgi Georgiev <chutz@chubaka.net>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.1.ebuild,v 1.9 2004/01/29 04:17:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.1.ebuild,v 1.10 2004/05/16 09:02:44 vapier Exp $
 
-S="${WORKDIR}/${PN}core-${PV}/build/generic"
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution."
-SRC_URI="http://files.xvid.org/downloads/${PN}core-${PV}.tar.bz2"
+DESCRIPTION="high performance/quality MPEG-4 video de-/encoding solution"
 HOMEPAGE="http://www.xvid.org/"
+SRC_URI="http://files.xvid.org/downloads/${PN}core-${PV}.tar.bz2"
 
-DEPEND="virtual/glibc
-	x86? ( >=dev-lang/nasm-0.98.30 )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 
-src_compile() {
-	[ -z "${CC}" ] && export CC="gcc"
+DEPEND="virtual/glibc
+	x86? ( >=dev-lang/nasm-0.98.30 )"
 
-	econf || die
-	emake || die
-}
+S="${WORKDIR}/${PN}core-${PV}/build/generic"
 
 src_install() {
 	dodir /usr/{include,lib}
@@ -30,7 +23,7 @@ src_install() {
 
 	dodoc authors.txt changelog.txt LICENSE README.txt todo.txt
 
-	if [ "`use doc`" ]
+	if use doc
 	then
 		dodoc CodingStyle doc/README doc/xvid-decoding.txt doc/xvid-encoder.txt
 
@@ -44,4 +37,3 @@ src_install() {
 		#doins examples/ex1/*
 	fi
 }
-
diff --git a/media-libs/xvid/xvid-0.9.2-r1.ebuild b/media-libs/xvid/xvid-0.9.2-r1.ebuild
index ecda392a4362..29cd63e1d261 100644
--- a/media-libs/xvid/xvid-0.9.2-r1.ebuild
+++ b/media-libs/xvid/xvid-0.9.2-r1.ebuild
@@ -1,26 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.2-r1.ebuild,v 1.4 2004/03/19 07:56:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.2-r1.ebuild,v 1.5 2004/05/16 09:02:44 vapier Exp $
 
 MY_P=${PN}core-${PV}
-S="${WORKDIR}/${MY_P}/build/generic"
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution."
-SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
+DESCRIPTION="high performance/quality MPEG-4 video de-/encoding solution"
 HOMEPAGE="http://www.xvid.org/"
+SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
 
-DEPEND="virtual/glibc
-	x86? ( >=dev-lang/nasm-0.98.36 )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 
-src_compile() {
-	[ -z "${CC}" ] && export CC="gcc"
+DEPEND="virtual/glibc
+	x86? ( >=dev-lang/nasm-0.98.36 )"
 
-	econf || die
-	emake || die
-}
+S="${WORKDIR}/${MY_P}/build/generic"
 
 src_install() {
 	dodir /usr/{include,lib}
@@ -31,7 +25,7 @@ src_install() {
 	dodoc authors.txt changelog.txt LICENSE README.txt todo.txt
 	dosym /usr/lib/libxvidcore.so.2.1 /usr/lib/libxvidcore.so
 
-	if [ "`use doc`" ]
+	if use doc
 	then
 		dodoc CodingStyle doc/README doc/xvid-decoding.txt doc/xvid-encoder.txt
 
diff --git a/media-libs/xvid/xvid-1.0.0_rc4.ebuild b/media-libs/xvid/xvid-1.0.0_rc4.ebuild
index 88195c6ed399..d7b7f6b5eb00 100644
--- a/media-libs/xvid/xvid-1.0.0_rc4.ebuild
+++ b/media-libs/xvid/xvid-1.0.0_rc4.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.0_rc4.ebuild,v 1.1 2004/04/26 22:47:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.0_rc4.ebuild,v 1.2 2004/05/16 09:02:44 vapier Exp $
 
 inherit eutils
 
 MY_P=${PN}core-${PV/_rc/-rc}
-S="${WORKDIR}/${MY_P}/build/generic"
 DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution."
 HOMEPAGE="http://www.xvid.org/"
 SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
@@ -18,6 +17,8 @@ IUSE="doc"
 DEPEND="virtual/glibc
 	x86? ( >=dev-lang/nasm-0.98.36 )"
 
+S="${WORKDIR}/${MY_P}/build/generic"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}