--- a/PKGBUILD	2011-12-14 00:06:25.000000000 -0500
+++ b/PKGBUILD	2011-12-15 11:04:02.924762791 -0500
@@ -4,7 +4,7 @@
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=vim
-pkgname=('vim' 'gvim' 'vim-runtime')
+pkgname=('vim' 'vim-runtime')
 _topver=7.3
 _patchlevel=353
 __hgrev=379a6398d462
@@ -14,15 +14,14 @@
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
+makedepends=('gpm' 'python2')
 source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
-        vimrc archlinux.vim gvim.desktop urxvt-mouse.diff)
+        vimrc archlinux.vim urxvt-mouse.diff)
 sha1sums=('1713682c077d26ec3d3e8d0d18bad88a2a447fd5'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
-          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba'
           '54d8edec6a450a529ba11bab45c5685b1e7c2e84')
 
 # source PKGBUILD && mksource
@@ -67,29 +66,16 @@
     vim-build/src/configure.in
   (cd vim-build/src && autoconf)
 
-  cp -a vim-build gvim-build
-
   cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
     --with-features=big --with-compiledby=ArchLinux \
     --enable-gpm --enable-acl --with-x=no \
     --disable-gui --enable-multibyte --enable-cscope \
-    --disable-netbeans --enable-perlinterp --disable-pythoninterp \
+    --disable-netbeans --enable-perlinterp --enable-pythoninterp \
     --disable-python3interp --disable-rubyinterp --disable-luainterp
 
   make
-
-  cd "${srcdir}"/gvim-build
-
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=ArchLinux \
-    --enable-gpm --enable-acl --with-x=yes \
-    --enable-gui=gtk2 --enable-multibyte --enable-cscope \
-    --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --enable-python3interp --enable-rubyinterp --enable-luainterp
-
-  make
 }
 
 package_vim() {
@@ -111,45 +97,11 @@
     rm -f evim.1    # this does not make sense if we have no GUI
   done
 
-  # Runtime provided by runtime package
-  rm -r "${pkgdir}"/usr/share/vim
-
-  # license
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_gvim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2' 'lua')
-  provides=("vim=${pkgver}-${pkgrel}")
-  conflicts=('vim')
-  install=gvim.install
-
-  cd "${srcdir}"/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
-
-  # delete some manpages
-  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
-    while read _mandir; do
-    cd ${_mandir}
-    rm -f ex.1 view.1 # provided by (n)vi
-  done
-
   # Move the runtime for later packaging
   mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
 
-  # freedesktop links
-  install -Dm644 "${srcdir}"/gvim.desktop \
-    "${pkgdir}"/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
-
   # license
-   install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
@@ -158,12 +110,12 @@
   depends=('perl' 'gawk')
   backup=('etc/vimrc')
 
-  # Install the runtime split from gvim
+  # Install the runtime split from vim
   install -dm755 "${pkgdir}"/usr/share
   mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
 
   # Don't forget logtalk.dict
-  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+  install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \
     "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216