[patch] rework USE flag handling in x11-libs/pixman

patch (text/plain), 3.31 KB, created by Rémi Cardona (RETIRED) on 2009-03-22 23:56:38 UTC

Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/pixman/Manifest,v
retrieving revision 1.34
diff -u -B -r1.34 Manifest
--- Manifest	18 Mar 2009 14:20:41 -0000	1.34
+++ Manifest	22 Mar 2009 23:47:23 -0000
@@ -12,7 +12,7 @@
 EBUILD pixman-0.11.6.ebuild 571 RMD160 7ba5cfe9a5b9cf3ec5a9e883914f3b00d12cd01c SHA1 86fb3ab34f160752f047f866f9af07e99df18490 SHA256 895e175cd2f5256d56ef9c89bbf23b67fd475f050f113ba2ca43bcd9c35483df
 EBUILD pixman-0.11.8.ebuild 1239 RMD160 18a075f750b7ff7a98d4a443ea19ea739235425d SHA1 c6da5c5b0750e2f79e426f6eb5b7d65a79d152f5 SHA256 be653d9c492d52a66869264c5c7d16f2ed6e41378ffa38e5c0dc73c8cef86940
 EBUILD pixman-0.12.0.ebuild 1196 RMD160 92bf46900f40162ddcda0ad013cdcb98439a38c3 SHA1 136b9e774555614174a2257b4569a6e2f35673bf SHA256 1dcaf79cf0a4f6efb49a78b0b826839580ef905169c8d48af24d3044d74c7037
-EBUILD pixman-0.14.0.ebuild 1211 RMD160 95df520a7560f2e39b09511e31bef2ea32d01729 SHA1 c81419951b8e61a6f9cbffe9a5e0d06c2c3d0101 SHA256 b6538e967278a2411e97dc97b71574373e05d3bc03632ee3c142886a2bda7889
+EBUILD pixman-0.14.0.ebuild 1069 RMD160 2395c57312f7f2adb86e5ed082e21b1323a7f280 SHA1 0e054d9a4545024f86ce0e4bcd0b75a0f81ec38e SHA256 c38729f913f7a740fed879ca49f336e0e89f6e26de95335529c0d9ae2c5c533c
 EBUILD pixman-0.9.6.ebuild 442 RMD160 07024b70d9d7c77d2a4e4a9e0bc7e8ec3a1002b7 SHA1 3ee1dc9ba7bbf5724f64099842a2ef3c643539c7 SHA256 b3fe59dac23feaea1b7c7f04235f1281721474e66511e4e5fb51af244804a728
 MISC ChangeLog 4810 RMD160 fe406b27aefbce6d5cc37c3f77eb89e466371dee SHA1 cb936e8f2a0242e5202e12b9c4290e182eb672cc SHA256 b5ec8490df9326b0983a55054b4169e43194aba57ec8143a8c6c8c837fd67f2b
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
Index: pixman-0.14.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.14.0.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 pixman-0.14.0.ebuild
--- pixman-0.14.0.ebuild	3 Mar 2009 16:33:36 -0000	1.2
+++ pixman-0.14.0.ebuild	22 Mar 2009 23:47:23 -0000
@@ -9,25 +9,25 @@
 
 DESCRIPTION="Low-level pixel manipulation routines"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="altivec mmx sse sse2"
-
-CONFIGURE_OPTIONS="$(use_enable altivec vmx) $(use_enable mmx) \
-$(use_enable sse2) --disable-gtk"
+IUSE="altivec mmx sse2"
 
 pkg_setup() {
-	if use sse2 && ! use sse; then
-		eerror "You enabled SSE2 but have SSE disabled. This is an invalid"
-		eerror "configuration. Either do USE='sse' or USE='-sse2'"
-		die "SSE2 selected without SSE"
-	fi
+	CONFIGURE_OPTIONS="
+		$(use_enable altivec vmx)
+		$(use_enable mmx)
+		--disable-gtk"
 
 	if use x86; then
 		if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
-			eerror "SSE2 instructions require GCC 4.2 or higher. Either use"
-			eerror "GCC 4.2 or higher or USE='-sse2'"
-			die "SSE2 instructions require GCC 4.2 or higher"
+			ewarn "SSE2 instructions require GCC 4.2 or higher." 
+			ewarn "pixman will be built *without* SSE2 support"
+
+			CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-sse2"
+		else
+			CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} $(use_enable sse2)"
 		fi
 	fi
+
 }
 
 src_unpack() {