Fix --enable-simd choice thanks to psm.

Package-Manager: portage-2.0.51.19

5 files changed, 39 insertions, 11 deletions

diff --git a/media-plugins/xmms-mpg123/ChangeLog b/media-plugins/xmms-mpg123/ChangeLog
index 60712e417b61..f2802805adde 100644
--- a/media-plugins/xmms-mpg123/ChangeLog
+++ b/media-plugins/xmms-mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-mpg123
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mpg123/ChangeLog,v 1.5 2005/03/14 00:33:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mpg123/ChangeLog,v 1.6 2005/03/16 05:53:15 eradicator Exp $
+
+  16 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-mpg123-1.2.10.ebuild, xmms-mpg123-1.2.10-r1.ebuild:
+  Fix --enable-simd choice thanks to psm.
 
   13 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-mpg123-1.2.10-r1.ebuild:
diff --git a/media-plugins/xmms-mpg123/Manifest b/media-plugins/xmms-mpg123/Manifest
index f1e37aa4f66e..f0612feea1e1 100644
--- a/media-plugins/xmms-mpg123/Manifest
+++ b/media-plugins/xmms-mpg123/Manifest
@@ -1,6 +1,16 @@
-MD5 48d8d25e44899bd12b0613741e9358de ChangeLog 812
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 8067a4dc2b164b2dd94dcbdf1ff8e17d xmms-mpg123-1.2.10-r1.ebuild 601
-MD5 c753e625ac66d58e8dc1d89469bc6a9e xmms-mpg123-1.2.10.ebuild 526
-MD5 af2d409c36e9f3caee63715699f1ce44 files/digest-xmms-mpg123-1.2.10 142
+MD5 016e95089acd603ddbd417fbf6633512 xmms-mpg123-1.2.10.ebuild 679
+MD5 42b1557928bffd1655f565a70d1e53d6 xmms-mpg123-1.2.10-r1.ebuild 754
+MD5 ad4d6ff5b5e055322da7f426e8317f2b ChangeLog 971
+MD5 f930420b092ea660e8da0c4b24e0f6a4 files/digest-xmms-mpg123-1.2.10 142
 MD5 29189a07ebf2ac1578898c2234dc1bce files/digest-xmms-mpg123-1.2.10-r1 227
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCN8nWArHZZzCEUG0RAnD3AJ90NinNowPWsHiytBblv3jvR4UamQCdHexK
+wzLs3crx72m5Ny1IpInL0wU=
+=lv53
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-mpg123/files/digest-xmms-mpg123-1.2.10 b/media-plugins/xmms-mpg123/files/digest-xmms-mpg123-1.2.10
index 6c72ae7c2cfb..bcf56814053d 100644
--- a/media-plugins/xmms-mpg123/files/digest-xmms-mpg123-1.2.10
+++ b/media-plugins/xmms-mpg123/files/digest-xmms-mpg123-1.2.10
@@ -1,2 +1,2 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
-MD5 20c6bdc86523cb9c1993078d2f5c331f xmms-1.2.10-gentoo-m4-1.0.tar.bz2 24874
+MD5 28314147dec40dbeaf4665bf1a9854b9 xmms-1.2.10-gentoo-m4-1.1.tar.bz2 26978
diff --git a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r1.ebuild b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r1.ebuild
index 9cbdb0178e87..1d3690f7c0b1 100644
--- a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r1.ebuild
+++ b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r1.ebuild,v 1.7 2005/03/14 00:33:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10-r1.ebuild,v 1.8 2005/03/16 05:53:15 eradicator Exp $
 
-IUSE="ipv6 ssl"
+IUSE="ipv6 ssl mmx 3dnow"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 
@@ -19,5 +19,12 @@ inherit xmms-plugin
 
 src_compile() {
 	myconf="${myconf} --enable-mpg123 $(use_enable ipv6) $(use_enable ssl)"
+
+	if use x86 && ! has_pic && { use mmx || use 3dnow; }; then
+		myconf="${myconf} --enable-simd"
+	else
+		myconf="${myconf} --disable-simd"
+	fi
+
 	xmms-plugin_src_compile
 }
diff --git a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10.ebuild b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10.ebuild
index 93194481009e..fb1ae718448c 100644
--- a/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10.ebuild
+++ b/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10.ebuild,v 1.3 2005/02/28 10:53:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mpg123/xmms-mpg123-1.2.10.ebuild,v 1.4 2005/03/16 05:53:15 eradicator Exp $
 
-IUSE="ipv6"
+IUSE="ipv6 mmx 3dnow"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 
@@ -10,11 +10,18 @@ DEPEND=">=media-sound/xmms-1.2.10"
 
 PLUGIN_PATH="Input/mpg123"
 
-M4_VER="1.0"
+M4_VER="1.1"
 
 inherit xmms-plugin
 
 src_compile() {
 	myconf="${myconf} --enable-mpg123 $(use_enable ipv6)"
+
+	if use x86 && ! has_pic && { use mmx || use 3dnow; }; then
+		myconf="${myconf} --enable-simd"
+	else
+		myconf="${myconf} --disable-simd"
+	fi
+
 	xmms-plugin_src_compile
 }