diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-05-20 07:51:59 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-05-20 07:51:59 +0000 |
| commit | 565d785e8e66e66dd906425f031ef18b276fa4db (patch) | |
| tree | dcb0a0577587c2b60808972887fd07adfaf2064c | |
| parent | Added ~ppc64 (diff) | |
| download | gentoo-2-565d785e8e66e66dd906425f031ef18b276fa4db.tar.gz gentoo-2-565d785e8e66e66dd906425f031ef18b276fa4db.tar.bz2 gentoo-2-565d785e8e66e66dd906425f031ef18b276fa4db.zip | |
Add virtual/x11 dependency for xorg-6.x
(Portage version: 2.1_rc1-r2)
| -rw-r--r-- | dev-lang/mercury-extras/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild | 8 | ||||
| -rw-r--r-- | dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index 4a0854e52943..8c1a86ea8a11 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.22 2006/05/20 07:15:45 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.23 2006/05/20 07:51:59 keri Exp $ + + 20 May 2006; Keri Harris <keri@gentoo.org> mercury-extras-0.12.2.ebuild, + mercury-extras-0.13.0_beta20060517.ebuild: + Add virtual/x11 dependency for xorg-6.x 20 May 2006; Keri Harris <keri@gentoo.org> -mercury-extras-0.13.0_beta20060501.ebuild, diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild index 14675f56a35a..59ea4056571f 100644 --- a/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild,v 1.4 2006/04/23 11:18:31 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2.ebuild,v 1.5 2006/05/20 07:51:59 keri Exp $ inherit eutils @@ -20,8 +20,10 @@ DEPEND="~dev-lang/mercury-0.12.2 iodbc? ( dev-db/libiodbc ) opengl? ( virtual/opengl ) tcktk? ( =dev-lang/tk-8.4* - x11-libs/libX11 - x11-libs/libXmu )" + || ( ( + x11-libs/libX11 + x11-libs/libXmu ) + virtual/x11 ) )" src_unpack() { unpack ${A} diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild index dd15fa31a699..f71e575c166e 100644 --- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild,v 1.1 2006/05/20 07:07:33 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild,v 1.2 2006/05/20 07:51:59 keri Exp $ inherit eutils versionator @@ -29,8 +29,10 @@ DEPEND="~dev-lang/mercury-${PV} iodbc? ( !odbc? ( dev-db/libiodbc ) ) opengl? ( virtual/opengl ) tcktk? ( =dev-lang/tk-8.4* - x11-libs/libX11 - x11-libs/libXmu )" + || ( ( + x11-libs/libX11 + x11-libs/libXmu ) + virtual/x11 ) )" S="${WORKDIR}"/${MY_P} |