fix bug #232126. Patch from Søren Sandmann <sandmann@redhat.com> to fix SSE2 check

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

6 files changed, 35 insertions, 34 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index a4cda3113382..bf70bac26700 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.15 2008/07/17 19:53:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.16 2008/07/19 04:02:50 cardoe Exp $
+
+  19 Jul 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/pixman-0.11.8-sse2-intrinsics-check.patch, -pixman-0.11.4.ebuild,
+  -pixman-0.11.4-r1.ebuild, pixman-0.11.8.ebuild:
+  fix bug #232126. Patch from Søren Sandmann <sandmann@redhat.com> to fix
+  SSE2 check
 
 *pixman-0.11.8 (17 Jul 2008)
 
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 4c68ae8e2d18..879c02c8ed24 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -2,23 +2,21 @@
 Hash: SHA1
 
 AUX pixman-0.11.4-memleak.patch 1460 RMD160 02ff324f7257e762543c48469ef2c875551bdfb2 SHA1 de6efadd1cd0d574926cc833401c527b2a73ade5 SHA256 ad698e59072c096bcad22a9262ce4de566b0c37e8c5036658505d1133f599eda
+AUX pixman-0.11.8-sse2-intrinsics-check.patch 628 RMD160 e804187cc82f8f802f20037052dfbfe8ae0b517a SHA1 c151e3d4833a6be3768f7d87c2287d4b9d295e91 SHA256 845328bc17aaea91ac079f45ecc56a25519007bcba109130c87cebead75c1dc6
 DIST pixman-0.10.0.tar.bz2 312275 RMD160 16c356f5fa3dfa4c0196456552daca3ab6244276 SHA1 9262e945281877c42d484098de664dcf1a68d857 SHA256 2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
-DIST pixman-0.11.4.tar.bz2 330235 RMD160 000ec544e1c25b6ef955eed098c3906b095e10d5 SHA1 e74dfcc6435edf7a397e8c42ffb4d581484e05d3 SHA256 2a499ad05f1e5fd729191c471eadb4f5e7362165264d5a5e6e8d70d527abb74f
 DIST pixman-0.11.6.tar.bz2 359630 RMD160 0b9e7a1f8b5f724d6cb374a6ab467211c01fc880 SHA1 9ee97f75d98678d50d4a400a9266bf05d3835481 SHA256 b23c1ffbc7da271f9f2d69220f3bf95d03c497a7a4554bfdebbcd6b1882b9129
 DIST pixman-0.11.8.tar.bz2 360229 RMD160 c1a69a2110b09c0af2bbc05637e74eebdfa7a120 SHA1 8db43d9fe094073cfcb03c1b1c86296b5a7df1aa SHA256 9488b7e3507155acf7307512bdb59dc88e55a2a78a0141fdea86f8048c399e49
 DIST pixman-0.9.6.tar.bz2 290399 RMD160 3cde968776ea75ed8efd4b5c126238fd2a9817cb SHA1 d31ea97176e475b47bcc9c0ad4813859857fb061 SHA256 c504db9338d67c388824ebbf805a424d2cc0fab681e33bff6733603539d6335b
 EBUILD pixman-0.10.0.ebuild 435 RMD160 40721f1458ae9ec1514880c9078c6a35223a6fbe SHA1 5362a8825583d296a72f61336d523d66ad804d82 SHA256 8361ca4d41d27863edf65e9440ffa0160a291e54598f0fe3ec951f57d3db0c08
-EBUILD pixman-0.11.4-r1.ebuild 493 RMD160 25fd0e2b1e18f41fef7553011b66eb3675902a88 SHA1 9e6b2b6ac95b99287c3a56ead25a4f4681728343 SHA256 f8a311a24852f6e482d0e64076c80425dd75b9eb887a152b6bdb8781093e8e00
-EBUILD pixman-0.11.4.ebuild 443 RMD160 03c24e67b93046e1f6d58c7b5f35a52590f58c5e SHA1 22f08184e4edbc519ed3d47991800250ea581f2f SHA256 515a2bece69642632f610ac9b09961318a0c5e2e607b6339b27d941e5c46903c
 EBUILD pixman-0.11.6.ebuild 564 RMD160 a9dc31ef7bfb1acf05d49ede774463c3f25b61a4 SHA1 3a8a0b9efe4b0ec0b21b729ffeb86afec7aa87ac SHA256 092c22952852f11d3ed627e7d62c99aef7755f7fb11c4753c57c6dc2cf02e401
