depend on >=portage-2.1.2 on amd64 to make sure the assembler USE flags are unmasked

Package-Manager: portage-2.1.2-r9

3 files changed, 18 insertions, 22 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index dda7130a8332..c4b69f68d25d 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.45 2007/01/07 15:12:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.46 2007/02/16 12:19:35 blubb Exp $
+
+  16 Feb 2007; Simon Stelling <blubb@gentoo.org> xdtv-2.3.3.ebuild:
+  depend on >=portage-2.1.2 on amd64 to make sure the assembler USE flags are
+  unmasked
 
   07 Jan 2007; Alexis Ballier <aballier@gentoo.org> xdtv-2.2.0-r1.ebuild,
   xdtv-2.3.3.ebuild:
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index 9a86cc5a8e76..8d08ea67eb53 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libxdtv-i18n-all-1.3.0-ldflags.patch 551 RMD160 91e4d23410d0da27c330f84aeacc388bc723b83f SHA1 b203ad1d6db5b684ef354adf606c62c2955d874e SHA256 97028239e4386ec033d5e4cb392142a2c18fd2ce34f1476b95b0b5f6bfbb0df8
 MD5 7d0c59969eb23101640e6c3881ff62e8 files/libxdtv-i18n-all-1.3.0-ldflags.patch 551
 RMD160 91e4d23410d0da27c330f84aeacc388bc723b83f files/libxdtv-i18n-all-1.3.0-ldflags.patch 551
@@ -75,14 +72,14 @@ EBUILD xdtv-2.2.0-r1.ebuild 7105 RMD160 18193148993e4614e2170dec8ae9608ca87df60b
 MD5 feb3ede4d8e960cf39e0dc83a75eb785 xdtv-2.2.0-r1.ebuild 7105
 RMD160 18193148993e4614e2170dec8ae9608ca87df60b xdtv-2.2.0-r1.ebuild 7105
 SHA256 aaaaf15321b778f4835cd2ed357ed6830a437f60c5a30e2b18302608dfab6a56 xdtv-2.2.0-r1.ebuild 7105
-EBUILD xdtv-2.3.3.ebuild 5995 RMD160 14ac737cfc43dedd2a053b476c147d3040d52567 SHA1 67b817fa194345a1565cc5bf9268758f0fb3d51c SHA256 9c759f7b96d54071cfab422dd126e869fb81ec50ed807e274270e226a0c7c628
-MD5 b62e6c8a1fd7750bff478ac6cab2af15 xdtv-2.3.3.ebuild 5995
-RMD160 14ac737cfc43dedd2a053b476c147d3040d52567 xdtv-2.3.3.ebuild 5995
-SHA256 9c759f7b96d54071cfab422dd126e869fb81ec50ed807e274270e226a0c7c628 xdtv-2.3.3.ebuild 5995
-MISC ChangeLog 7520 RMD160 e93d81b35a18196bdda56fda195ba6d6ef3abcce SHA1 a3cea2c33126d132995639470404cd200193e8d8 SHA256 62fe27c1218a6d5fd683fe57a77039359d42dbc24ef248310bb74c1b89e852ab
-MD5 26532bd3a96549137eb4171c053b2fc5 ChangeLog 7520
-RMD160 e93d81b35a18196bdda56fda195ba6d6ef3abcce ChangeLog 7520
-SHA256 62fe27c1218a6d5fd683fe57a77039359d42dbc24ef248310bb74c1b89e852ab ChangeLog 7520
+EBUILD xdtv-2.3.3.ebuild 6102 RMD160 dc61b528db4296d6ffc91eb84039b5b53930de83 SHA1 cfcaca70c82b3b95c4d65c9298e7719f0b12e5d8 SHA256 8124da1e8b5b1eb6362044398fead92385053abfc4830b86e32b47f38843693b
+MD5 e8fddcb8b24d35b9f186b2012e815dae xdtv-2.3.3.ebuild 6102
+RMD160 dc61b528db4296d6ffc91eb84039b5b53930de83 xdtv-2.3.3.ebuild 6102
+SHA256 8124da1e8b5b1eb6362044398fead92385053abfc4830b86e32b47f38843693b xdtv-2.3.3.ebuild 6102
+MISC ChangeLog 7675 RMD160 779b6fc154fdb8f3c7e6be3aacb2e175c6c0a213 SHA1 b6d0b48a5d7a4fe2992ec8d46033e6a406b3753d SHA256 c4b1c6ffe165c1e2db30afa5bc5a74fcab3a106003c3bbcabd9e9aae1e14fe88
+MD5 ac93129814b150aed4c83916019e751e ChangeLog 7675
+RMD160 779b6fc154fdb8f3c7e6be3aacb2e175c6c0a213 ChangeLog 7675
+SHA256 c4b1c6ffe165c1e2db30afa5bc5a74fcab3a106003c3bbcabd9e9aae1e14fe88 ChangeLog 7675
 MISC metadata.xml 251 RMD160 5a95bc58fcda94b2d82b3040b6730442e120f8ea SHA1 06b6e03f61417e4af6428787da39f3e5f76b6bf1 SHA256 27a61643c6fa329d9ffed2f5517d4f142d60b94836413a2fdfe3cfdc085a9d38
 MD5 e94a425466daf4d1f823b904e88608cd metadata.xml 251
 RMD160 5a95bc58fcda94b2d82b3040b6730442e120f8ea metadata.xml 251
@@ -93,10 +90,3 @@ SHA256 dcc0947ec0e61e4392d7e7df13e717d52cc62743d6124a1f7a4c9ab6e927898b files/di
 MD5 72a337045093ae71fc7537ed979eca7d files/digest-xdtv-2.3.3 8635
 RMD160 0ab4db8cd45d115bb303e782c341bb87fde11787 files/digest-xdtv-2.3.3 8635
 SHA256 8f5068c7cc8feea1ac7e67052fdc101ed89033e2ed445c6475bcc91773e5b158 files/digest-xdtv-2.3.3 8635
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFoQ3VvFcC4BYPU0oRAuZSAJ924LFR67lsZlc01EYRx59D6MzPOACeM8+f
-SHEhpegp+Gpkhi3NX0IMKWk=
-=BCW6
------END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/xdtv-2.3.3.ebuild b/media-tv/xdtv/xdtv-2.3.3.ebuild
index 94165e3141f4..9edf25943daf 100644
--- a/media-tv/xdtv/xdtv-2.3.3.ebuild
+++ b/media-tv/xdtv/xdtv-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.3.ebuild,v 1.7 2007/01/07 15:12:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.3.ebuild,v 1.8 2007/02/16 12:19:35 blubb Exp $
 
 WANT_AUTOMAKE="1.7"
 WANT_AUTOCONF="2.5"
@@ -69,6 +69,9 @@ DEPEND="${RDEPEND}
 			x11-apps/mkfontscale
 			xinerama? ( x11-proto/xineramaproto )
 		) <virtual/x11-7 )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
 FONT_S="${S}/font"
 FONT_SUFFIX="pcf.gz"
@@ -134,8 +137,7 @@ src_compile() {
 		ewarn "If you want a better GUI toolkit, enable either \"neXt\" or \"Xaw3d\" USE flags."
 	fi
 
-	( use mmx || use amd64 ) && myconf="${myconf} --enable-mmx" || \
-		myconf="${myconf} --disable-mmx"
+	myconf="${myconf} $(use_enable mmx)"
 
 	has_version '<x11-base/xorg-x11-7.0' && \
 		appdefaultsdir="/etc/X11/app-defaults" || \