Restrict mercury_cairo package to non-debug grades when default grade != asm_fast

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 13 insertions, 9 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 00896573590c..9a329158dfec 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.91 2011/06/05 06:49:44 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.92 2011/06/11 20:30:55 keri Exp $
+
+  11 Jun 2011; <keri@gentoo.org> mercury-extras-11.01.ebuild:
+  Restrict mercury_cairo package to non-debug grades when default grade !=
+  asm_fast
 
   05 Jun 2011; <keri@gentoo.org> mercury-extras-11.01.ebuild:
   Restrict mercury_cairo package to non-debug grades
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 1fdefa9178f4..9d6fc67b76e1 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -19,7 +19,7 @@ DIST mercury-extras-10.04.2-gentoo-patchset-1.tar.gz 5728 RMD160 22b3002ba1b3f36
 DIST mercury-extras-10.04.2.tar.gz 706566 RMD160 b88dc81d7a943ff265ead704ecd92f9a8a7976a4 SHA1 513de139260a8d02418ec3a1a0219845cdf03014 SHA256 f219b58df5e4dc24e75e0fb6f8f0d1255d4c2c9cbc5ea7e97f136896ce8acc8a
 DIST mercury-extras-10.04.tar.gz 706376 RMD160 988e17736ace555916b452a5f22b3d8f67ad6b4e SHA1 22cb6eb10bd6a4d17605217fe97f8718b8dfbbb4 SHA256 408d0a428b8d15934d5b7f5bd3e2139807fb2eb0a7f58d125c8490456445814b
 DIST mercury-extras-11.01-beta-2010-12-22.tar.gz 776653 RMD160 9b209534b6ae80e885304f06b0756f59203371be SHA1 2bb6df2c2d3d58e3ba64d96a40ea3ca4816cac89 SHA256 784f741daa43b63230b406e3c44f374c4e1393254a2fad6cdbd0f206073cc1df
-DIST mercury-extras-11.01-gentoo-patchset-1.tar.gz 5009 RMD160 5f3ec3f8db94a6769fefe4dbafd60f0a9c67535f SHA1 ea47a7e44f183c71acee3c99eb98ba4c96ec3a3a SHA256 d5637ca87c62f06c2236afe0a9bbdc44f724d08ce6061d9ee511834c9385502d
+DIST mercury-extras-11.01-gentoo-patchset-2.tar.gz 5005 RMD160 4621a6c46793b414404d67a96ca32c4037c189b2 SHA1 c646f0624f31444d5367116dabe06df11217b8d4 SHA256 68e8a358a75527823a7c7f119ac0104acb0702263178f27be659c6b1d09cb46c
 DIST mercury-extras-11.01.tar.gz 777185 RMD160 992446a01d81d26d06ff60ed7f98d47e897c59fc SHA1 b82bdeded6ebcd843202ad2b4649edb3e2a402c3 SHA256 52eb6758e2136eb288329917d4c352da98e9ce0e951d6a5c884919bf8e85b1b1
 DIST mercury-extras-11.01_beta1-gentoo-patchset-1.tar.gz 5056 RMD160 f5c7073fafe97511bf9c80673281c7e0fca26845 SHA1 f67ef663687b5ff5c2033123551b8069fae85b6c SHA256 7d1c2087914f3825f17f09470561d31547e29c7fd4737902b8cd754b4edd9dc6
 EBUILD mercury-extras-0.13.1-r1.ebuild 3342 RMD160 a139b622205437966ada7ad174e0722a8753b769 SHA1 113f4ed6961e95a4aee286009d8848072de779b4 SHA256 e610104bea89b1549901826b1a608b893168f54c0a60f0a5e2e6405bc34ade0c
@@ -28,14 +28,14 @@ EBUILD mercury-extras-10.04.1.ebuild 3429 RMD160 6127de097ab79ff06dca20eb717484a
 EBUILD mercury-extras-10.04.2-r1.ebuild 4589 RMD160 75a91f3b81d04c7860f505b706a7dbd4929eb671 SHA1 7ecdc204abd738c8b618bb95c327e779535b3e49 SHA256 4c530a60804326809b0317bcfbd5e64cecc0fbcc3e9c25eb50fe3d10a9028533
 EBUILD mercury-extras-10.04.2.ebuild 3429 RMD160 db0973650632ecbbdbf8bfc888aafb6872ada518 SHA1 dff92bb08f4abc35297f5f335d904684e2365035 SHA256 e3eebedfe041bbc032038abc9af54902e68134ed90e20c9c9ec6dfbd28543163
 EBUILD mercury-extras-10.04.ebuild 3265 RMD160 331f535fb74186b645d658cb66d412a0b647e8aa SHA1 2ad3590b0dfbe5a28724ef1b2c4036821613e707 SHA256 1987f9ad950f93b5c9747c6745fba8da875637cf0e0e608217bd55d68e89b295
-EBUILD mercury-extras-11.01.ebuild 4740 RMD160 e6269b2f938929765a084e3bacb41c0b2b581cd4 SHA1 c4fbb55182c81b488fe6e875675b4075b44930c0 SHA256 d7d524fa696629ef9c10d33d1ec0fb8db15cfdae3337054937e0ae834b4e6ef4
+EBUILD mercury-extras-11.01.ebuild 4740 RMD160 3727a80505c935f95ab966b2b38c89154b622350 SHA1 96d3c373ba34fc90428b81ae4a9835660e4ba80e SHA256 976759840312f8521c9ae8325897baee64d0f0d022c5b7d272f999c15733bc21
 EBUILD mercury-extras-11.01_beta1.ebuild 4831 RMD160 65cc1eab2923ad16d65273d091aa9a945fc1ec01 SHA1 a5a2979c331da35da0ba1895f997576eae675dc9 SHA256 ce736a3a0f42a063cf51e9840b29945c47512638b746c3770adc4a98197f06ef
-MISC ChangeLog 25816 RMD160 3be4b365520800b4305e81da53b5b506cc9d7d58 SHA1 22bb60f9b403e2276f11e9ac78ae40443d6e7a88 SHA256 b4bd51509754a7473f3c24fb7149c239314a94b09a88a26e98b188c56114102e
+MISC ChangeLog 25965 RMD160 f27bad5ae931b32460cfd20cec75bb9b274e9247 SHA1 ad747d534c7a00765eac931c99813214f00c2409 SHA256 42a7af2cda9ce6e9e002f1f19db2ec8c4c0a4d722abbb8c8fdd525a2f87e8dad
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3rJxIACgkQrwS/tqE49e2YawCbBJ0QaavPufgKNWKrQhZ637js
-+4oAn0vMYavvWBgo65XpjFNJDv9IadRX
-=x1An
+iEYEARECAAYFAk3z0I0ACgkQrwS/tqE49e2uxACfZRSL1gJTYdo0B6X875coX4kc
+lbIAn0lL+YTqMIfj/QjXZmDjEebh1op2
+=rTTh
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury-extras/mercury-extras-11.01.ebuild b/dev-lang/mercury-extras/mercury-extras-11.01.ebuild
index ef0594f6428c..21f63bef0001 100644
--- a/dev-lang/mercury-extras/mercury-extras-11.01.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-11.01.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-11.01.ebuild,v 1.2 2011/06/05 06:49:44 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-11.01.ebuild,v 1.3 2011/06/11 20:30:55 keri Exp $
 
 EAPI=2
 
 inherit eutils
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
 HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"