fix mmx logic for amd64

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 17 insertions, 24 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index d7d0683e7fe7..26b819052a01 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.47 2006/04/14 18:18:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.48 2006/10/23 11:38:00 blubb Exp $
+
+  23 Oct 2006; Simon Stelling <blubb@gentoo.org> imlib2-1.2.2.001.ebuild:
+  fix mmx logic for amd64
 
   14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   imlib2-1.2.1.009.ebuild:
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 1a5d3e84aa61..3bf147f9d414 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST imlib2-1.2.1.009.tar.gz 915132 RMD160 171c6cff84b5ac547e09931a993abfa1c73d00c0 SHA1 2cfa87e6a0b42a153e4d5a7271680b91b7d4d66f SHA256 eeaf62dca09414c723478f7ef288fac5efdc3091a2c89684fe98d4d4b52589ca
 DIST imlib2-1.2.2.001.tar.gz 944824 RMD160 947b8fcdca0851e655b20071bb44656dc0d56598 SHA1 4c8c2497bb55ffbcd1105459aadb2c15c7ed5e3c SHA256 beb929f4ceff865375a9e56c0156ffbfb197dff82299071bdb641bb60299f84b
 EBUILD imlib2-1.2.1.009.ebuild 1390 RMD160 b8520de7fc58a6a3c18b8c5cd69f690c6acf9489 SHA1 76d95b3975e083735a4daae4ee43b9905aaa3b42 SHA256 e193f2705e81122c16720df0909de3ad7e3c753e626e447953247a1b06930a75
 MD5 550e2a8bed4a09d589c7dc20f7841788 imlib2-1.2.1.009.ebuild 1390
 RMD160 b8520de7fc58a6a3c18b8c5cd69f690c6acf9489 imlib2-1.2.1.009.ebuild 1390
 SHA256 e193f2705e81122c16720df0909de3ad7e3c753e626e447953247a1b06930a75 imlib2-1.2.1.009.ebuild 1390
-EBUILD imlib2-1.2.2.001.ebuild 1290 RMD160 07c266cda27d13b3db479ada2881aac5d9aa6296 SHA1 1f83cad940c91ed60f6c27293c1e751667487512 SHA256 8dd0042aeb0234bf8182ab8a32837108c2e1f778756c95e593a954279b1ee0fe
-MD5 418177ed473fd587bff7b6bb27817732 imlib2-1.2.2.001.ebuild 1290
-RMD160 07c266cda27d13b3db479ada2881aac5d9aa6296 imlib2-1.2.2.001.ebuild 1290
-SHA256 8dd0042aeb0234bf8182ab8a32837108c2e1f778756c95e593a954279b1ee0fe imlib2-1.2.2.001.ebuild 1290
+EBUILD imlib2-1.2.2.001.ebuild 1294 RMD160 2ddee9b8d7630575c9d1ef0bc68e679436890b48 SHA1 86d76565be49900356dda461ae86e5226d69db2d SHA256 4fc1f6e1260e46fce2ed3a2df00eb54b61422683d3735f702caa1a94d4fd9009
+MD5 851cbc9411c0849116adc02dae573bf3 imlib2-1.2.2.001.ebuild 1294
+RMD160 2ddee9b8d7630575c9d1ef0bc68e679436890b48 imlib2-1.2.2.001.ebuild 1294
+SHA256 4fc1f6e1260e46fce2ed3a2df00eb54b61422683d3735f702caa1a94d4fd9009 imlib2-1.2.2.001.ebuild 1294
 EBUILD imlib2-9999.ebuild 1264 RMD160 f4b25f508e582bad3b1a07d2c8760d1e90412cbf SHA1 0a279be040fef91d58f243f7f000b00bf23f014f SHA256 193f7dde30a54d9f9bc9835eb827dcd441a684e878156b8913a80d2b31765a21
 MD5 83796a043d27191c79ef73870de358d4 imlib2-9999.ebuild 1264
 RMD160 f4b25f508e582bad3b1a07d2c8760d1e90412cbf imlib2-9999.ebuild 1264
 SHA256 193f7dde30a54d9f9bc9835eb827dcd441a684e878156b8913a80d2b31765a21 imlib2-9999.ebuild 1264
-MISC ChangeLog 5494 RMD160 a787bc34ebbf5796d16da0538adeef2ed8e8b57d SHA1 92a7030805afdd0ff14955a19df395c203a3c241 SHA256 99c2a7cbe8bc65585203ad6b1db54f34fb7ebdc69ccaa94a1c247151d40ae565
-MD5 7fb0f5a9a55b71747faac5343d2de9ed ChangeLog 5494
-RMD160 a787bc34ebbf5796d16da0538adeef2ed8e8b57d ChangeLog 5494
-SHA256 99c2a7cbe8bc65585203ad6b1db54f34fb7ebdc69ccaa94a1c247151d40ae565 ChangeLog 5494
+MISC ChangeLog 5591 RMD160 6198feed8e2596573382790e8bb03ddeeb1dd4b4 SHA1 ef1cdd998a28aaf619b27250bb4119ca1eddee8c SHA256 06c2cdd0f4bfe299576a3c51464971c4374e53af18f39bc412218e0a2f42886f
+MD5 6f5d425343ec81976b43a56150b3a252 ChangeLog 5591
+RMD160 6198feed8e2596573382790e8bb03ddeeb1dd4b4 ChangeLog 5591
+SHA256 06c2cdd0f4bfe299576a3c51464971c4374e53af18f39bc412218e0a2f42886f ChangeLog 5591
 MISC metadata.xml 2284 RMD160 1beb3cfbdf7bf582e2d534ee2c6e7d0daedc1e2b SHA1 f791c4147cc40417ebb718ac06c533350ad6b8f1 SHA256 a3fe8a53761d20a0718156eef74c69648fd587cbe4dc29ee90b214b7ee0a028b
 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
 RMD160 1beb3cfbdf7bf582e2d534ee2c6e7d0daedc1e2b metadata.xml 2284
@@ -32,10 +29,3 @@ SHA256 2ef57d33dcf9f2f9e327bfa94ac2685ea6b5617e7fb5669644180324f90d8fd1 files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-imlib2-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-imlib2-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-imlib2-9999 1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEuc2mamhnQswr0vIRAhVFAJ4jQQp+Hd1fp9PJnbpWw7hbeY0RygCdFkgN
-pZN0EUljvl59EIXN345Fwlw=
-=9tmG
------END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/imlib2-1.2.2.001.ebuild b/media-libs/imlib2/imlib2-1.2.2.001.ebuild
index 39101b1b66a2..30935f7f6c55 100644
--- a/media-libs/imlib2/imlib2-1.2.2.001.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.2.001.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-libs/imlib2/imlib2-1.2.2.001.ebuild,v 1.2 2006/07/16 05:17:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.2.001.ebuild,v 1.3 2006/10/23 11:38:00 blubb Exp $
 
 inherit enlightenment toolchain-funcs libtool
 
@@ -22,11 +22,11 @@ DEPEND="=media-libs/freetype-2*
 
 src_compile() {
 	local mymmx=""
-#	if [[ $(tc-arch) == "amd64" ]] ; then
-#		mymmx="--enable-amd64 --disable-mmx"
-#	else
+	if [[ $(tc-arch) == "amd64" ]] ; then
+		mymmx="$(use_enable mmx amd64) --disable-mmx"
+	else
 		mymmx="--disable-amd64 $(use_enable mmx)"
-#	fi
+	fi
 
 	elibtoolize