diff options
| -rw-r--r-- | app-editors/gvim/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/gvim/Manifest | 16 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-6.4.ebuild | 8 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-7.0_alpha20051207.ebuild | 7 |
4 files changed, 18 insertions, 19 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/Manifest b/app-editors/gvim/Manifest index e9fe58d4b646..b76bd2fb0613 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 2c2b44aa647adaa521c65b811096bd36 ChangeLog 23672 +MD5 1b643d6cf03fe7f8c03fae58218520e3 ChangeLog 23810 MD5 f06702e38dc279aee7ca16c7283d67cb files/digest-gvim-6.4 200 MD5 82c6d6400445f99a8d7d6382e22752a2 files/digest-gvim-7.0_alpha20051207 162 MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200 @@ -9,13 +6,6 @@ MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780 MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050 -MD5 3fdf0bfecfbbf28f4007e6b905ccf108 gvim-6.4.ebuild 1074 -MD5 6b631182b4dc2fca7a4980a975be384c gvim-7.0_alpha20051207.ebuild 985 +MD5 1c4a6862618692b1b919d649cfaddfc3 gvim-6.4.ebuild 1151 +MD5 2a3bf25b736a2ee581dec7240c9dfa1f gvim-7.0_alpha20051207.ebuild 1071 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDmvw5LLFUmVNQ7rkRAsJdAJ4oHWgFC8IxLej1wPGoZzWGM0lp8wCeKM3k -sM/4C/2Ry/U+lc1CjUJtTLM= -=uPeH ------END PGP SIGNATURE----- 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 ) + ) ) ) )" |