Hard-enable mmx/mmxext for amd64. Abort with error when USE="-mmx -mmxext".

Package-Manager: portage-2.1.1_pre5-r1

3 files changed, 28 insertions, 15 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 2c9deb8095e4..6a82aa5b2352 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.16 2006/08/16 07:21:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.17 2006/08/16 09:42:17 zzam Exp $
+
+  16 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-softdevice-0.2.3.20060814-r1.ebuild:
+  Hard-enable mmx/mmxext for amd64. Abort with error when USE="-mmx -mmxext".
 
 *vdr-softdevice-0.2.3.20060814-r1 (16 Aug 2006)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index cda45bc4018b..e528a6a7b983 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -51,14 +51,14 @@ EBUILD vdr-softdevice-0.2.3.20060511-r7.ebuild 3098 RMD160 d9733421ea94ec1722577
 MD5 43a1247255aef5bc32a2eb739657b50e vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
 RMD160 d9733421ea94ec172257737294cf8c6af855ff00 vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
 SHA256 9be701e372f6001124721c3b636c53a2d14dd561599641e394b611ab47f06450 vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
-EBUILD vdr-softdevice-0.2.3.20060814-r1.ebuild 3186 RMD160 65f566eb2de9e37b8adf82902f8b063315f3a8c3 SHA1 58c7b8455aa49b292008ac28571ffd204a847f39 SHA256 8a770753e1404cbae1f59cc88d1d49f15111ef14ff56fb888f629b396d933240
-MD5 870865df064a9a2642e12d198eeaa6b8 vdr-softdevice-0.2.3.20060814-r1.ebuild 3186
-RMD160 65f566eb2de9e37b8adf82902f8b063315f3a8c3 vdr-softdevice-0.2.3.20060814-r1.ebuild 3186
-SHA256 8a770753e1404cbae1f59cc88d1d49f15111ef14ff56fb888f629b396d933240 vdr-softdevice-0.2.3.20060814-r1.ebuild 3186
-MISC ChangeLog 4250 RMD160 f33b90c82e3ee47ca4c7b4dc3d94249b9f122bc7 SHA1 217e79f69c9096b4f3eafc12c65d67f7e18388cb SHA256 cc108f2cc31e151c84c6e6813ca51ce6fa89e66c85f409b2b28282b3f4432576
-MD5 c1b26dd54d0e499e24aba59864369957 ChangeLog 4250
-RMD160 f33b90c82e3ee47ca4c7b4dc3d94249b9f122bc7 ChangeLog 4250
-SHA256 cc108f2cc31e151c84c6e6813ca51ce6fa89e66c85f409b2b28282b3f4432576 ChangeLog 4250
+EBUILD vdr-softdevice-0.2.3.20060814-r1.ebuild 3502 RMD160 52576aa865b28c3b60adbb978fb74e1c7e81d07d SHA1 0f56e6dd6d9de90f4a3bae597e0296d2b36ff6f4 SHA256 06d12a852333194f60533e04b17fa3884142cc846d07a35ec4db1e41b43c493f
+MD5 7ede6415ae6570342b8a05a4b1bf0871 vdr-softdevice-0.2.3.20060814-r1.ebuild 3502
+RMD160 52576aa865b28c3b60adbb978fb74e1c7e81d07d vdr-softdevice-0.2.3.20060814-r1.ebuild 3502
+SHA256 06d12a852333194f60533e04b17fa3884142cc846d07a35ec4db1e41b43c493f vdr-softdevice-0.2.3.20060814-r1.ebuild 3502
+MISC ChangeLog 4425 RMD160 d128ac094f17c5fff518c39e0cfa42169210d176 SHA1 1cadb304e71dc7c88aafe2e7dc27112a7876a76f SHA256 3896c9daecbdf949b8a90e80d006e20367823d0e1e0aad874ecedcb6a213c702
+MD5 91220c3d8b85363430fb210ad4a0e08b ChangeLog 4425
+RMD160 d128ac094f17c5fff518c39e0cfa42169210d176 ChangeLog 4425
+SHA256 3896c9daecbdf949b8a90e80d006e20367823d0e1e0aad874ecedcb6a213c702 ChangeLog 4425
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -72,7 +72,7 @@ SHA256 8b86ceef4b53dc1cfc1b5d595124a672bc98f5da8c14227241d905ab41581b42 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4sd5t2vP6XvVdOcRAn3WAKC0PVVc/MO6xeV2gxjG9CKC6v4ligCcDQhz
-pJY4tceRVgM6No3E+9lhkcA=
-=mcVu
+iD8DBQFE4uiCt2vP6XvVdOcRAqX3AJ9bF9P8TZbpG9XaH8LyPoigUBBl+wCfQBew
+M36hVvf7AyiT+RLqRPbrcHY=
+=aGR2
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild
index e45f90eaf079..2731167f0e37 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.3.20060814-r1.ebuild,v 1.1 2006/08/16 07:21:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild,v 1.2 2006/08/16 09:42:17 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -94,8 +94,17 @@ src_compile() {
 	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
 
 	# MMX-Support
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
+	# 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"
+
+		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
+	fi
 
 	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"