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

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64)

5 files changed, 29 insertions, 26 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/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"