-EBUILD pixman-0.11.8.ebuild 564 RMD160 756dcb0dfe0c10aebb4d4389b53d82d040cb4f28 SHA1 3074da37544178a0f7e88e9849299acd4665f0d9 SHA256 dcd83b367e6b8eb7f1330252a1fadd5e4ba4770bf40380721f8fc26947430c81
+EBUILD pixman-0.11.8.ebuild 629 RMD160 d2e1cdaa75edc6f8eb472867dc813086987aceab SHA1 de0fd95db7a05f386342efe02cbd98de9a0b34ab SHA256 a478eacf21b55d491f3b63871a6bf802d5dbbc334f4a5179d1cf7040b1ed8bfc
 EBUILD pixman-0.9.6.ebuild 442 RMD160 07024b70d9d7c77d2a4e4a9e0bc7e8ec3a1002b7 SHA1 3ee1dc9ba7bbf5724f64099842a2ef3c643539c7 SHA256 b3fe59dac23feaea1b7c7f04235f1281721474e66511e4e5fb51af244804a728
-MISC ChangeLog 2761 RMD160 f9a92fe3c22ae5f77f1d05117aa4dc0641ad6390 SHA1 9361a741f9ed9da7072ded58fa1ade19a2ced0e9 SHA256 e3957317aa0ce627289ae392e3e81dafd36527a227d66f8d204ac963c3e6c298
+MISC ChangeLog 3025 RMD160 fd1224e71c155ea166c00d3568a9642e97997405 SHA1 d29b2145fda01fcc66b5cc301a130975a35154a0 SHA256 ea09f73784efd6f5eb149e64a07a4a40c004fc81c60bd9c7b73d9f9688008947
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh/ozgACgkQoeSe8B0zEfy07ACeM+kTBygDcMueHnhxAj53AcoU
-ASwAn0I2808TJ3vEtRcHRPxzRt1EJOlD
-=ugCt
+iEYEARECAAYFAkiBZ3MACgkQoeSe8B0zEfx42QCfRJISdt7xIDBLLF+EHic4VIAk
+Cz4An0doiAhLOKx6s+E/ZBk+ODM77nA2
+=aqO7
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pixman/files/pixman-0.11.8-sse2-intrinsics-check.patch b/x11-libs/pixman/files/pixman-0.11.8-sse2-intrinsics-check.patch
new file mode 100644
index 000000000000..9d4eaced5524
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.11.8-sse2-intrinsics-check.patch
@@ -0,0 +1,19 @@
+From: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri, 18 Jul 2008 18:49:35 +0000 (-0400)
+Subject: Fix typo in sse2 configure logic
+X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=51576cda8ba830c0d7dbbeaebb79fbef276f7e2d
+
+Fix typo in sse2 configure logic
+---
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -250,7 +250,7 @@ if test $have_sse2_intrinsics = yes ; th
+ fi
+ 
+ AC_MSG_RESULT($have_sse2_intrinsics)
+-if test $enable_sse2 = yes && test $have_sse_intrinsics = no ; then
++if test $enable_sse2 = yes && test $have_sse2_intrinsics = no ; then
+    AC_MSG_ERROR([SSE2 intrinsics not detected])
+ fi
+ 
diff --git a/x11-libs/pixman/pixman-0.11.4-r1.ebuild b/x11-libs/pixman/pixman-0.11.4-r1.ebuild
deleted file mode 100644
index e92b17549d12..000000000000
--- a/x11-libs/pixman/pixman-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.4-r1.ebuild,v 1.1 2008/06/12 14:56:11 cardoe Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-PATCHES="${FILESDIR}/${PN}-0.11.4-memleak.patch"
-
-inherit x-modular
-
-DESCRIPTION="Low-level pixel manipulation routines"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-libs/pixman/pixman-0.11.4.ebuild b/x11-libs/pixman/pixman-0.11.4.ebuild
deleted file mode 100644
index 0722d3a3a45b..000000000000
--- a/x11-libs/pixman/pixman-0.11.4.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.4.ebuild,v 1.1 2008/06/10 00:39:14 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Low-level pixel manipulation routines"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-libs/pixman/pixman-0.11.8.ebuild b/x11-libs/pixman/pixman-0.11.8.ebuild
index 3cedc5a74e10..18b3f75ef12b 100644
--- a/x11-libs/pixman/pixman-0.11.8.ebuild
+++ b/x11-libs/pixman/pixman-0.11.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.8.ebuild,v 1.1 2008/07/17 19:53:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.8.ebuild,v 1.2 2008/07/19 04:02:50 cardoe Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -13,3 +13,5 @@ IUSE="altivec mmx sse2"
 
 CONFIGURE_OPTIONS="$(use_enable altivec vmx) $(use_enable mmx) \
 $(use_enable sse2) --disable-gtk"
+
+PATCHES="${FILESDIR}/pixman-0.11.8-sse2-intrinsics-check.patch"