Block dev-lang/mercury. Closes #247070.

Package-Manager: portage-2.1.4.5

5 files changed, 20 insertions, 23 deletions

diff --git a/dev-libs/mpatrol/ChangeLog b/dev-libs/mpatrol/ChangeLog
index 27e63db7f3b1..dae520b91585 100644
--- a/dev-libs/mpatrol/ChangeLog
+++ b/dev-libs/mpatrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/mpatrol
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.18 2008/10/06 08:24:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.19 2008/11/21 22:44:12 keri Exp $
+
+  21 Nov 2008; <keri@gentoo.org> mpatrol-1.4.8.ebuild,
+  mpatrol-1.4.8-r1.ebuild, mpatrol-1.4.8-r2.ebuild:
+  Block dev-lang/mercury. Closes #247070.
 
   06 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
   mpatrol-1.4.8-r2.ebuild:
diff --git a/dev-libs/mpatrol/Manifest b/dev-libs/mpatrol/Manifest
index 3b4f03a18196..d24c3e446d3f 100644
--- a/dev-libs/mpatrol/Manifest
+++ b/dev-libs/mpatrol/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mpatrol-1.4.8-soname.patch 1097 RMD160 d0d767d24c51b8804691b416ac47d59bee8d4c2f SHA1 8878f286ac66f6fd3e757ba9fe627bd34a6c3f3a SHA256 f7e63160f3df250151bb9d8de13e252394a02beb89b9c905a0034907061498b2
 AUX mpatrol-textrel-fix.patch 529 RMD160 e0ef6ab28b24c2261a88e682d1f59ed0c681a328 SHA1 e6b65eb79fc334cb1f82214ed3c0000890e1e876 SHA256 23566db6fe6e035870db35e7311f42c2a367a50ec1a24b044a465fa7fe81f30b
 DIST mpatrol_1.4.8.tar.gz 4413896 RMD160 5caa6a31f1a53578f28ff597e62c010d68320bc0 SHA1 26b3ef60a718f80486f10f74468cb33b5fcf75dd SHA256 2a58512cb355bf46b08e85683a2ad872bdd4cad5f7a40c87117c7f5badd9f232
-EBUILD mpatrol-1.4.8-r1.ebuild 2474 RMD160 84d3ccf9a43617e61c539e20ef9bf4b4894c104a SHA1 9338ebed4ccc022e6be9a1f463beda34c2783b4f SHA256 9d3c026616eb987daebc0dfbbb1f44414d3ea8d310f0862b62176000dbf3856a
-EBUILD mpatrol-1.4.8-r2.ebuild 2726 RMD160 81a4a881c40ec3589a34273b94df98d882085d66 SHA1 63d8acec39bf5777e1291af45e9b6700a2261760 SHA256 168663481c4535bdef2fd28e445308f79f078703b5b0e65182f62d377cbab901
-EBUILD mpatrol-1.4.8.ebuild 2237 RMD160 40bf9b2a781713a17c2079501392906d63fd5124 SHA1 c1fdda03971cd2a244a30d1ac688e1b843d10df7 SHA256 3de5cbf16b62a4e6c057ec3e974c1586bc086f60a4605769852bf7bbdb571e6a
-MISC ChangeLog 1727 RMD160 8fa3da2491371d31c1fda5b464358e682b5cadf2 SHA1 42dadb605a92172ef10b806ae6a70f6965d25706 SHA256 d7b2ffc2c0a1711177d171aa67bdd60bdd266c2018389dc19f39fbcf12275654
+EBUILD mpatrol-1.4.8-r1.ebuild 2491 RMD160 be3c28d0a72b67b27e5a19a819826f748c6f8956 SHA1 1e487cc5a2b5c0a8cafafd7e4925cfddb2d64908 SHA256 e5a47aa2ea786866269df89681a41f5baddc2dec989f1a6295e9b80ac9b7b536
+EBUILD mpatrol-1.4.8-r2.ebuild 2740 RMD160 10604ecc9cb2f4743a29cb02de366852cc03fdd7 SHA1 24a18a9b783c7ecc3ee863feafaa9b0b35fbb50f SHA256 6480a134b62fb842ca702dfb2fc99013eb1b445e51e091006f34fd0a0bfd3791
+EBUILD mpatrol-1.4.8.ebuild 2252 RMD160 c13853d4297b5afa478d9f36f98bd78894548e7f SHA1 c651eb855b4cde40039b8db16cae2c99ad48b423 SHA256 791193ae77cb97df6df1890d6e2f58ba6a5d75d5eed66051620714543f95eeb0
+MISC ChangeLog 1872 RMD160 7a441709f6494ee447e8bf10336ea301f78e69b4 SHA1 458606663e6ca4ec0895cb1f1df7e93b20ac45b8 SHA256 04b83b1545f46d73bfbd847abcdc847ad84031b2c0354db65ac35b4b16450403
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjpy1YACgkQAiZjviIA2Xin/gCgz2IEmNSJ2cLIrHEwjRZ9Rbo4
-6/AAoMIN5mpHcYDD+hp8Qr0cgaDOL8I4
-=tH/G
------END PGP SIGNATURE-----
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild
index 9313b29c93ac..f858a597f4b7 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild,v 1.3 2007/03/03 23:08:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild,v 1.4 2008/11/21 22:44:12 keri Exp $
 
 IUSE="X"
 
@@ -14,7 +14,8 @@ KEYWORDS="~x86 ~sparc"
 S="${WORKDIR}/${PN}"
 
 # To use X, mpatrol requires Motif
-DEPEND="X? ( x11-libs/openmotif )
+DEPEND="!dev-lang/mercury
+	X? ( x11-libs/openmotif )
 		virtual/libc"
 
 src_unpack() {
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
index ae4d4eede772..2141fb30dfc9 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.3 2008/10/06 08:24:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.4 2008/11/21 22:44:12 keri Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,7 +16,8 @@ KEYWORDS="~x86 ~sparc"
 S="${WORKDIR}/${PN}"
 
 # To use X, mpatrol requires Motif
-DEPEND="X? ( x11-libs/openmotif )
+DEPEND="!dev-lang/mercury
+	X? ( x11-libs/openmotif )
 		virtual/libc"
 
 src_unpack() {
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8.ebuild
index 3c5b5e41b142..7cba9061d6ca 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8.ebuild,v 1.15 2004/06/24 23:28:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8.ebuild,v 1.16 2008/11/21 22:44:12 keri Exp $
 
 IUSE="X"
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 
 # To use X, mpatrol requires Motif
-DEPEND="X? ( x11-libs/openmotif )"
+DEPEND="!dev-lang/mercury
+	X? ( x11-libs/openmotif )"
 
 src_compile() {
 	cd $S/build/unix