[gentoo-commits] gentoo-x86 commit in media-sound/mpg123: ChangeLog mpg123-1.12.1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/04/25 13:33:06

  Modified:             ChangeLog mpg123-1.12.1.ebuild
  Log:
  Use tc-arch to select between amd64 and x86 optimization wrt #317069.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.223                media-sound/mpg123/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/ChangeLog?rev=1.223&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/ChangeLog?rev=1.223&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/ChangeLog?r1=1.222&r2=1.223

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- ChangeLog	24 Apr 2010 17:19:21 -0000	1.222
+++ ChangeLog	25 Apr 2010 13:33:05 -0000	1.223
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.222 2010/04/24 17:19:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.223 2010/04/25 13:33:05 ssuominen Exp $
+
+  25 Apr 2010; Samuli Suominen <ssuominen@g.o> mpg123-1.12.1.ebuild:
+  Use tc-arch to select between amd64 and x86 optimization wrt #317069.
 
   24 Apr 2010; Samuli Suominen <ssuominen@g.o> mpg123-1.12.1.ebuild:
   Remove USE network from this release wrt #315139.



1.4                  media-sound/mpg123/mpg123-1.12.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/mpg123-1.12.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/mpg123-1.12.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpg123/mpg123-1.12.1.ebuild?r1=1.3&r2=1.4

Index: mpg123-1.12.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.12.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpg123-1.12.1.ebuild	24 Apr 2010 17:24:02 -0000	1.3
+++ mpg123-1.12.1.ebuild	25 Apr 2010 13:33:06 -0000	1.4
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.12.1.ebuild,v 1.3 2010/04/24 17:24:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.12.1.ebuild,v 1.4 2010/04/25 13:33:06 ssuominen Exp $
 
 EAPI=2
+inherit toolchain-funcs
 
 DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
 HOMEPAGE="http://www.mpg123.org/"
@@ -13,7 +14,6 @@
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="3dnow 3dnowext alsa altivec ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
-# +network
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -29,7 +29,6 @@
 	local _audio=dummy
 	local _output=dummy
 	local _cpu=generic_fpu
-	local _ipv6=disable
 
 	for flag in nas portaudio sdl oss jack alsa pulseaudio; do
 		if use ${flag}; then
@@ -40,12 +39,9 @@
 
 	use altivec && _cpu=altivec
 
-	if [[ ${ABI} = amd64 ]] && use sse; then
-		_cpu=x86-64
-	fi
-
-	if [[ ${ABI} = x86 ]]; then
-		_cpu=i586
+	if [[ $(tc-arch) == amd64 ]]; then
+		use sse && _cpu=x86-64
+	else
 		use mmx && _cpu=mmx
 		use 3dnow && _cpu=3dnow
 		use sse && _cpu=x86