Rice it down, don't add extra flags to the build, like the deprecated -mtune or -O3 -fomit-frame-pointer.

(Portage version: 2.1_rc2-r2)

5 files changed, 18 insertions, 12 deletions

diff --git a/media-libs/a52dec/ChangeLog b/media-libs/a52dec/ChangeLog
index 530bcf31ec87..ea5a9217e356 100644
--- a/media-libs/a52dec/ChangeLog
+++ b/media-libs/a52dec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/a52dec
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.44 2006/02/04 15:38:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.45 2006/05/25 00:18:32 flameeyes Exp $
+
+  25 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/a52dec-0.7.4-build.patch, a52dec-0.7.4-r5.ebuild:
+  Rice it down, don't add extra flags to the build, like the deprecated -mtune
+  or -O3 -fomit-frame-pointer.
 
   04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> a52dec-0.7.4-r3.ebuild,
   a52dec-0.7.4-r5.ebuild:
diff --git a/media-libs/a52dec/a52dec-0.7.4-r5.ebuild b/media-libs/a52dec/a52dec-0.7.4-r5.ebuild
index 5e8740fb90e0..7813ba57bdc6 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r5.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r5.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-libs/a52dec/a52dec-0.7.4-r5.ebuild,v 1.12 2006/02/04 15:38:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r5.ebuild,v 1.13 2006/05/25 00:18:32 flameeyes Exp $
 
 inherit eutils flag-o-matic libtool autotools
 
@@ -19,9 +19,9 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-build.patch
-	epatch ${FILESDIR}/${P}-freebsd.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-freebsd.patch"
 
 	eautoreconf
 	epunt_cxx
@@ -35,7 +35,7 @@ src_compile() {
 	econf \
 		$(use_enable djbfft) \
 		${myconf} || die
-	emake || die "emake failed"
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/a52dec/files/a52dec-0.7.4-build.patch b/media-libs/a52dec/files/a52dec-0.7.4-build.patch
index bc1aa988f301..f3a29f303ceb 100644
--- a/media-libs/a52dec/files/a52dec-0.7.4-build.patch
+++ b/media-libs/a52dec/files/a52dec-0.7.4-build.patch
@@ -1,30 +1,27 @@
 diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
 --- a52dec-0.7.4.orig/liba52/Makefile.am	2002-01-27 20:36:48.000000000 -0800
 +++ a52dec-0.7.4/liba52/Makefile.am	2004-11-05 01:10:21.317401872 -0800
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
-+AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
  
  lib_LTLIBRARIES = liba52.la
  
 diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
 --- a52dec-0.7.4.orig/liba52/configure.incl	2002-01-27 20:36:48.000000000 -0800
 +++ a52dec-0.7.4/liba52/configure.incl	2004-11-05 01:11:38.172672216 -0800
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,6 @@
  AC_SUBST([LIBA52_LIBS])
  
  dnl avoid -fPIC when possible
 -LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
-+dnl LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
  
  AC_ARG_ENABLE([double],
      [  --enable-double         use double-precision samples])
 diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
 --- a52dec-0.7.4.orig/src/Makefile.am	2002-06-22 18:51:57.000000000 -0700
 +++ a52dec-0.7.4/src/Makefile.am	2004-11-05 01:10:21.320401375 -0800
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -CFLAGS = @A52DEC_CFLAGS@
-+AM_CFLAGS = @A52DEC_CFLAGS@
  
  bin_PROGRAMS = a52dec extract_a52
  a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/media-libs/a52dec/files/digest-a52dec-0.7.4-r3 b/media-libs/a52dec/files/digest-a52dec-0.7.4-r3
index 51a373ceb950..00eab7d0efb5 100644
--- a/media-libs/a52dec/files/digest-a52dec-0.7.4-r3
+++ b/media-libs/a52dec/files/digest-a52dec-0.7.4-r3
@@ -1 +1,3 @@
 MD5 caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz 241507
+RMD160 5b63b34c5840e7182b733cad41e916a8d4875eb1 a52dec-0.7.4.tar.gz 241507
+SHA256 a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 a52dec-0.7.4.tar.gz 241507
diff --git a/media-libs/a52dec/files/digest-a52dec-0.7.4-r5 b/media-libs/a52dec/files/digest-a52dec-0.7.4-r5
index 51a373ceb950..00eab7d0efb5 100644
--- a/media-libs/a52dec/files/digest-a52dec-0.7.4-r5
+++ b/media-libs/a52dec/files/digest-a52dec-0.7.4-r5
@@ -1 +1,3 @@
 MD5 caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz 241507
+RMD160 5b63b34c5840e7182b733cad41e916a8d4875eb1 a52dec-0.7.4.tar.gz 241507
+SHA256 a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 a52dec-0.7.4.tar.gz 241507