summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2008-11-21 22:44:12 +0000
committerKeri Harris <keri@gentoo.org>2008-11-21 22:44:12 +0000
commitf0821735ae152ecae774244227095e8df81c24e4 (patch)
tree160dd8cb29861e1be8c0d7849f329a453bb56180 /dev-libs/mpatrol
parentFixed homepage. (diff)
downloadgentoo-2-f0821735ae152ecae774244227095e8df81c24e4.tar.gz
gentoo-2-f0821735ae152ecae774244227095e8df81c24e4.tar.bz2
gentoo-2-f0821735ae152ecae774244227095e8df81c24e4.zip
Block dev-lang/mercury. Closes #247070.
(Portage version: 2.1.4.5)
Diffstat (limited to 'dev-libs/mpatrol')
-rw-r--r--dev-libs/mpatrol/ChangeLog6
-rw-r--r--dev-libs/mpatrol/mpatrol-1.4.8-r1.ebuild7
-rw-r--r--dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild5
-rw-r--r--dev-libs/mpatrol/mpatrol-1.4.8.ebuild7
4 files changed, 16 insertions, 9 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/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