Convert packages to the new template format (v).

srcpkgs/v4l-utils/qv4l2.template

@@ -1,9 +0,0 @@
-# Template file for 'libv4l-devel'.
-#
-short_desc="QT v4l2 control panel application"
-
-do_install() {
-	vmove usr/bin/qv4l2 usr/bin
-	vmove usr/share/applications usr/share
-	vmove usr/share/icons usr/share
-}

srcpkgs/v4l-utils/template

@@ -1,8 +1,7 @@
 # Template file for 'v4l-utils'
 pkgname=v4l-utils
 version=0.8.9
-revision=1
+revision=2
-depends="sysfsutils"
 makedepends="which libjpeg-turbo-devel libsysfs-devel qt-devel libstdc++-devel"
 short_desc="Userspace tools and libraries for Video 4 Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,9 +10,6 @@ license="GPL-2, LGPL-2.1"
 distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2"
 checksum=3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e
 
-conf_files="/etc/rc_maps.cfg"
-subpackages="$pkgname-devel qv4l2"
-
 do_build() {
 	sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules
 	make PREFIX=/usr ${makejobs}
@@ -27,3 +23,30 @@ do_install() {
 	vmkdir usr/lib
 	vmove "lib/*" usr/lib
 }
+
+v4l-utils-devel_package() {
+	depends="libjpeg-turbo-devel libsysfs-devel v4l-utils>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+qv4l2_package() {
+	short_desc="QT v4l2 control panel application"
+	pkg_install() {
+		vmove usr/bin/qv4l2
+		vmove usr/share/applications
+		vmove usr/share/icons
+	}
+}
+
+v4l-utils_package() {
+	depends="sysfsutils"
+	conf_files="/etc/rc_maps.cfg"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/v4l-utils/v4l-utils-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'libv4l-devel'.
-#
-noarch=yes
-depends="libjpeg-turbo-devel libsysfs-devel v4l-utils>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/v8/libv8.template

@@ -1,16 +0,0 @@
-# Template file for 'libv8'.
-#
-short_desc="${short_desc} (Runtime library)"
-long_desc="
- V8 is Google's open source JavaScript engine. V8 is written in C++ and is
- used in Google Chrome, the open source browser from Google.
-
- V8 implements ECMAScript as specified in ECMA-262, 5th edition, and runs on
- Windows (XP or newer), Mac OS X (10.5 or newer), and Linux systems that use
- IA-32, x64, or ARM processors.
-
- This package contains the v8 runtime library."
-
-do_install() {
-	vmove usr/lib usr
-}

srcpkgs/v8/template

@@ -1,7 +1,7 @@
 # Template file for 'v8'
 pkgname=v8
 version=3.12.19.15
-revision=1
+revision=2
 short_desc="V8 JavaScript Engine"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://code.google.com/p/v8/"
@@ -20,7 +20,6 @@ long_desc="
  
  This package contains v8 the utilities mksnapshot and the d8 shell."
 
-subpackages="${pkgname}-devel lib${pkgname}"
 makedepends="which subversion python readline-devel"
 
 do_build() {
@@ -39,3 +38,24 @@ do_install() {
 	vinstall include/${pkgname}.h 644 usr/include
 	vinstall include/${pkgname}stdint.h 644 usr/include
 }
+
+v8-devel_package() {
+	depends="libv8-${version}_${revision}"
+	short_desc="${short_desc} (Development headers)"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+libv8_package() {
+	short_desc="${short_desc} (Runtime library)"
+	pkg_install() {
+		vmove usr/lib
+	}
+}
+
+v8_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/v8/v8-devel.template

@@ -1,18 +0,0 @@
-# Template file for 'v8-devel'.
-#
-noarch=yes
-depends="libv8-${version}_${revision}"
-short_desc="${short_desc} (Development headers)"
-long_desc="
- V8 is Google's open source JavaScript engine. V8 is written in C++ and is
- used in Google Chrome, the open source browser from Google.
-
- V8 implements ECMAScript as specified in ECMA-262, 5th edition, and runs on
- Windows (XP or newer), Mac OS X (10.5 or newer), and Linux systems that use
- IA-32, x64, or ARM processors.
-
- This package contains the v8 development headers."
-
-do_install() {
-	vmove usr/include usr
-}

srcpkgs/valabind-git/template

@@ -2,13 +2,8 @@
 pkgname=valabind-git
 version="$(date -u +%Y%m%d)"
 revision=1
-nofetch=yes
-noextract=yes
-provides="valabind-9999"
-replaces="valabind>=0"
 build_style=gnu-makefile
-depends="glib-devel vala-devel>=0.18"
+makedepends="pkg-config vala-devel>=0.18 libglib-devel"
-makedepends="pkg-config vala-devel>=0.18 glib-devel"
 short_desc="Tool to transform vala source files to swig, GIR or GEAR (git snapshot)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-3"
@@ -24,8 +19,20 @@ long_desc="
 
  It can also generate bindings for C++ and v8-GearBox."
 
+nofetch=yes
+noextract=yes
+
 do_fetch() {
 	local url="git://github.com/radare/valabind"
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
+
+valabind-git_package() {
+	replaces="valabind>=0"
+	provides="valabind-9999"
+	depends="glib-devel vala-devel>=0.18"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/valabind/template

@@ -20,3 +20,10 @@ long_desc="
  written in vala or C with a vapi interface.
 
  It can also generate bindings for C++ and v8-GearBox."
+
+valabind_package() {
+	depends="vala-devel>=0.20"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/valadoc-git/template

@@ -2,10 +2,6 @@
 pkgname=valadoc-git
 version=20130328
 revision=1
-nofetch=yes
-noextract=yes
-provides="valadoc-${version}"
-replaces="valadoc>=0"
 build_style=gnu-configure
 hostmakedepends="pkg-config libtool automake which"
 makedepends="libglib-devel vala-devel>=0.20 libgee08-devel graphviz-devel"
@@ -14,6 +10,9 @@ maintainer="pancake <pancake@nopcode.org>"
 license="LGPL-3"
 homepage="https://live.gnome.org/Valadoc"
 
+nofetch=yes
+noextract=yes
+
 do_fetch() {
 	local url="git://git.gnome.org/valadoc"
 	msg_normal "Fetching source from $url ...\n"
@@ -23,3 +22,11 @@ do_fetch() {
 pre_configure() {
         ./autogen.sh
 }
+
+valadoc-git_package() {
+	replaces="valadoc>=0"
+	provides="valadoc-20130328"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/valgrind/template

@@ -3,15 +3,30 @@ pkgname=valgrind
 version=3.8.1
 revision=3
 only_for_archs="i686 x86_64"
-subpackages="${pkgname}-devel"
 build_style=gnu-configure
 configure_args="--enable-tls --with-mpicc=/dev/null"
-depends="glibc>=2.17<2.18 glibc-dbg>=2.17<2.18"
+makedepends="perl pkg-config"
-makedepends="pkg-config"
-fulldepends="perl>=0"
 short_desc="Tool for finding memory management bugs in programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://valgrind.org/"
 license="GPL-2"
 distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2"
 checksum=473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db
+
+valgrind-devel_package() {
+	depends="valgrind>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/valgrind/*.a"
+		vmove usr/share/doc
+	}
+}
+
+valgrind_package() {
+	depends="perl glibc>=2.17<2.18 glibc-dbg>=2.17<2.18"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/valgrind/valgrind-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'valgrind-devel'.
-#
-depends="valgrind>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/valgrind/*.a" usr/lib/valgrind
-	vmove usr/share/doc usr/share
-}

srcpkgs/vamp-plugin-sdk/libvamp-plugin-sdk.template

@@ -1,11 +0,0 @@
-# Template file for 'libvamp'.
-#
-short_desc="${short_desc} - Runtime libraries"
-long_desc="${long_desc}
-
- This package contains the VAMP runtime lib(s)."
-
-do_install()
-{
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/vamp-plugin-sdk/template

@@ -1,23 +1,43 @@
 # Template file for 'vamp-plugin-sdk'
 pkgname=vamp-plugin-sdk
 version=2.2
-homepage="http://www.vamp-plugins.org/"
+revision=4
-distfiles="${SOURCEFORGE_SITE}/vamp/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
-revision=3
 makedepends="pkg-config libsndfile-devel"
 short_desc="The Vamp audio analysis plugin system"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
+homepage="http://www.vamp-plugins.org/"
+distfiles="${SOURCEFORGE_SITE}/vamp/${pkgname}-${version}.tar.gz"
 checksum=601d9d9f859b3232afda63ca099e51d81202556bbb0ee275a9aab14bf3d6c766
 long_desc="
  Vamp is an audio processing plugin system for plugins that extract descriptive
  information from audio data — typically referred to as audio analysis plugins
  or audio feature extraction plugins."
 
-subpackages="lib${pkgname} ${pkgname}-devel"
-
-
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+libvamp-plugin-sdk_package() {
+	short_desc="${short_desc} - Runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+vamp-plugin-sdk-devel_package() {
+	depends="libsndfile-devel libvamp-plugin-sdk>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+		vmove "usr/lib/*.a"
+        	vmove usr/lib/pkgconfig
+	}
+}
+
+vamp-plugin-sdk_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vamp-plugin-sdk/vamp-plugin-sdk-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'vamp-plugin-sdk-devel'.
-#
-depends="libsndfile-devel libvamp-plugin-sdk"
-short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-        vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-        vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/vanitygen/template

@@ -19,3 +19,9 @@ do_install() {
 	vinstall vanitygen 755 usr/bin
 	vinstall keyconv 755 usr/bin
 }
+
+vanitygen_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/varnish/libvarnishapi-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'libvarnishapi-devel'.
-#
-noarch=yes
-depends="libvarnishapi>=${version}"
-short_desc="${short_desc} -- API development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-}

srcpkgs/varnish/libvarnishapi.template

@@ -1,10 +0,0 @@
-# Template file for 'libvarnishapi'.
-#
-short_desc="${short_desc} -- API runtime library"
-long_desc="${long_desc}
-
- This package contains the runtime API library for varnish."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/varnish/template

@@ -1,7 +1,7 @@
 # Template file for 'varnish'
 pkgname=varnish
 version=3.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="pkg-config pcre-devel readline-devel"
@@ -19,14 +19,36 @@ long_desc="
  your architecture. A high level overview of what Varnish does can be seen
  in the video attached to this web page."
 
-subpackages="libvarnishapi libvarnishapi-devel"
-conf_files="/etc/varnish/default.vcl"
-systemd_services="varnish.service on"
-make_dirs="/var/varnish 750 nobody nogroup"
-
 post_install() {
 	# systemd reload helper
 	vinstall ${FILESDIR}/varnish-vcl-reload 755 usr/sbin
 	# systemd service
 	vinstall ${FILESDIR}/varnish.service 644 usr/lib/systemd/system
 }
+
+libvarnishapi_package() {
+	short_desc="${short_desc} -- API runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libvarnishapi-devel_package() {
+	depends="libvarnishapi>=${version}"
+	short_desc="${short_desc} -- API development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+varnish_package() {
+	conf_files="/etc/varnish/default.vcl"
+	systemd_services="varnish.service on"
+	make_dirs="/var/varnish 750 nobody nogroup"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/vbetool/template

@@ -2,18 +2,23 @@
 pkgname=vbetool
 version=1.1
 revision=3
-distfiles="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-$version.tar.gz"
 build_style=gnu-configure
 make_build_args="LIBS=-lpci"
-depends="pciutils"
 makedepends="zlib-devel libx86-devel pciutils-devel"
 short_desc="Run real-mode video BIOS code to alter hardware state"
 homepage="http://www.codon.org.uk/~mjg59/vbetool/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-$version.tar.gz"
 checksum=4d26ddc43144593742349e69481e3536ce3482faaa9ad4494fdc7c8b7662f954
 long_desc="
  vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
  able to alter DPMS states, save/restore video card state and attempt to
  initialize the video card from scratch."
 
+vbetool_package() {
+	depends="pciutils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vde2/libvde2.template

@@ -1,10 +0,0 @@
-# Template file for 'libvde2'.
-#
-short_desc="${short_desc} -- runtime libraries"
-long_desc="${long_desc}
-
- This package contains the runtime shared libraries."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/vde2/template

@@ -1,13 +1,11 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=3
+revision=4
 build_style=gnu-configure
-disable_parallel_build=yes
 configure_args="--disable-static --enable-experimental
 --disable-python --enable-kernel-switch"
 makedepends="libpcap-devel openssl-devel"
-subpackages="libvde2 vde2-devel"
 short_desc="Virtual Distributed Ethernet"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1, BSD"
@@ -18,13 +16,37 @@ long_desc="
  VDE is an ethernet compliant virtual network that can be spawned over a set of
  physical computer over the Internet."
 
-conf_files="
+disable_parallel_build=yes
-/etc/vdecmd
-/etc/libvdemgmt/asyncrecv.rc
-/etc/libvdemgmt/closemachine.rc
-/etc/libvdemgmt/openmachine.rc
-/etc/libvdemgmt/sendcmd.rc"
 
 post_install() {
 	vinstall COPYING.slirpvde 644 usr/share/licenses/vde2
 }
+
+libvde2_package() {
+	short_desc="${short_desc} -- runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+vde2-devel_package() {
+	depends="libvde2-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+vde2_package() {
+	conf_files="
+		/etc/vdecmd
+		/etc/libvdemgmt/asyncrecv.rc
+		/etc/libvdemgmt/closemachine.rc
+		/etc/libvdemgmt/openmachine.rc
+		/etc/libvdemgmt/sendcmd.rc"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/vde2/vde2-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'vde2-devel'.
-#
-noarch=yes
-depends="libvde2-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/vdpau-video/template

@@ -1,15 +1,20 @@
 # Template file for 'vdpau-video'
 pkgname=vdpau-video
 version=0.7.3
-homepage="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/"
-distfiles="${homepage}/$pkgname-$version.tar.gz"
-build_style=gnu-configure
 revision=3
+build_style=gnu-configure
 makedepends="pkg-config libva-devel libvdpau-devel MesaLib-devel"
 short_desc="A VDPAU-based backend for VA-API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/"
+distfiles="${homepage}/$pkgname-$version.tar.gz"
 checksum=28f66adc7d87a513a765dd79fda469e895b76692173d2aa79a26f4a618f91266
 long_desc="
  vdpau-video consists in a VDPAU-based backend for VA-API."
 
+vdpau-video_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vdpauinfo/template

@@ -1,20 +1,25 @@
 # Template file for 'vdpauinfo'
 pkgname=vdpauinfo
 version=0.0.6
-homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
+revision=1
-distfiles="http://cgit.freedesktop.org/~aplattner/$pkgname/snapshot/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 makedepends="automake pkg-config libvdpau-devel"
-revision=1
 short_desc="Command line utility for querying the capabilities of a VDPAU device"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
+distfiles="http://cgit.freedesktop.org/~aplattner/$pkgname/snapshot/$pkgname-$version.tar.bz2"
 checksum=9a81a13780cbf668ac7d6d6449a4f12857891775cc945ffa9ff27f8ffd102b25
 long_desc="
  vdpauinfo queries the capabilities of a VDPAU device and shows them via
  a command line utility."
 
-
 pre_configure() {
 	autoreconf -fi
 }
+
+vdpauinfo_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/videoproto/template

@@ -1,15 +1,20 @@
 # Template build file for 'videoproto'.
 pkgname=videoproto
 version=2.3.0
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="Video extension headers from modular X.org X11"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f
 long_desc="
  Video extension headers from modular X.org X11 project."
 
-noarch=yes
+videoproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vim/gvim.template

@@ -1,19 +0,0 @@
-# Template file for 'vim-x11'.
-#
-depends="desktop-file-utils hicolor-icon-theme"
-
-short_desc="VI iMproved - GTK+ GUI"
-long_desc="${long_desc}
-
- This packages contains gvim, the GTK+ GUI version of vim."
-
-do_install() {
-	cd $wrksrc/gvim
-        sed -i "s|/locolor|/hicolor|g" src/Makefile
-        for d in 16 32 48; do
-                vmkdir usr/share/icons/hicolor/${d}x${d}/apps
-        done
-	make -C src DESTDIR=$DESTDIR installvimbin install-icons
-
-	vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
-}

srcpkgs/vim/template

@@ -4,10 +4,9 @@ _distver=7.3
 _patchver=798
 version=${_distver}.${_patchver}
 revision=1
-subpackages="vim-common vim-x11 gvim"
-depends="vim-common>=$version"
 hostmakedepends="mercurial pkg-config"
-makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel"
+makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel
+ desktop-file-utils hicolor-icon-theme"
 short_desc="Vim editor (vi clone)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.vim.org"
@@ -17,8 +16,6 @@ nofetch=yes
 noextract=yes
 
 if [ "$CROSS_BUILD" ]; then
-	# XXX x11 and gvim subpkgs.
-	subpackages="vim-common"
 	makedepends="ncurses-devel acl-devel"
 fi
 
@@ -90,3 +87,45 @@ do_install() {
 
 	find ${DESTDIR}/usr/share/man -type f -name evim.1 -delete
 }
+
+vim-common_package() {
+	short_desc="VI iMproved - common files"
+	noarch=yes
+	replaces="vim<=7.2_2"
+	pkg_install() {
+		vmove usr/share/vim
+	}
+}
+
+vim-x11_package() {
+	provides="vim-${version}"
+	replaces="vim>=0"
+	short_desc="VI iMproved - X11 version"
+	pkg_install() {
+		cd $wrksrc/vim-x11
+		make DESTDIR=$PKGDESTDIR install
+		rm -f ${PKGDESTDIR}/usr/bin/{ex,view}
+		rm -rf $PKGDESTDIR/usr/share
+	}
+}
+
+gvim_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	short_desc="VI iMproved - GTK+ GUI"
+	pkg_install() {
+		cd $wrksrc/gvim
+        	sed -i "s|/locolor|/hicolor|g" src/Makefile
+        	for d in 16 32 48; do
+                	install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
+        	done
+		make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons
+		vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
+	}
+}
+
+vim_package() {
+	depends="vim-common>=$version"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vim/vim-common.template

@@ -1,13 +0,0 @@
-# Template file for 'vim-common'.
-#
-short_desc="VI iMproved - common files"
-long_desc="${long_desc}
-
- This package contains common files shared by all vim flavours."
-
-noarch=yes
-replaces="vim<=7.2_2"
-
-do_install() {
-	vmove usr/share/vim usr/share
-}

srcpkgs/vim/vim-x11.template

@@ -1,15 +0,0 @@
-# Template file for 'vim-x11'.
-#
-provides="vim-${version}"
-replaces="vim>=0"
-short_desc="VI iMproved - X11 version"
-long_desc="${long_desc}
-
- This packages contains vim-x11, the x11 capable version of vim."
-
-do_install() {
-	cd $wrksrc/vim-x11
-	make DESTDIR=$DESTDIR install
-	rm -f ${DESTDIR}/usr/bin/{ex,view}
-	rm -rf $DESTDIR/usr/share
-}

srcpkgs/vinagre/template

@@ -5,11 +5,10 @@ revision=1
 # XXX rdp (rdesktop) plugin
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-rdp"
-depends="desktop-file-utils hicolor-icon-theme"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils"
 makedepends="libxml2-devel libsecret-devel avahi-ui-libs-devel
- spice-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel gtk-vnc-devel"
+ spice-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel
-fulldepends="openssh>=6.1p1 gnome-icon-theme"
+ gtk-vnc-devel openssh>=6.1p1 gnome-icon-theme"
 short_desc="VNC client for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/vinagre"
@@ -24,3 +23,10 @@ long_desc="
   You can browse your network for VNC servers, we like avahi
   You don't need to supply the password on every connection, we like GNOME Keyring
 "
+
+vinagre_package() {
+	depends="openssh>=6.1p1 gnome-icon-theme desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vino/template

@@ -4,15 +4,21 @@ version=3.8.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
-depends="desktop-file-utils"
 hostmakedepends="pkg-config intltool gnome-doc-utils"
 makedepends="libjpeg-turbo-devel gtk+3-devel>=3.8.0
  libnotify-devel avahi-glib-libs-devel dbus-glib-devel telepathy-glib-devel
  libsoup-devel libXtst-devel NetworkManager-devel libsecret-devel
- gnutls-devel>=3.1.5"
+ gnutls-devel>=3.1.5 desktop-file-utils"
 short_desc="VNC server for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=be665ff7a76076902a84cab69e7c3a6a7ddf2c634cc648aa35189895eefaac28
+
+vino_package() {
+	depends="desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/virt-manager/template

@@ -11,10 +11,6 @@ homepage="http://virt-manager.et.redhat.com"
 distfiles="http://virt-manager.et.redhat.com/download/sources/$pkgname/$pkgname-$version.tar.gz"
 checksum=dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0
 
-noarch=yes
-pycompile_dirs="/usr/share/virt-manager"
-depends="dbus-python pygtk libvirt-python virtinst gtk2-vnc-python
- python-gconf netcat libxml2-python"
 makedepends="pkg-config intltool GConf-devel"
 
 post_install() {
@@ -24,3 +20,13 @@ post_install() {
 		${DESTDIR}/etc/gconf/schemas/*.schemas
 	rm -rf ${DESTDIR}/etc/gconf
 }
+
+virt-manager_package() {
+	noarch="yes"
+	pycompile_dirs="/usr/share/virt-manager"
+	depends="dbus-python pygtk libvirt-python virtinst gtk2-vnc-python
+		python-gconf netcat libxml2-python"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/virtinst/template

@@ -4,8 +4,7 @@ version=0.600.3
 revision=1
 noarch=yes
 build_style=python-module
-fulldepends="python libvirt-python urlgrabber"
+makedepends="python libvirt-python urlgrabber"
-pycompile_module="virtinst virtconv"
 short_desc="Virtual Machine Installation module"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virt-manager.et.redhat.com"
@@ -18,3 +17,12 @@ long_desc="
  machines.  It supports both paravirt guests (for which only FC and
  RHEL guests are currently supported) as well as fully virtualized
  guests. It uses libvirt (http://www.libvirt.org) for starting things."
+
+virtinst_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pycompile_module="virtinst virtconv"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/virtualbox-ose/template

@@ -14,9 +14,6 @@ checksum=a9246b65e28f0e6e1ab3fd0180294c9dac78fdad3d61b642f9bc5a84b6a4d2b9
 
 disable_debug=yes
 
-depends="virtualbox-ose-dkms-${version}_${revision}
- hicolor-icon-theme desktop-file-utils"
-
 makedepends="which openssl-devel libcurl-devel libpng-devel>=1.5.10 SDL-devel
  qt-devel libXcursor-devel libXinerama-devel libXrandr-devel
  libXcomposite-devel libIDL-devel glib-devel pam-devel python-devel
@@ -24,12 +21,10 @@ makedepends="which openssl-devel libcurl-devel libpng-devel>=1.5.10 SDL-devel
  alsa-lib-devel device-mapper-devel docbook-xsl acpica-utils
  kernel-headers dev86 yasm"
 
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="${makedepends} gcc-c++-multilib"
+	makedepends+=" gcc-c++-multilib"
 fi
 
-subpackages="${pkgname}-dkms ${pkgname}-guest ${pkgname}-guest-dkms"
-system_groups="vboxusers"
 
 do_build() {
 	local _khdrver=$($XBPS_PKGDB_CMD version kernel-headers)
@@ -108,3 +103,89 @@ do_install() {
 	# Install modules-load.d file.
 	vinstall ${FILESDIR}/virtualbox.conf 644 usr/lib/modules-load.d
 }
+
+virtualbox-ose-dkms_package() {
+	short_desc="${short_desc} - kernel module sources for dkms"
+	dkms_modules="virtualbox-ose ${_vbox_distver}"
+	depends="dkms"
+	noarch=yes
+
+	pkg_install() {
+		source ${wrksrc}./env.sh
+
+		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
+		local _osedir=${PKGDESTDIR}/usr/src/${sourcepkg}-${version}
+
+		install -d ${_osedir}
+		cp -a . ${_osedir}
+		rm -f ${_osedir}/do_dkms
+		install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf
+		vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \
+			usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules
+	}
+}
+
+virtualbox-ose-guest_package() {
+	systemd_services="vboxservice.service on"
+	depends="virtualbox-ose-guest-dkms-${version}_${revision}"
+	short_desc="${short_desc} - guest utilities"
+
+	pkg_install() {
+		source ${wrksrc}./env.sh
+
+		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
+		install -d ${PKGDESTDIR}/usr/bin ${PKGDESTDIR}/usr/sbin
+
+		install -m755 VBoxClient VBoxControl VBoxService ${PKGDESTDIR}/usr/bin
+		install -m755 mount.vboxsf ${PKGDESTDIR}/usr/sbin
+		install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+			${PKGDESTDIR}/etc/xdg/autostart/vboxclient.desktop
+
+		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
+		install -D vboxmouse_drv_16.so \
+			${PKGDESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so
+		install -D vboxvideo_drv_112.so \
+			${PKGDESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so
+		install -d ${PKGDESTDIR}/usr/lib/xorg/modules/dri
+		install -m755 VBoxOGL*.so ${PKGDESTDIR}/usr/lib
+		ln -sf /usr/lib/VBoxOGL.so \
+			${PKGDESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so
+		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
+		install -Dm755 pam_vbox.so ${PKGDESTDIR}/usr/lib/security/pam_vbox.so
+
+		vinstall ${FILESDIR}/virtualbox-guest.conf 644 usr/lib/modules-load.d
+		vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system
+	}
+}
+
+virtualbox-ose-guest-dkms_package() {
+	short_desc="${short_desc} - guest addition module source for dkms"
+	dkms_modules="virtualbox-ose-guest ${_vbox_distver}"
+	depends="dkms"
+	noarch=yes
+
+	pkg_install() {
+		source ${wrksrc}./env.sh
+	
+		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
+		local _guestdir=${PKGDESTDIR}/usr/src/${sourcepkg}-guest-${version}
+
+		install -d ${_guestdir}
+		cp -a . ${_guestdir}
+		rm -f ${_guestdir}/do_dkms
+		install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.dkms \
+			${_guestdir}/dkms.conf
+		vinstall ${FILESDIR}/${sourcepkg}-guest-dkms.udev 644 \
+			usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules
+	}
+}
+
+virtualbox-ose_package() {
+	depends="virtualbox-ose-dkms-${version}_${revision}
+		hicolor-icon-theme desktop-file-utils shadow"
+	system_groups="vboxusers"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template

@@ -1,20 +0,0 @@
-# Template file for 'virtualbox-ose-dkms'.
-#
-short_desc="${short_desc} - kernel module sources for dkms"
-dkms_modules="virtualbox-ose ${_vbox_distver}"
-noarch=yes
-
-do_install() {
-	source ./env.sh
-
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
-	local _osedir=${DESTDIR}/usr/src/${sourcepkg}-${version}
-
-	install -d ${_osedir}
-	cp -a . ${_osedir}
-	rm -f ${_osedir}/do_dkms
-	install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf
-	vmkdir usr/lib/udev/rules.d
-	vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \
-		usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules
-}

srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template

@@ -1,21 +0,0 @@
-# Template file for 'virtualbox-ose-guest-dkms'.
-#
-short_desc="${short_desc} - guest addition module source for dkms"
-dkms_modules="virtualbox-ose-guest ${_vbox_distver}"
-noarch=yes
-
-do_install() {
-	source ./env.sh
-	
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
-	local _guestdir=${DESTDIR}/usr/src/${sourcepkg}-guest-${version}
-
-	install -d ${_guestdir}
-	cp -a . ${_guestdir}
-	rm -f ${_guestdir}/do_dkms
-	install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.dkms \
-		${_guestdir}/dkms.conf
-	vmkdir usr/lib/udev/rules.d
-	vinstall ${FILESDIR}/${sourcepkg}-guest-dkms.udev 644 \
-		usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules
-}

srcpkgs/virtualbox-ose/virtualbox-ose-guest.template

@@ -1,33 +0,0 @@
-# Template file for 'virtualbox-ose-guest'.
-#
-systemd_services="vboxservice.service on"
-depends="virtualbox-ose-guest-dkms-${version}_${revision}"
-short_desc="${short_desc} - guest utilities"
-
-do_install() {
-	source ./env.sh
-
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	vmkdir usr/bin
-	vmkdir usr/sbin
-
-	install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin
-	install -m755 mount.vboxsf ${DESTDIR}/usr/sbin
-	install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-		${DESTDIR}/etc/xdg/autostart/vboxclient.desktop
-
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -D vboxmouse_drv_16.so \
-		${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so
-	install -D vboxvideo_drv_112.so \
-		${DESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so
-	install -d ${DESTDIR}/usr/lib/xorg/modules/dri
-	install -m755 VBoxOGL*.so ${DESTDIR}/usr/lib
-	ln -sf /usr/lib/VBoxOGL.so \
-		${DESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -Dm755 pam_vbox.so ${DESTDIR}/usr/lib/security/pam_vbox.so
-
-	vinstall ${FILESDIR}/virtualbox-guest.conf 644 usr/lib/modules-load.d
-	vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system
-}

srcpkgs/vlc/template

@@ -23,7 +23,6 @@ long_desc="
  codec, program or codec pack to work."
 
 # XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2).
-depends="pulseaudio freefont-ttf hicolor-icon-theme desktop-file-utils"
 makedepends="pkg-config videoproto libudev-devel>=183 libpng-devel>=1.5.10
  libvorbis-devel SDL_image-devel x264-devel ffmpeg-devel>=1.0.1 jack-devel
  xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 libsamplerate-devel
@@ -55,3 +54,10 @@ post_install() {
 	cd ${DESTDIR}/usr/share/pixmaps && \
 		ln -sf ../icons/hicolor/48x48/apps/vlc.png vlc.png
 }
+
+vlc_package() {
+	depends="pulseaudio freefont-ttf hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/void-artwork/template

@@ -13,9 +13,15 @@ long_desc="
 noextract=yes
 noarch=yes
 
-do_install()
+do_install() {
-{
 	vinstall ${FILESDIR}/splash.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork
 }
+
+void-artwork_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/void-installer/template

@@ -10,7 +10,7 @@ license="Simplified BSD"
 nofetch=yes
 noextract=yes
 noarch=yes
-fulldepends="dialog"
+makedepends="dialog"
 
 do_fetch() {
 	local url="git://github.com/voidlinux/void-installer"
@@ -21,3 +21,11 @@ do_fetch() {
 do_install() {
 	make DESTDIR=$DESTDIR install
 }
+
+void-installer_package() {
+	depends="dialog"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/void-mklive/template

@@ -12,7 +12,7 @@ homepage="https://www.voidlinux.eu"
 noarch=yes
 nofetch=yes
 noextract=yes
-depends="dracut>=020_6 grub-x86_64-efi squashfs-tools syslinux>=4.05_2
+makedepends="dracut>=020_6 grub-x86_64-efi squashfs-tools syslinux>=4.05_2
  dosfstools xorriso xbps>=0.21"
 replaces="vmklive>=0"
 
@@ -21,3 +21,12 @@ do_fetch() {
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
+
+void-mklive_package() {
+	noarch="yes"
+	replaces="vmklive>=0"
+	depends="${makedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vte/template

@@ -1,8 +1,7 @@
 # Template build file for 'vte'.
 pkgname=vte
 version=0.28.2
-revision=4
+revision=5
-subpackages="vte-python vte-devel"
 build_style=gnu-configure
 configure_args="--disable-static --with-gtk=2.0"
 makedepends="pkg-config intltool gtk+-devel ncurses-devel pygtk-devel"
@@ -15,3 +14,28 @@ checksum=8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903
 long_desc="
  Terminal widget with improved font, internationalization and
  accessibility support for the GNOME 2 desktop."
+
+vte-python_package() {
+	depends="pygtk"
+	short_desc+=" -- Python bindings"
+	pkg_install() {
+		vmove "usr/lib/python*"
+		vmove "usr/share/pygtk*"
+	}
+}
+
+vte-devel_package() {
+	depends="libglib-devel pango-devel cairo-devel gtk+-devel vte-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+	}
+}
+
+vte_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vte/vte-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'vte-devel'.
-#
-noarch=yes
-depends="glib-devel pango-devel cairo-devel gtk+-devel vte-${version}_${revision}"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
-}

srcpkgs/vte/vte-python.template

@@ -1,15 +0,0 @@
-# Template file for 'vte-python'.
-#
-depends="pygtk"
-short_desc="${sourcepkg} - Python bindings"
-long_desc="${long_desc}
-
- This package contains the Python bindings."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/pygtk* ${DESTDIR}/usr/share
-}

srcpkgs/vte3/template

@@ -4,12 +4,10 @@ version=0.34.3
 revision=1
 wrksrc=vte-${version}
 build_style=gnu-configure
-subpackages="vte3-devel"
 configure_args="--with-gtk=3.0 --enable-introspection
  --disable-gnome-pty-helper --disable-static"
 hostmakedepends="pkg-config intltool gobject-introspection"
-makedepends="gtk+3-devel ncurses-devel"
+makedepends="gtk+3-devel ncurses-devel vte"
-fulldepends="vte>=0"
 short_desc="Terminal widget with improved accessibility and I18N support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -19,3 +17,21 @@ checksum=e5f52e505ce6ac66075bd84143f728cba858722753055ff9e64c59fce70822cc
 long_desc="
  Terminal widget with improved font, internationalization and
  accessibility support for the GNOME 3 desktop."
+
+vte3-devel_package() {
+	depends="gtk+3-devel vte3-${version}_${revision}"
+	short_desc="${sourcepkg} development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/gtk-doc
+	}
+}
+
+vte3_package() {
+	depends="vte"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/vte3/vte3-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'vte3-devel'.
-#
-depends="gtk+3-devel vte3-${version}_${revision}"
-short_desc="${sourcepkg} development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/share/gtk-doc usr/share
-}