Avoid the dirty sed hack, allow to disable nasm on non-x86, respect CC, CFLAGS and LDFLAGS.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 57 insertions, 25 deletions

diff --git a/media-video/effectv/ChangeLog b/media-video/effectv/ChangeLog
index 516230411a40..ea405eefcb5d 100644
--- a/media-video/effectv/ChangeLog
+++ b/media-video/effectv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/effectv
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/ChangeLog,v 1.1 2005/03/29 22:50:57 chriswhite Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/ChangeLog,v 1.2 2006/03/07 16:34:24 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/effectv-0.3.10-makefile.patch, effectv-0.3.10.ebuild:
+  Avoid the dirty sed hack, allow to disable nasm on non-x86, respect CC,
+  CFLAGS and LDFLAGS.
 
 *effectv-0.3.10 (30 Mar 2005)
 
diff --git a/media-video/effectv/Manifest b/media-video/effectv/Manifest
index edd644a2bb0a..fefddda31abd 100644
--- a/media-video/effectv/Manifest
+++ b/media-video/effectv/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 177e74fd3e0f0c5dcf8dbcc1fef93ede effectv-0.3.10.ebuild 1037
-MD5 7cd1f4a9f91a4f84362d4d5baadabf25 metadata.xml 323
-MD5 f07fbf44913c1c97d05d42c5c00a5a27 ChangeLog 432
+MD5 deef5c5f9f27b2390ff53f49007684cd ChangeLog 644
+RMD160 a6c9ac8b6b5200166edbb86111b1f0fd7de1de30 ChangeLog 644
+SHA256 a8947e1d5978c34b4489de9050a823c39b2c8e1575c5497dfb6056e10606cf96 ChangeLog 644
+MD5 1298d46d4a5219845ad0d32c3792c131 effectv-0.3.10.ebuild 961
+RMD160 707e091b65bd094aed823747cb1d424394279064 effectv-0.3.10.ebuild 961
+SHA256 954691844099eb8e588790603cb5016153bd70eb8e5b950aa8c040e687a5021b effectv-0.3.10.ebuild 961
 MD5 04e4ca37e7ef9c7138e8b2147dda4d7f files/digest-effectv-0.3.10 67
+RMD160 bcff9e3bdd338d79fa5c83e1bf732778bab6a1a0 files/digest-effectv-0.3.10 67
+SHA256 f9db583cab024d9e9b4ba4953db63a1bcf219edfe5d1cdf65971c7b7e6e10bba files/digest-effectv-0.3.10 67
+MD5 6f3b1ab5c4757825af62d93fd6fc1fe5 files/effectv-0.3.10-makefile.patch 598
+RMD160 059b929555c06c637b590599899099a607eee510 files/effectv-0.3.10-makefile.patch 598
+SHA256 972f4a05c97f934e7a22adf2578c9df4c78f11675da662766c078ac7ac6ba20f files/effectv-0.3.10-makefile.patch 598
+MD5 7cd1f4a9f91a4f84362d4d5baadabf25 metadata.xml 323
+RMD160 82d10c7f349509ceabbaf9ac9088eef41d5d39f4 metadata.xml 323
+SHA256 db4c539d074d1626f5128f94aeadbc7856e42784b257144c6f2b08385a02debf metadata.xml 323
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFCSdQ6FdQwWVoAgN4RAo4aAKCcaq6MljNbmgpEY45yRJ4ZCJ+eawCcCQTz
-kuD5vhsENuHiIuMgKtbrXvI=
-=r5EH
+iD8DBQFEDbYdAiZjviIA2XgRAvlBAKCJpDSghcU0keFnAEHqe0fX9LTTEQCfQJK7
+AGdr30OX9Nl3KRL0VAlK9TY=
+=DA8u
 -----END PGP SIGNATURE-----
diff --git a/media-video/effectv/effectv-0.3.10.ebuild b/media-video/effectv/effectv-0.3.10.ebuild
index ea93ab46994a..a552969ce5e9 100644
--- a/media-video/effectv/effectv-0.3.10.ebuild
+++ b/media-video/effectv/effectv-0.3.10.ebuild
@@ -1,8 +1,8 @@
-# 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/effectv/effectv-0.3.10.ebuild,v 1.1 2005/03/29 22:50:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/effectv-0.3.10.ebuild,v 1.2 2006/03/07 16:34:24 flameeyes Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="EffecTV is a real-time video effect-processor"
 HOMEPAGE="http://effectv.sourceforge.net/"
@@ -11,27 +11,24 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="mmx"
-DEPEND="virtual/libc
-		dev-lang/nasm
+DEPEND="x86? ( dev-lang/nasm )
 		media-libs/libsdl"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# modify path and comment out presets
-	sed -i -e 's:/usr/local:/usr:' \
-		-e 's:^USE_VLOOPBACK:#USE_VLOOPBACK:' \
-		-e 's:^ARCH:#ARCH:' config.mk
-	if ! use mmx; then
-		sed -i -e 's:^USE_MMX:#USE_MMX:' config.mk
-	fi
-	# use Gentoo CFLAGS and compiler
-	sed -i -e "s:\$(CONFIG.arch) \$(CFLAGS.opt):${CFLAGS}:" \
-		-e "s:^CC:#CC:" Makefile
+	epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
 src_compile() {
-	emake || die "emake failed"
+	local mmx
+	local nasm
+
+	use mmx && mmx="yes" || mmx="no"
+	[[ $(tc-arch) == "x86" ]] && nasm="yes" || nasm="no"
+
+	emake CC="$(tc-getCC)" PREFIX="/usr" CFLAGS.opt="${CFLAGS}" \
+		USE_MMX=${mmx} USE_NASM=${nasm} ARCH= || die "emake failed"
 }
 
 src_install() {
diff --git a/media-video/effectv/files/effectv-0.3.10-makefile.patch b/media-video/effectv/files/effectv-0.3.10-makefile.patch
new file mode 100644
index 000000000000..33504129050a
--- /dev/null
+++ b/media-video/effectv/files/effectv-0.3.10-makefile.patch
@@ -0,0 +1,19 @@
+Index: effectv-0.3.10/Makefile
+===================================================================
+--- effectv-0.3.10.orig/Makefile
++++ effectv-0.3.10/Makefile
+@@ -40,12 +40,12 @@ all-recursive:
+ all-am: $(PROGRAM)
+ 
+ $(PROGRAM): $(OBJS) $(LIBEFFECTS) v4lutils/libv4lutils.a
+-	$(CC) -o $@ $(OBJS) $(LIBEFFECTS) $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBEFFECTS) $(LIBS)
+ 
+ $(OBJS): EffecTV.h screen.h video.h palette.h frequencies.h vloopback.h utils.h
+ 
+ install: all-am
+-	$(INSTALL) -s $(PROGRAM) $(bindir)/
++	$(INSTALL) $(PROGRAM) $(bindir)/
+ 	$(INSTALL) effectv.1 $(mandir)/man1/
+ 
+ clean: