diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 45fc9ca2418..fe28f9f3524 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,6 +1,8 @@
 # Template file for 'base-chroot'
 pkgname=base-chroot
 version=0.28
+noarch=yes
+bootstrap=yes
 build_style=meta-template
 homepage="http://code.google.com/p/xbps"
 fulldepends="xbps-triggers base-files kernel-libc-headers chroot-glibc chroot-gcc chroot-binutils chroot-patch chroot-bash chroot-grep chroot-coreutils chroot-diffutils chroot-gettext chroot-texinfo chroot-sed chroot-gawk chroot-findutils chroot-make chroot-gzip chroot-bzip2 chroot-file chroot-tar chroot-m4 chroot-xz chroot-fakeroot mpfr-devel gmp-devel zlib-devel ccache"
@@ -10,41 +12,3 @@ license="Public domain"
 long_desc="
  This package installs all necessary packages to be able to build packages
  inside of a chroot with xbps-src."
-
-noarch=yes
-bootstrap=yes
-
-if [ -n "$IN_CHROOT" ]; then
-	_deptype="run"
-else
-	_deptype="full"
-fi
-
-Add_dependency ${_deptype} xbps-triggers
-Add_dependency ${_deptype} base-files
-Add_dependency ${_deptype} kernel-libc-headers
-Add_dependency ${_deptype} chroot-glibc
-Add_dependency ${_deptype} chroot-gcc
-Add_dependency ${_deptype} chroot-binutils
-Add_dependency ${_deptype} chroot-patch
-Add_dependency ${_deptype} chroot-bash
-Add_dependency ${_deptype} chroot-grep
-Add_dependency ${_deptype} chroot-coreutils
-Add_dependency ${_deptype} chroot-diffutils
-Add_dependency ${_deptype} chroot-gettext
-Add_dependency ${_deptype} chroot-texinfo
-Add_dependency ${_deptype} chroot-sed
-Add_dependency ${_deptype} chroot-gawk
-Add_dependency ${_deptype} chroot-findutils
-Add_dependency ${_deptype} chroot-make
-Add_dependency ${_deptype} chroot-gzip
-Add_dependency ${_deptype} chroot-bzip2
-Add_dependency ${_deptype} chroot-file
-Add_dependency ${_deptype} chroot-tar
-Add_dependency ${_deptype} chroot-m4
-Add_dependency ${_deptype} chroot-xz
-Add_dependency ${_deptype} chroot-fakeroot
-Add_dependency ${_deptype} mpfr-devel
-Add_dependency ${_deptype} gmp-devel
-Add_dependency ${_deptype} zlib-devel
-Add_dependency ${_deptype} ccache
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index ea9a22fb53f..d3b60dbe453 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -11,6 +11,10 @@ http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$vers
 http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="pkg-config which unzip yasm flex gperf perl>=0 python>=0 libgcrypt-devel libelf-devel mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel libvpx-devel speex-devel libwebp-devel pulseaudio-devel cups-devel hunspell-devel libflac-devel"
