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, 24 insertions, 32 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 57578311a2b4..494b763c1654 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.33 2007/01/05 16:51:49 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.34 2007/02/16 12:26:37 blubb Exp $
+
+  16 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  vdr-softdevice-0.3.1.20061217.ebuild:
+  depend on >=portage-2.1.2 on amd64 to make sure the assembler USE flags are
+  unmasked
 
   05 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-softdevice-0.3.0-r1.ebuild, vdr-softdevice-0.3.1-r2.ebuild,
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index fcaa5ffe2f7e..4ced321ac6a1 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d4504300662d6a00324091c5d2e22f9f1feb2 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e
 MD5 dacfaa95c10d3b9ae3c1e08ff04dcc65 files/confd 431
 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 files/confd 431
@@ -49,14 +46,14 @@ EBUILD vdr-softdevice-0.3.1.20061124.ebuild 3520 RMD160 aade2e6ae591aa228a374d87
 MD5 cc625afbf889402b6e00158a92e938f1 vdr-softdevice-0.3.1.20061124.ebuild 3520
 RMD160 aade2e6ae591aa228a374d87a74f88cc75ab439c vdr-softdevice-0.3.1.20061124.ebuild 3520
 SHA256 23032609a135fd048d5765d61dc087ac1041d4eeffc1557c2b7309f8822200ed vdr-softdevice-0.3.1.20061124.ebuild 3520
-EBUILD vdr-softdevice-0.3.1.20061217.ebuild 3482 RMD160 5e2632cc816de55ad572abff72d08463aaf94f5e SHA1 d695ac4fedabc72207be397f18a48e02023fbf63 SHA256 928eb99bb8fe32938f4c2fb6674508efc15b8319147671296cbfeebdc58f8080
-MD5 cd28a6546e40d35bef00278a7668a086 vdr-softdevice-0.3.1.20061217.ebuild 3482
-RMD160 5e2632cc816de55ad572abff72d08463aaf94f5e vdr-softdevice-0.3.1.20061217.ebuild 3482
-SHA256 928eb99bb8fe32938f4c2fb6674508efc15b8319147671296cbfeebdc58f8080 vdr-softdevice-0.3.1.20061217.ebuild 3482
-MISC ChangeLog 7989 RMD160 1c1ded9fbe487d239ebda2a1572c176612b25191 SHA1 36b0a3a647e0da80ca66d237d079cb1505d4f3b6 SHA256 c6834149eb0cc84b8d5f2327213faae86234899f927fc1893e2e856c4e21b5a0
-MD5 d9e1f9dfaa9268eb3bfc6d9477d5dd9d ChangeLog 7989
-RMD160 1c1ded9fbe487d239ebda2a1572c176612b25191 ChangeLog 7989
-SHA256 c6834149eb0cc84b8d5f2327213faae86234899f927fc1893e2e856c4e21b5a0 ChangeLog 7989
+EBUILD vdr-softdevice-0.3.1.20061217.ebuild 3537 RMD160 f7c45ee3b10b204c64f75f70bf255859948be59b SHA1 5687dc4b2d151a72b32f2c064c3b3f2fb7f110fa SHA256 aa45686f325c1218c1cd3a5d1708864798b04239bee557b0cc209e38849eeac5
+MD5 78dc5738c56ffdf9ac50e0d8650d1ea6 vdr-softdevice-0.3.1.20061217.ebuild 3537
+RMD160 f7c45ee3b10b204c64f75f70bf255859948be59b vdr-softdevice-0.3.1.20061217.ebuild 3537
+SHA256 aa45686f325c1218c1cd3a5d1708864798b04239bee557b0cc209e38849eeac5 vdr-softdevice-0.3.1.20061217.ebuild 3537
+MISC ChangeLog 8164 RMD160 9f363a05b138ce9c4d927209ced3656823fd8761 SHA1 8c2f564c3b6553c5374f2df3af8b19a19eedad92 SHA256 7a673d3581ddf09420ec70b78a2cbb44b9a39bd16decde5f072d8c9022de2a3f
+MD5 a3b6bcb3501716ecb73ce1c4ce921028 ChangeLog 8164
+RMD160 9f363a05b138ce9c4d927209ced3656823fd8761 ChangeLog 8164
+SHA256 7a673d3581ddf09420ec70b78a2cbb44b9a39bd16decde5f072d8c9022de2a3f ChangeLog 8164
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -73,11 +70,3 @@ SHA256 8ae7a69241616d142fcc81fb835a4400bd59094b83cc35c4051f97ce9a56f218 files/di
 MD5 7c9f01afbc74587480120a2be789a0a3 files/digest-vdr-softdevice-0.3.1.20061217 286
 RMD160 3c61590cb2a0fb1cf9648fdc4c7de7f2aa595a02 files/digest-vdr-softdevice-0.3.1.20061217 286
 SHA256 7a6c1f850f8a96e5d7fd1f8e56dbb8076c838ff9a983805e166e17aaf6f09399 files/digest-vdr-softdevice-0.3.1.20061217 286
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: GnuPG-Pack Basics: http://home.arcor.de/rose-indorf
-
-iD8DBQFFnoKDdn07HTTCgIoRAk+UAKCXaEHmxAWO6e+J3xlWCYRQuZw95ACeK9lu
-3dxBM3gg8gyW3l1otQU0tso=
-=LJit
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild
index 9423615aa10e..54f2a52dd2ec 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.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-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild,v 1.2 2007/01/05 16:51:49 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1.20061217.ebuild,v 1.3 2007/02/16 12:26:37 blubb Exp $
 
 inherit vdr-plugin
 
@@ -43,7 +43,9 @@ DEPEND="${RDEPEND}
 	) )
 	fbcon? ( sys-kernel/linux-headers )
 	dev-util/pkgconfig"
-
+# 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 )"
 
 PATCHES="
 		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
@@ -93,17 +95,13 @@ src_compile() {
 	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
 	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
 
-	# MMX-Support
-	# hardcode mmx for amd64 - do not disable even without use-flag
-	if ! use amd64; then
-		use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-		use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
+	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
+	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
 
-		if use !mmx && use !mmxext; then
-			ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
-			ewarn 'Please enable at least one of these two use-flags.'
-			die "${PN}"' does not compile with USE="-mmx -mmxext".'
-		fi
+	if use !mmx && use !mmxext; then
+		ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
+		ewarn 'Please enable at least one of these two use-flags.'
+		die "${PN}"' does not compile with USE="-mmx -mmxext".'
 	fi
 
 	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"