[gentoo-commits] proj/x11:master commit in: x11-libs/pixman/

["Michał Górny" <mgorny@gentoo.org>]

commit:     a7ab8f73cb3ad0bf80490cf7b8459557c17b9f78
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:36:39 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:36:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a7ab8f73

x11-libs/pixman: Migrate to XORG_CONFIGURE_OPTIONS.

(Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest commit with key 05DE07BB)

---
 x11-libs/pixman/metadata.xml       |    8 ++++++++
 x11-libs/pixman/pixman-9999.ebuild |   22 +++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
new file mode 100644
index 0000000..3983c53
--- /dev/null
+++ b/x11-libs/pixman/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>x11</herd>
+  <use>
+    <flag name="neon">Enables NEON optimizations for ARM processors.</flag>
+  </use>
+</pkgmetadata>

diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 03f0f82..0d489aa 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,10 +13,6 @@ IUSE="altivec mmx neon sse2"
 
 pkg_setup() {
 	xorg-2_pkg_setup
-	CONFIGURE_OPTIONS="
-		$(use_enable altivec vmx)
-		$(use_enable neon arm-neon)
-		--disable-gtk"
 
 	local enable_mmx="$(use mmx && echo 1 || echo 0)"
 	local enable_sse2="$(use sse2 && echo 1 || echo 0)"
@@ -30,17 +26,25 @@ pkg_setup() {
 		fi
 	fi
 
+	local confadd
 	# this block fixes bug #236558
 	case "$enable_mmx,$enable_sse2" in
 	'1,1')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --enable-sse2" ;;
+		confadd=(--enable-mmx --enable-sse2) ;;
 	'1,0')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --disable-sse2" ;;
+		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."
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
+		confadd=(--disable-mmx --disable-sse2) ;;
 	'0,0')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
+		confadd=(--disable-mmx --disable-sse2) ;;
 	esac
+
+	XORG_CONFIGURE_OPTIONS=(
+		"${confadd[@]}"
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		--disable-gtk
+	)
 }