+if [ "$XBPS_MACHINE" = "x86_64" ]; then
+	makedepends="${makedepends} gcc-multilib"
+fi
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"
@@ -28,16 +32,6 @@ long_desc="
 
  This package contains the Chromium browser."
 
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	Add_dependency build zlib32
-	Add_dependency build libstdc++32
-	Add_dependency build gcc-multilib
-fi
-
-
 pre_configure() {
 	# http://code.google.com/p/chromium/issues/detail?id=109527
 	sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
diff --git a/srcpkgs/gcc/gcc-c++-multilib.template b/srcpkgs/gcc/gcc-c++-multilib.template
index a518d2a3892..e356f5c612f 100644
--- a/srcpkgs/gcc/gcc-c++-multilib.template
+++ b/srcpkgs/gcc/gcc-c++-multilib.template
@@ -1,5 +1,6 @@
 # Template file for 'gcc-c++-multilib'.
 #
+depends="gcc-c++>=4.7 gcc-multilib>=4.7 libstdc++32-devel>=4.7"
 short_desc="GCC C++ compiler (multilib files)"
 long_desc="
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
@@ -9,9 +10,6 @@ long_desc="
 
 noverifyrdeps=yes
 
-Add_dependency run gcc-c++ 		">=${_majorver}"
-Add_dependency run gcc-multilib 	">=${_majorver}"
-Add_dependency run libstdc++32-devel 	">=${_majorver}"
 
 do_install() {
 	local libmddir="usr/lib/gcc/${_triplet}/${_majorver}"
diff --git a/srcpkgs/gcc/gcc-multilib.template b/srcpkgs/gcc/gcc-multilib.template
index 72636278282..407f203d7ea 100644
--- a/srcpkgs/gcc/gcc-multilib.template
+++ b/srcpkgs/gcc/gcc-multilib.template
@@ -1,5 +1,6 @@
 # Template file for 'gcc-c-multilib'.
 #
+depends="gcc>=4.7 libgcc32>=4.7 libgomp32>=4.7 libitm32>=4.7 zlib32 glibc32-devel"
 short_desc="GCC C compiler (multilib files)"
 long_desc="
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
@@ -9,12 +10,6 @@ long_desc="
 
 noverifyrdeps=yes
 
-Add_dependency run gcc		">=${_majorver}"
-Add_dependency run libgcc32	">=${_majorver}"
-Add_dependency run libgomp32	">=${_majorver}"
-Add_dependency run libitm32	">=${_majorver}"
-Add_dependency run zlib32
-Add_dependency run glibc32-devel
 
 do_install() {
 	local libmddir="usr/lib/gcc/${_triplet}/${_majorver}"
diff --git a/srcpkgs/gcc/gcc-objc-multilib.template b/srcpkgs/gcc/gcc-objc-multilib.template
index 50b833c6345..e9ed6e0c740 100644
--- a/srcpkgs/gcc/gcc-objc-multilib.template
+++ b/srcpkgs/gcc/gcc-objc-multilib.template
@@ -1,5 +1,6 @@
 # Template file for 'gcc-objc-multilib'.
 #
+depends="gcc-multilib>=4.7 gcc-objc>=4.7 libobjc32>=4.7"
 short_desc="The GNU Objective-C compiler (multilib files)"
 long_desc="
  This is the GNU Objective-C compiler, which compiles Objective-C on
@@ -10,9 +11,6 @@ long_desc="
 
 noverifyrdeps=yes
 
-Add_dependency run gcc-multilib	">=${_majorver}"
-Add_dependency run gcc-objc	">=${_majorver}"
-Add_dependency run libobjc32	">=${_majorver}"
 
 do_install() {
 	local libmddir="/usr/lib/gcc/${_triplet}/${_majorver}"
diff --git a/srcpkgs/gcc/libgomp32.template b/srcpkgs/gcc/libgomp32.template
index 089d95fb6f2..e3c768b2d7e 100644
--- a/srcpkgs/gcc/libgomp32.template
+++ b/srcpkgs/gcc/libgomp32.template
@@ -1,5 +1,6 @@
 # Template file for 'libgomp32'.
 #
+depends="libgcc32 glibc32"
 short_desc="GCC OpenMP v3.0 shared support library (32bit)"
 long_desc="${long_desc}
 
@@ -8,8 +9,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run libgcc32
-Add_dependency run glibc32
 
 do_install() {
 	vmove "usr/lib32/libgomp.*" usr/lib32
diff --git a/srcpkgs/gcc/libitm32.template b/srcpkgs/gcc/libitm32.template
index 4bbe52226e0..5bc38780de9 100644
--- a/srcpkgs/gcc/libitm32.template
+++ b/srcpkgs/gcc/libitm32.template
@@ -1,5 +1,6 @@
 # Template file for 'libitm'.
 #
+depends="libgcc32"
 short_desc="GCC Transactional Memory support library (32bit)"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run libgcc32
 
 do_install() {
 	vmove "usr/lib32/libitm*" usr/lib32
diff --git a/srcpkgs/gcc/libmudflap32-devel.template b/srcpkgs/gcc/libmudflap32-devel.template
index be68b25d42d..eb29093e185 100644
--- a/srcpkgs/gcc/libmudflap32-devel.template
+++ b/srcpkgs/gcc/libmudflap32-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libmudflap32-devel'.
 #
+depends="gcc-multilib glibc32-devel libmudflap32"
 short_desc="GCC 32bit mudflap support libraries (development files)"
 long_desc="
  The libmudflap libraries are used by GCC for instrumenting pointer
@@ -7,9 +8,6 @@ long_desc="
 
  This package contains the headers and the static libraries." 
 
-Add_dependency run gcc-multilib
-Add_dependency run glibc32-devel
-Add_dependency run libmudflap32
 
 do_install() {
 	vmove "usr/lib32/libmudflap*.a" usr/lib32
diff --git a/srcpkgs/gcc/libmudflap32.template b/srcpkgs/gcc/libmudflap32.template
index 262c4ff2b43..8b37f42c007 100644
--- a/srcpkgs/gcc/libmudflap32.template
+++ b/srcpkgs/gcc/libmudflap32.template
@@ -1,5 +1,6 @@
 # Template file for 'libmudflap32'.
 #
+depends="gcc-multilib glibc32"
 short_desc="GCC mudflap shared support libraries (32bit)"
 long_desc="
  The libmudflap libraries are used by GCC for instrumenting pointer
@@ -7,8 +8,6 @@ long_desc="
 
 noverifyrdeps=yes
 
-Add_dependency run gcc-multilib
-Add_dependency run glibc32
 
 do_install() {
 	vmove "usr/lib32/libmudflap*.so*" usr/lib32
diff --git a/srcpkgs/gcc/libobjc32.template b/srcpkgs/gcc/libobjc32.template
index 37b7837d710..18da2646bed 100644
--- a/srcpkgs/gcc/libobjc32.template
+++ b/srcpkgs/gcc/libobjc32.template
@@ -1,5 +1,6 @@
 # Template file for 'libobjc32'.
 #
+depends="libgcc32 glibc32"
 short_desc="GCC Objective-C shared library support (32bit)"
 long_desc="${long_desc}
 
@@ -8,8 +9,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run libgcc32
-Add_dependency run glibc32
 
 do_install() {
 	vmove "usr/lib32/libobjc.so*" usr/lib32
diff --git a/srcpkgs/gcc/libssp32.template b/srcpkgs/gcc/libssp32.template
index 1ffcaf0277d..52caa09aa9d 100644
--- a/srcpkgs/gcc/libssp32.template
+++ b/srcpkgs/gcc/libssp32.template
@@ -1,5 +1,6 @@
 # Template file for 'libssp32'.
 #
+depends="glibc32"
 short_desc="GCC SSP shared library support (32bit)"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run glibc32
 
 do_install() {
 	vmove "usr/lib32/libssp.so*" usr/lib32
diff --git a/srcpkgs/gcc/libstdc++32-devel.template b/srcpkgs/gcc/libstdc++32-devel.template
index 3d77fcc7c04..13e0e5f8312 100644
--- a/srcpkgs/gcc/libstdc++32-devel.template
+++ b/srcpkgs/gcc/libstdc++32-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libstdc++32-devel'.
 #
+depends="libstdc++-devel libstdc++32"
 short_desc="GCC Standard C++ Library (32bit) development files"
 long_desc="${long_desc}
 
@@ -8,8 +9,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run libstdc++-devel
-Add_dependency run libstdc++32
 
 do_install() {
 	vmove usr/include/c++/${_majorver}/${_triplet}/32 \
diff --git a/srcpkgs/gcc/libstdc++32.template b/srcpkgs/gcc/libstdc++32.template
index a3cc13f55df..d5c66fc3287 100644
--- a/srcpkgs/gcc/libstdc++32.template
+++ b/srcpkgs/gcc/libstdc++32.template
@@ -1,5 +1,6 @@
 # Template file for 'libstdc++32'.
 #
+depends="libgcc32 glibc32 libstdc++"
 short_desc="GCC Standard C++ Library (32bit)"
 long_desc="${long_desc}
 
@@ -8,9 +9,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run libgcc32
-Add_dependency run glibc32
-Add_dependency run libstdc++
 
 do_install() {
 	vmove "usr/lib32/libstdc++.so*" usr/lib32
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 741b56291d2..384f07fbcf4 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -17,13 +17,9 @@ long_desc="
  for ObjectiveC++ install gcc-objc++, for Go install gcc-go,
  for Fortran install gcc-fortran."
 
-
-
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	# Required stuff for multilib packages.
-	Add_dependency build glibc32-devel
-	Add_dependency build zlib32-devel
-
+	makedepends="${makedepends} glibc32-devel zlib32-devel"
 	subpackages="gcc-multilib gcc-c++-multilib"
 	subpackages="${subpackages} gcc-objc-multilib libgcc32 libgomp32"
 	subpackages="${subpackages} libmudflap32-devel libmudflap32"
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index ba6f579b047..9ff3ca0be2d 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -7,6 +7,11 @@ distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz"
 short_desc="An Advanced Memory Diagnostic Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+nostrip=yes
+noverifyrdeps=yes
+if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+	makedepends="gcc-multilib"
+fi
 checksum=5630ce978d0e6b671891df4253fc5c54659764d0cdfc7515ac0df3d8dd9e8737
 long_desc="
  Memtest86+ scans your RAM for errors.
@@ -18,13 +23,6 @@ long_desc="
  as well as a number of general-purpose improvements, including many patches
  to memtest86 available from various sources."
 
-nostrip=yes
-noverifyrdeps=yes
-
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	Add_dependency build gcc-multilib
-fi
-
 do_build() {
 	make ${makejobs}
 }
diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template
index 641693601a9..7dab169eccb 100644
--- a/srcpkgs/mingw-w64-crt/template
+++ b/srcpkgs/mingw-w64-crt/template
@@ -8,6 +8,9 @@ version=${_majversion}.${_snapshot}
 revision=3
 distfiles=${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2
 makedepends="flex"
+if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+	makedepends="${makedepends} gcc-multilib"
+fi
 fulldepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc"
 short_desc="The mingw-w64 cross-compiler runtime"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -20,11 +23,6 @@ long_desc="
  This is the mingw-64 cross-compiler, which supports building code for Win32
  or Win64 (multilib).  For the i686 platform, only 32bit is available."
 
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	Add_dependency build gcc-multilib
-fi
-
-
 _mingwprefix=/opt
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
@@ -36,12 +34,10 @@ else
 fi
 
 strip_cmd=${_mingwprefix}/bin/${_mingwtriplet}-strip
-
 wrksrc=${_shortname}-v${_majversion}-${_snapshot}
 build_wrksrc=${pkgname}
 
-do_build()
-{
+do_build() {
 	unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
 	local SAVEDPATH=$PATH
 	export PATH="/opt/bin:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
@@ -56,8 +52,7 @@ do_build()
 	export PATH=$SAVEDPATH
 }
 
-do_install()
-{
+do_install() {
 	# This path setting is necessary so that it finds ${_mingwprefix}-ranlib
 	unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
 	local SAVEDPATH=$PATH
diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template
index a23a8b91690..c1ced409264 100644
--- a/srcpkgs/mingw-w64-gcc/template
+++ b/srcpkgs/mingw-w64-gcc/template
@@ -6,6 +6,9 @@ version=${_majorver}.1
 revision=6
 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2
 makedepends="flex"
+if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+	makedepends="${makedepends} gcc-multilib"
+fi
 fulldepends="mingw-w64-binutils mingw-w64-headers"
 short_desc="The GNU C Compiler (for mingw-w64)"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -18,13 +21,6 @@ long_desc="
  This is the mingw-64 cross-compiler, which supports building code for Win32
  or Win64 (multilib).  For the i686 platform, only 32bit is available."
 
-
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	Add_dependency build gcc-multilib
-fi
-
-
-
 _mingwprefix=/opt
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
@@ -41,13 +37,7 @@ fi
 wrksrc=gcc-${version}
 build_wrksrc=${pkgname}-build
 
-pre_configure()
-{
-	mkdir -p ${wrksrc}/${build_wrksrc}
-}
-
-do_build()
-{
+do_build() {
 	# As specified in the LFS book, disable installing libiberty.
 	sed -i 's/install_to_$(INSTALL_DEST) //' ${wrksrc}/libiberty/Makefile.in
 	# Do not run fixincludes
@@ -74,8 +64,7 @@ do_build()
 	export PATH=$SAVEDPATH
 }
 
-do_install()
-{
+do_install() {
 	make DESTDIR=${DESTDIR} ${makejobs} install-gcc
 
 	# Remove useless manpages
diff --git a/srcpkgs/mingw-w64-libgcc/template b/srcpkgs/mingw-w64-libgcc/template
index e6943062745..ada8fac298f 100644
--- a/srcpkgs/mingw-w64-libgcc/template
+++ b/srcpkgs/mingw-w64-libgcc/template
@@ -7,6 +7,9 @@ revision=2
 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2
 depends="glibc cloog-ppl ppl gmp mpc mpfr zlib"
 makedepends="flex"
+if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+	makedepends="${makedepends} gcc-multilib"
+fi
 fulldepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc mingw-w64-crt"
 short_desc="The GNU C Compiler (libs for mingw-w64)"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -19,12 +22,6 @@ long_desc="
  This is the mingw-64 cross-compiler, which supports building code for Win32
  or Win64 (multilib).  For the i686 platform, only 32bit is available."
 
-
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	Add_dependency build gcc-multilib
-fi
-
-
 _mingwprefix=/opt
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
@@ -39,17 +36,10 @@ else
 fi
 
 strip_cmd=${_mingwprefix}/bin/${_mingwtriplet}-strip
-
 wrksrc=gcc-${version}
 build_wrksrc=${pkgname}-build
 
-pre_configure()
-{
-	mkdir -p ${wrksrc}/${build_wrksrc}
-}
-
-do_build()
-{
+do_build() {
 	# As specified in the LFS book, disable installing libiberty.
 	sed -i 's/install_to_$(INSTALL_DEST) //' ${wrksrc}/libiberty/Makefile.in
 	# Do not run fixincludes
@@ -81,8 +71,7 @@ do_build()
 	unset RANLIB
 }
 
-do_install()
-{
+do_install() {
 	export RANLIB=${_mingwprefix}/bin/${_mingwtriplet}-ranlib
 
 	# These make targets prevent anything from all-gcc from being installed
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 246edb9750b..fa5594a73f9 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -20,8 +20,6 @@ subpackages="$pkgname-python $pkgname-perl"
 subpackages="${subpackages} $pkgname-gnome-keyring-auth $pkgname-devel"
 subpackages="${subpackages} $pkgname-apache libsvn"
 
-#Add_dependency build ruby-devel
-
 do_configure() {
 	./configure --prefix=/usr --with-apxs --disable-javahl \
 		--without-kwallet --with-gnome-keyring --with-editor=vim \
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 4d1a3a24272..3ad52070a40 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -7,6 +7,11 @@ configure_args="--disable-scrollkeeper --disable-static
 --disable-schemas-compile --disable-python --enable-nautilus"
 makedepends="which pkg-config intltool gnome-doc-utils gnutls-devel gst-plugins-base-devel totem-pl-parser-devel nautilus-devel libbluetooth-devel evolution-data-server-devel libsoup-devel mx-devel clutter-gst-devel clutter-gtk-devel libpeas-devel libXtst-devel grilo-devel libepc-devel"
 fulldepends="grilo-plugins hicolor-icon-theme desktop-file-utils gst-ffmpeg gst-plugins-bad gst-plugins-ugly gst-plugins-good"
+# XXX xulrunner plugin.
+subpackages="totem-devel totem-mozilla-plugin"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+# XXX reenable python plugin if pylint pkg exists.
+#pycompile_dirs="usr/lib/totem/plugins"
 short_desc="A GNOME2 integrated movie player based on Gstreamer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -34,13 +39,3 @@ long_desc="
    * Works on remote displays
    * DVD, VCD and OGG/OGM subtitles with automatic language selection
    * Extensible with plugins"
-
-# XXX xulrunner plugin.
-subpackages="totem-devel totem-mozilla-plugin"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-# XXX reenable python plugin if pylint pkg exists.
-#pycompile_dirs="usr/lib/totem/plugins"
-
-#Add_dependency build pygobject-devel
-
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 44225108c10..ced90dfc45b 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -7,6 +7,13 @@ patch_args="-Np1"
 distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
 depends="virtualbox-ose-dkms>=4.1.16 hicolor-icon-theme desktop-file-utils"
 makedepends="which openssl-devel libcurl-devel libpng-devel SDL-devel qt-devel libXext-devel libXcursor-devel libXinerama-devel libXrandr-devel libXcomposite-devel MesaLib-devel libIDL-devel glib-devel pam-devel pulseaudio-devel libxslt-devel libcap-devel xorg-server-devel docbook-xsl acpica-utils kernel-headers dev86 yasm"
+if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+	makedepends="${makedepends} gcc-c++-multilib"
+fi
+system_groups="vboxusers"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+subpackages="${pkgname}-dkms ${pkgname}-guest ${pkgname}-guest-dkms"
+systemd_services="virtualbox.service on"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virtualbox.org"
@@ -16,16 +23,6 @@ long_desc="
  VirtualBox is a free x86 virtualization solution allowing a wide range of x86
  operating systems such as Windows, DOS, BSD or Linux to run on a Linux system."
 
-system_groups="vboxusers"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="${pkgname}-dkms ${pkgname}-guest ${pkgname}-guest-dkms"
-systemd_services="virtualbox.service on"
-
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	Add_dependency build gcc-c++-multilib
-fi
-
-
 do_build() {
 	local _khdrver=$($XBPS_PKGDB_CMD version kernel-headers)
 
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 1451e3b2962..955bcf5b636 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -3,8 +3,15 @@ pkgname=xen
 version=4.1.2
 wrksrc=xen-${version}
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
+broken_as_needed=yes
+nostrip=yes
+pycompile_module="xen grub"
+subpackages="xen-devel"
 depends="iproute2 bridge-utils"
 makedepends="openssl-devel e2fsprogs-devel zlib-devel gnutls-devel libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel ncurses-devel liblzma-devel python-devel dev86 acpica-utils wget git"
+if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+	makedepends="${makedepends} gcc-multilib"
+fi
 short_desc="Xen Hypervisor and Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
@@ -14,12 +21,6 @@ long_desc="
  This package provides the official Xen Hypervisor and related utilities
  for starting/stopping/accessing unprivileged domains (domUs)."
 
-broken_as_needed=yes
-nostrip=yes
-
-pycompile_module="xen grub"
-subpackages="xen-devel"
-
 make_dirs="
 /var/run/xenstored	755	root	root
 /var/run/xend/boot	755	root	root
@@ -39,12 +40,6 @@ conf_files="
 /etc/xen/xend-pci-quirks.sxp
 /etc/xen/xend-pci-permissive.sxp"
 
-
-
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	Add_dependency build gcc-multilib
-fi
-
 do_build() {
 	install -d ${DESTDIR}
 	cd ${DESTDIR} && ln -sf . install
diff --git a/srcpkgs/xorg-input-drivers/template b/srcpkgs/xorg-input-drivers/template
index a3dcc1a7201..e19790fc5c0 100644
--- a/srcpkgs/xorg-input-drivers/template
+++ b/srcpkgs/xorg-input-drivers/template
@@ -2,6 +2,7 @@
 pkgname=xorg-input-drivers
 version=7.6
 revision=1
+noarch=yes
 build_style=meta-template
 fulldepends="xf86-input-evdev>=2.5.0 xf86-input-synaptics>=1.3.0 xf86-input-vmmouse>=12.6.10 xf86-input-wacom>=0.14.0"
 short_desc="X.org input drivers meta-package"
@@ -9,10 +10,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
  This is the Xorg meta-package for installing the various
  X.org xserver input drivers from the modular Xorg X11 project."
-
-noarch=yes
-#Add_dependency full xf86-input-acecad		">=1.4.0"
-#Add_dependency full xf86-input-aiptek		">=1.3.0"
-#Add_dependency full xf86-input-joystick	">=1.4.99.2"
-#Add_dependency full xf86-input-keyboard	">=1.4.0"
-#Add_dependency full xf86-input-mouse		">=1.5.0"
diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template
index 1c45d1420a0..d11fdb1dd6c 100644
--- a/srcpkgs/xorg-video-drivers/template
+++ b/srcpkgs/xorg-video-drivers/template
@@ -9,36 +9,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
  This is the Xorg meta-package for installing the various
  X.org xserver video drivers from the modular Xorg X11 project."
-
-#
-# By default support ATI, Intel, VESA, VMWare, QXL, nouveau and openchrome.
-# Install any those commented out packages if you have such old hardware.
-#
-
-#Add_dependency full xf86-video-apm		">=1.2.2"
-#Add_dependency full xf86-video-ark		">=0.7.2"
-#Add_dependency full xf86-video-ast		">=0.89.9"
-#Add_dependency full xf86-video-chips		">=1.2.2"
-
-# XXX currently broken with 1.12.0
-#Add_dependency full xf86-video-cirrus		">=1.3.2"
-
-#Add_dependency full xf86-video-fbdev		">=0.4.1"
-#Add_dependency full xf86-video-geode		">=2.11.6"
-#Add_dependency full xf86-video-glint		">=1.2.4"
-#Add_dependency full xf86-video-i128		">=1.3.3"
-#Add_dependency full xf86-video-i740		">=1.3.2"
-#Add_dependency full xf86-video-mach64		">=6.8.2"
-#Add_dependency full xf86-video-mga		">=1.4.11"
-#Add_dependency full xf86-video-neomagic	">=1.2.4"
-#Add_dependency full xf86-video-r128		">=6.8.1"
-#Add_dependency full xf86-video-s3		">=0.6.3"
-#Add_dependency full xf86-video-s3virge		">=1.10.4"
-#Add_dependency full xf86-video-savage		">=2.3.1"
-#Add_dependency full xf86-video-siliconmotion	">=1.7.3"
-#Add_dependency full xf86-video-sis		">=0.10.3"
-#Add_dependency full xf86-video-tdfx		">=1.4.3"
-#Add_dependency full xf86-video-trident		">=1.3.3"
-#Add_dependency full xf86-video-tseng		">=1.2.3"
-#Add_dependency full xf86-video-v4l		">=0.2.0"
-#Add_dependency full xf86-video-voodoo		">=1.2.3"