Version cleanup and [R]DEPEND moved into vim.eclass

(Portage version: 2.1.7/cvs/Linux i686)

5 files changed, 8 insertions, 163 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index c655bca651bc..06777206da93 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.297 2009/09/27 15:40:12 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.298 2009/10/17 17:21:27 lack Exp $
+
+  17 Oct 2009; Jim Ramsay <lack@gentoo.org> -gvim-7.2.ebuild,
+  -gvim-7.2.108.ebuild, -gvim-7.2.238.ebuild, gvim-7.2.264.ebuild:
+  Version cleanup and [R]DEPEND moved into vim.eclass
 
 *gvim-7.2.264 (27 Sep 2009)
 
diff --git a/app-editors/gvim/gvim-7.2.108.ebuild b/app-editors/gvim/gvim-7.2.108.ebuild
deleted file mode 100644
index 40fd2bc1f579..000000000000
--- a/app-editors/gvim/gvim-7.2.108.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.108.ebuild,v 1.1 2009/02/19 19:30:41 lack Exp $
-
-inherit vim
-
-VIM_VERSION="7.2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar"
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r1"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-extra.tar.gz
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			x11-libs/libXft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.2.238.ebuild b/app-editors/gvim/gvim-7.2.238.ebuild
deleted file mode 100644
index addb0c9f497b..000000000000
--- a/app-editors/gvim/gvim-7.2.238.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.238.ebuild,v 1.2 2009/09/25 14:31:30 lack Exp $
-
-inherit vim
-
-VIM_VERSION="7.2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-extra.tar.gz
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-RDEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			x11-libs/libXft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
-DEPEND="${RDEPEND}
-	!aqua? (
-		gtk? (
-			dev-util/pkgconfig
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.2.264.ebuild b/app-editors/gvim/gvim-7.2.264.ebuild
index 8da7aca7126a..4578d4839401 100644
--- a/app-editors/gvim/gvim-7.2.264.ebuild
+++ b/app-editors/gvim/gvim-7.2.264.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.264.ebuild,v 1.1 2009/09/27 15:40:12 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.264.ebuild,v 1.2 2009/10/17 17:21:27 lack Exp $
 
+EAPI=2
 inherit vim
 
 VIM_VERSION="7.2"
@@ -19,31 +20,4 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="GUI version of the Vim text editor"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-RDEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			x11-libs/libXft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"
-DEPEND="${RDEPEND}
-	!aqua? (
-		gtk? (
-			dev-util/pkgconfig
-		)
-	)"
+IUSE=""
diff --git a/app-editors/gvim/gvim-7.2.ebuild b/app-editors/gvim/gvim-7.2.ebuild
deleted file mode 100644
index 9b16fd0d9d62..000000000000
--- a/app-editors/gvim/gvim-7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.ebuild,v 1.7 2009/01/04 22:43:51 ulm Exp $
-
-inherit vim
-
-VIM_VERSION="7.2"
-VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r1"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
-	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-extra.tar.gz
-	mirror://gentoo/${VIM_GENTOO_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	x11-libs/libXext
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			x11-libs/libXft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? ( x11-libs/libXaw )
-			)
-		)
-	)"