Apply unconditionally the gcc 3.4 patches on 0.9.1-r1. Improved check for gcc >=3.4 on 0.9.1.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 14 insertions, 10 deletions

diff --git a/media-libs/libfame/ChangeLog b/media-libs/libfame/ChangeLog
index 63bdb094020e..1a5c4e23e9c0 100644
--- a/media-libs/libfame/ChangeLog
+++ b/media-libs/libfame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libfame
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.33 2005/05/15 02:11:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.34 2005/05/15 16:19:44 flameeyes Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> libfame-0.9.1.ebuild,
+  libfame-0.9.1-r1.ebuild:
+  Apply unconditionally the gcc 3.4 patches on 0.9.1-r1. Improved check for
+  gcc >=3.4 on 0.9.1.
 
   15 May 2005; Diego Pettenò <flameeyes@gentoo.org> libfame-0.9.1.ebuild,
   libfame-0.9.1-r1.ebuild:
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 902a5fd405ef..5f234d4c0026 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -1,9 +1,9 @@
-MD5 6520511dc3bd57a9791f36708b99e816 ChangeLog 3816
+MD5 673d1d1c8b9b2fa9bfd076a7cdb80f9f ChangeLog 4017
 MD5 9e501b7e4b89f84f344b8094941e7b09 libfame-0.8.10.ebuild 798
 MD5 a3448605a548cc3385b88768dd9fc4b8 libfame-0.9.0-r1.ebuild 1075
 MD5 2120445221c8a91f1b31eca9501cd737 libfame-0.9.0.ebuild 1022
-MD5 a88e0c592a1a4cbdeabe48d8516e5f16 libfame-0.9.1-r1.ebuild 1294
-MD5 ae8e12889156bcdaa298e27b67f8ec02 libfame-0.9.1.ebuild 1271
+MD5 8a41df0e85e6627456edf3b9a3e033ca libfame-0.9.1-r1.ebuild 1137
+MD5 f16673def2a067c14bb4357f55ee1ee6 libfame-0.9.1.ebuild 1328
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 c3a2bb99aa1812617fb10c1738955aad files/digest-libfame-0.8.10 66
 MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0 65
diff --git a/media-libs/libfame/libfame-0.9.1-r1.ebuild b/media-libs/libfame/libfame-0.9.1-r1.ebuild
index 41908f9a7618..6b4b46977827 100644
--- a/media-libs/libfame/libfame-0.9.1-r1.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.10 2005/05/15 02:11:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.11 2005/05/15 16:19:44 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -21,9 +21,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	[ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 02_all_mmx-configure.patch 03_all_gcc34.patch"
-
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 
 	# Do not add -march=i586, bug #41770.
diff --git a/media-libs/libfame/libfame-0.9.1.ebuild b/media-libs/libfame/libfame-0.9.1.ebuild
index fc3c62191f96..0efb9a4d0639 100644
--- a/media-libs/libfame/libfame-0.9.1.ebuild
+++ b/media-libs/libfame/libfame-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.10 2005/05/15 02:11:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.11 2005/05/15 16:19:44 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -23,8 +23,10 @@ src_unpack() {
 
 	# Added in -r1
 	EPATCH_EXCLUDE="04_all_pic.patch"
-	[ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] || \
+	if ! ( [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "4" ] || \
+	[ "$(gcc-major-version)" -ge "4" ] ); then
 		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 02_all_mmx-configure.patch 03_all_gcc34.patch"
+	fi
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}