Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 61 insertions, 16 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 245e1a57a11b..f5ec7f21316d 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.121 2012/01/02 13:42:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.122 2012/01/31 21:29:27 chithanh Exp $
+
+*pixman-0.24.2 (31 Jan 2012)
+
+  31 Jan 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +pixman-0.24.2.ebuild:
+  Version bump.
 
   02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   USE description for flag "neon" is in use.desc now.
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 3dc4ab276091..6a6d64d46cde 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,25 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pixman-0.24.0-posix-test.patch 430 RMD160 f736d96ad7696f343f0015ec1f32dd9ead281a51 SHA1 ee6eb17a7f8d5e010e1dac0b99e1f0eefbf2c548 SHA256 d273a0d62ba91edce3e9b5e87137fc20d953a16af37f25f121b90f3ffcc3990d
 DIST pixman-0.20.2.tar.bz2 446620 RMD160 f1a2ef1252e97a8948c8e5cf991c3978fa597619 SHA1 9972c8f8ce484f7649d9f588168cd29f61c05c63 SHA256 30316f269a6b84c32b47545ca7fc428fd16875849fea644dc6910b3f8c33f4a9
 DIST pixman-0.22.0.tar.bz2 468024 RMD160 8ed9ea99c4bcabf58431d3715f3db30ae4140eb0 SHA1 d24ea233755d7dce9f0d93136ad99fba8d4e4fa0 SHA256 24a1bce57c36c773f67d48f7f25f80d69a47ef92a67404f1644d94dee156ae2b
 DIST pixman-0.22.2.tar.bz2 461319 RMD160 13dbab02962cf45995aaebde4ec9a952ca8e6e76 SHA1 ad2b828ce4280472f5933d8bb5f0f4d583aed7f3 SHA256 2d0a6dfca175f31ae53fb368292496e8833faff45bbeafdf40b2833d23186272
 DIST pixman-0.24.0.tar.bz2 467328 RMD160 fed9b2b92f61aa952078d373734db42b00b06e59 SHA1 a3b73c3ea6cada20d705203a394f574aa69e2177 SHA256 744e8b36b29ba76bdfe8f7cbc45585fb237533ac8d716a27e306874dcfa1cf44
+DIST pixman-0.24.2.tar.bz2 467979 RMD160 985a64799ba4b7240248807e7a691c3e9824ee3d SHA1 233eed3cd16ee1b2a842140477503d2c68b74418 SHA256 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 EBUILD pixman-0.20.2.ebuild 1675 RMD160 c71bd43b6fa6d253f665893c7d759eec5f53c103 SHA1 48531fea4fd86d44a129c38001ebb5d2372eac85 SHA256 f0fb6560bc6233db122e9758796c4d3bd8fd06e80169cecaf7fb59c27b857902
 EBUILD pixman-0.22.0.ebuild 1586 RMD160 7bad0a476339effc751ea7e89fe358aec93f7726 SHA1 69277ceee6a1aacbf1beed347f565cb492d375d6 SHA256 f3bd4d2c4efcc930da88db57ca16a3a3cff07aef437e509b4b12c8f76cfa1974
 EBUILD pixman-0.22.2.ebuild 1589 RMD160 fa94897c26b82abe14510a35d3afd1313d86bdcb SHA1 1c9ad6c2207cec538ff49abbe31f570d7533593f SHA256 4a4c45d29ab5b85301d5d134f424fb773fb0d13256400e5e54f518be49a14e3c
 EBUILD pixman-0.24.0.ebuild 1709 RMD160 3ddf36df9c78df8716f8a488110d30e23c772940 SHA1 3b72626585315be9f587bf2b247aea69546f535e SHA256 b548d07e4761b3a9692134b7bc92459e35a5f8cf7fa623941b868fb161e9504f
-MISC ChangeLog 16194 RMD160 38fee123b71d58bbc2ec96a118d0625499135c88 SHA1 ca451c7efa5ac486d7bebd6cbc653bc2899e7424 SHA256 5c3ef1adc8c5b08794c418776ac5b628cfe9ccaf599beac99a1511895dce055f
+EBUILD pixman-0.24.2.ebuild 1643 RMD160 0a58f722b2e93c2658a3b98bc7cd47d8a2b25941 SHA1 4046b1284e068f457472a6d195ec251a4ae18e47 SHA256 d45344fef43c71d950a7bb36862b1b5e4195679c7575f47dd0c69d5718cbc851
+MISC ChangeLog 16334 RMD160 200650c852ce3eade09830ec9f242dd91859e81a SHA1 d7f718edf5941b7dcc1c1fa21b65ca45165cbf98 SHA256 007f7173dc638581d38f6f5f1cb7a210ba7d46dd7c9eb96b8b890e8572501d8f
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPAbP0AAoJEEdUh39IaPFNaycH+wVn6j+2UuPA7mLJMWbx/WUy
-JU1rkeNumt4MVzDjA0odmAh83iwa+79HKcDGThrriemn67sslS3CGJjspXISSBJL
-/Xyoquxq54JTmGDq12EFU0n9H7odOQuLACFBm+oO4gFj3wRGh1GIB/9NSU8nDyWe
-B9zbAjcpQlMt1kNAb7j0U7/ZFRdywhQ9iwEG1sG8UDcU1wRp23AS7juGRcTo2zSc
-ay6qvwOf4H926z/zU03vqt0EjK6SeSC5mn4IJu3GzsZ3w4Y5RPw6hDs7FtPMwy+E
-HC/X9hz/5XaDB52YT+xIllNmM7gcPZ4e1ck3ExF8+6Uurankihdir4uXZIVjcYQ=
-=RSqH
------END PGP SIGNATURE-----
diff --git a/x11-libs/pixman/pixman-0.24.2.ebuild b/x11-libs/pixman/pixman-0.24.2.ebuild
new file mode 100644
index 000000000000..812ef7c3dcb4
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.24.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.24.2.ebuild,v 1.1 2012/01/31 21:29:27 chithanh Exp $
+
+EAPI=4
+inherit xorg-2 toolchain-funcs versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="altivec iwmmxt mmx neon sse2"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	local enable_mmx="$(use mmx && echo 1 || echo 0)"
+	local enable_sse2="$(use sse2 && echo 1 || echo 0)"
+
+	# this block fixes bug #260287
+	if use x86; then
+		if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
+			ewarn "SSE2 instructions require GCC 4.2 or higher."
+			ewarn "pixman will be built *without* SSE2 support"
+			enable_sse2="0"
+		fi
+	fi
+
+	local confadd
+	# this block fixes bug #236558
+	case "$enable_mmx,$enable_sse2" in
+	'1,1')
+		confadd=(--enable-mmx --enable-sse2) ;;
+	'1,0')
+		confadd=(--enable-mmx --disable-sse2) ;;
+	'0,1')
+		ewarn "You enabled SSE2 but have MMX disabled. This is an invalid."
+		ewarn "pixman will be built *without* MMX/SSE2 support."
+		confadd=(--disable-mmx --disable-sse2) ;;
+	'0,0')
+		confadd=(--disable-mmx --disable-sse2) ;;
+	esac
+
+	XORG_CONFIGURE_OPTIONS=(
+		"${confadd[@]}"
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		$(use_enable iwmmxt arm-iwmmxt)
+		--disable-gtk
+	)
+}