Ensure lex patch can be applied from Mercury top-level

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

3 files changed, 9 insertions, 5 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 4bf73a2b8a66..44c9037cd6ab 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.82 2010/11/03 07:51:27 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.83 2010/11/16 06:01:11 keri Exp $
+
+  16 Nov 2010; <keri@gentoo.org> mercury-extras-10.04.2-r1.ebuild:
+  Ensure lex patch can be applied from Mercury top-level
 
   03 Nov 2010; <keri@gentoo.org> mercury-extras-10.04.ebuild,
   mercury-extras-10.04-r1.ebuild, mercury-extras-10.04.1.ebuild,
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index b752795578d6..46db542a0c22 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -12,13 +12,14 @@ DIST mercury-extras-10.04-gentoo-patchset-0.tar.gz 5725 RMD160 5082f1da6cca30678
 DIST mercury-extras-10.04.1-gentoo-patchset-0.tar.gz 5600 RMD160 e03fff9e674c695c27a8b60174db486db59e0276 SHA1 2c33a3c16a4a605a9078c65931dfb1ccf0914b37 SHA256 d0d1758a93b9121d2f2f27530f95b8788f3f65a949eb20a1ff588ce52fb07420
 DIST mercury-extras-10.04.1.tar.gz 706531 RMD160 c249b239eafb19d27180e2fcbd6c763967eb4dda SHA1 5dec96a55fef96d5269f8be50f970f4d53522947 SHA256 7d7825224b0e0ae5079cdad4a323493d65a24f0a7f00eff6a100a6569329af3c
 DIST mercury-extras-10.04.2-gentoo-patchset-0.tar.gz 5720 RMD160 4e8539053ad5d71f5206462ac5777238d7b49692 SHA1 c4ac1a17c0cdca6e51c12e2525fbedd29f65e48b SHA256 deb629debc130b27fcd92c668c13cb3993b16c9e8991f5406863e729b38e211c
+DIST mercury-extras-10.04.2-gentoo-patchset-1.tar.gz 5728 RMD160 22b3002ba1b3f36f82a222a0ff1705051ba81644 SHA1 5420e804500e6789a3e850568c707f9e9e7d540f SHA256 77a494ce116e241a68f9d9542afd1d476a9a8fbd0efc0cdc7a35903cbe0ef570
 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
 EBUILD mercury-extras-0.13.1-r1.ebuild 3350 RMD160 92d13713ecb014ad8f482e970d040e1d721faa89 SHA1 537059c10b7079070e6f9f1cf2ae5122b7e1c2af SHA256 850d2176525117052e2e40cfe85f9139cd22979443a0f78530944082e0f0ce7f
 EBUILD mercury-extras-10.04-r1.ebuild 3435 RMD160 ea7620ace250385b35c0056205c7a8d35cf9bbc5 SHA1 cb57075b669c330fedb4d7ffda2ab34ede29ec31 SHA256 e0c9bb1f22271bc53923bf05673b64fd9b1ae6271977fba9a13753c36e084af7
 EBUILD mercury-extras-10.04.1.ebuild 3433 RMD160 70b97740e27086807115ea977173efef058e984b SHA1 4e035f7f858bc21e160659bff204ad6bd5f73a8b SHA256 418f22953ee9724589ddedb6138905b76f9a509c5ab990e1cbb1c55a0ff0572b
-EBUILD mercury-extras-10.04.2-r1.ebuild 4573 RMD160 28608002c889b34f73614a7885a9b1cf8d893263 SHA1 adc15cc627851f4a4be87ed9359cba8dd86875df SHA256 1b6c06ca8ec33ca32ef2c0259736e937739c78d064e9cfa32534922aeabf2d9a
+EBUILD mercury-extras-10.04.2-r1.ebuild 4573 RMD160 df2e51597c7b21aae5244a70f3f0d6b0c60b93d4 SHA1 935c0094c8de3e33a89db78c3ad8c5ddc7a4200e SHA256 4dea7dea062587267bb08286e4b7778addd75c836c0ff733e72eb63934c9afc6
 EBUILD mercury-extras-10.04.2.ebuild 3433 RMD160 464585e7d93c19fae81463998d08b788ac139bee SHA1 8332b8d7b583ab3d28a99c701a900d2e5fa22a85 SHA256 9ad7d54f057c090a1b19149b9f743ec02ed41f28722e4a681a94996f2491f24d
 EBUILD mercury-extras-10.04.ebuild 3269 RMD160 bc4dccb8b14fe704f5d359d4bec3459c9104defc SHA1 34aa64892eb2a792c45f94aa29039aff7fd183bc SHA256 991306f9b8e3abf0175b9486b98ee572b33901b360b6ddcaad4e72df64432d48
-MISC ChangeLog 24567 RMD160 fa98536ace14e709f425a7fea7091f9e729a2c43 SHA1 66342dfd398a9a8994be78720d10e785488511b7 SHA256 11f36ce9b98544dbc49f793c1d40c085cb0f1a09112aaff760fed26bfa831828
+MISC ChangeLog 24692 RMD160 9c8b931b28c6c4196f82c2880e95c7564d7ad2dc SHA1 7aa6450593db420d2497fcebd5768e1ff8919841 SHA256 a7dd47d0f719e9aa392765b13f5343a60eb8df828e41e0311ae1b8828b4403f0
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
index c5836713989a..d99f7b57364c 100644
--- a/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.3 2010/11/03 07:51:27 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.4 2010/11/16 06:01:11 keri Exp $
 
 inherit eutils
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 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"