Cleanup of ebuild: using $() syntax for command expansion; better check for gcc 3.4 or better (consider gcc 4).

Package-Manager: portage-2.0.51.21-r1

3 files changed, 20 insertions, 19 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 9742d7f428a0..220da9093243 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.224 2005/05/15 02:03:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.225 2005/05/15 15:28:54 flameeyes Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.0.1-r1.ebuild:
+  Cleanup of ebuild: using $() syntax for command expansion; better check for
+  gcc 3.4 or better (consider gcc 4).
 
   15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1_rc6-r2.ebuild, xine-lib-1_rc8-r1.ebuild,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index ed41df02ceab..b4e7b1538150 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,11 +1,11 @@
-MD5 48dc673ff57b4c45d66b2e17ee509d1e ChangeLog 8722
+MD5 c628e9b7a75086feb9cae461eb5865ff ChangeLog 8920
 MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
 MD5 52de75262d8f3959e67bedb31ad0f504 xine-lib-1.0-r2.ebuild 7091
 MD5 26fcc8c7c4566812f911baef742cf191 xine-lib-1.0-r3.ebuild 7079
-MD5 d369fe96b3307250f3d22c3b13785e35 xine-lib-1.0-r4.ebuild 7186
-MD5 027323fd036c9106ffa813d90244d10d xine-lib-1.0.1-r1.ebuild 7339
+MD5 13d43d2a540653eeb091a62461004bff xine-lib-1.0.1-r1.ebuild 7276
 MD5 85bf551f99f2047ef56c5eb8b19d9378 xine-lib-1_rc6-r2.ebuild 5251
 MD5 893e7360a0c817ebe6c8eae8b1d3d3b3 xine-lib-1_rc8-r1.ebuild 5284
+MD5 d369fe96b3307250f3d22c3b13785e35 xine-lib-1.0-r4.ebuild 7186
 MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r2 134
 MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r3 134
 MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r4 134
diff --git a/media-libs/xine-lib/xine-lib-1.0.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.0.1-r1.ebuild
index 7373959d51d2..e0a08305e31e 100644
--- a/media-libs/xine-lib/xine-lib-1.0.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.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/xine-lib/xine-lib-1.0.1-r1.ebuild,v 1.5 2005/05/15 02:03:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.1-r1.ebuild,v 1.6 2005/05/15 15:28:55 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool
 
@@ -45,6 +45,7 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	vcd? ( media-video/vcdimager )
 	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
 	!=media-libs/xine-lib-0.9.13*"
+
 DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 	>=sys-devel/automake-1.7
@@ -77,7 +78,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	#filter dangerous compile CFLAGS
 	strip-flags
 
@@ -86,20 +86,19 @@ src_compile() {
 
 	use x86 && has_pic && append-flags -UHAVE_MMX
 
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-		append-flags -fno-web #49509
+	if [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "4" ] || \
+	[ "$(gcc-major-version)" -ge "4" ]; then
+		# bugs 49509 and 55202
+		append-flags -fno-web -funit-at-a-time
 		filter-flags -fno-unit-at-a-time #55202
-		append-flags -funit-at-a-time #55202
 	fi
 
 	is-flag -O? || append-flags -O1 #31243
 
 	# fix build errors with sse2 #49482
-	if use x86 ; then
-		if [ `gcc-major-version` -eq 3 ] ; then
-			append-flags -mno-sse2 `test_flag -mno-sse3`
-			filter-mfpmath sse
-		fi
+	if use x86 && [ $(gcc-major-version) -ge 3 ]; then
+		append-flags -mno-sse2 $(test_flag -mno-sse3)
+		filter-mfpmath sse
 	fi
 
 	local myconf
@@ -109,9 +108,6 @@ src_compile() {
 		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
 		|| myconf="${myconf} --disable-asf"
 
-	use sparc \
-		&& myconf="${myconf} --build=${CHOST}"
-
 	# enable/disable appropiate optimizations on sparc
 	[ "${PROFILE_ARCH}" == "sparc64" ] \
 		&& myconf="${myconf} --enable-vis"
@@ -121,11 +117,11 @@ src_compile() {
 	# Fix compilation-errors on PowerPC #45393 & #55460 & #68251
 	if use ppc || use ppc64 ; then
 		append-flags -U__ALTIVEC__
-		myconf="${myconf} `use_enable altivec`"
+		myconf="${myconf} $(use_enable altivec)"
 	fi
 
 	# The default CFLAGS (-O) is the only thing working on hppa.
-	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
+	if use hppa; then
 		unset CFLAGS
 	else
 		append-flags -ffunction-sections