Fix pixman libtool failure and add sse useflag and patch from bug #232126

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-hh7 i686

4 files changed, 31 insertions, 16 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index bf70bac26700..d36c85d03fc0 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2008/07/19 04:02:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.17 2008/07/20 14:01:57 yngwin Exp $
+
+  20 Jul 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/pixman-0.11.8-sse.patch, pixman-0.11.8.ebuild:
+  Fixing libtool problems as reported in bug #232301 and adding sse useflag
+  and patch from bug #232126.
 
   19 Jul 2008; Doug Goldstein <cardoe@gentoo.org>
   +files/pixman-0.11.8-sse2-intrinsics-check.patch, -pixman-0.11.4.ebuild,
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 879c02c8ed24..8f6803adb426 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pixman-0.11.4-memleak.patch 1460 RMD160 02ff324f7257e762543c48469ef2c875551bdfb2 SHA1 de6efadd1cd0d574926cc833401c527b2a73ade5 SHA256 ad698e59072c096bcad22a9262ce4de566b0c37e8c5036658505d1133f599eda
+AUX pixman-0.11.8-sse.patch 415 RMD160 2b60b366b411d5b7c504673b0c7ed7bc24e65337 SHA1 3902c85a84dc70a6664cb259f2f40935787fc994 SHA256 053d053e371b53c0dd4bba012a534607a00069dfd8f93be3f4aa75a8789e2539
 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.6.tar.bz2 359630 RMD160 0b9e7a1f8b5f724d6cb374a6ab467211c01fc880 SHA1 9ee97f75d98678d50d4a400a9266bf05d3835481 SHA256 b23c1ffbc7da271f9f2d69220f3bf95d03c497a7a4554bfdebbcd6b1882b9129
@@ -9,14 +7,7 @@ DIST pixman-0.11.8.tar.bz2 360229 RMD160 c1a69a2110b09c0af2bbc05637e74eebdfa7a12
 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.6.ebuild 564 RMD160 a9dc31ef7bfb1acf05d49ede774463c3f25b61a4 SHA1 3a8a0b9efe4b0ec0b21b729ffeb86afec7aa87ac SHA256 092c22952852f11d3ed627e7d62c99aef7755f7fb11c4753c57c6dc2cf02e401
-EBUILD pixman-0.11.8.ebuild 629 RMD160 d2e1cdaa75edc6f8eb472867dc813086987aceab SHA1 de0fd95db7a05f386342efe02cbd98de9a0b34ab SHA256 a478eacf21b55d491f3b63871a6bf802d5dbbc334f4a5179d1cf7040b1ed8bfc
+EBUILD pixman-0.11.8.ebuild 748 RMD160 21ed459e9c7e72b8a89da43146c92cc62be09c8c SHA1 a04dcd5bcad331ccfaab7eb77432fe65c5f1e450 SHA256 9f1a1ac8bb23e2303ce291f2b1715b2011b6140b7bf7e2cc3b1ae76168054616
 EBUILD pixman-0.9.6.ebuild 442 RMD160 07024b70d9d7c77d2a4e4a9e0bc7e8ec3a1002b7 SHA1 3ee1dc9ba7bbf5724f64099842a2ef3c643539c7 SHA256 b3fe59dac23feaea1b7c7f04235f1281721474e66511e4e5fb51af244804a728
-MISC ChangeLog 3025 RMD160 fd1224e71c155ea166c00d3568a9642e97997405 SHA1 d29b2145fda01fcc66b5cc301a130975a35154a0 SHA256 ea09f73784efd6f5eb149e64a07a4a40c004fc81c60bd9c7b73d9f9688008947
+MISC ChangeLog 3236 RMD160 2635b23bed382e57875e6bf4acf6eea29109a551 SHA1 c5e3ea907611227a442d40704db3f477996c7760 SHA256 6a80f0301d60a9557c9cbcc7b2e199b004c75b122f036983fac69cb9dae388aa
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiBZ3MACgkQoeSe8B0zEfx42QCfRJISdt7xIDBLLF+EHic4VIAk
-Cz4An0doiAhLOKx6s+E/ZBk+ODM77nA2
-=aqO7
------END PGP SIGNATURE-----
diff --git a/x11-libs/pixman/files/pixman-0.11.8-sse.patch b/x11-libs/pixman/files/pixman-0.11.8-sse.patch
new file mode 100644
index 000000000000..5cdb1d452ec7
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.11.8-sse.patch
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2008-07-18 13:15:45.000000000 +0200
++++ configure.ac	2008-07-18 13:15:50.000000000 +0200
+@@ -187,9 +187,6 @@
+ #if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
+ #error "Need GCC >= 3.4 for SSE intrinsics"
+ #endif
+-#if !defined(__amd64__) && !defined(__x86_64__)
+-#error "Need x86-64 for SSE"
+-#endif
+ #include <mmintrin.h>
+ #include <xmmintrin.h>
+ int main () {
diff --git a/x11-libs/pixman/pixman-0.11.8.ebuild b/x11-libs/pixman/pixman-0.11.8.ebuild
index 18b3f75ef12b..d37412d5399d 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.2 2008/07/19 04:02:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.8.ebuild,v 1.3 2008/07/20 14:01:57 yngwin Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,9 +9,16 @@ inherit x-modular
 
 DESCRIPTION="Low-level pixel manipulation routines"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="altivec mmx sse2"
+IUSE="altivec mmx sse 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"
+src_unpack() {
+	x-modular_src_unpack
+	cd "${S}"
+	use sse && epatch "${FILESDIR}"/${P}-sse.patch
+	epatch "${FILESDIR}"/${P}-sse2-intrinsics-check.patch
+	eautoreconf
+	elibtoolize
+}