diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-12-14 04:36:43 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-14 04:36:43 +0000 |
| commit | f0f3282ac74b2a81bf005f21e26e1aca8c4c2e50 (patch) | |
| tree | f4f3b58ea855b295a0b2ea48ee9b8c19dfe01fa4 | |
| parent | Added modular X dependencies. (diff) | |
| download | gentoo-2-f0f3282ac74b2a81bf005f21e26e1aca8c4c2e50.tar.gz gentoo-2-f0f3282ac74b2a81bf005f21e26e1aca8c4c2e50.tar.bz2 gentoo-2-f0f3282ac74b2a81bf005f21e26e1aca8c4c2e50.zip | |
Add modular X dependencies.
(Portage version: 2.0.53)
| -rw-r--r-- | app-editors/gvim/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-6.4.ebuild | 8 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-7.0_alpha20051207.ebuild | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index ee41353e702c..fe1a5fcb9ad5 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/gvim # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.166 2005/12/10 16:02:34 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.167 2005/12/14 04:36:43 spyderous Exp $ + + 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; gvim-6.4.ebuild, + gvim-7.0_alpha20051207.ebuild: + Add modular X dependencies. 10 Dec 2005; Ciaran McCreesh <ciaranm@gentoo.org> gvim-7.0_alpha20051207.ebuild: diff --git a/app-editors/gvim/gvim-6.4.ebuild b/app-editors/gvim/gvim-6.4.ebuild index 58d6785a6de3..f99efd28931a 100644 --- a/app-editors/gvim/gvim-6.4.ebuild +++ b/app-editors/gvim/gvim-6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.4.ebuild,v 1.9 2005/11/21 23:27:44 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.4.ebuild,v 1.10 2005/12/14 04:36:43 spyderous Exp $ inherit vim @@ -24,10 +24,12 @@ IUSE="gnome gtk motif nls" PROVIDE="virtual/editor" DEPEND="${DEPEND} ~app-editors/vim-core-${PV} - virtual/x11 + || ( x11-libs/libXpm virtual/x11 ) gtk? ( >=x11-libs/gtk+-2.6 virtual/xft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) - !gtk? ( motif? ( x11-libs/openmotif ) )" + !gtk? ( motif? ( x11-libs/openmotif ) + !motif? ( || ( x11-libs/libXaw virtual/x11 ) ) + )" diff --git a/app-editors/gvim/gvim-7.0_alpha20051207.ebuild b/app-editors/gvim/gvim-7.0_alpha20051207.ebuild index 40af5a426e32..7e54e90a8551 100644 --- a/app-editors/gvim/gvim-7.0_alpha20051207.ebuild +++ b/app-editors/gvim/gvim-7.0_alpha20051207.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20051207.ebuild,v 1.2 2005/12/10 16:02:35 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20051207.ebuild,v 1.3 2005/12/14 04:36:43 spyderous Exp $ inherit vim @@ -22,7 +22,7 @@ IUSE="aqua gnome gtk motif nextaw" PROVIDE="virtual/editor" DEPEND="${DEPEND} ~app-editors/vim-core-${PV} - virtual/x11 + || ( x11-libs/libXpm virtual/x11 ) !aqua? ( gtk? ( >=x11-libs/gtk+-2.6 @@ -37,6 +37,9 @@ DEPEND="${DEPEND} nextaw? ( x11-libs/neXtaw ) + !nextaw? ( + || ( x11-libs/libXaw virtual/x11 ) + ) ) ) )" |