minor amd64-specific cleanup

Package-Manager: portage-2.0.51.19

3 files changed, 45 insertions, 51 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 31d9590a6088..57c23ce7d60f 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.302 2005/04/19 00:20:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.303 2005/04/21 09:49:49 blubb Exp $
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> mplayer-1.0_pre6-r6.ebuild:
+  minor amd64-specific cleanup
 
   19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
   mplayer-1.0_pre6-r4.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b84cd44edfdf..dfb0ec22f540 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,57 +1,47 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6b73457c2b3800fbd0afc2bcda19799e ChangeLog 56049
-MD5 55052c567ab0887b03c2c00755158b2d mplayer-1.0_pre6-r6.ebuild 18290
+MD5 cb55b1c2c6738154f7e9f97300a46632 ChangeLog 56157
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 211ad7e953c470d98d76ced823f35c47 mplayer-1.0_pre6-r4.ebuild 18378
+MD5 358ffd02ff69efeb5e332a34f050e37f mplayer-1.0_pre6-r6.ebuild 18391
+MD5 31a76aa868e3aa8e73c045e465393118 mplayer-1.0_pre5-r5.ebuild 18497
 MD5 9a167a94034cc13a8582b735e3ad1727 mplayer-1.0_pre7.ebuild 17688
 MD5 45e2a019f7e6f9fdc7bda68ff8d19f10 mplayer-1.0_pre6-r5.ebuild 18461
-MD5 31a76aa868e3aa8e73c045e465393118 mplayer-1.0_pre5-r5.ebuild 18497
-MD5 443b9526abb33e4e9f8786f764253b53 files/mplayer-1.0_pre5-gcc_detection.patch 445
-MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
-MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272
-MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
-MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
-MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre5-alsa-gcc34.patch 299
-MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388
-MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r4 429
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre5-help_mp-ro.h.patch 3267
-MD5 62d91cee9c8499fb0186fd7597c725f7 files/digest-mplayer-1.0_pre7 428
-MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r5 429
-MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
-MD5 a8ffa5151727e9dd008d95a6553948bb files/mplayer-gcc_detection.patch 780
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
-MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429
+MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
+MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
 MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
+MD5 62d91cee9c8499fb0186fd7597c725f7 files/digest-mplayer-1.0_pre7 428
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre5-alsa-gcc34.patch 299
+MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre5-help_mp-ro.h.patch 3267
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
 MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 443b9526abb33e4e9f8786f764253b53 files/mplayer-1.0_pre5-gcc_detection.patch 445
+MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
+MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
+MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
+MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264
 MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
-MD5 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
+MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388
+MD5 a8ffa5151727e9dd008d95a6553948bb files/mplayer-gcc_detection.patch 780
+MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
+MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
 MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
-MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
-MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
+MD5 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593
+MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429
-MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZE7TKf2g/qXtneoRAkhHAJ9ne6axMHfOdbqMk1MYnq8HbVGPcQCcDBGm
-yY3DFZvVpAToIBrvt1qIgOo=
-=9ET1
------END PGP SIGNATURE-----
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
index cebb5f20d75b..6749d5439467 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r6.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-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.3 2005/04/18 19:02:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.4 2005/04/21 09:49:49 blubb Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -439,10 +439,11 @@ src_compile() {
 	#################
 	myconf="${myconf} $(use_enable 3dnow)"
 	myconf="${myconf} $(use_enable 3dnowext 3dnowex)";
-	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable sse2)"
-	myconf="${myconf} $(use_enable mmx)"
-	myconf="${myconf} $(use_enable mmxext mmx2)"
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use x86 && myconf="${myconf} $(use_enable sse)"
+	use x86 && myconf="${myconf} $(use_enable sse2)"
+	use x86 && myconf="${myconf} $(use_enable mmx)"
+	use x86 && myconf="${myconf} $(use_enable mmxext mmx2)"
 	myconf="${myconf} $(use_enable debug)"
 	myconf="${myconf} $(use_enable nls i18n)"