Include missing testsuite patches. Closes #422477

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

3 files changed, 12 insertions, 9 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index e9cc3300d115..caebe598825f 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.147 2012/03/10 11:07:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.148 2012/06/22 18:02:29 keri Exp $
+
+  22 Jun 2012; <keri@gentoo.org> mercury-11.07.1.ebuild:
+  Include missing testsuite patches. Closes #422477
 
   09 Mar 2012; <keri@gentoo.org> mercury-11.07.1.ebuild:
   Update Mmake.vars to set INSTALL_LIBDIR
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 5918e94fc77b..652a32f3c146 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 AUX 50mercury-gentoo.el 130 RMD160 293a39103c84059a611896e552d89736ee742789 SHA1 ea6071d0be2885090f90211ffca5474ad50b2286 SHA256 802dbbd82d775bba22bb750668e0a8462960d9e8b28e3731171cded00783d6f4
 DIST mercury-11.01-gentoo-patchset-1.tar.gz 7129 RMD160 cfb89fa798724744ea7f1912b0015affdb1ea63c SHA1 d23e615b81cfd259e369cfcd1c5cd9965780f946 SHA256 43dbcb63add22b24da7515b7d42d8b4ad119d9923f80dbb29767d756436d0fa4
 DIST mercury-11.07-gentoo-patchset-0.tar.gz 6889 RMD160 38152c3e6e10524fdc3c6911adda90ad384ad8c4 SHA1 e2f95ce3384ea8618ce86f65512b79154640f1cf SHA256 2fce2c95b6cb8b5819fb576de8ce184293a926c52f120027e3195d14f0552d78
-DIST mercury-11.07.1-gentoo-patchset-1.tar.gz 5779 RMD160 0ea7a34603e202602fa12d35b5a5a0aab1ad87b5 SHA1 87e642438adc9580cb7244bc6d88009aba2f3b5f SHA256 ca969bf0ea5ed150a2192888e1d9dd87874ff3a3861651a16960e8fa9504bf1f
+DIST mercury-11.07.1-gentoo-patchset-2.tar.gz 6947 RMD160 b5308e6aa7a979be7ad91e62c53196d445f8b4cc SHA1 db18ada6d98bcd37c060db620558dd24373394b5 SHA256 a90cdc91b7a7b5eca56410ac89b8bf9f45fa864ee61539778b01b00f721ed089
 DIST mercury-compiler-11.01.tar.gz 25122699 RMD160 bee82b6037fa1f14f27b43d6f7d751d232941bc7 SHA1 508f9fbebdf061f706a44db5c77868cb4e769066 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0
 DIST mercury-compiler-11.07.1.tar.gz 25308185 RMD160 10593ad6decefffdd8225d0c29fdb731d1470ca9 SHA1 717daf9bf74ae22e759b78f4e1f101dba951f89b SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11
 DIST mercury-compiler-11.07.tar.gz 25298643 RMD160 1573be5c26415c6fac96f85ff9558db736890b83 SHA1 d27541f5fcd5ec6b8ca2fc39f72ed74c833f243a SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2
@@ -12,14 +12,14 @@ DIST mercury-tests-11.01.tar.gz 1351134 RMD160 4568a0b1044a116ab59b2f0d98002e20c
 DIST mercury-tests-11.07.1.tar.gz 1648437 RMD160 929364e2ca22db8b3a7bcb80fa146b70584ac95d SHA1 8c3fb4381817dc79cab56eb5859b117aa1d168be SHA256 01558a6ddd28d2f832d88da8bbf38fec542d091fc53b5adf92fac5e2564c2057
 DIST mercury-tests-11.07.tar.gz 1647435 RMD160 146fd0a87a6e70d817c39e15fda660f747330a5d SHA1 2e41846f2e0020e3f9a27caf5b30d8217fa787b2 SHA256 9206c7ffaace2357367bb6f8c3efe9aeb05ccac6a02946f6579c6001f953501b
 EBUILD mercury-11.01.ebuild 5815 RMD160 07b2850968c2411bc41062b3e3217a5e3ca51b51 SHA1 e6334dc5b6ceb4607a640a820c496b3e02fcafb5 SHA256 1677f4b9f63c3bd405898616204bdf67c9bf8a88f0e71173478fbf5ca1c68a62
-EBUILD mercury-11.07.1.ebuild 5813 RMD160 79c5be4fa9a75b1e2eafad6429c47d7db8d600ab SHA1 5d34da17acafee7b5a86891937c12742e29f9954 SHA256 c44479c032505baee168567144b04b7af4fe24ccd87bc46ee1d503d357707f7e
+EBUILD mercury-11.07.1.ebuild 5813 RMD160 220658a75a5a4cbe8b6ad6e3df4110e0ea1efe7a SHA1 97e6a0cebb284b475941f94543d7adc9262c4f26 SHA256 f4f762edb149e7b8d28ad6d7555b9e5f5f2dc21ab65ef9526a8a2a1f5c530889
 EBUILD mercury-11.07.ebuild 5811 RMD160 611fa430491d0403f1c3ed692068a237c0cdcd20 SHA1 fc921a6eeef92b5a648e8189e0ac0c0e0e277bc8 SHA256 3164de7bf4263e502b84a11213c6232f88dc9282a148b1bc4b22fbd91428a85a
-MISC ChangeLog 31232 RMD160 0ed1763a60c72f92fc25ff19c2c0f96375cf3aeb SHA1 640bcaf42caf32f736e2a0b9da3442b927bd3f65 SHA256 4ad59fc5f0f1dc0c2fc4096b60e8e656b2a815150f6cdcb4cda14abcbfef117a
+MISC ChangeLog 31342 RMD160 765474d9f3605d63495b5c576e7daa1021b11499 SHA1 2dcc538febfb8fdf9cac4f8b74e401e5d75a7607 SHA256 568f12f8885ee3efa94ec47b9a44c2af96dd67128197ef15ef7de6fba4f99a50
 MISC metadata.xml 297 RMD160 a6000ba142c7a80d67b574399247e5ef95b22dce SHA1 f4a1c6383313475d951175f6b167457a2cf87d27 SHA256 6814d23336067f1c5aace679d091bb6f4450122bfa7a94cbc66f625a8d970f4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9akDwACgkQrwS/tqE49e2ligCgpDKVrMq6qN8I/VInTEkmUDQ2
-r6YAnA44ZL4hLwQ9DEvGoPZCmT1JIGow
-=Pe6u
+iEYEARECAAYFAk/juLQACgkQrwS/tqE49e3YvwCeOn4KjosoZkc/Jm2Xxy1h5RFG
+cIMAoKXWut3j60gbbbz6eEY1PCTpMmiA
+=49vQ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild b/dev-lang/mercury/mercury-11.07.1.ebuild
index 8bdf8b96ecd4..836496780919 100644
--- a/dev-lang/mercury/mercury-11.07.1.ebuild
+++ b/dev-lang/mercury/mercury-11.07.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07.1.ebuild,v 1.2 2012/03/10 11:07:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07.1.ebuild,v 1.3 2012/06/22 18:02:29 keri Exp $
 
 EAPI=2
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"