diff --git a/common/shlibs b/common/shlibs
index 23117326db..59109f47bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4,991 +4,957 @@
 # in XBPS. Every shared library installed by a package must be
 # listed here and mapped to a binary package.
 #
-# The third field controls the development package associated with
-# the binary package that provides the shared library.
+# The first field lists the exact SONAME embedded in binaries.
 #
-# The fourth field (optional) specifies that shared library is only
+# The second field lists the package/version tuple containing the SONAME.
+# The version component is used as greater than or equal to that version
+# in resulting binary package.
+#
+# The third field (optional) specifies that shared library is only
 # available on the target architecture.
 #
 # PLEASE NOTE: when multiple packages provide the same SONAME, the first
 # one (order top->bottom) is preferred over the next ones.
 #
-################################################################################################
-# SONAME			BINPKG			BINPKG-DEVEL			ARCH
-################################################################################################
-libc.so.6			glibc			glibc-devel
-libm.so.6			glibc			glibc-devel
-libpthread.so.0			glibc			glibc-devel
-librt.so.1			glibc			glibc-devel
-libdl.so.2			glibc			glibc-devel
-ld-linux-x86-64.so.2		glibc			glibc-devel			x86_64
-ld-linux.so.2			glibc			glibc-devel			i686
-libresolv.so.2			glibc			glibc-devel
-libanl.so.1			glibc			glibc-devel
-libthread_db.so.1		glibc			glibc-devel
-libutil.so.1			glibc			glibc-devel
-libnsl.so.1			glibc			glibc-devel
-libnss_files.so.2		glibc			glibc-devel
-libnss_compat.so.2		glibc			glibc-devel
-libnss_dns.so.2			glibc			glibc-devel
-libnss_hesiod.so.2		glibc			glibc-devel
-libnss_nisplus.so.2		glibc			glibc-devel
-libnss_nis.so.2			glibc			glibc-devel
-libcrypt.so.1			glibc			glibc-devel
-libBrokenLocale.so.1		glibc			glibc-devel
-libpcprofile.so			glibc			glibc-devel
-libmemusage.so			glibc			glibc-devel
-libSegFault.so			glibc			glibc-devel
-libGB.so			glibc			glibc-devel
-libCNS.so			glibc			glibc-devel
-libJISX0213.so			glibc			glibc-devel
-libKSC.so			glibc			glibc-devel
-libJIS.so			glibc			glibc-devel
-libISOIR165.so			glibc			glibc-devel
-libz.so.1			zlib			zlib-devel
-libbz2.so.1			bzip2			bzip2-devel
-libarchive.so.12		libarchive		libarchive-devel
-libgcc_s.so.1			libgcc
-libperl.so			perl
-libmp.so.3			gmp			gmp-devel
-libgmp.so.10			gmp			gmp-devel
-libgmpxx.so.4			gmp			gmp-devel
-libmpfr.so.4			mpfr			mpfr-devel
-libpwl.so.5			ppl			ppl-devel
-libppl.so.9			ppl			ppl-devel
-libppl_c.so.4			ppl			ppl-devel
-libstdc++.so.6			libstdc++		libstdc++-devel
-libssp.so.0			libssp			libssp-devel
-libcurses.so			ncurses-libs		ncurses-devel
-libncurses.so.5			ncurses-libs		ncurses-devel
-libform.so			ncurses-libs		ncurses-devel
-libpanel.so			ncurses-libs		ncurses-devel
-libmenu.so			ncurses-libs		ncurses-devel
-libncursesw.so.6		ncurses-libs		ncurses-devel
-libformw.so.6			ncurses-libs		ncurses-devel
-libpanelw.so.6			ncurses-libs		ncurses-devel
-libmenuw.so.6			ncurses-libs		ncurses-devel
-libobjc.so.3			libobjc			libobjc-devel
-libmudflap.so.0			libmudflap		libmudflap-devel
-libmudflapth.so.0		libmudflap		libmudflap-devel
-libgomp.so.1			libgomp			libgomp-devel
-libmagic.so.1			file			file-devel
-libcloog.so.0			cloog-ppl		cloog-ppl-devel
-libbluetooth.so.3		libbluetooth		libbluetooth-devel
-libwmf-0.2.so.7			libwmf			libwmf-devel
-libwmflite-0.2.so.7		libwmf			libwmf-devel
-libgthread-2.0.so.0		glib			glib-devel
-libglib-2.0.so.0		glib			glib-devel
-libgmodule-2.0.so.0		glib			glib-devel
-libgio-2.0.so.0			glib			glib-devel
-libgobject-2.0.so.0		glib			glib-devel
-libatk-1.0.so.0			atk			atk-devel
-libpangocairo-1.0.so.0		pango			pango-devel
-libpangoft2-1.0.so.0		pango			pango-devel
-libpangoxft-1.0.so.0		pango			pango-devel
-libpangox-1.0.so.0		pango			pango-devel
-libpango-1.0.so.0		pango			pango-devel
-libcairo.so.2			cairo			cairo-devel
-libcairo-gobject.so.2		cairo			cairo-devel
-libcairo-script-interpreter.so.2	cairo		cairo-devel
-libgdk-x11-2.0.so.0		gtk+			gtk+-devel
-libgtk-x11-2.0.so.0		gtk+			gtk+-devel
-libgdk_pixbuf-2.0.so.0		gdk-pixbuf		gdk-pixbuf-devel
-libgdk_pixbuf_xlib-2.0.so.0	gdk-pixbuf		gdk-pixbuf-devel
-libgailutil.so.18		gtk+			gtk+-devel
-libfreetype.so.6		freetype		freetype-devel
-libfontconfig.so.1		fontconfig		fontconfig-devel
-libX11-xcb.so.1			libX11			libX11-devel
-libX11.so.6			libX11			libX11-devel
-libexpat.so.1			expat			expat-devel
-libjpeg.so.8			jpeg			jpeg-devel
-libjpeg.so.8			libturbojpeg		libturbojpeg-devel
-libpng14.so.14			libpng			libpng-devel
-libXrender.so.1			libXrender		libXrender-devel
-libXrandr.so.2			libXrandr		libXrandr-devel
-libGLU.so.1			libGLU			MesaLib-devel
-libEGL.so.1			libEGL			MesaLib-devel
-libGL.so.1			libGL			MesaLib-devel
-libglapi.so.0			libglapi		MesaLib-devel
-libOpenVG.so.1			libOpenVG		MesaLib-devel
-libglsl.so			MesaLib			MesaLib-devel
-libdricore.so			MesaLib			MesaLib-devel
-librsvg-2.so.2			librsvg			librsvg-devel
-libdbus-1.so.3			dbus-libs		dbus-devel
-libdbus-glib-1.so.2		dbus-glib		dbus-glib-devel
-libxml2.so.2			libxml2			libxml2-devel
-libfuse.so.2			fuse			fuse-devel
-libXext.so.6			libXext			libXext-devel
-libXcomposite.so.1		libXcomposite		libXcomposite-devel
-libXdamage.so.1			libXdamage		libXdamage-devel
-libXfixes.so.3			libXfixes		libXfixes-devel
-libXinerama.so.1		libXinerama		libXinerama-devel
-libSM.so.6			libSM			libSM-devel
-libICE.so.6			libICE			libICE-devel
-libXau.so.6			libXau			libXau-devel
-libexslt.so.0			libxslt			libxslt-devel
-libxslt.so.1			libxslt			libxslt-devel
-libstartup-notification-1.so.0	startup-notification	startup-notification-devel
-libwnck-1.so.22			libwnck2		libwnck2-devel
-libwnck-3.so.0			libwnck			libwnck-devel
-libnl.so.1			libnl			libnl-devel
-libnl-3.so.200			libnl3			libnl3-devel
-libnl-route-3.so.200		libnl3			libnl3-devel
-libnl-nf-3.so.200		libnl3			libnl3-devel
-libnl-genl-3.so.200		libnl3			libnl3-devel
-libnl-cli-3.so.200		libnl3			libnl3-devel
-libssl.so.1			libssl			openssl-devel
-libcrypto.so.1			libssl			openssl-devel
-libreadline.so.6		readline		readline-devel
-libhistory.so.6			readline		readline-devel
-libxfcegui4.so.4		libxfcegui4		libxfcegui4-devel
-libxfce4kbd-private.so		libxfcegui4		libxfcegui4-devel
-libxfce4menu-0.1.so		libxfce4menu		libxfce4menu-devel
-libxfconf-0.so.2		xfconf			xfconf-devel
-libxfce4util.so.6		libxfce4util		libxfce4util-devel
-libxfce4panel-1.0.so.4		xfce4-panel		xfce4-panel-devel
-libgstreamer-0.10.so.0		gstreamer		gstreamer-devel
-libgstbase-0.10.so.0		gstreamer		gstreamer-devel
-libgstdataprotocol-0.10.so.0	gstreamer		gstreamer-devel
-libgstcontroller-0.10.so.0	gstreamer		gstreamer-devel
-libgstnet-0.10.so.0		gstreamer		gstreamer-devel
-libgstfft-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstaudio-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstapp-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstsdp-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgsttag-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstinterfaces-0.10.so.0	gst-plugins-base	gst-plugins-base-devel
-libgstriff-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstcdda-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstnetbuffer-0.10.so.0	gst-plugins-base	gst-plugins-base-devel
-libgstrtsp-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstvideo-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstpbutils-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libgstrtp-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
-libbfd-2.21.so			binutils		binutils-devel
-libopcodes-2.21.so		binutils		binutils-devel
-libdb-4.8.so			libdb			db-devel
-libdb_cxx-4.8.so		libdb-cxx		db-devel
-libgdbm.so.4			gdbm			gdbm-devel
-libgdbm_compat.so.4		gdbm			gdbm-devel
-libgettextsrc-0.18.1.so		gettext-libs		gettext-devel
-libgettextlib-0.18.1.so		gettext-libs		gettext-devel
-libgettextpo.so.0		gettext-libs		gettext-devel
-libattr.so.1			attr			attr-devel
-libacl.so.1			acl			acl-devel
-libpython2.7.so.1.0		python			python-devel
-libffi.so.5			libffi			libffi-devel
-libcrack.so.2			cracklib		cracklib-devel
-libpam.so.0			pam			pam-devel
-libpam_misc.so.0		pam			pam-devel
-libcap.so.2			libcap			libcap-devel
-liblzma.so.5			liblzma			liblzma-devel
-libuuid.so.1			libuuid			libuuid-devel
-libblkid.so.1			libblkid		libblkid-devel
-libidn.so.11			libidn			libidn-devel
-libusb-1.0.so.0			libusb			libusb-devel
-libusb-0.1.so.4			libusb-compat		libusb-compat-devel
-libpci.so.3			pciutils		pciutils-devel
-libpcre.so.0			libpcre			pcre-devel
-libpcreposix.so.0		libpcre			pcre-devel
-libpcrecpp.so.0			libpcrecpp		pcre-devel
-libgirepository-gimarshallingtests-1.0.so	libgirepository		libgirepository-devel
-libgirepository-everything-1.0.so		libgirepository		libgirepository-devel
-libgirepository-1.0.so.1			libgirepository		libgirepository-devel
-libudev.so.0			libudev			libudev-devel
-libgudev-1.0.so.0 		libgudev		libgudev-devel
-libext2fs.so.2			e2fsprogs-libs		e2fsprogs-devel
-libcom_err.so.2			e2fsprogs-libs		e2fsprogs-devel
-libe2p.so.2			e2fsprogs-libs		e2fsprogs-devel
-libss.so.2			e2fsprogs-libs		e2fsprogs-devel
-libiw.so.29			wireless_tools		wireless_tools-devel
-libpopt.so.0			popt			popt-devel
-libtasn1.so.3			libtasn1		libtasn1-devel
-libgpg-error.so.0		libgpg-error		libgpg-error-devel
-liblzo2.so.2			lzo			lzo-devel
-libgcrypt.so.11			libgcrypt		libgcrypt-devel
-libgnutls.so.26			gnutls			gnutls-devel
-libgnutlsxx.so.26		gnutls			gnutls-devel
-libgnutls-extra.so.26		gnutls			gnutls-devel
-libgnutls-openssl.so.26		gnutls			gnutls-devel
-libwrap.so.0			tcp_wrappers-libs	tcp_wrappers-devel
-libdevmapper.so.1.02		device-mapper		device-mapper-devel
-libdevmapper-event.so.1.02	device-mapper		device-mapper-devel
-libdevmapper-event-lvm2.so.2.02	device-mapper		device-mapper-devel
-liblvm2cmd.so.2.02		device-mapper		device-mapper-devel
-libprop.so.0			proplib			proplib-devel
-libxbps.so.0			xbps			xbps-static
-libxbps.so.0			xbps-devel		xbps-devel-static
-libfontenc.so.1			libfontenc		libfontenc-devel
-libXfont.so.1			libXfont		libXfont-devel
-libx86.so.1			libx86			libx86-devel
-libxcb-render.so.0		libxcb			libxcb-devel
-libxcb-glx.so.0			libxcb			libxcb-devel
-libxcb-composite.so.0		libxcb			libxcb-devel
-libxcb-randr.so.0		libxcb			libxcb-devel
-libxcb-shape.so.0		libxcb			libxcb-devel
-libxcb-sync.so.0		libxcb			libxcb-devel
-libxcb-shm.so.0			libxcb			libxcb-devel
-libxcb-screensaver.so.0		libxcb			libxcb-devel
-libxcb-xprint.so.0		libxcb			libxcb-devel
-libxcb-res.so.0			libxcb			libxcb-devel
-libxcb.so.1			libxcb			libxcb-devel
-libxcb-damage.so.0		libxcb			libxcb-devel
-libxcb-dpms.so.0		libxcb			libxcb-devel
-libxcb-record.so.0		libxcb			libxcb-devel
-libxcb-xtest.so.0		libxcb			libxcb-devel
-libxcb-xv.so.0			libxcb			libxcb-devel
-libxcb-xf86dri.so.0		libxcb			libxcb-devel
-libxcb-xinerama.so.0		libxcb			libxcb-devel
-libxcb-dri2.so.0		libxcb			libxcb-devel
-libxcb-xevie.so.0		libxcb			libxcb-devel
-libxcb-xfixes.so.0		libxcb			libxcb-devel
-libxcb-xvmc.so.0		libxcb			libxcb-devel
-libXdmcp.so.6			libXdmcp		libXdmcp-devel
-libpolkit-gobject-1.so.0	polkit			polkit-devel
-libpolkit-agent-1.so.0		polkit			polkit-devel
-libpolkit-backend-1.so.0	polkit			polkit-devel
-libck-connector.so.0		ConsoleKit		ConsoleKit-devel
-libXt.so.6			libXt			libXt-devel
-libXtst.so.6			libXtst			libXtst-devel
-libxkbfile.so.1			libxkbfile		libxkbfile-devel
-libXpm.so.4			libXpm			libXpm-devel
-libXmu.so.6			libXmu			libXmu-devel
-libXmuu.so.1			libXmu			libXmu-devel
-libdrm.so.2			libdrm			libdrm-devel
-libdrm_radeon.so.1		libdrm			libdrm-devel
-libdrm_intel.so.1		libdrm			libdrm-devel
-libdrm_nouveau.so.2		libdrm			libdrm-devel
-libkms.so.1			libdrm			libdrm-devel
-libXxf86vm.so.1			libXxf86vm		libXxf86vm-devel
-libXi.so.6			libXi			libXi-devel
-libdmx.so.1			libdmx			libdmx-devel
-libXRes.so.1			libXres			libXres-devel
-libpciaccess.so.0		libpciaccess		libpciaccess-devel
-libpixman-1.so.0		pixman			pixman-devel
-libXaw.so.7			libXaw			libXaw-devel
-libXaw6.so.6			libXaw			libXaw-devel
-libXaw7.so.7			libXaw			libXaw-devel
-libXft.so.2			libXft			libXft-devel
-libXcursor.so.1			libXcursor		libXcursor-devel
-libXxf86dga.so.1		libXxf86dga		libXxf86dga-devel
-libXxf86misc.so.1		libXxf86misc		libXxf86misc-devel
-libXp.so.6			libXp			libXp-devel
-libXfontcache.so.1		libXfontcache		libXfontcache-devel
-libXv.so.1			libXv			libXv-devel
-libXvMC.so.1			libXvMC			libXvMC-devel
-libXvMCW.so.1			libXvMC			libXvMC-devel
-libxcb-render-util.so.0		xcb-util		xcb-util-devel
-libxcb-icccm.so.1		xcb-util		xcb-util-devel
-libxcb-aux.so.0			xcb-util		xcb-util-devel
-libxcb-image.so.0		xcb-util		xcb-util-devel
-libxcb-reply.so.1		xcb-util		xcb-util-devel
-libxcb-keysyms.so.1		xcb-util		xcb-util-devel
-libxcb-property.so.1		xcb-util		xcb-util-devel
-libxcb-atom.so.1		xcb-util		xcb-util-devel
-libxcb-event.so.1		xcb-util		xcb-util-devel
-libtiff.so.5			tiff			tiff-devel
-libtiffxx.so.5			tiff			tiff-devel
-libnotify.so.4			libnotify		libnotify-devel
-libexo-1.so.0			exo			exo-devel
-libvte.so.9			vte			vte-devel
-libglade-2.0.so.0		libglade		libglade-devel
-libthunarx-2.so.0		Thunar			Thunar-devel
-libexif.so.12			libexif			libexif-devel
-liboil-0.3.so.0			liboil			liboil-devel
-libogg.so.0			libogg			libogg-devel
-libvorbis.so.0			libvorbis		libvorbis-devel
-libvorbisenc.so.2		libvorbis		libvorbis-devel
-libvorbisfile.so.3		libvorbis		libvorbis-devel
-libtheora.so.0			libtheora		libtheora-devel
-libtheoradec.so.1		libtheora		libtheora-devel
-libtheoraenc.so.1		libtheora		libtheora-devel
-libcdda_interface.so.0		cdparanoia		cdparanoia-devel
-libcdda_paranoia.so.0		cdparanoia		cdparanoia-devel
-libasound.so.2			alsa-lib		alsa-lib-devel
-libvisual-0.4.so.0		libvisual		libvisual-devel
-libxfsm-4.6.so.0		xfce4-session		xfce4-session-devel
-libxklavier.so.16		libxklavier		libxklavier-devel
-libsexy.so.2			libsexy			libsexy-devel
-liblcms.so.1			lcms			lcms-devel
-libgd.so.2			gd			gd-devel
-libcroco-0.6.so.3		libcroco		libcroco-devel
-libgsf-1.so.114			libgsf			libgsf-devel
-libMagickCore.so.5		libmagick		libmagick-devel
-libMagickWand.so.5		libmagick		libmagick-devel
-libMagick++.so.5		libmagick		libmagick-devel
-libltdl.so.7			libltdl			libltdl-devel
-libpoppler-glib.so.8		poppler-glib		poppler-glib-devel
-libpoppler.so.25		poppler			poppler-devel
-libpoppler-cpp.so.0		poppler-cpp		poppler-cpp-devel
-libpoppler-qt4.so.3		poppler-qt4		poppler-qt4-devel
-libtcl8.5.so			tcl			tcl-devel
-libsqlite3.so.0			sqlite			sqlite-devel
-libtclsqlite3.so		sqlite-tcl		sqlite-devel
-libIDL-2.so.0			libIDL			libIDL-devel
-libnspr4.so			nspr			nspr-devel
-libplc4.so			nspr			nspr-devel
-libplds4.so			nspr			nspr-devel
-libsoftokn3.so			nss			nss-devel
-libssl3.so			nss			nss-devel
-libnssutil3.so			nss			nss-devel
-libsmime3.so			nss			nss-devel
-libfreebl3.so			nss			nss-devel
-libnssdbm3.so			nss			nss-devel
-libnssckbi.so			nss			nss-devel
-libnss3.so			nss			nss-devel
-libcurl.so.4			libcurl			libcurl-devel
-libpyglib-gi-2.0-python.so.0	pygobject		pygobject-devel
-libpyglib-2.0-python.so.0	pygobject2		pygobject2-devel
-libdaemon.so.0			libdaemon		libdaemon-devel
-libavahi-common.so.3		avahi-libs		avahi-libs-devel
-libavahi-core.so.7		avahi-libs		avahi-libs-devel
-libavahi-client.so.3		avahi-libs		avahi-libs-devel
-libavahi-gobject.so.0		avahi-glib-libs		avahi-glib-libs-devel
-libavahi-glib.so.1		avahi-glib-libs		avahi-glib-libs-devel
-libdns_sd.so.1			avahi-compat-libs	avahi-compat-libs-devel
-libhowl.so.0			avahi-compat-libs	avahi-compat-libs-devel
-libavahi-ui.so.0		avahi-ui-libs		avahi-ui-libs-devel
-libavahi-ui-gtk3.so.0		avahi-ui-libs-gtk3	avahi-ui-libs-devel
-libmp4v2.so.1			libmp4v2		libmp4v2-devel
-libmp4av.so			libmp4v2		libmp4v2-devel
-libmpeg4ip_gnu.so		libmp4v2		libmp4v2-devel
-libfaac.so.0			faac			faac-devel
-libfaad.so.2			faad2			faad2-devel
-libid3tag.so.0			libid3tag		libid3tag-devel
-libgif.so.4			giflib			giflib-devel
-libungif.so.4			giflib			giflib-devel
-libImlib2.so.1			imlib2			imlib2-devel
-libmp3lame.so.0			lame			lame-devel
-libavdevice.so.53		libavdevice		ffmpeg-devel
-libavformat.so.53		libavformat		ffmpeg-devel
-libswscale.so.2			libswscale		ffmpeg-devel
-libswresample.so.0		libswresample		ffmpeg-devel
-libpostproc.so.52		libpostproc		ffmpeg-devel
-libavcodec.so.53		libavcodec		ffmpeg-devel
-libavutil.so.51 		libavutil		ffmpeg-devel
-libavfilter.so.2		libavfilter		ffmpeg-devel
-libSDL-1.2.so.0			SDL			SDL-devel
-libSDL_image-1.2.so.0		SDL_image		SDL_image-devel
-libx264.so.120			x264			x264-devel
-libxvidcore.so.4		xvidcore		xvidcore-devel
-libtag.so.1			taglib			taglib-devel
-libtag_c.so.0			taglib			taglib-devel
-libfribidi.so.0			fribidi			fribidi-devel
-liba52.so.0			liba52			liba52-devel
-libcddb.so.2			libcddb			libcddb-devel
-libiso9660.so.8			libcdio			libcdio-devel
-libudf.so.0			libcdio			libcdio-devel
-libcdio_cdda.so.1		libcdio			libcdio-devel
-libcdio_paranoia.so.1		libcdio			libcdio-devel
-libiso9660++.so.0		libcdio			libcdio-devel
-libcdio++.so.0			libcdio			libcdio-devel
-libcdio.so.13			libcdio			libcdio-devel
-libmpcdec.so.5			libmpcdec		libmpcdec-devel
-libproxy.so.1			libproxy		libproxy-devel
-libmodman.so.1			libproxy		libproxy-devel
-libFLAC.so.8			libflac			libflac-devel
-libmad.so.0			libmad			libmad-devel
-libmatroska.so.5		libmatroska		libmatroska-devel
-libebml.so.3			libebml			libebml-devel
-libdvdread.so.4			libdvdread		libdvdread-devel
-libdvdnav.so.4			libdvdnav		libdvdnav-devel
-libdvbpsi.so.5			libdvbpsi		libdvbpsi-devel
-libdca.so.0			libdca			libdca-devel
-libmpeg2.so.0			libmpeg2		libmpeg2-devel
-libmpeg2convert.so.0		libmpeg2		libmpeg2-devel
-libmng.so.1			libmng			libmng-devel
-libQtAssistantClient.so		qt			qt-devel
-libQtXmlPatterns.so.4		qt			qt-devel
-libQtScriptTools.so.4		qt			qt-devel
-libQtCLucene.so.4		qt			qt-devel
-libQtMultimedia.so.4		qt			qt-devel
-libQtGui.so.4			qt			qt-devel
-libQtDBus.so.4			qt			qt-devel
-libQtNetwork.so.4		qt			qt-devel
-libQtOpenGL.so.4		qt			qt-devel
-libQtXml.so.4			qt			qt-devel
-libQtTest.so.4			qt			qt-devel
-libQt3Support.so.4		qt			qt-devel
-libQtSvg.so.4			qt			qt-devel
-libQtScript.so.4		qt			qt-devel
-libQtHelp.so.4			qt			qt-devel
-libphonon.so.4			qt-libphonon		qt-devel
-libQtCore.so.4			qt			qt-devel
-libQtSql.so.4			qt			qt-devel
-libQtDeclarative.so.4		qt			qt-devel
-libQtDesignerComponents.so.4	qt-designer		qt-devel
-libQtDesigner.so.4		qt-designer		qt-devel
-libsysfs.so.2			libsysfs		libsysfs-devel
-libsensors.so.4			libsensors		libsensors-devel
-libcap-ng.so.0			libcap-ng		libcap-ng-devel
-libphysfs.so.1			physfs			physfs-devel
-libSDL_ttf-2.0.so.0		SDL_ttf			SDL_ttf-devel
-libparted.so.2			libparted		libparted-devel
-libparted-fs-resize.so.0	libparted		libparted-devel
-libopenobex.so.1		libopenobex		libopenobex-devel
-libntfs-3g.so.81		ntfs-3g			ntfs-3g-devel
-libruby.so.1.9			ruby			ruby-devel
-libfsimage.so.1.0		xen			xen-devel
-libxenctrl.so.4.0		xen			xen-devel
-libxenstore.so.3.0		xen			xen-devel
-libflask.so.1.0 		xen			xen-devel
-libblktap.so.3.0		xen			xen-devel
-libxenguest.so.4.0		xen			xen-devel
-libxenlight.so.1.0		xen			xen-devel
-libxlutil.so.1.0		xen			xen-devel
-libvhd.so.1.0			xen			xen-devel
-libblktapctl.so.1.0		xen			xen-devel
-libbabl-0.1.so.0		babl			babl-devel
-libgegl-0.2.so.0		gegl			gegl-devel
-libiculx.so.46			icu-libs		icu-devel
-libicule.so.46			icu-libs		icu-devel
-libicuio.so.46			icu-libs		icu-devel
-libicui18n.so.46		icu-libs		icu-devel
-libicudata.so.46		icu-libs		icu-devel
-libicutu.so.46			icu-libs		icu-devel
-libicuuc.so.46			icu-libs		icu-devel
-libaspell.so.15			aspell			aspell-devel
-libhunspell-1.2.so.0		hunspell		hunspell-devel
-libenchant.so.1			enchant			enchant-devel
-libgconf-2.so.4			GConf			GConf-devel
-libsoup-2.4.so.1		libsoup			libsoup-devel
-libsoup-gnome-2.4.so.1		libsoup-gnome		libsoup-gnome-devel
-libunique-3.0.so.0		libunique		libunique-devel
-libwebkit-1.0.so		webkit-gtk		webkit-gtk-devel
-libwebkitgtk-1.0.so.0		webkit-gtk		webkit-gtk-devel
-libwebkitgtk-3.0.so.0		webkit-gtk3		webkit-gtk3-devel
-libgimp-2.0.so.0		gimp			gimp-devel
-libgimpwidgets-2.0.so.0		gimp			gimp-devel
-libgimpui-2.0.so.0		gimp			gimp-devel
-libgimpbase-2.0.so.0		gimp			gimp-devel
-libgimpthumb-2.0.so.0		gimp			gimp-devel
-libgimpconfig-2.0.so.0		gimp			gimp-devel
-libgimpmath-2.0.so.0		gimp			gimp-devel
-libgimpcolor-2.0.so.0		gimp			gimp-devel
-libgimpmodule-2.0.so.0		gimp			gimp-devel
-libexiv2.so.11			exiv2			exiv2-devel
-libsearchclient.so.0		strigi			strigi-devel
-libstreamanalyzer.so.0		strigi			strigi-devel
-libstrigihtmlgui.so.0		strigi			strigi-devel
-libstreams.so.0			strigi			strigi-devel
-libstrigiqtdbusclient.so.0	strigi			strigi-devel
-libclucene.so.0			clucene			clucene-devel
-libecpg_compat.so.3		postgresql-libs		postgresql-libs-devel
-libecpg.so.6			postgresql-libs		postgresql-libs-devel
-libpgtypes.so.3			postgresql-libs		postgresql-libs-devel
-libpq.so.5			postgresql-libs		postgresql-libs-devel
-libmysqlclient_r.so.16		libmysqlclient		libmysqlclient-devel
-libmysqlclient.so.16		libmysqlclient		libmysqlclient-devel
-libndbclient.so.16		libndbclient		libndbclient-devel
-libgssapi_krb5.so.2		mit-krb5-libs		mit-krb5-devel
-libgssrpc.so.4			mit-krb5-libs		mit-krb5-devel
-libk5crypto.so.3		mit-krb5-libs		mit-krb5-devel
-libkadm5clnt_mit.so.8		mit-krb5-libs		mit-krb5-devel
-libkadm5clnt.so 		mit-krb5-libs		mit-krb5-devel
-libkadm5srv_mit.so.8		mit-krb5-libs		mit-krb5-devel
-libkadm5srv.so			mit-krb5-libs		mit-krb5-devel
-libkdb5.so.6			mit-krb5-libs		mit-krb5-devel
-libkrb5.so.3			mit-krb5-libs		mit-krb5-devel
-libkrb5support.so.0		mit-krb5-libs		mit-krb5-devel
-libverto.so.0			mit-krb5-libs		mit-krb5-devel
-libverto-k5ev.so.0		mit-krb5-libs		mit-krb5-devel
-libasn1.so 			heimdal-libs		heimdal-devel
-libgssapi.so 			heimdal-libs		heimdal-devel
-libhdb.so 			heimdal-libs		heimdal-devel
-libheimntlm.so 			heimdal-libs		heimdal-devel
-libheimsqlite.so 		heimdal-libs		heimdal-devel
-libhx509.so 			heimdal-libs		heimdal-devel
-libkadm5clnt.so 		heimdal-libs		heimdal-devel
-libkadm5srv.so 			heimdal-libs		heimdal-devel
-libkafs.so 			heimdal-libs		heimdal-devel
-libkdc.so 			heimdal-libs		heimdal-devel
-libkrb5.so.3 			heimdal-libs		heimdal-devel
-libotp.so 			heimdal-libs		heimdal-devel
-libroken.so.18 			heimdal-libs		heimdal-devel
-libsl.so 			heimdal-libs		heimdal-devel
-libwind.so 			heimdal-libs		heimdal-devel
-libmenu-cache.so.1		menu-cache		menu-cache-devel
-libupower-glib.so.1		upower			upower-devel
-libdevkit-power-gobject.so	upower			upower-devel
-libgnomekbd.so.7		libgnomekbd		libgnomekbd-devel
-libgnomekbdui.so.7		libgnomekbd		libgnomekbd-devel
-libcanberra.so.0		libcanberra		libcanberra-devel
-libcanberra-gtk.so.0		libcanberra		libcanberra-devel
-libcanberra-gtk3.so.0		libcanberra		libcanberra-devel
-libgtop-2.0.so.7		libgtop			libgtop-devel
-librarian.so.0			rarian			rarian-devel
-libgnome-desktop-3.so.2		gnome-desktop		gnome-desktop-devel
-libmetacity-private.so.0	metacity		metacity-devel
-libgnome-menu-3.so.0		gnome-menus		gnome-menus-devel
-libart_lgpl_2.so.2		libart			libart-devel
-libgnomecanvas-2.so.0		libgnomecanvas		libgnomecanvas-devel
-libgnome-keyring.so.0		libgnome-keyring	libgnome-keyring-devel
-libgweather-3.so.0		libgweather		libgweather-devel
-libical.so.0			libical			libical-devel
-libicalss.so.0			libical			libical-devel
-libicalvcal.so.0		libical			libical-devel
-libcamel-1.2.so.33		evolution-data-server	evolution-data-server-devel
-libebackend-1.2.so.2		evolution-data-server	evolution-data-server-devel
-libebook-1.2.so.13		evolution-data-server	evolution-data-server-devel
-libecal-1.2.so.11		evolution-data-server	evolution-data-server-devel
-libedata-book-1.2.so.13		evolution-data-server	evolution-data-server-devel
-libedata-cal-1.2.so.15		evolution-data-server	evolution-data-server-devel
-libedataserver-1.2.so.16	evolution-data-server	evolution-data-server-devel
-libedataserverui-3.0.so.1	evolution-data-server	evolution-data-server-devel
-libgdata.so.13			libgdata		libgdata-devel
-libpcap.so.1			libpcap			libpcap-devel
-libiptc.so.0			iptables		iptables-devel
-libip6tc.so.0			iptables		iptables-devel
-libxtables.so.7			iptables		iptables-devel
-libip4tc.so.0			iptables		iptables-devel
-libipq.so.0			iptables		iptables-devel
-libnm-util.so.2			libnm			NetworkManager-devel
-libnm-glib.so.4			libnm			NetworkManager-devel
-libnm-glib-vpn.so.1		libnm			NetworkManager-devel
-libpanel-applet-4.so.0		gnome-panel		gnome-panel-devel
-libgnome-control-center.so.1	gnome-control-center	gnome-control-center-devel
-libboost_date_time.so.1.44.0		boost			boost-devel
-libboost_math_tr1f.so.1.44.0		boost			boost-devel
-libboost_serialization.so.1.44.0	boost			boost-devel
-libboost_filesystem.so.1.44.0		boost			boost-devel
-libboost_math_tr1l.so.1.44.0		boost			boost-devel
-libboost_signals.so.1.44.0		boost			boost-devel
-libboost_graph.so.1.44.0		boost			boost-devel
-libboost_math_tr1.so.1.44.0		boost			boost-devel
-libboost_system.so.1.44.0		boost			boost-devel
-libboost_iostreams.so.1.44.0		boost			boost-devel
-libboost_prg_exec_monitor.so.1.44.0	boost			boost-devel
-libboost_thread.so.1.44.0		boost			boost-devel
-libboost_math_c99f.so.1.44.0		boost			boost-devel
-libboost_program_options.so.1.44.0	boost			boost-devel
-libboost_unit_test_framework.so.1.44.0	boost			boost-devel
-libboost_math_c99l.so.1.44.0		boost			boost-devel
-libboost_python.so.1.44.0		boost-python		boost-devel
-libboost_wave.so.1.44.0			boost			boost-devel
-libboost_math_c99.so.1.44.0		boost			boost-devel
-libboost_regex.so.1.44.0		boost			boost-devel
-libboost_wserialization.so.1.44.0	boost			boost-devel
-libexempi.so.3			exempi			exempi-devel
-libatasmart.so.4		libatasmart		libatasmart-devel
-libsgutils2.so.2		libsgutils		sg3_utils-devel
-liblvm2app.so.2.2		liblvm2app		liblvm2app-devel
-libcpufreq.so.0			libcpufreq		libcpufreq-devel
-libgucharmap_2_90.so.7		gucharmap		gucharmap-devel
-libgphoto2.so.2			libgphoto2		libgphoto2-devel
-libgphoto2_port.so.0		libgphoto2		libgphoto2-devel
-libgvfscommon.so.0		gvfs			gvfs-devel
-libgvfscommon-dnssd.so.0	gvfs			gvfs-devel
-libnautilus-extension.so.1	libnautilus		nautilus-devel
-libgnomeui-2.so.0		libgnomeui		libgnomeui-devel
-libmpc.so.2.0.0			mpc			mpc-devel
-libsigc-2.0.so.0		libsigc++		libsigc++-devel
-libglibmm-2.4.so.1		glibmm			glibmm-devel
-libgiomm-2.4.so.1		glibmm			glibmm-devel
-libglibmm_generate_extra_defs-2.4.so.1	glibmm		glibmm-devel
-libcairomm-1.0.so.1		cairomm			cairomm-devel
-libpangomm-1.4.so.1		pangomm			pangomm-devel
-libatkmm-1.6.so.1		atkmm			atkmm-devel
-libgtkmm-3.0.so.1		gtkmm			gtkmm-devel
-libgdkmm-3.0.so.1		gtkmm			gtkmm-devel
-libgnome-bluetooth.so.10	gnome-bluetooth		gnome-bluetooth-devel
-libgnome-bluetooth-applet.so.0	gnome-bluetooth		gnome-bluetooth-devel
-libsasl2.so.2			libsasl			libsasl-devel
-liblber-2.4.so.2		libldap			libldap-devel
-libldap-2.4.so.2		libldap			libldap-devel
-libldap_r-2.4.so.2		libldap			libldap-devel
-libevent-2.0.so.5		libevent		libevent-devel
-libSDL_mixer-1.2.so.0		SDL_mixer		SDL_mixer-devel
-libapr-1.so.0			apr			apr-devel
-libaprutil-1.so.0		apr-util		apr-util-devel
-libnetpgp.so.0			libnetpgp		libnetpgp-devel
-libmj.so.0			libnetpgp		libnetpgp-devel
-libmca_common_sm.so.1		openmpi			openmpi-devel
-libmpi_cxx.so.0			openmpi			openmpi-devel
-libmpi.so.0			openmpi			openmpi-devel
-libopenmpi_malloc.so.0		openmpi			openmpi-devel
-libopen-pal.so.0		openmpi			openmpi-devel
-libopen-rte.so.0		openmpi			openmpi-devel
-libmtp.so.8			libmtp			libmtp-devel
-libelf-0.8.13.so		libelf			libelf-devel
-libelf.so.0			libelf			libelf-devel
-libgtksourceview-3.0.so.0	gtksourceview		gtksourceview-devel
-libtalloc.so.1			talloc			talloc-devel
-libtalloc.so.2			talloc			talloc-devel
-libmount.so.1			libmount		libmount-devel
-libdconf.so.0			dconf			dconf-devel
-libassuan.so.0			libassuan		libassuan-devel
-libgpgme.so.11			gpgme			gpgme-devel
-libgpgme-pthread.so.11		gpgme			gpgme-devel
-libgarcon-1.so.0		garcon			garcon-devel
-libxfce4ui-1.so.0		libxfce4ui		libxfce4ui-devel
-libxfce4kbd-private-2.so.0	libxfce4ui		libxfce4ui-devel
-libntfs.so.10			ntfsprogs		ntfsprogs-devel
-libxml++-2.6.so.2		libxml++		libxml++-devel
-libftgl.so.2			ftgl			ftgl-devel
-libGLEW.so.1.6			glew			glew-devel
-libsndfile.so.1			libsndfile		libsndfile-devel
-libspeex.so.1			libspeex		speex-devel
-libspeexdsp.so.1		libspeex		speex-devel
-libasyncns.so.0			libasyncns		libasyncns-devel
-libpulse.so.0			libpulseaudio		pulseaudio-devel
-libpulsecommon-2.0.so		libpulseaudio		pulseaudio-devel
-libpulse-mainloop-glib.so.0	libpulseaudio		pulseaudio-devel
-libpulse-simple.so.0		libpulseaudio		pulseaudio-devel
-libpulsecore-1.1.so		pulseaudio		pulseaudio-devel
-libbluetooth-util.so		pulseaudio		pulseaudio-devel
-libavahi-wrap.so		pulseaudio		pulseaudio-devel
-libprotocol-esound.so		pulseaudio		pulseaudio-devel
-libalsa-util.so			pulseaudio		pulseaudio-devel
-libraop.so			pulseaudio		pulseaudio-devel
-librtp.so			pulseaudio		pulseaudio-devel
-libprotocol-http.so		pulseaudio		pulseaudio-devel
-libprotocol-cli.so		pulseaudio		pulseaudio-devel
-libprotocol-native.so		pulseaudio		pulseaudio-devel
-libcli.so			pulseaudio		pulseaudio-devel
-libprotocol-simple.so		pulseaudio		pulseaudio-devel
-libbluetooth-ipc.so		pulseaudio		pulseaudio-devel
-libbluetooth-sbc.so		pulseaudio		pulseaudio-devel
-libpulse-browse.so		pulseaudio		pulseaudio-devel
-liborc-0.4.so.0			orc			orc-devel
-liborc-test-0.4.so.0		orc			orc-devel
-libgmime-2.6.so.0		gmime			gmime-devel
-libtotem-plparser.so.17		totem-pl-parser		totem-pl-parser-devel
-libtotem-plparser-mini.so.17	totem-pl-parser		totem-pl-parser-devel
-libgladeui-1.so			libgladeui		glade-devel
-libgladeui-2.so.0		libgladeui3		glade3-devel
-libgstvdp-0.10.so.0		gst-plugins-bad		gst-plugins-bad-devel
-libgstphotography-0.10.so.0	gst-plugins-bad		gst-plugins-bad-devel
-libgstbasevideo-0.10.so.0	gst-plugins-bad		gst-plugins-bad-devel
-libgstsignalprocessor-0.10.so.0	gst-plugins-bad		gst-plugins-bad-devel
-libgstbasecamerabinsrc-0.10.so.0	gst-plugins-bad		gst-plugins-bad-devel
-libtdb.so.1			libtdb			tdb-devel
-libgssdp-1.0.so.3		gssdp			gssdp-devel
-libgupnp-1.0.so.4		gupnp			gupnp-devel
-libsamplerate.so.0		libsamplerate		libsamplerate-devel
-libmms.so.0			libmms			libmms-devel
-libsmbclient.so.0		libsmbclient		samba-devel
-libwbclient.so.0		libsmbclient		samba-devel
-libjasper.so.1			libjasper		jasper-devel
-librecode.so.0			librecode		recode-devel
-libenca.so.0			libenca			enca-devel
-libwavpack.so.1			libwavpack		wavpack-devel
-libvala-0.16.so.0		libvala			vala-devel
-libSDL_net-1.2.so.0		SDL_net			SDL_net-devel
-libmodplug.so.1			libmodplug		libmodplug-devel
-libfetch.so			libfetch		libfetch-devel
-libneon.so.27			neon			neon-devel
-libsvn_subr-1.so.0		libsvn			subversion-devel
-libsvn_diff-1.so.0		libsvn			subversion-devel
-libsvn_client-1.so.0		libsvn			subversion-devel
-libsvn_delta-1.so.0		libsvn			subversion-devel
-libsvn_fs-1.so.0		libsvn			subversion-devel
-libsvn_ra-1.so.0		libsvn			subversion-devel
-libsvn_repos-1.so.0		libsvn			subversion-devel
-libsvn_wc-1.so.0		libsvn			subversion-devel
-libsvn_fs_util-1.so.0		libsvn			subversion-devel
-libsvn_ra_svn-1.so.0		libsvn			subversion-devel
-libsvn_fs_fs-1.so.0		libsvn			subversion-devel
-libsvn_fs_base-1.so.0		libsvn			subversion-devel
-libsvn_ra_local-1.so.0		libsvn			subversion-devel
-libsvn_ra_neon-1.so.0		libsvn			subversion-devel
-libsvn_swig_py-1.so.0		subversion-python	subversion-devel
-libsvn_swig_perl-1.so.0		subversion-perl		subversion-devel
-libsvn_swig_ruby-1.so.0		subversion-ruby		subversion-devel
-libjson-glib-1.0.so.0		json-glib		json-glib-devel
-liblxc.so.0			liblxc			lxc-devel
-libvirt.so.0			libvirt			libvirt-devel
-libvirt-qemu.so.0		libvirt			libvirt-devel
-libgdk-3.so.0			gtk+3			gtk+3-devel
-libgtk-3.so.0			gtk+3			gtk+3-devel
-libgailutil-3.so.0		gtk+3			gtk+3-devel
-liblightdm-gobject-1.so.0	liblightdm-gobject	lightdm-devel
-liblightdm-qt-1.so.0		liblightdm-qt		lightdm-devel
-libcelt051.so.0			celt051			celt051-devel
-libcelt0.so.2			celt			celt-devel
-libspice-server.so.1		spice			spice-devel
-libbrasero-burn3.so.1		brasero			brasero-devel
-libbrasero-media3.so.1		brasero			brasero-devel
-libbrasero-utils3.so.1		brasero			brasero-devel
-libXss.so.1			libXScrnSaver		libXScrnSaver-devel
-libyelp.so.0			yelp			yelp-devel
-libpeas-1.0.so.0		libpeas			libpeas-devel
-libpeas-gtk-1.0.so.0		libpeas			libpeas-devel
-libtotem.so.0			totem			totem-devel
-libclutter-1.0.so.0		clutter			clutter-devel
-libmutter-private.so		mutter			mutter-devel
-libmutter-wm.so			mutter			mutter-devel
-libgjs.so.0			gjs			gjs-devel
-libgjs-gi.so			gjs			gjs-devel
-libgjs-dbus.so.0		gjs			gjs-devel
-libtelepathy-glib.so.0		telepathy-glib		telepathy-glib-devel
-libgedit-private.so.0		gedit			gedit-devel
-libaccountsservice.so.0		accountsservice		accountsservice-devel
-libgee.so.2			libgee			libgee-devel
-libfolks.so.25			folks			folks-devel
-libfolks-telepathy.so.25	folks			folks-devel
-libfolks-libsocialweb.so.25	folks			folks-devel
-libfolks-eds.so.25		folks			folks-devel
-libnice.so.10			libnice			libnice-devel
-libgupnp-igd-1.0.so.3		gupnp-igd		gupnp-igd-devel
-libtelepathy-logger.so.2	telepathy-logger	telepathy-logger-devel
-libmission-control-plugins.so.0	telepathy-mission-control	telepathy-mission-control-devel
-libclutter-gtk-1.0.so.0		clutter-gtk		clutter-gtk-devel
-libchamplain-0.12.so.0		libchamplain		libchamplain-devel
-libchamplain-gtk-0.12.so.0	libchamplain		libchamplain-devel
-libgeoclue.so.0			geoclue			geoclue-devel
-libvpx.so.1			libvpx			libvpx-devel
-libXevie.so.1			libXevie		libXevie-devel
-libatspi.so.0			at-spi2-core		at-spi2-core-devel
-libmutter.so.0			mutter			mutter-devel
-libvte2_90.so.9			vte3			vte3-devel
-libgnome-media-profiles-3.0.so.0	libgnome-media-profiles	libgnome-media-profiles-devel
-libpipeline.so.1		libpipeline		libpipeline-devel
-libosp.so.5			opensp			opensp-devel
-libogrove.so.0			openjade		openjade-devel
-libospgrove.so.0		openjade		openjade-devel
-libostyle.so.0			openjade		openjade-devel
-libtorrent.so.14		libtorrent		libtorrent-devel
-libgiblib.so.1			giblib			giblib-devel
-libgc.so.1			gc			gc-devel
-libgslcblas.so.0		gsl			gsl-devel
-libgsl.so.0			gsl			gsl-devel
-liblua.so.5			lua			lua-devel
-libburn.so.4			libburn			libburn-devel
-libgdkmm-2.4.so.1		gtkmm2			gtkmm2-devel
-libgtkmm-2.4.so.1		gtkmm2			gtkmm2-devel
-libseed-gtk3.so.0		libseed			libseed-devel
-libquadmath.so.0		libquadmath		libquadmath-devel
-libgo.so.0			libgo			libgo-devel
-libgfortran.so.3		libgfortran		libgfortran-devel
-swig-callback-callback.so	go			go
-swig-file-file.so		go			go
-libblktapctl.so.1		xen			xen-devel
-libmozjs185.so.1.0		js			js-devel
-libwebp.so.2			libwebp			libwebp-devel
-libva-x11.so.1			libva			libva-devel
-libva.so.1			libva			libva-devel
-libva-glx.so.1			libva			libva-devel
-libva-tpi.so.1			libva			libva-devel
-libva-egl.so.1			libva			libva-devel
-libv4l2.so.0			v4l-utils		v4l-utils-devel
-libv4lconvert.so.0		v4l-utils		v4l-utils-devel
-libv4l1.so.0			v4l-utils		v4l-utils-devel
-libclutter-gst-1.0.so.0		clutter-gst		clutter-gst-devel
-libmx-1.0.so.2			mx			mx-devel
-libmx-gtk-1.0.so.0		mx			mx-devel
-libcheese.so.3			libcheese		cheese-devel
-libcheese-gtk.so.21		libcheese		cheese-devel
-libjson.so.0			json-c			json-c-devel
-libcogl.so.9			cogl			cogl-devel
-libcogl-pango.so.0		cogl			cogl-devel
-libp11-kit.so.0			p11-kit			p11-kit-devel
-librest-0.7.so.0		rest			rest-devel
-librest-extras-0.7.so.0		rest			rest-devel
-libjavascriptcoregtk-1.0.so.0	webkit-gtk		webkit-gtk-devel
-libjavascriptcoregtk-3.0.so.0	webkit-gtk3		webkit-gtk3-devel
-libgoa-1.0.so.0			gnome-online-accounts	gnome-online-accounts-devel
-libgoa-backend-1.0.so.0		gnome-online-accounts	gnome-online-accounts-devel
-liboauth.so.0			liboauth		liboauth-devel
-libsocialweb.so.0		libsocialweb		libsocialweb-devel
-libsocialweb-keyfob.so.0	libsocialweb		libsocialweb-devel
-libsocialweb-keystore.so.0	libsocialweb		libsocialweb-devel
-libsocialweb-client.so.2	libsocialweb		libsocialweb-devel
-liblcms2.so.2			lcms2			lcms2-devel
-libcolord.so.1			colord			colord-devel
-libnm-gtk.so.0			libnm-gtk		network-manager-applet-devel
-libcaribou.so.0			caribou			caribou-devel
-libgdmgreeter.so.1		gdm			gdm-devel
-libgdmsimplegreeter.so.1	gdm			gdm-devel
-libgupnp-av-1.0.so.2		gupnp-av		gupnp-av-devel
-libgrilo-0.1.so.0		grilo			grilo-devel
-libgrlnet-0.1.so.0		grilo			grilo-devel
-libquvi.so.7			libquvi			libquvi-devel
-libepc-1.0.so.3			libepc			libepc-devel
-libepc-ui-1.0.so.3		libepc			libepc-devel
-libgupnp-dlna-1.0.so.2		gupnp-dlna		gupnp-dlna-devel
-libtracker-common.so.0		libtracker		tracker-devel
-libtracker-data.so.0		libtracker		tracker-devel
-libtracker-extract-0.14.so.0	libtracker		tracker-devel
-libtracker-miner-0.14.so.0	libtracker		tracker-devel
-libtracker-sparql-0.14.so.0	libtracker		tracker-devel
-libply.so.2			libplymouth		plymouth-devel
-libply-splash-graphics.so.2	libplymouth		plymouth-devel
-libply-splash-core.so.2		libplymouth		plymouth-devel
-libfm.so.1			libfm			libfm-devel
-libfm-gtk.so.1			libfm			libfm-devel
-libunique-1.0.so.0		libunique1		libunique1-devel
-libxnoise.so.0			libxnoise		xnoise-devel
-libdiscid.so.0			libdiscid		libdiscid-devel
-libmusicbrainz3.so.6		libmusicbrainz		libmusicbrainz-devel
-librhythmbox-core.so.5		librhythmbox		rhythmbox-devel
-libdmapsharing-3.0.so.2		libdmapsharing		libdmapsharing-devel
-libgexiv2.so.1			libgexiv2		libgexiv2-devel
-libraw.so.5			libraw			libraw-devel
-libraw_r.so.5			libraw			libraw-devel
-libdjvulibre.so.21		libdjvulibre		djvulibre-devel
-libgxps.so.2			libgxps			libgxps-devel
-libt1.so.5			libt1			t1lib-devel
-libt1x.so.5			libt1			t1lib-devel
-libevdocument3.so.4		libevince		evince-devel
-libevview3.so.3			libevince		evince-devel
-libjack.so.0			libjack			jack-devel
-libjackserver.so.0		libjack			jack-devel
-libjacknet.so.0			libjack			jack-devel
-libfftw3_threads.so.3		libfftw			fftw-devel
-libfftw3.so.3			libfftw			fftw-devel
-libfftw3l_threads.so.3		libfftw			fftw-devel
-libfftw3l.so.3			libfftw			fftw-devel
-libfftw3f_threads.so.3		libfftw			fftw-devel
-libfftw3f.so.3			libfftw			fftw-devel
-libfluidsynth.so.1		libfluidsynth		fluidsynth-devel
-liblo.so.7			liblo			liblo-devel
-libvamp-sdk.so.2		libvamp-plugin-sdk	vamp-plugin-sdk-devel
-librubberband.so.2		librubberband		rubberband-devel
-libaubio.so.2			libaubio		aubio-devel
-libaubioext.so.2		libaubio		aubio-devel
-libraptor2.so.0			libraptor		raptor-devel
-liblrdf.so.2			liblrdf			liblrdf-devel
-libserd-0.so.0			libserd			serd-devel
-libsord-0.so.0			libsord			sord-devel
-libgiggle.so.0			libgiggle		giggle-devel
-libgiggle-git.so.0		libgiggle		giggle-devel
-libwine.so.1			libwine			wine-devel
-libwine.so.1			libwine-unstable	wine-unstable-devel
-libwv-1.2.so.3			libwv			wv-devel
-libabiword-2.8.so		libabiword		abiword-devel
-libmpg123.so.0			libmpg123		mpg123-devel
-libopenal.so.1			libopenal		libopenal-devel
-libalut.so.0			freealut		freealut-devel
-liblilv-0.so.0			liblilv			lilv-devel
-libsuil-0.so.0			suil			suil-devel
-libportaudio.so.2		portaudio		portaudio-devel
-libportaudiocpp.so.0		portaudiocpp		portaudiocpp-devel
-libprotoc.so.7			protobuf		protobuf-devel
-libprotobuf.so.7		protobuf		protobuf-devel
-libprotobuf-lite.so.7		protobuf-lite		protobuf-devel
-libmcpp.so.0			libmcpp			mcpp-devel
-libIce.so.34			libIce			Ice-devel
-libIceUtil.so.34		libIce			Ice-devel
-libIceStorm.so.34		libIce			Ice-devel
-libIceGrid.so.34		libIce			Ice-devel
-libGlacier2.so.34		libIce			Ice-devel
-libIceDB.so.34			libIce			Ice-devel
-libIceBox.so.34			libIce			Ice-devel
-libFreeze.so.34			libIce			Ice-devel
-libIceStormService.so.34	libIce			Ice-devel
-libSlice.so.34			libIce			Ice-devel
-libIceSSL.so.34			libIce			Ice-devel
-libIcePatch2.so.34		libIce			Ice-devel
-libIceXML.so.34			libIce			Ice-devel
-libvdpau.so.1			libvdpau		libvdpau-devel
-libgtkhtml-4.0.so.0		libgtkhtml		gtkhtml-devel
-libgtkhtml-editor-4.0.so.0	libgtkhtml		gtkhtml-devel
-libgsm.so			libgsm			libgsm-devel
-libcgroup.so.1			libcgroup		libcgroup-devel
-libxdg-basedir.so.1		libxdg-basedir		libxdg-basedir-devel
-libev.so.4			libev			libev-devel
-libgvnc-1.0.so.0		gtk-vnc			gtk-vnc-devel
-libgtk-vnc-2.0.so.0		gtk-vnc			gtk-vnc-devel
-libyaml-0.so.2			libyaml			libyaml-devel
-libgtksourceviewmm-3.0.so.0	gtksourceviewmm		gtksourceviewmm-devel
-libyajl.so.2			yajl			yajl-devel
-libconfuse.so.0			confuse			confuse-devel
-libLLVM-3.0.so			libllvm			llvm-devel
-libclang.so			libclang		libclang-devel
-libisofs.so.6			libisofs		libisofs-devel
-libbfd-2.22.so			binutils		binutils-devel
-libopcodes-2.22.so		binutils		binutils-devel
-libv8.so			libv8			v8-devel
-libGeoIP.so.1			libgeoip		geoip-devel
-libGeoIPUpdate.so.0		libgeoip		geoip-devel
-libcherokee-base.so.0		libcherokee		cherokee-devel
-libcherokee-client.so.0		libcherokee		cherokee-devel
-libcherokee-server.so.0		libcherokee		cherokee-devel
-libnilfs.so.0			libnilfs		nilfs-utils-devel
-libnilfsgc.so.0			libnilfs		nilfs-utils-devel
-libnilfscleaner.so.0		libnilfs		nilfs-utils-devel
-libchicken.so.6			libchicken		chicken-devel
-libmdb.so.0.0.0			libmdb			mdbtools-devel
-libmdbsql.so.0			libmdb			mdbtools-devel
-libkmod.so.2			libkmod			libkmod-devel
-libestr.so.0			libestr			libestr-devel
-libee.so.0			libee			libee-devel
-libobt.so.0			libopenbox		openbox-devel
-libobrender.so.27		libopenbox		openbox-devel
-libgssglue.so.1			libgssglue		libgssglue-devel
-libtirpc.so.1			libtirpc		libtirpc-devel
-librpcsecgss.so.3		librpcsecgss		librpcsecgss-devel
-libnfsidmap.so.0		libnfsidmap		libnfsidmap-devel
-liblwres.so.90			bind-libs		bind-devel
-libdns.so.93			bind-libs		bind-devel
-libbind9.so.90			bind-libs		bind-devel
-libisccfg.so.90 		bind-libs		bind-devel
-libisc.so.90			bind-libs		bind-devel
-libisccc.so.90			bind-libs		bind-devel
-libsystemd-daemon.so.0		systemd-libs		systemd-devel
-libsystemd-id128.so.0 		systemd-libs		systemd-devel
-libsystemd-journal.so.0 	systemd-libs		systemd-devel
-libsystemd-login.so.0 		systemd-libs		systemd-devel
-libplist.so.1			libplist		libplist-devel
-libplist++.so.1			libplist++		libplist-devel
-libnsbmp.so.0			libnsbmp		libnsbmp-devel
-libnsgif.so.0			libnsgif		libnsgif-devel
-libparserutils.so.0		libparserutils		libparserutils-devel
-libwapcaplet.so.0		libwapcaplet		libwapcaplet-devel
-libcss.so.0			libcss			libcss-devel
-libhubbub.so.0			libhubbub		libhubbub-devel
-libdom.so.0			libdom			libdom-devel
-liblutok.so.0			lutok			lutok-devel
-libmtdev.so.1			mtdev			mtdev-devel
-libcryptsetup.so.4		libcryptsetup		cryptsetup-devel
-libgusb.so.2			libgusb			libgusb-devel
-libmash-0.2.so.0		mash			mash-devel
-libudisks2.so.0			udisks2			udisks2-devel
-libgcr-3.so.1			gcr			gcr-devel
-libgck-1.so.0			gcr			gcr-devel
-libgcr-base-3.so.1 		gcr			gcr-devel
-libwacom.so.2			libwacom		libwacom-devel
-libfarstream-0.1.so.0		farstream		farstream-devel
-libtelepathy-farstream.so.2	telepathy-farstream	telepathy-farstream-devel
-libass.so.4			libass			libass-devel
-libcryptui.so.0			libcryptui		libcryptui-devel
-libwx_gtk2u-2.8.so.0		wxGTK			wxGTK-devel
-libwx_gtk2u_gl-2.8.so.0		wxGTK			wxGTK-devel
-libwx_gtk2u_fl-2.8.so.0		wxGTK			wxGTK-devel
-libwx_gtk2u_gizmos-2.8.so.0	wxGTK			wxGTK-devel
-libwx_gtk2u_gizmos_xrc-2.8.so.0	wxGTK			wxGTK-devel
-libwx_gtk2u_mmedia-2.8.so.0	wxGTK			wxGTK-devel
-libwx_gtk2u_ogl-2.8.so.0	wxGTK			wxGTK-devel
-libwx_gtk2u_plot-2.8.so.0	wxGTK			wxGTK-devel
-libwx_gtk2u_stc-2.8.so.0	wxGTK			wxGTK-devel
-libwx_gtk2u_svg-2.8.so.0	wxGTK			wxGTK-devel
-libkeyutils.so.1		libkeyutils		keyutils-devel
-libiptcdata.so.0		libiptcdata		libiptcdata-devel
-libutempter.so.0		libutempter		libutempter-devel
-libxatracker.so.1		MesaLib			MesaLib-devel
-libtumbler-1.so.0		tumbler			tumbler-devel
-libwebrtc_audio_processing.so.0	webrtc-audio-processing	webrtc-audio-processing-devel
-libcupsmime.so.1		libcups			cups-devel
-libcupsppdc.so.1		libcups			cups-devel
-libcupscgi.so.1			libcups			cups-devel
-libcupsdriver.so.1		libcups			cups-devel
-libcups.so.2			libcups			cups-devel
-libcupsimage.so.2		libcups			cups-devel
-libijs-0.35.so			libijs			ghostscript-devel
-libgs.so.9			libgs			ghostscript-devel
-libssh2.so.1			libssh2			libssh2-devel
-libvirt-glib-1.0.so.0		libvirt-glib		libvirt-glib-devel
-libnetsnmp.so.30		libnet-snmp		net-snmp-devel
-libnetsnmpagent.so.30		libnet-snmp		net-snmp-devel
-libnetsnmpmibs.so.30		libnet-snmp		net-snmp-devel
-libnetsnmptrapd.so.30		libnet-snmp		net-snmp-devel
-libieee1284.so.3		libieee1284		libieee1284-devel
-libsane.so.1			libsane			sane-devel
-libhpmud.so.0			hplip			hplip
-libhpip.so.0			hplip			hplip
-libfltk.so.1.3			fltk			fltk-devel
-libfltk_forms.so.1.3		fltk			fltk-devel
-libfltk_gl.so.1.3		fltk			fltk-devel
-libfltk_images.so.1.3		fltk			fltk-devel
-libspectre.so.1			libspectre		libspectre-devel
+libc.so.6 glibc-2.8
+libm.so.6 glibc-2.8
+libpthread.so.0 glibc-2.8
+librt.so.1 glibc-2.8
+libdl.so.2 glibc-2.8
+ld-linux-x86-64.so.2 glibc-2.8 x86_64
+ld-linux.so.2 glibc-2.8 i686
+libresolv.so.2 glibc-2.8
+libanl.so.1 glibc-2.8
+libthread_db.so.1 glibc-2.8
+libutil.so.1 glibc-2.8
+libnsl.so.1 glibc-2.8
+libnss_files.so.2 glibc-2.8
+libnss_compat.so.2 glibc-2.8
+libnss_dns.so.2 glibc-2.8
+libnss_hesiod.so.2 glibc-2.8
+libnss_nisplus.so.2 glibc-2.8
+libnss_nis.so.2 glibc-2.8
+libcrypt.so.1 glibc-2.8
+libBrokenLocale.so.1 glibc-2.8
+libz.so.1 zlib-1.2.3
+libbz2.so.1 bzip2-1.0.5
+libarchive.so.12 libarchive-3.0.2
+libgcc_s.so.1 libgcc-4.4.0
+libperl.so perl-5.12.0
+libmp.so.3 gmp-5.0.1
+libgmp.so.10 gmp-5.0.1
+libgmpxx.so.4 gmp-5.0.1
+libmpfr.so.4 mpfr-3.0.0
+libpwl.so.5 ppl-0.11
+libppl.so.9 ppl-0.11
+libppl_c.so.4 ppl-0.11
+libstdc++.so.6 libstdc++-4.4.0
+libssp.so.0 libssp-4.4.0
+libcurses.so ncurses-libs-5.8
+libncurses.so.5 ncurses-libs-5.8
+libform.so ncurses-libs-5.8
+libpanel.so ncurses-libs-5.8
+libmenu.so ncurses-libs-5.8
+libncursesw.so.6 ncurses-libs-5.8
+libformw.so.6 ncurses-libs-5.8
+libpanelw.so.6 ncurses-libs-5.8
+libmenuw.so.6 ncurses-libs-5.8
+libobjc.so.3 libobjc-4.4.0
+libmudflap.so.0 libmudflap-4.4.0
+libmudflapth.so.0 libmudflap-4.4.0
+libgomp.so.1 libgomp-4.4.0
+libmagic.so.1 file-4.90
+libcloog.so.0 cloog-ppl-0.15.7
+libbluetooth.so.3 libbluetooth-4.58
+libwmf-0.2.so.7 libwmf-0.2.8.4
+libwmflite-0.2.so.7 libwmf-0.2.8.4
+libgthread-2.0.so.0 glib-2.18.0
+libglib-2.0.so.0 glib-2.18.0
+libgmodule-2.0.so.0 glib-2.18.0
+libgio-2.0.so.0 glib-2.18.0
+libgobject-2.0.so.0 glib-2.18.0
+libatk-1.0.so.0 atk-1.26.0
+libpangocairo-1.0.so.0 pango-1.24.0
+libpangoft2-1.0.so.0 pango-1.24.0
+libpangoxft-1.0.so.0 pango-1.24.0
+libpangox-1.0.so.0 pango-1.24.0
+libpango-1.0.so.0 pango-1.24.0
+libcairo.so.2 cairo-1.8.6
+libcairo-gobject.so.2 cairo-1.8.6
+libcairo-script-interpreter.so.2 cairo-1.8.6
+libgdk-x11-2.0.so.0 gtk+-2.16.0
+libgtk-x11-2.0.so.0 gtk+-2.16.0
+libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0
+libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-2.22.0
+libgailutil.so.18 gtk+-2.16.0
+libfreetype.so.6 freetype-2.3.9
+libfontconfig.so.1 fontconfig-2.6.0
+libX11-xcb.so.1 libX11-1.2
+libX11.so.6 libX11-1.2
+libexpat.so.1 expat-2.0.0
+libjpeg.so.8 jpeg-8
+libpng14.so.14 libpng-1.4.2
+libXrender.so.1 libXrender-0.9.4
+libXrandr.so.2 libXrandr-1.3.0
+libGLU.so.1 libGLU-7.11
+libEGL.so.1 libEGL-7.11
+libGL.so.1 libGL-7.11
+libglapi.so.0 libglapi-7.11
+libOpenVG.so.1 libOpenVG-7.11
+libglsl.so MesaLib-7.11
+libdricore.so MesaLib-7.11
+librsvg-2.so.2 librsvg-2.26.0
+libdbus-1.so.3 dbus-libs-1.2.10
+libdbus-glib-1.so.2 dbus-glib-0.80
+libxml2.so.2 libxml2-2.7.0
+libfuse.so.2 fuse-2.8.1
+libXext.so.6 libXext-1.0.5
+libXcomposite.so.1 libXcomposite-0.4.0
+libXdamage.so.1 libXdamage-1.1.1
+libXfixes.so.3 libXfixes-4.0.3
+libXinerama.so.1 libXinerama-1.0.3
+libSM.so.6 libSM-1.1.0
+libICE.so.6 libICE-1.0.5
+libXau.so.6 libXau-1.0.4
+libexslt.so.0 libxslt-1.1.24
+libxslt.so.1 libxslt-1.1.24
+libstartup-notification-1.so.0 startup-notification-0.10
+libwnck-1.so.22 libwnck2-2.30
+libwnck-3.so.0 libwnck-2.91.90
+libnl.so.1 libnl-1.1
+libnl-3.so.200 libnl3-3.2.1
+libnl-route-3.so.200 libnl3-3.2.1
+libnl-nf-3.so.200 libnl3-3.2.1
+libnl-genl-3.so.200 libnl3-3.2.1
+libnl-cli-3.so.200 libnl3-3.2.1
+libssl.so.1 libssl-1.0.0
+libcrypto.so.1 libssl-1.0.0
+libreadline.so.6 readline-6.0
+libhistory.so.6 readline-6.0
+libxfcegui4.so.4 libxfcegui4-4.7.0
+libxfce4kbd-private.so libxfcegui4-4.7.0
+libxfce4menu-0.1.so libxfce4menu-4.6.1
+libxfconf-0.so.2 xfconf-4.9.1
+libxfce4util.so.6 libxfce4util-4.9.1
+libxfce4panel-1.0.so.4 xfce4-panel-4.9.2
+libgstreamer-0.10.so.0 gstreamer-0.10.22
+libgstbase-0.10.so.0 gstreamer-0.10.22
+libgstdataprotocol-0.10.so.0 gstreamer-0.10.22
+libgstcontroller-0.10.so.0 gstreamer-0.10.22
+libgstnet-0.10.so.0 gstreamer-0.10.22
+libgstfft-0.10.so.0 gst-plugins-base-0.10.22
+libgstaudio-0.10.so.0 gst-plugins-base-0.10.22
+libgstapp-0.10.so.0 gst-plugins-base-0.10.22
+libgstsdp-0.10.so.0 gst-plugins-base-0.10.22
+libgsttag-0.10.so.0 gst-plugins-base-0.10.22
+libgstinterfaces-0.10.so.0 gst-plugins-base-0.10.22
+libgstriff-0.10.so.0 gst-plugins-base-0.10.22
+libgstcdda-0.10.so.0 gst-plugins-base-0.10.22
+libgstnetbuffer-0.10.so.0 gst-plugins-base-0.10.22
+libgstrtsp-0.10.so.0 gst-plugins-base-0.10.22
+libgstvideo-0.10.so.0 gst-plugins-base-0.10.22
+libgstpbutils-0.10.so.0 gst-plugins-base-0.10.22
+libgstrtp-0.10.so.0 gst-plugins-base-0.10.22
+libbfd-2.21.so binutils-2.22_1<2.23
+libopcodes-2.21.so binutils-2.22_1<2.23
+libdb-4.8.so libdb-4.8.24
+libdb_cxx-4.8.so libdb-cxx-4.8.24
+libgdbm.so.4 gdbm-1.10_1
+libgdbm_compat.so.4 gdbm-1.10_1
+libgettextsrc-0.18.1.so gettext-libs-0.17
+libgettextlib-0.18.1.so gettext-libs-0.17
+libgettextpo.so.0 gettext-libs-0.17
+libattr.so.1 attr-2.4.43
+libacl.so.1 acl-2.2.47
+libpython2.7.so.1.0 python-2.7
+libffi.so.5 libffi-3.0.8
+libcrack.so.2 cracklib-2.8.0
+libpam.so.0 pam-1.0.0
+libpam_misc.so.0 pam-1.0.0
+libcap.so.2 libcap-2.16
+liblzma.so.5 liblzma-5.0.0
+libuuid.so.1 libuuid-2.18
+libblkid.so.1 libblkid-2.18
+libidn.so.11 libidn-1.10
+libusb-1.0.so.0 libusb-1.0.0
+libusb-0.1.so.4 libusb-compat-0.1.0
+libpci.so.3 pciutils-3.1.2
+libpcre.so.0 libpcre-7.8
+libpcreposix.so.0 libpcre-7.8
+libpcrecpp.so.0 libpcrecpp-7.8
+libgirepository-gimarshallingtests-1.0.so libgirepository-1.30
+libgirepository-everything-1.0.so libgirepository-1.30
+libgirepository-1.0.so.1 libgirepository-1.30
+libudev.so.0 libudev-149
+libgudev-1.0.so.0 libgudev-149
+libext2fs.so.2 e2fsprogs-libs-1.41.5_1
+libcom_err.so.2 e2fsprogs-libs-1.41.5_1
+libe2p.so.2 e2fsprogs-libs-1.41.5_1
+libss.so.2 e2fsprogs-libs-1.41.5_1
+libiw.so.29 wireless_tools-29
+libpopt.so.0 popt-1.15
+libtasn1.so.3 libtasn1-2.1
+libgpg-error.so.0 libgpg-error-1.6
+liblzo2.so.2 lzo-2.03
+libgcrypt.so.11 libgcrypt-1.4.4
+libgnutls.so.26 gnutls-2.6.6
+libgnutlsxx.so.26 gnutls-2.6.6
+libgnutls-extra.so.26 gnutls-2.6.6
+libgnutls-openssl.so.26 gnutls-2.6.6
+libwrap.so.0 tcp_wrappers-libs-7.6
+libdevmapper.so.1.02 device-mapper-2.02.54
+libdevmapper-event.so.1.02 device-mapper-2.02.54
+libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.54
+liblvm2cmd.so.2.02 device-mapper-2.02.54
+libprop.so.0 proplib-0.1
+libfontenc.so.1 libfontenc-1.0.4
+libXfont.so.1 libXfont-1.4.0
+libx86.so.1 libx86-1.1
+libxcb-render.so.0 libxcb-1.2
+libxcb-glx.so.0 libxcb-1.2
+libxcb-composite.so.0 libxcb-1.2
+libxcb-randr.so.0 libxcb-1.2
+libxcb-shape.so.0 libxcb-1.2
+libxcb-sync.so.0 libxcb-1.2
+libxcb-shm.so.0 libxcb-1.2
+libxcb-screensaver.so.0 libxcb-1.2
+libxcb-xprint.so.0 libxcb-1.2
+libxcb-res.so.0 libxcb-1.2
+libxcb.so.1 libxcb-1.2
+libxcb-damage.so.0 libxcb-1.2
+libxcb-dpms.so.0 libxcb-1.2
+libxcb-record.so.0 libxcb-1.2
+libxcb-xtest.so.0 libxcb-1.2
+libxcb-xv.so.0 libxcb-1.2
+libxcb-xf86dri.so.0 libxcb-1.2
+libxcb-xinerama.so.0 libxcb-1.2
+libxcb-dri2.so.0 libxcb-1.2
+libxcb-xevie.so.0 libxcb-1.2
+libxcb-xfixes.so.0 libxcb-1.2
+libxcb-xvmc.so.0 libxcb-1.2
+libXdmcp.so.6 libXdmcp-1.0.2
+libpolkit-gobject-1.so.0 polkit-0.99
+libpolkit-agent-1.so.0 polkit-0.99
+libpolkit-backend-1.so.0 polkit-0.99
+libck-connector.so.0 ConsoleKit-0.4.1
+libXt.so.6 libXt-1.0.5
+libXtst.so.6 libXtst-1.0.3
+libxkbfile.so.1 libxkbfile-1.0.5
+libXpm.so.4 libXpm-3.5.7
+libXmu.so.6 libXmu-1.0.4
+libXmuu.so.1 libXmu-1.0.4
+libdrm.so.2 libdrm-2.4.6
+libdrm_radeon.so.1 libdrm-2.4.6
+libdrm_intel.so.1 libdrm-2.4.6
+libdrm_nouveau.so.2 libdrm-2.4.34
+libkms.so.1 libdrm-2.4.6
+libXxf86vm.so.1 libXxf86vm-1.0.2
+libXi.so.6 libXi-1.2.1
+libdmx.so.1 libdmx-1.0.2
+libXRes.so.1 libXres-1.0.3
+libpciaccess.so.0 libpciaccess-0.10.5
+libpixman-1.so.0 pixman-0.14.0
+libXaw.so.7 libXaw-1.0.5
+libXaw6.so.6 libXaw-1.0.5
+libXaw7.so.7 libXaw-1.0.5
+libXft.so.2 libXft-2.1.13
+libXcursor.so.1 libXcursor-1.1.9
+libXxf86dga.so.1 libXxf86dga-1.0.2
+libXxf86misc.so.1 libXxf86misc-1.0.1
+libXp.so.6 libXp-1.0.0
+libXfontcache.so.1 libXfontcache-1.0.4
+libXv.so.1 libXv-1.0.4
+libXvMC.so.1 libXvMC-1.0.4
+libXvMCW.so.1 libXvMC-1.0.4
+libxcb-render-util.so.0 xcb-util-0.3.4
+libxcb-icccm.so.1 xcb-util-0.3.4
+libxcb-aux.so.0 xcb-util-0.3.4
+libxcb-image.so.0 xcb-util-0.3.4
+libxcb-reply.so.1 xcb-util-0.3.4
+libxcb-keysyms.so.1 xcb-util-0.3.4
+libxcb-property.so.1 xcb-util-0.3.4
+libxcb-atom.so.1 xcb-util-0.3.4
+libxcb-event.so.1 xcb-util-0.3.4
+libtiff.so.5 tiff-4.0.0
+libtiffxx.so.5 tiff-4.0.0
+libnotify.so.4 libnotify-0.7
+libexo-1.so.0 exo-0.7.3
+libvte.so.9 vte-0.20.1
+libglade-2.0.so.0 libglade-2.6.4
+libthunarx-2.so.0 Thunar-1.3.2
+libexif.so.12 libexif-0.6.17
+liboil-0.3.so.0 liboil-0.3.16
+libogg.so.0 libogg-1.3.0
+libvorbis.so.0 libvorbis-1.2.1rc1
+libvorbisenc.so.2 libvorbis-1.2.1rc1
+libvorbisfile.so.3 libvorbis-1.2.1rc1
+libtheora.so.0 libtheora-1.0
+libtheoradec.so.1 libtheora-1.0
+libtheoraenc.so.1 libtheora-1.0
+libcdda_interface.so.0 cdparanoia-10.2
+libcdda_paranoia.so.0 cdparanoia-10.2
+libasound.so.2 alsa-lib-1.0.20
+libvisual-0.4.so.0 libvisual-0.4.0
+libxfsm-4.6.so.0 xfce4-session-4.9.1
+libxklavier.so.16 libxklavier-5.0
+libsexy.so.2 libsexy-0.1.11
+liblcms.so.1 lcms-1.18
+libgd.so.2 gd-2.0.35
+libcroco-0.6.so.3 libcroco-0.6.2
+libgsf-1.so.114 libgsf-1.14.11
+libMagickCore.so.5 libmagick-6.7.3.8
+libMagickWand.so.5 libmagick-6.7.3.8
+libMagick++.so.5 libmagick-6.7.3.8
+libltdl.so.7 libltdl-2.2.6
+libpoppler-glib.so.8 poppler-glib-0.18.2
+libpoppler.so.19 poppler-0.18.2
+libpoppler-cpp.so.0 poppler-cpp-0.18.2
+libpoppler-qt4.so.3 poppler-qt4-0.18.2
+libtcl8.5.so tcl-8.5.8
+libsqlite3.so.0 sqlite-3.6.13
+libtclsqlite3.so sqlite-tcl-3.6.13
+libIDL-2.so.0 libIDL-0.8.13
+libnspr4.so nspr-4.8
+libplc4.so nspr-4.8
+libplds4.so nspr-4.8
+libsoftokn3.so nss-3.12.4
+libssl3.so nss-3.12.4
+libnssutil3.so nss-3.12.4
+libsmime3.so nss-3.12.4
+libfreebl3.so nss-3.12.4
+libnssdbm3.so nss-3.12.4
+libnssckbi.so nss-3.12.4
+libnss3.so nss-3.12.4
+libcurl.so.4 libcurl-7.19
+libpyglib-gi-2.0-python.so.0 pygobject-2.27.0
+libpyglib-2.0-python.so.0 pygobject2-2.28.6
+libdaemon.so.0 libdaemon-0.14
+libavahi-common.so.3 avahi-libs-0.6.25
+libavahi-core.so.7 avahi-libs-0.6.25
+libavahi-client.so.3 avahi-libs-0.6.25
+libavahi-gobject.so.0 avahi-glib-libs-0.6.25
+libavahi-glib.so.1 avahi-glib-libs-0.6.25
+libdns_sd.so.1 avahi-compat-libs-0.6.25
+libhowl.so.0 avahi-compat-libs-0.6.25
+libavahi-ui.so.0 avahi-ui-libs-0.6.25
+libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25
+libmp4v2.so.1 libmp4v2-1.9.1
+libmp4av.so libmp4v2-1.9.1
+libmpeg4ip_gnu.so libmp4v2-1.9.1
+libfaac.so.0 faac-1.28
+libfaad.so.2 faad2-2.7
+libid3tag.so.0 libid3tag-0.15.1b
+libgif.so.4 giflib-4.1.6
+libungif.so.4 giflib-4.1.6
+libImlib2.so.1 imlib2-1.4.2
+libmp3lame.so.0 lame-3.98.2
+libavdevice.so.53 libavdevice-0.8.6
+libavformat.so.53 libavformat-0.8.6
+libswscale.so.2 libswscale-0.8.6
+libswresample.so.0 libswresample-0.8.6
+libpostproc.so.52 libpostproc-0.8.6
+libavcodec.so.53 libavcodec-0.8.6
+libavutil.so.51 libavutil-0.8.6
+libavfilter.so.2 libavfilter-0.8.6
+libSDL-1.2.so.0 SDL-1.2.14
+libSDL_image-1.2.so.0 SDL_image-1.2.10
+libx264.so.120 x264-20120126
+libxvidcore.so.4 xvidcore-1.2.2
+libtag.so.1 taglib-1.6.1
+libtag_c.so.0 taglib-1.6.1
+libfribidi.so.0 fribidi-0.19.2
+liba52.so.0 liba52-0.7.4
+libcddb.so.2 libcddb-1.3.2
+libiso9660.so.8 libcdio-0.83
+libudf.so.0 libcdio-0.83
+libcdio_cdda.so.1 libcdio-0.83
+libcdio_paranoia.so.1 libcdio-0.83
+libiso9660++.so.0 libcdio-0.83
+libcdio++.so.0 libcdio-0.83
+libcdio.so.13 libcdio-0.83
+libmpcdec.so.5 libmpcdec-1.2.6
+libproxy.so.1 libproxy-0.4.6
+libmodman.so.1 libproxy-0.4.6
+libFLAC.so.8 libflac-1.2.1
+libmad.so.0 libmad-0.15.1b
+libmatroska.so.5 libmatroska-1.3.0
+libebml.so.3 libebml-1.2.0
+libdvdread.so.4 libdvdread-4.1.3
+libdvdnav.so.4 libdvdnav-4.1.3
+libdvbpsi.so.5 libdvbpsi-0.1.6
+libdca.so.0 libdca-0.0.5
+libmpeg2.so.0 libmpeg2-0.5.1
+libmpeg2convert.so.0 libmpeg2-0.5.1
+libmng.so.1 libmng-1.0.10
+libQtAssistantClient.so qt-4.5.3
+libQtXmlPatterns.so.4 qt-4.5.3
+libQtScriptTools.so.4 qt-4.5.3
+libQtCLucene.so.4 qt-4.5.3
+libQtMultimedia.so.4 qt-4.5.3
+libQtGui.so.4 qt-4.5.3
+libQtDBus.so.4 qt-4.5.3
+libQtNetwork.so.4 qt-4.5.3
+libQtOpenGL.so.4 qt-4.5.3
+libQtXml.so.4 qt-4.5.3
+libQtTest.so.4 qt-4.5.3
+libQt3Support.so.4 qt-4.5.3
+libQtSvg.so.4 qt-4.5.3
+libQtScript.so.4 qt-4.5.3
+libQtHelp.so.4 qt-4.5.3
+libphonon.so.4 qt-libphonon-4.5.3
+libQtCore.so.4 qt-4.5.3
+libQtSql.so.4 qt-4.5.3
+libQtDeclarative.so.4 qt-4.5.3
+libQtDesignerComponents.so.4 qt-designer-4.5.3
+libQtDesigner.so.4 qt-designer-4.5.3
+libsysfs.so.2 libsysfs-2.1.0
+libsensors.so.4 libsensors-3.1.1
+libcap-ng.so.0 libcap-ng-0.6.2
+libphysfs.so.1 physfs-2.0.0
+libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9
+libparted.so.2 libparted-3.1
+libparted-fs-resize.so.0 libparted-3.1
+libopenobex.so.1 libopenobex-1.5
+libntfs-3g.so.81 ntfs-3g-2010.10.2
+libruby.so.1.9 ruby-1.9.3
+libfsimage.so.1.0 xen-4.1.2
+libxenctrl.so.4.0 xen-4.1.2
+libxenstore.so.3.0 xen-4.1.2
+libflask.so.1.0 xen-4.1.2
+libblktap.so.3.0 xen-4.1.2
+libxenguest.so.4.0 xen-4.1.2
+libxenlight.so.1.0 xen-4.1.2
+libxlutil.so.1.0 xen-4.1.2
+libvhd.so.1.0 xen-4.1.2
+libblktapctl.so.1.0 xen-4.1.2
+libbabl-0.1.so.0 babl-0.1.10
+libgegl-0.2.so.0 gegl-0.2.0
+libiculx.so.46 icu-libs-4.6.1
+libicule.so.46 icu-libs-4.6.1
+libicuio.so.46 icu-libs-4.6.1
+libicui18n.so.46 icu-libs-4.6.1
+libicudata.so.46 icu-libs-4.6.1
+libicutu.so.46 icu-libs-4.6.1
+libicuuc.so.46 icu-libs-4.6.1
+libaspell.so.15 aspell-0.60
+libhunspell-1.2.so.0 hunspell-1.2.8
+libenchant.so.1 enchant-1.4.2
+libgconf-2.so.4 GConf-2.32.0
+libsoup-2.4.so.1 libsoup-2.34.0
+libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0
+libunique-3.0.so.0 libunique-2.91.4
+libwebkit-1.0.so webkit-gtk-1.3.12
+libwebkitgtk-1.0.so.0 webkit-gtk-1.3.12
+libwebkitgtk-3.0.so.0 webkit-gtk3-1.3.12
+libgimp-2.0.so.0 gimp-2.6.6
+libgimpwidgets-2.0.so.0 gimp-2.6.6
+libgimpui-2.0.so.0 gimp-2.6.6
+libgimpbase-2.0.so.0 gimp-2.6.6
+libgimpthumb-2.0.so.0 gimp-2.6.6
+libgimpconfig-2.0.so.0 gimp-2.6.6
+libgimpmath-2.0.so.0 gimp-2.6.6
+libgimpcolor-2.0.so.0 gimp-2.6.6
+libgimpmodule-2.0.so.0 gimp-2.6.6
+libexiv2.so.11 exiv2-0.22
+libsearchclient.so.0 strigi-0.7.2
+libstreamanalyzer.so.0 strigi-0.7.2
+libstrigihtmlgui.so.0 strigi-0.7.2
+libstreams.so.0 strigi-0.7.2
+libstrigiqtdbusclient.so.0 strigi-0.7.2
+libclucene.so.0 clucene-0.9.21b
+libecpg_compat.so.3 postgresql-libs-8.4.2
+libecpg.so.6 postgresql-libs-8.4.2
+libpgtypes.so.3 postgresql-libs-8.4.2
+libpq.so.5 postgresql-libs-8.4.2
+libmysqlclient_r.so.16 libmysqlclient-5.1.14
+libmysqlclient.so.16 libmysqlclient-5.1.14
+libndbclient.so.16 libndbclient-5.1.14
+libgssapi_krb5.so.2 mit-krb5-libs-1.8
+libgssrpc.so.4 mit-krb5-libs-1.8
+libk5crypto.so.3 mit-krb5-libs-1.8
+libkadm5clnt_mit.so.8 mit-krb5-libs-1.8
+libkadm5clnt.so mit-krb5-libs-1.8
+libkadm5srv_mit.so.8 mit-krb5-libs-1.8
+libkadm5srv.so mit-krb5-libs-1.8
+libkdb5.so.6 mit-krb5-libs-1.8
+libkrb5.so.3 mit-krb5-libs-1.8
+libkrb5support.so.0 mit-krb5-libs-1.8
+libverto.so.0 mit-krb5-libs-1.8
+libverto-k5ev.so.0 mit-krb5-libs-1.8
+libmenu-cache.so.1 menu-cache-0.2.6
+libupower-glib.so.1 upower-0.9.2
+libdevkit-power-gobject.so upower-0.9.2
+libgnomekbd.so.7 libgnomekbd-2.91.90
+libgnomekbdui.so.7 libgnomekbd-2.91.90
+libcanberra.so.0 libcanberra-0.23
+libcanberra-gtk.so.0 libcanberra-0.23
+libcanberra-gtk3.so.0 libcanberra-0.23
+libgtop-2.0.so.7 libgtop-2.28.1
+librarian.so.0 rarian-0.8.1
+libgnome-desktop-3.so.2 gnome-desktop-2.91.90
+libmetacity-private.so.0 metacity-2.30.1
+libgnome-menu-3.so.0 gnome-menus-2.91.6
+libart_lgpl_2.so.2 libart-2.3.20
+libgnomecanvas-2.so.0 libgnomecanvas-2.30.1
+libgnome-keyring.so.0 libgnome-keyring-3.0.0
+libgweather-3.so.0 libgweather-2.91.6
+libical.so.0 libical-0.44
+libicalss.so.0 libical-0.44
+libicalvcal.so.0 libical-0.44
+libcamel-1.2.so.33 evolution-data-server-3.3.92
+libebackend-1.2.so.2 evolution-data-server-3.3.92
+libebook-1.2.so.13 evolution-data-server-3.3.92
+libecal-1.2.so.11 evolution-data-server-3.3.92
+libedata-book-1.2.so.13 evolution-data-server-3.3.92
+libedata-cal-1.2.so.15 evolution-data-server-3.3.92
+libedataserver-1.2.so.16 evolution-data-server-3.3.92
+libedataserverui-3.0.so.1 evolution-data-server-3.3.92
+libgdata.so.13 libgdata-0.10.0
+libpcap.so.1 libpcap-1.1.1
+libiptc.so.0 iptables-1.4.7
+libip6tc.so.0 iptables-1.4.7
+libxtables.so.7 iptables-1.4.7
+libip4tc.so.0 iptables-1.4.7
+libipq.so.0 iptables-1.4.7
+libnm-util.so.2 libnm-0.9.1.90
+libnm-glib.so.4 libnm-0.9.1.90
+libnm-glib-vpn.so.1 libnm-0.9.1.90
+libpanel-applet-4.so.0 gnome-panel-3.3.92
+libboost_date_time.so.1.44.0 boost-1.44<1.45
+libboost_math_tr1f.so.1.44.0 boost-1.44<1.45
+libboost_serialization.so.1.44.0 boost-1.44<1.45
+libboost_filesystem.so.1.44.0 boost-1.44<1.45
+libboost_math_tr1l.so.1.44.0 boost-1.44<1.45
+libboost_signals.so.1.44.0 boost-1.44<1.45
+libboost_graph.so.1.44.0 boost-1.44<1.45
+libboost_math_tr1.so.1.44.0 boost-1.44<1.45
+libboost_system.so.1.44.0 boost-1.44<1.45
+libboost_iostreams.so.1.44.0 boost-1.44<1.45
+libboost_prg_exec_monitor.so.1.44.0 boost-1.44<1.45
+libboost_thread.so.1.44.0 boost-1.44<1.45
+libboost_math_c99f.so.1.44.0 boost-1.44<1.45
+libboost_program_options.so.1.44.0 boost-1.44<1.45
+libboost_unit_test_framework.so.1.44.0 boost-1.44<1.45
+libboost_math_c99l.so.1.44.0 boost-1.44<1.45
+libboost_python.so.1.44.0 boost-python-1.44<1.45
+libboost_wave.so.1.44.0 boost-1.44<1.45
+libboost_math_c99.so.1.44.0 boost-1.44<1.45
+libboost_regex.so.1.44.0 boost-1.44<1.45
+libboost_wserialization.so.1.44.0 boost-1.44<1.45
+libexempi.so.3 exempi-2.1.1
+libatasmart.so.4 libatasmart-0.17
+libsgutils2.so.2 libsgutils-1.28
+liblvm2app.so.2.2 liblvm2app-2.02.54
+libcpufreq.so.0 libcpufreq-007
+libgucharmap_2_90.so.7 gucharmap-3.0.0
+libgphoto2.so.2 libgphoto2-2.4.9
+libgphoto2_port.so.0 libgphoto2-2.4.9
+libgvfscommon.so.0 gvfs-1.7.2
+libgvfscommon-dnssd.so.0 gvfs-1.7.2
+libnautilus-extension.so.1 libnautilus-3.2.1
+libgnomeui-2.so.0 libgnomeui
+libmpc.so.2.0.0 mpc-0.8.1
+libsigc-2.0.so.0 libsigc++-1.1
+libglibmm-2.4.so.1 glibmm-2.24.0
+libgiomm-2.4.so.1 glibmm-2.24.0
+libglibmm_generate_extra_defs-2.4.so.1 glibmm-2.24.0
+libcairomm-1.0.so.1 cairomm-1.8.4
+libpangomm-1.4.so.1 pangomm-2.26.0
+libatkmm-1.6.so.1 atkmm-2.22.1
+libgtkmm-3.0.so.1 gtkmm-2.99.5
+libgdkmm-3.0.so.1 gtkmm-2.99.5
+libgksu2.so.0 libgksu-2.0.12
+libgnome-bluetooth.so.10 gnome-bluetooth-3.3.92
+libgnome-bluetooth-applet.so.0 gnome-bluetooth-3.3.92
+libsasl2.so.2 libsasl-2.1.23
+liblber-2.4.so.2 libldap-2.4.21
+libldap-2.4.so.2 libldap-2.4.21
+libldap_r-2.4.so.2 libldap-2.4.21
+libevent-2.0.so.5 libevent-2.0.10
+libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11
+libapr-1.so.0 apr-1.4.2
+libaprutil-1.so.0 apr-util-1.3.9
+libnetpgp.so.0 libnetpgp-20100313
+libmj.so.0 libnetpgp-20100313
+libmca_common_sm.so.1 openmpi-1.4.1
+libmpi_cxx.so.0 openmpi-1.4.1
+libmpi.so.0 openmpi-1.4.1
+libopenmpi_malloc.so.0 openmpi-1.4.1
+libopen-pal.so.0 openmpi-1.4.1
+libopen-rte.so.0 openmpi-1.4.1
+libmtp.so.8 libmtp-1.0.2
+libelf-0.8.13.so libelf-0.8.13
+libelf.so.0 libelf-0.8.13
+libgtksourceview-3.0.so.0 gtksourceview-3.0.0
+libtalloc.so.1 talloc-2.0.1
+libtalloc.so.2 talloc-2.0.1
+libmount.so.1 libmount-2.18
+libdconf.so.0 dconf-0.5.1
+libassuan.so.0 libassuan-2.0.1
+libgpgme.so.11 gpgme-1.3.0
+libgpgme-pthread.so.11 gpgme-1.3.0
+libgarcon-1.so.0 garcon-0.1.12
+libxfce4ui-1.so.0 libxfce4ui-4.9.2
+libxfce4kbd-private-2.so.0 libxfce4ui-4.9.2
+libxml++-2.6.so.2 libxml++-2.32.0
+libftgl.so.2 ftgl-2.1.2
+libGLEW.so.1.6 glew-1.6.0
+libsndfile.so.1 libsndfile-1.0.20
+libspeex.so.1 libspeex-1.1
+libspeexdsp.so.1 libspeex-1.1
+libasyncns.so.0 libasyncns-0.8
+libpulse.so.0 libpulseaudio-1.0
+libpulsecommon-2.0.so libpulseaudio-1.0
+libpulse-mainloop-glib.so.0 libpulseaudio-1.0
+libpulse-simple.so.0 libpulseaudio-1.0
+libpulsecore-1.1.so pulseaudio-1.0
+libbluetooth-util.so pulseaudio-1.0
+libavahi-wrap.so pulseaudio-1.0
+libprotocol-esound.so pulseaudio-1.0
+libalsa-util.so pulseaudio-1.0
+libraop.so pulseaudio-1.0
+librtp.so pulseaudio-1.0
+libprotocol-http.so pulseaudio-1.0
+libprotocol-cli.so pulseaudio-1.0
+libprotocol-native.so pulseaudio-1.0
+libcli.so pulseaudio-1.0
+libprotocol-simple.so pulseaudio-1.0
+libbluetooth-ipc.so pulseaudio-1.0
+libbluetooth-sbc.so pulseaudio-1.0
+libpulse-browse.so pulseaudio-1.0
+liborc-0.4.so.0 orc-0.4.11
+liborc-test-0.4.so.0 orc-0.4.11
+libgmime-2.6.so.0 gmime-2.6.4
+libtotem-plparser.so.17 totem-pl-parser-2.32.0
+libtotem-plparser-mini.so.17 totem-pl-parser-2.32.0
+libgladeui-2.so.0 libgladeui3-3.10.0
+libgstvdp-0.10.so.0 gst-plugins-bad-0.10.20
+libgstphotography-0.10.so.0 gst-plugins-bad-0.10.20
+libgstbasevideo-0.10.so.0 gst-plugins-bad-0.10.20
+libgstsignalprocessor-0.10.so.0 gst-plugins-bad-0.10.20
+libgstbasecamerabinsrc-0.10.so.0 gst-plugins-bad-0.10.20
+libtdb.so.1 libtdb-1.2.2
+libgssdp-1.0.so.3 gssdp-0.9.0
+libgupnp-1.0.so.4 gupnp-0.18.0
+libsamplerate.so.0 libsamplerate-0.1.7
+libmms.so.0 libmms-0.6
+libsmbclient.so.0 libsmbclient-3.5.6
+libwbclient.so.0 libsmbclient-3.5.6
+libjasper.so.1 libjasper-1.900.1
+librecode.so.0 librecode-3.6
+libenca.so.0 libenca-1.13
+libwavpack.so.1 libwavpack-4.60.1
+libvala-0.16.so.0 libvala-0.15.2
+libSDL_net-1.2.so.0 SDL_net-1.2.7
+libmodplug.so.1 libmodplug-0.8.8
+libfetch.so libfetch-2.33
+libneon.so.27 neon-0.29.5
+libsvn_subr-1.so.0 libsvn-0.29.5
+libsvn_diff-1.so.0 libsvn-0.29.5
+libsvn_client-1.so.0 libsvn-0.29.5
+libsvn_delta-1.so.0 libsvn-0.29.5
+libsvn_fs-1.so.0 libsvn-0.29.5
+libsvn_ra-1.so.0 libsvn-0.29.5
+libsvn_repos-1.so.0 libsvn-0.29.5
+libsvn_wc-1.so.0 libsvn-0.29.5
+libsvn_fs_util-1.so.0 libsvn-0.29.5
+libsvn_ra_svn-1.so.0 libsvn-0.29.5
+libsvn_fs_fs-1.so.0 libsvn-0.29.5
+libsvn_fs_base-1.so.0 libsvn-0.29.5
+libsvn_ra_local-1.so.0 libsvn-0.29.5
+libsvn_ra_neon-1.so.0 libsvn-0.29.5
+libsvn_swig_py-1.so.0 subversion-python-0.29.5
+libsvn_swig_perl-1.so.0 subversion-perl-0.29.5
+libsvn_swig_ruby-1.so.0 subversion-ruby-0.29.5
+libjson-glib-1.0.so.0 json-glib-0.12.2
+liblxc.so.0 liblxc-0.7.3
+libvirt.so.0 libvirt-0.8.7
+libvirt-qemu.so.0 libvirt-0.8.7
+libgdk-3.so.0 gtk+3-3.0.0
+libgtk-3.so.0 gtk+3-3.0.0
+libgailutil-3.so.0 gtk+3-3.0.0
+liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
+liblightdm-qt-1.so.0 liblightdm-qt-1.2.2_1
+libcelt051.so.0 celt051-0.5.1.3
+libcelt0.so.2 celt-0.11.1
+libspice-server.so.1 spice-0.6.4
+libbrasero-burn3.so.1 brasero-2.91.90
+libbrasero-media3.so.1 brasero-2.91.90
+libbrasero-utils3.so.1 brasero-2.91.90
+libXss.so.1 libXScrnSaver-1.1.3
+libyelp.so.0 yelp-2.91.90
+libpeas-1.0.so.0 libpeas-1.0.0
+libpeas-gtk-1.0.so.0 libpeas-1.0.0
+libtotem.so.0 totem-2.91.7
+libclutter-1.0.so.0 clutter-1.9.16
+libmutter-private.so mutter-3.4.1
+libmutter-wm.so mutter-3.4.1
+libgjs.so.0 gjs-0.7.11
+libgjs-gi.so gjs-0.7.11
+libgjs-dbus.so.0 gjs-0.7.11
+libtelepathy-glib.so.0 telepathy-glib-0.15.5
+libgedit-private.so.0 gedit-2.91.7
+libaccountsservice.so.0 accountsservice-0.6.4
+libgee.so.2 libgee-0.6.1
+libfolks.so.25 folks-0.6.3.2
+libfolks-telepathy.so.25 folks-0.6.3.2
+libfolks-libsocialweb.so.25 folks-0.6.3.2
+libfolks-eds.so.25 folks-0.6.3.2
+libnice.so.10 libnice-0.1.0
+libgupnp-igd-1.0.so.3 gupnp-igd-0.1.7
+libtelepathy-logger.so.2 telepathy-logger-0.2.12
+libmission-control-plugins.so.0 telepathy-mission-control-5.9.2
+libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2
+libchamplain-0.12.so.0 libchamplain-0.12.2_1
+libchamplain-gtk-0.12.so.0 libchamplain-0.12.2_1
+libgeoclue.so.0 geoclue-0.12.0
+libvpx.so.1 libvpx-1.0.0
+libXevie.so.1 libXevie-1.0.2
+libatspi.so.0 at-spi2-core-1.91.91
+libmutter.so.0 mutter-3.4.1
+libvte2_90.so.9 vte3-0.28.0
+libgnome-media-profiles-3.0.so.0 libgnome-media-profiles-3.0.0
+libpipeline.so.1 libpipeline-1.2.0
+libosp.so.5 opensp-1.5.2
+libogrove.so.0 openjade-1.3.2
+libospgrove.so.0 openjade-1.3.2
+libostyle.so.0 openjade-1.3.2
+libtorrent.so.14 libtorrent-0.12.8
+libgiblib.so.1 giblib-1.2.4
+libgc.so.1 gc-7.1
+libgslcblas.so.0 gsl-1.15
+libgsl.so.0 gsl-1.15
+liblua.so.5 lua-5.1.4
+libburn.so.4 libburn-0.7.2
+libgdkmm-2.4.so.1 gtkmm2-2.24.0
+libgtkmm-2.4.so.1 gtkmm2-2.24.0
+libseed-gtk3.so.0 libseed-3.0.0
+libquadmath.so.0 libquadmath-4.4.0
+libgo.so.0 libgo-4.4.0
+libgfortran.so.3 libgfortran-4.4.0
+libblktapctl.so.1 xen-4.1.2
+libmozjs185.so.1.0 js-1.8.5
+libwebp.so.2 libwebp-0.1.3
+libva-x11.so.1 libva-1.0.14
+libva.so.1 libva-1.0.14
+libva-glx.so.1 libva-1.0.14
+libva-tpi.so.1 libva-1.0.14
+libva-egl.so.1 libva-1.0.14
+libv4l2.so.0 v4l-utils-0.8.5
+libv4lconvert.so.0 v4l-utils-0.8.5
+libv4l1.so.0 v4l-utils-0.8.5
+libclutter-gst-1.0.so.0 clutter-gst-1.5.4
+libmx-1.0.so.2 mx-1.4.3_1
+libmx-gtk-1.0.so.0 mx-1.4.3_1
+libcheese.so.3 libcheese-3.3.92
+libcheese-gtk.so.21 libcheese-3.3.92
+libjson.so.0 json-c-0.9
+libcogl.so.9 cogl-1.10.0
+libcogl-pango.so.0 cogl-1.10.0
+libp11-kit.so.0 p11-kit-0.7
+librest-0.7.so.0 rest-0.7
+librest-extras-0.7.so.0 rest-0.7
+libjavascriptcoregtk-1.0.so.0 webkit-gtk-1.3.12
+libjavascriptcoregtk-3.0.so.0 webkit-gtk3-1.3.12
+libgoa-1.0.so.0 gnome-online-accounts-3.2.0
+libgoa-backend-1.0.so.0 gnome-online-accounts-3.2.0
+liboauth.so.0 liboauth-0.9.4
+libsocialweb.so.0 libsocialweb-0.25.19
+libsocialweb-keyfob.so.0 libsocialweb-0.25.19
+libsocialweb-keystore.so.0 libsocialweb-0.25.19
+libsocialweb-client.so.2 libsocialweb-0.25.19
+liblcms2.so.2 lcms2-2.2
+libcolord.so.1 colord-0.1.12
+libnm-gtk.so.0 libnm-gtk-0.9.1.95
+libcaribou.so.0 caribou-0.4.0
+libgdmgreeter.so.1 gdm-3.2.0
+libgdmsimplegreeter.so.1 gdm-3.2.0
+libgupnp-av-1.0.so.2 gupnp-av-0.10.0
+libgrilo-0.1.so.0 grilo-0.1.17
+libgrlnet-0.1.so.0 grilo-0.1.17
+libquvi.so.7 libquvi-0.4.0
+libepc-1.0.so.3 libepc-0.4.1
+libepc-ui-1.0.so.3 libepc-0.4.1
+libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1
+libtracker-common.so.0 libtracker-0.14.0
+libtracker-data.so.0 libtracker-0.14.0
+libtracker-extract-0.14.so.0 libtracker-0.14.0
+libtracker-miner-0.14.so.0 libtracker-0.14.0
+libtracker-sparql-0.14.so.0 libtracker-0.14.0
+libply.so.2 libplymouth-0.8.3
+libply-splash-graphics.so.2 libplymouth-0.8.3
+libply-splash-core.so.2 libplymouth-0.8.3
+libfm.so.1 libfm-0.1.16
+libfm-gtk.so.1 libfm-0.1.16
+libunique-1.0.so.0 libunique1-1.1.6
+libxnoise.so.0 libxnoise-0.1.29
+libdiscid.so.0 libdiscid-0.2.2
+libmusicbrainz3.so.6 libmusicbrainz-3.0.3
+librhythmbox-core.so.5 librhythmbox-2.95
+libdmapsharing-3.0.so.2 libdmapsharing-2.9.12
+libgexiv2.so.1 libgexiv2-0.4.1
+libraw.so.5 libraw-0.14.1
+libraw_r.so.5 libraw-0.14.1
+libdjvulibre.so.21 libdjvulibre-3.5.24
+libgxps.so.2 libgxps-0.2.0
+libt1.so.5 libt1-5.1.2
+libt1x.so.5 libt1-5.1.2
+libevdocument3.so.4 libevince-3.3.92
+libevview3.so.3 libevince-3.3.92
+libjack.so.0 libjack-1.9.7
+libjackserver.so.0 libjack-1.9.7
+libjacknet.so.0 libjack-1.9.7
+libfftw3_threads.so.3 libfftw-3.3
+libfftw3.so.3 libfftw-3.3
+libfftw3l_threads.so.3 libfftw-3.3
+libfftw3l.so.3 libfftw-3.3
+libfftw3f_threads.so.3 libfftw-3.3
+libfftw3f.so.3 libfftw-3.3
+libfluidsynth.so.1 libfluidsynth-1.1.5
+liblo.so.7 liblo-0.26
+libvamp-sdk.so.2 libvamp-plugin-sdk-2.2
+librubberband.so.2 librubberband-1.6.0
+libaubio.so.2 libaubio-0.3.2
+libaubioext.so.2 libaubio-0.3.2
+libraptor2.so.0 libraptor-2.0.4
+liblrdf.so.2 liblrdf-0.4.0
+libserd-0.so.0 libserd-0.5.0
+libsord-0.so.0 libsord-0.5.0
+libgiggle.so.0 libgiggle-0.6.1
+libgiggle-git.so.0 libgiggle
+libwine.so.1 libwine-1.2.3
+libwine.so.1 libwine-unstable-1.2.3
+libwv-1.2.so.3 libwv-1.2.4
+libabiword-2.8.so libabiword-2.8.6
+libmpg123.so.0 libmpg123-1.13.4_2
+libopenal.so.1 libopenal-1.13
+libalut.so.0 freealut-1.1.0
+liblilv-0.so.0 liblilv-0.5.0
+libsuil-0.so.0 suil-0.4.4
+libportaudio.so.2 portaudio-19.20110326
+libportaudiocpp.so.0 portaudiocpp-19.20110326
+libprotoc.so.7 protobuf-2.4.1
+libprotobuf.so.7 protobuf-2.4.1
+libprotobuf-lite.so.7 protobuf-lite-2.4.1
+libmcpp.so.0 libmcpp-2.7.2
+libIce.so.34 libIce-3.4.2_1
+libIceUtil.so.34 libIce-3.4.2_1
+libIceStorm.so.34 libIce-3.4.2_1
+libIceGrid.so.34 libIce-3.4.2_1
+libGlacier2.so.34 libIce-3.4.2_1
+libIceDB.so.34 libIce-3.4.2_1
+libIceBox.so.34 libIce-3.4.2_1
+libFreeze.so.34 libIce-3.4.2_1
+libIceStormService.so.34 libIce-3.4.2_1
+libSlice.so.34 libIce-3.4.2_1
+libIceSSL.so.34 libIce-3.4.2_1
+libIcePatch2.so.34 libIce-3.4.2_1
+libIceXML.so.34 libIce-3.4.2_1
+libvdpau.so.1 libvdpau-0.4.1
+libgtkhtml-4.0.so.0 libgtkhtml-4.2.1
+libgtkhtml-editor-4.0.so.0 libgtkhtml-4.2.1
+libgsm.so libgsm-1.0.13
+libcgroup.so.1 libcgroup-0.37.1
+libxdg-basedir.so.1 libxdg-basedir-1.1.1
+libev.so.4 libev-4.04
+libgvnc-1.0.so.0 gtk-vnc-0.4.4
+libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4
+libyaml-0.so.2 libyaml-0.1.4
+libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0
+libyajl.so.2 yajl-2.0.1
+libconfuse.so.0 confuse-2.7
+libLLVM-3.0.so libllvm-3.0
+libclang.so libclang-3.0
+libisofs.so.6 libisofs-0.6.24
+libbfd-2.22.so binutils-2.22_1<2.23
+libopcodes-2.22.so binutils-2.22_1<2.23
+libv8.so libv8-3.9.8
+libGeoIP.so.1 libgeoip-1.4.8
+libGeoIPUpdate.so.0 libgeoip-1.4.8
+libcherokee-base.so.0 libcherokee-1.2.101
+libcherokee-client.so.0 libcherokee-1.2.101
+libcherokee-server.so.0 libcherokee-1.2.101
+libnilfs.so.0 libnilfs-2.1.0
+libnilfsgc.so.0 libnilfs-2.1.0
+libnilfscleaner.so.0 libnilfs-2.1.0
+libchicken.so.6 libchicken-4.7.0
+libmdb.so.0.0.0 libmdb-0.5
+libmdbsql.so.0 libmdb-0.5
+libkmod.so.2 libkmod-5
+libestr.so.0 libestr-0.1.2
+libee.so.0 libee-0.3.2
+libobt.so.0 libopenbox-3.5.0
+libobrender.so.27 libopenbox-3.5.0
+libgssglue.so.1 libgssglue-0.3
+libtirpc.so.1 libtirpc-0.2.2
+librpcsecgss.so.3 librpcsecgss-0.19
+libnfsidmap.so.0 libnfsidmap-0.24
+liblwres.so.90 bind-libs-9.9.0
+libdns.so.93 bind-libs-9.9.0
+libbind9.so.90 bind-libs-9.9.0
+libisccfg.so.90 bind-libs-9.9.0
+libisc.so.90 bind-libs-9.9.0
+libisccc.so.90 bind-libs-9.9.0
+libsystemd-daemon.so.0 systemd-libs-43
+libsystemd-id128.so.0 systemd-libs-43
+libsystemd-journal.so.0 systemd-libs-43
+libsystemd-login.so.0 systemd-libs-43
+libplist.so.1 libplist-1.4
+libplist++.so.1 libplist++-1.4
+libnsbmp.so.0 libnsbmp-0.0.3
+libnsgif.so.0 libnsgif-0.0.3
+libparserutils.so.0 libparserutils-0.1.1
+libwapcaplet.so.0 libwapcaplet-0.1.0
+libcss.so.0 libcss-0.1.1
+libhubbub.so.0 libhubbub-0.1.1
+liblutok.so.0 lutok-0.1
+libmtdev.so.1 mtdev-1.1.2
+libcryptsetup.so.4 libcryptsetup-1.4.1
+libgusb.so.2 libgusb-0.1.3
+libmash-0.2.so.0 mash-0.2.0
+libudisks2.so.0 udisks2-1.93.0
+libgcr-3.so.1 gcr-3.3.92
+libgck-1.so.0 gcr-3.3.92
+libgcr-base-3.so.1 gcr-3.3.92
+libwacom.so.2 libwacom-0.3
+libfarstream-0.1.so.0 farstream-0.1.1
+libtelepathy-farstream.so.2 telepathy-farstream-0.2.3
+libass.so.4 libass-0.10.0
+libcryptui.so.0 libcryptui-3.4.0
+libwx_gtk2u-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_gl-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_fl-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_gizmos-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_gizmos_xrc-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_mmedia-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_ogl-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_plot-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_stc-2.8.so.0 wxGTK-2.8.12.1
+libwx_gtk2u_svg-2.8.so.0 wxGTK-2.8.12.1
+libkeyutils.so.1 libkeyutils-1.5.5
+libiptcdata.so.0 libiptcdata-1.0.4
+libutempter.so.0 libutempter-1.1.5
+libxatracker.so.1 MesaLib-7.11
+libtumbler-1.so.0 tumbler-4.9.2
+libwebrtc_audio_processing.so.0 webrtc-audio-processing-0.1
+libcupsmime.so.1 libcups-1.5.3
+libcupsppdc.so.1 libcups-1.5.3
+libcupscgi.so.1 libcups-1.5.3
+libcupsdriver.so.1 libcups-1.5.3
+libcups.so.2 libcups-1.5.3
+libcupsimage.so.2 libcups-1.5.3
+libijs-0.35.so libijs-0.8
+libgs.so.9 libgs-0.8
+libssh2.so.1 libssh2-1.4.1
+libvirt-glib-1.0.so.0 libvirt-glib-0.0.8
+libnetsnmp.so.30 libnet-snmp-5.7.1
+libnetsnmpagent.so.30 libnet-snmp-5.7.1
+libnetsnmpmibs.so.30 libnet-snmp-5.7.1
+libnetsnmptrapd.so.30 libnet-snmp-5.7.1
+libieee1284.so.3 libieee1284-0.2.10
+libsane.so.1 libsane-1.0.22
+libfltk.so.1.3 fltk-1.3.0
+libfltk_forms.so.1.3 fltk-1.3.0
+libfltk_gl.so.1.3 fltk-1.3.0
+libfltk_images.so.1.3 fltk-1.3.0
+libspectre.so.1 libspectre-0.2.6
diff --git a/srcpkgs/ConsoleKit/ConsoleKit-devel.template b/srcpkgs/ConsoleKit/ConsoleKit-devel.template
index 43c6fbb29f..06946f36ea 100644
--- a/srcpkgs/ConsoleKit/ConsoleKit-devel.template
+++ b/srcpkgs/ConsoleKit/ConsoleKit-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'ConsoleKit-devel'.
 #
+depends="libX11-devel dbus-devel glib-devel pam-devel polkit-devel zlib-devel ConsoleKit"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libX11-devel
-Add_dependency run dbus-devel
-Add_dependency run glib-devel
-Add_dependency run pam-devel
-Add_dependency run polkit-devel
-Add_dependency run zlib-devel
-Add_dependency run ConsoleKit
 
 do_install()
 {
diff --git a/srcpkgs/ConsoleKit/ConsoleKit-x11.template b/srcpkgs/ConsoleKit/ConsoleKit-x11.template
index 1e42f161a8..72fa4593ca 100644
--- a/srcpkgs/ConsoleKit/ConsoleKit-x11.template
+++ b/srcpkgs/ConsoleKit/ConsoleKit-x11.template
@@ -1,13 +1,12 @@
 # Template file for 'ConsoleKit-x11'.
 #
+depends="dbus-x11 ConsoleKit"
 short_desc="${sourcepkg} X11-requiring add-ons"
 long_desc="${long_desc}
 
  This package contains some tools that require X libraries."
 
 
-Add_dependency run dbus-x11
-Add_dependency run ConsoleKit
 
 do_install()
 {
diff --git a/srcpkgs/ConsoleKit/depends b/srcpkgs/ConsoleKit/depends
deleted file mode 100644
index fed1cb2e2e..0000000000
--- a/srcpkgs/ConsoleKit/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template
index e051599610..266ed99dbb 100644
--- a/srcpkgs/ConsoleKit/template
+++ b/srcpkgs/ConsoleKit/template
@@ -6,6 +6,7 @@ distfiles="http://www.freedesktop.org/software/$pkgname/dist/$pkgname-$version.t
 build_style=gnu-configure
 configure_args="--enable-docbook-docs --enable-pam-module
 --with-systemdsystemunitdir=/lib/systemd/system"
+makedepends="pkg-config xmlto libX11-devel dbus-devel glib-devel dbus-glib-devel pam-devel polkit-devel zlib-devel"
 short_desc="Framework for defining and tracking users, login sessions and seats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/ConsoleKit"
@@ -23,15 +24,6 @@ subpackages="$pkgname-devel $pkgname-x11"
 make_dirs="/var/log/${pkgname} 0755 root root"
 
 
-Add_dependency build pkg-config
-Add_dependency build xmlto
-Add_dependency build libX11-devel
-Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build pam-devel
-Add_dependency build polkit-devel
-Add_dependency build zlib-devel
 
 post_install()
 {
diff --git a/srcpkgs/Cython/Cython.rshlibs b/srcpkgs/Cython/Cython.rshlibs
new file mode 100644
index 0000000000..614278798c
--- /dev/null
+++ b/srcpkgs/Cython/Cython.rshlibs
@@ -0,0 +1,3 @@
+libpython2.7.so.1.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/Cython/template b/srcpkgs/Cython/template
index c0ee93a9cf..589a3438c5 100644
--- a/srcpkgs/Cython/template
+++ b/srcpkgs/Cython/template
@@ -5,6 +5,9 @@ revision=2
 distfiles="http://www.cython.org/release/$pkgname-$version.tar.gz"
 build_style=python-module
 make_build_args="--prefix=/usr"
+depends="glibc python"
+makedepends="python-devel"
+fulldepends="Pyrex"
 short_desc="C-Extensions for Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cython.org"
@@ -25,7 +28,3 @@ long_desc="
 
 pycompile_module="pyximport Cython ."
 
-Add_dependency run glibc
-Add_dependency run python
-Add_dependency full Pyrex
-Add_dependency build python-devel
diff --git a/srcpkgs/GConf/GConf-devel.template b/srcpkgs/GConf/GConf-devel.template
index 46dfc2bc2a..cad2dbf49a 100644
--- a/srcpkgs/GConf/GConf-devel.template
+++ b/srcpkgs/GConf/GConf-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'GConf-devel'.
 #
+depends="glib-devel dbus-devel GConf"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run dbus-devel
-Add_dependency run GConf
 
 do_install() {
 	install -d ${DESTDIR}/usr/lib/GConf/2 ${DESTDIR}/usr/{bin,share}
diff --git a/srcpkgs/GConf/depends b/srcpkgs/GConf/depends
deleted file mode 100644
index 6a11fcf61d..0000000000
--- a/srcpkgs/GConf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.32.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index fecce054e7..8228f2f812 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/GConf/3.2/GConf-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
 --disable-orbit --enable-gsettings-backend"
+makedepends="pkg-config intltool gobject-introspection gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 short_desc="A process-transparent configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/gconf"
@@ -18,13 +19,6 @@ long_desc="
 conf_files="/etc/gconf/2/path"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build polkit-devel
-Add_dependency build libxml2-devel
 
 post_install() {
 	# Create GCONF_SCHEMAS_DIR
diff --git a/srcpkgs/ISOEnts/template b/srcpkgs/ISOEnts/template
index f0517d6a26..8940356d11 100644
--- a/srcpkgs/ISOEnts/template
+++ b/srcpkgs/ISOEnts/template
@@ -2,6 +2,8 @@
 pkgname=ISOEnts
 version=1986
 distfiles="http://www.oasis-open.org/cover/${pkgname}.zip"
+makedepends="bsdtar"
+fulldepends="xmlcatmgr"
 short_desc="Character entity sets from ISO 8879:1986 (SGML)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.oasis-open.org"
@@ -32,8 +34,6 @@ long_desc="
 noarch=yes
 noextract=yes
 
-Add_dependency full xmlcatmgr
-Add_dependency build bsdtar
 export sgml_entries="CATALOG /usr/share/sgml/iso8879/catalog --"
 
 do_install() {
diff --git a/srcpkgs/Ice/Ice-devel.template b/srcpkgs/Ice/Ice-devel.template
index 236297ccd5..39a5a36277 100644
--- a/srcpkgs/Ice/Ice-devel.template
+++ b/srcpkgs/Ice/Ice-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'Ice-devel'.
 #
+depends="Ice"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run Ice
 
 do_install()
 {
diff --git a/srcpkgs/Ice/depends b/srcpkgs/Ice/depends
deleted file mode 100644
index 4c61d46f15..0000000000
--- a/srcpkgs/Ice/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.4.2_1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 08b12ed6de..d9561eaf70 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -5,6 +5,7 @@ revision=5
 build_wrksrc=cpp
 homepage="http://www.zeroc.com"
 distfiles="${homepage}/download/Ice/3.4/${pkgname}-${version}.tar.gz"
+makedepends="mcpp-devel db-devel expat-devel openssl-devel"
 short_desc="The Internet Communications Engine (Ice)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, ICE"
@@ -22,10 +23,6 @@ long_desc="
 subpackages="lib$pkgname $pkgname-devel"
 
 # XXX: other language bindings
-Add_dependency build mcpp-devel
-Add_dependency build db-devel
-Add_dependency build expat-devel
-Add_dependency build openssl-devel
 
 do_configure() {
 	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
diff --git a/srcpkgs/ImageMagick/depends b/srcpkgs/ImageMagick/depends
deleted file mode 100644
index b3e59e2155..0000000000
--- a/srcpkgs/ImageMagick/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=6.7.3.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ImageMagick/libmagick-devel.template b/srcpkgs/ImageMagick/libmagick-devel.template
index f9fb073fa5..4f47450e64 100644
--- a/srcpkgs/ImageMagick/libmagick-devel.template
+++ b/srcpkgs/ImageMagick/libmagick-devel.template
@@ -1,36 +1,12 @@
 # Template file for 'libmagick-devel'.
 #
+depends="pkg-config lcms-devel tiff-devel freetype-devel jpeg-devel fontconfig-devel libXext-devel libXt-devel bzip2-devel zlib-devel glibc-devel libltdl-devel libSM-devel libICE-devel libX11-devel libgomp libxml2-devel libpng-devel librsvg-devel gtk+-devel cairo-devel glib-devel libwmf-devel libstdc++-devel libmagick"
 short_desc="ImageMagick low-level image manipulation development files"
 long_desc="${long_desc}
 
  This package contains headers and other related development files
  with MagickCore."
 
-Add_dependency run pkg-config
-Add_dependency run lcms-devel
-Add_dependency run tiff-devel
-Add_dependency run freetype-devel
-Add_dependency run jpeg-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libXext-devel
-Add_dependency run libXt-devel
-Add_dependency run bzip2-devel
-Add_dependency run zlib-devel
-Add_dependency run glibc-devel
-Add_dependency run libltdl-devel
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run libgomp
-Add_dependency run libxml2-devel
-Add_dependency run libpng-devel
-Add_dependency run librsvg-devel
-Add_dependency run gtk+-devel
-Add_dependency run cairo-devel
-Add_dependency run glib-devel
-Add_dependency run libwmf-devel
-Add_dependency run libstdc++-devel
-Add_dependency run libmagick
 
 do_install()
 {
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index f1e8e76ea4..cecd2ed9b9 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -10,6 +10,7 @@ configure_args="--without-gslib --without-jp2 --without-autotrace
 --without-dps --without-fpx --without-gvc --without-jbig
 --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
 --with-magick-plus-plus --with-modules -with-perl --enable-shared"
+makedepends="pkg-config jpeg-devel libpng-devel tiff-devel lcms2-devel freetype-devel libwebp-devel fontconfig-devel libXext-devel libXt-devel libltdl-devel libxml2-devel glib-devel cairo-devel librsvg-devel gtk+-devel libwmf-devel fftw-devel djvulibre-devel"
 short_desc="Package for display and interactive manipulation of images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.imagemagick.org/"
@@ -47,25 +48,6 @@ conf_files="
 keep_libtool_archives=yes
 subpackages="libmagick libmagick-devel libmagick-perl"
 
-Add_dependency build pkg-config
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build tiff-devel
-Add_dependency build lcms2-devel
-Add_dependency build freetype-devel
-Add_dependency build libwebp-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libXext-devel
-Add_dependency build libXt-devel
-Add_dependency build libltdl-devel
-Add_dependency build libxml2-devel
-Add_dependency build glib-devel
-Add_dependency build cairo-devel
-Add_dependency build librsvg-devel
-Add_dependency build gtk+-devel
-Add_dependency build libwmf-devel
-Add_dependency build fftw-devel
-Add_dependency build djvulibre-devel
 
 post_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template
index 858e88f63d..b1b34c94a1 100644
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/srcpkgs/MesaLib/MesaLib-devel.template
@@ -1,26 +1,11 @@
 # Template file for 'MesaLib-devel'.
 #
+depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.23 expat-devel libXt-devel libGL>=8.0.3 libOpenVG>=8.0.3 libGLES>=8.0.3 libGLU>=8.0.3 libEGL>=8.0.3"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glproto
-Add_dependency run dri2proto  	">=2.1"
-Add_dependency run libXext-devel
-Add_dependency run libXxf86vm-devel
-Add_dependency run libXdamage-devel
-Add_dependency run libXfixes-devel
-Add_dependency run libX11-devel
-Add_dependency run libxcb-devel
-Add_dependency run libdrm-devel	">=2.4.23"
-Add_dependency run expat-devel
-Add_dependency run libXt-devel
-Add_dependency run libGL	">=${version}"
-Add_dependency run libOpenVG	">=${version}"
-Add_dependency run libGLES	">=${version}"
-Add_dependency run libGLU	">=${version}"
-Add_dependency run libEGL	">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/MesaLib/depends b/srcpkgs/MesaLib/depends
deleted file mode 100644
index 905728c193..0000000000
--- a/srcpkgs/MesaLib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=7.11"
-api_depends=">=7.11_3" # multiple subpkgs for shared libs.
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index f9998f05d4..8bf96988b1 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -10,6 +10,7 @@ configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
 --enable-gallium-egl --disable-va --enable-vdpau --enable-xvmc --enable-xa
 --enable-texture-float --with-gallium-drivers=i915,r300,r600,svga,swrast
 --with-dri-drivers=i915,i965,r200,radeon,swrast"
+makedepends="perl>=0 flex pkg-config glproto dri2proto>=2.1 makedepend libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel libudev-devel libdrm-devel expat-devel libXt-devel talloc-devel libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org/"
@@ -26,23 +27,3 @@ long_desc="
 subpackages="libEGL libglapi libGLES libGL libGLU libOpenVG"
 subpackages="${subpackages} ${pkgname}-devel"
 
-Add_dependency build perl		">=0"
-Add_dependency build flex
-Add_dependency build pkg-config
-Add_dependency build glproto
-Add_dependency build dri2proto		">=2.1"
-Add_dependency build makedepend
-Add_dependency build libXext-devel
-Add_dependency build libXxf86vm-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libxcb-devel
-Add_dependency build libudev-devel
-Add_dependency build libdrm-devel
-Add_dependency build expat-devel
-Add_dependency build libXt-devel
-Add_dependency build talloc-devel
-Add_dependency build libxml2-python
-Add_dependency build llvm-devel
-Add_dependency build libvdpau-devel
-Add_dependency build libXvMC-devel ">=1.0.6"
diff --git a/srcpkgs/MoinMoin/template b/srcpkgs/MoinMoin/template
index 68b5e79b6c..902e8dacf4 100644
--- a/srcpkgs/MoinMoin/template
+++ b/srcpkgs/MoinMoin/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc=moin-${version}
 distfiles="http://static.moinmo.in/files/moin-${version}.tar.gz"
 build_style=python-module
+fulldepends="python"
 short_desc="MoinMoin, a Python clone of WikiWiki"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://moinmo.in"
@@ -19,4 +20,3 @@ long_desc="
 noarch=yes
 pycompile_module="$pkgname jabberbot"
 
-Add_dependency full python
diff --git a/srcpkgs/NetworkManager/NetworkManager-devel.template b/srcpkgs/NetworkManager/NetworkManager-devel.template
index 6a6d25623b..1021284643 100644
--- a/srcpkgs/NetworkManager/NetworkManager-devel.template
+++ b/srcpkgs/NetworkManager/NetworkManager-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'NetworkManager-devel'.
 #
+depends="dbus-glib-devel libnm>=0.9.4.0"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dbus-glib-devel
-Add_dependency run libnm ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/NetworkManager/depends b/srcpkgs/NetworkManager/depends
deleted file mode 100644
index 54f10a8613..0000000000
--- a/srcpkgs/NetworkManager/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.1.90"
-api_depends=">=0.9.4.0"
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 2222df91ff..a9d8b2b30f 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -9,6 +9,8 @@ configure_args="--with-distro=gentoo
 --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
 --with-crypto=nss --disable-static --enable-ppp --enable-concheck
 --with-systemdsystemunitdir=/lib/systemd/system"
+makedepends="pkg-config intltool libuuid-devel nss-devel dbus-glib-devel libgudev-devel wireless_tools-devel libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel"
+fulldepends="dbus>=0 iproute2 dhcpcd>=5.5.4_1 wpa_supplicant"
 short_desc="Network Management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
@@ -26,23 +28,7 @@ systemd_services="${pkgname}.service on"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 subpackages="$pkgname-devel libnm"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libuuid-devel
-Add_dependency build nss-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libgudev-devel
-Add_dependency build wireless_tools-devel
-Add_dependency build libnl3-devel
-Add_dependency build polkit-devel
-Add_dependency build ppp-devel
-Add_dependency build iptables-devel
-Add_dependency build libsoup-devel
 
-Add_dependency full dbus		">=0"
-Add_dependency full iproute2
-Add_dependency full dhcpcd		">=5.5.4_1" # switch to /usr.
-Add_dependency full wpa_supplicant
 
 post_install() {
 	# Install config file.
diff --git a/srcpkgs/Pyrex/template b/srcpkgs/Pyrex/template
index f917490f70..903f7b7a89 100644
--- a/srcpkgs/Pyrex/template
+++ b/srcpkgs/Pyrex/template
@@ -4,6 +4,7 @@ version=0.9.9
 revision=2
 distfiles="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-$version.tar.gz"
 build_style=python-module
+fulldepends="python"
 short_desc="Language for writing Python extension modules"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex"
@@ -16,4 +17,3 @@ long_desc="
 noarch=yes
 pycompile_module="$pkgname"
 
-Add_dependency full python
diff --git a/srcpkgs/SDL/SDL-devel.template b/srcpkgs/SDL/SDL-devel.template
index e3394b81fa..6391837038 100644
--- a/srcpkgs/SDL/SDL-devel.template
+++ b/srcpkgs/SDL/SDL-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'SDL-devel'.
 #
+depends="libX11-devel libXext-devel libXrender-devel alsa-lib-devel SDL"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXrender-devel
-Add_dependency run alsa-lib-devel
-Add_dependency run SDL
 
 do_install()
 {
diff --git a/srcpkgs/SDL/depends b/srcpkgs/SDL/depends
deleted file mode 100644
index 7ca2acd28b..0000000000
--- a/srcpkgs/SDL/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.14"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
index 8cf2585394..2b6c31c3fe 100644
--- a/srcpkgs/SDL/template
+++ b/srcpkgs/SDL/template
@@ -6,6 +6,8 @@ distfiles="http://www.libsdl.org/release/SDL-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath
 --enable-clock_gettime --disable-nas --disable-arts"
+depends="libXext libXrender libX11 alsa-lib libpulseaudio"
+makedepends="pkg-config nasm libXext-devel libXrender-devel libX11-devel MesaLib-devel alsa-lib-devel pulseaudio-devel"
 short_desc="Simple Directmedia Layer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libsdl.org/"
@@ -20,17 +22,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 # The following run-time dependencies are dlopen(3)ed.
-Add_dependency run libXext
-Add_dependency run libXrender
-Add_dependency run libX11
-Add_dependency run alsa-lib
-Add_dependency run libpulseaudio
 
-Add_dependency build pkg-config
-Add_dependency build nasm
-Add_dependency build libXext-devel
-Add_dependency build libXrender-devel
-Add_dependency build libX11-devel
-Add_dependency build MesaLib-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build pulseaudio-devel
diff --git a/srcpkgs/SDL_image/SDL_image-devel.template b/srcpkgs/SDL_image/SDL_image-devel.template
index c80299d60f..1ee68c0512 100644
--- a/srcpkgs/SDL_image/SDL_image-devel.template
+++ b/srcpkgs/SDL_image/SDL_image-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'SDL_image-devel'.
 #
+depends="libpng-devel tiff-devel jpeg-devel SDL-devel SDL_image"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libpng-devel
-Add_dependency run tiff-devel
-Add_dependency run jpeg-devel
-Add_dependency run SDL-devel
-Add_dependency run SDL_image
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/SDL_image/depends b/srcpkgs/SDL_image/depends
deleted file mode 100644
index 7784c0e6b0..0000000000
--- a/srcpkgs/SDL_image/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.10"
-api_depends=">=1.2.11" # libwebp support
diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index 4b97095a1e..bec34ae1ab 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -4,6 +4,8 @@ version=1.2.12
 homepage="http://www.libsdl.org/projects/SDL_image/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="libpng tiff jpeg libwebp"
+makedepends="libpng-devel tiff-devel jpeg-devel SDL-devel libwebp-devel"
 short_desc="Load images as SDL surfaces"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -15,16 +17,7 @@ long_desc="
 
 subpackages="$pkgname-devel"
 # The following are dlopen(3)ed at runtime.
-Add_dependency run libpng
-Add_dependency run tiff
-Add_dependency run jpeg
-Add_dependency run libwebp
 
-Add_dependency build libpng-devel
-Add_dependency build tiff-devel
-Add_dependency build jpeg-devel
-Add_dependency build SDL-devel
-Add_dependency build libwebp-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/SDL_mixer/SDL_mixer-devel.template b/srcpkgs/SDL_mixer/SDL_mixer-devel.template
index d27748672f..c4d41a38b0 100644
--- a/srcpkgs/SDL_mixer/SDL_mixer-devel.template
+++ b/srcpkgs/SDL_mixer/SDL_mixer-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'SDL_mixer-devel'.
 #
+depends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel SDL_mixer"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run SDL-devel
-Add_dependency run libvorbis-devel
-Add_dependency run libmikmod-devel
-Add_dependency run libflac-devel
-Add_dependency run smpeg-devel
-Add_dependency run SDL_mixer
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/SDL_mixer/depends b/srcpkgs/SDL_mixer/depends
deleted file mode 100644
index bd2919ddf1..0000000000
--- a/srcpkgs/SDL_mixer/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.11"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 1814721aa8..c6601d1796 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -5,6 +5,8 @@ revision=2
 homepage="http://www.libsdl.org/projects/SDL_mixer/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="libvorbis libmikmod smpeg libflac"
+makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel fluidsynth-devel"
 short_desc="Multi-channel audio mixer library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -17,18 +19,8 @@ long_desc="
 
 subpackages="$pkgname-devel"
 # The following are dlopen(3)ed at runtime.
-Add_dependency run libvorbis
-Add_dependency run libmikmod
-Add_dependency run smpeg
-Add_dependency run libflac
 #Add_dependency run libfluidsynth
 
-Add_dependency build SDL-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libmikmod-devel
-Add_dependency build libflac-devel
-Add_dependency build smpeg-devel
-Add_dependency build fluidsynth-devel
 
 pre_configure() {
 	sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \
diff --git a/srcpkgs/SDL_net/SDL_net-devel.template b/srcpkgs/SDL_net/SDL_net-devel.template
index f867815ec2..ab427cd057 100644
--- a/srcpkgs/SDL_net/SDL_net-devel.template
+++ b/srcpkgs/SDL_net/SDL_net-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'SDL_net-devel'.
 #
+depends="SDL-devel SDL_net"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run SDL-devel
-Add_dependency run SDL_net
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/SDL_net/depends b/srcpkgs/SDL_net/depends
deleted file mode 100644
index 15f9440056..0000000000
--- a/srcpkgs/SDL_net/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.7"
-api_depends=">=1.2.8" # pkgconfig support in -devel pkg.
diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index c2388882a8..47dedd8a68 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -4,6 +4,7 @@ version=1.2.8
 homepage="http://www.libsdl.org/projects/SDL_net/"
 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="SDL-devel"
 short_desc="Small sample cross-platform networking library for SDL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -13,7 +14,6 @@ long_desc="
  supplementary to the SDL (Simple DirectMedia Layer) library."
 
 subpackages="$pkgname-devel"
-Add_dependency build SDL-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/SDL_ttf/SDL_ttf-devel.template b/srcpkgs/SDL_ttf/SDL_ttf-devel.template
index 0229e2b8a1..752a825c18 100644
--- a/srcpkgs/SDL_ttf/SDL_ttf-devel.template
+++ b/srcpkgs/SDL_ttf/SDL_ttf-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'SDL_ttf-devel'.
 #
+depends="freetype-devel SDL-devel SDL_ttf"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run freetype-devel
-Add_dependency run SDL-devel
-Add_dependency run SDL_ttf
 
 do_install()
 {
diff --git a/srcpkgs/SDL_ttf/depends b/srcpkgs/SDL_ttf/depends
deleted file mode 100644
index d3b3c31d05..0000000000
--- a/srcpkgs/SDL_ttf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index a2fd5a90c3..3871d301b3 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -4,6 +4,7 @@ version=2.0.11
 homepage="http://www.libsdl.org/projects/$pkgname"
 distfiles="${homepage}/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config freetype-devel SDL-devel MesaLib-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,7 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build freetype-devel
-Add_dependency build SDL-devel
-Add_dependency build MesaLib-devel
diff --git a/srcpkgs/Terminal/template b/srcpkgs/Terminal/template
index 3e099f6327..43072a993f 100644
--- a/srcpkgs/Terminal/template
+++ b/srcpkgs/Terminal/template
@@ -4,6 +4,8 @@ version=0.4.8
 revision=4
 distfiles="http://archive.xfce.org/src/apps/terminal/0.4/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool dbus-glib-devel exo-devel libxfce4util-devel vte-devel gtk+-devel"
 short_desc="X Terminal Emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/projects/terminal"
@@ -16,13 +18,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-glib-devel
-Add_dependency build exo-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build vte-devel
-Add_dependency build gtk+-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/Thunar/Thunar-devel.template b/srcpkgs/Thunar/Thunar-devel.template
index 9a8e428349..b43c15d6ac 100644
--- a/srcpkgs/Thunar/Thunar-devel.template
+++ b/srcpkgs/Thunar/Thunar-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'Thunar-devel'.
 #
+depends="glib-devel gtk+-devel Thunar>=1.4.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gtk+-devel
-Add_dependency run Thunar ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/Thunar/depends b/srcpkgs/Thunar/depends
deleted file mode 100644
index 27ebe44099..0000000000
--- a/srcpkgs/Thunar/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index e2d729f837..129a32d0ba 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -5,6 +5,8 @@ distfiles="http://archive.xfce.org/src/xfce/thunar/1.4/Thunar-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-gio-unix --enable-dbus --enable-gudev --enable-exif
 --enable-pcre --enable-notifications"
+depends="gvfs hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libgudev-devel libnotify-devel libxfce4util-devel libxfce4ui-devel gtk+-devel dbus-glib-devel libexif-devel pcre-devel exo-devel xfce4-panel-devel startup-notification-devel"
 short_desc="Thunar File Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://thunar.xfce.org"
@@ -22,23 +24,7 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 make_dirs="/etc/polkit-1/localauthority 0700 root root"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libgudev-devel
-Add_dependency build libnotify-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libexif-devel
-Add_dependency build pcre-devel
-Add_dependency build exo-devel
-Add_dependency build xfce4-panel-devel
-Add_dependency build startup-notification-devel
 
-Add_dependency run gvfs
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
 post_install() {
 	# install udisks permission file
diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template
index aa38f414f9..6f9d1f1733 100644
--- a/srcpkgs/Twisted/template
+++ b/srcpkgs/Twisted/template
@@ -3,6 +3,8 @@ pkgname=Twisted
 version=12.0.0
 distfiles="http://twistedmatrix.com/Releases/Twisted/${version%.*}/Twisted-${version}.tar.bz2"
 build_style=python-module
+makedepends="python-devel"
+fulldepends="python zope.interface pycrypto pyopenssl"
 short_desc="Event-driven networking engine written in Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://twistedmatrix.com/"
@@ -41,8 +43,3 @@ long_desc="
 
 pycompile_module="twisted"
 
-Add_dependency full python
-Add_dependency full zope.interface
-Add_dependency full pycrypto
-Add_dependency full pyopenssl
-Add_dependency build python-devel
diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template
index 91f207cdf9..feb3a5ffa3 100644
--- a/srcpkgs/abGate/template
+++ b/srcpkgs/abGate/template
@@ -5,6 +5,8 @@ homepage="http://abgate.sourceforge.net/"
 build_style=gnu-makefile
 distfiles="${SOURCEFORGE_SITE}/abgate/${pkgname}-${version}.tar.gz"
 revision=1
+makedepends="pkg-config gtkmm2-devel atkmm-devel glibmm-devel libsigc++-devel gtk+-devel glib-devel libstdc++-devel"
+fulldepends="lv2core"
 short_desc="LV2 Noise Gate plugin"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -12,13 +14,4 @@ checksum=f1f65e4e05038c7cbff05463ebb423213ce99603db58f7802a10f4d8e735abf5
 long_desc="
  abGate: LV2 Noise Gate plugin."
 
-Add_dependency build pkg-config
-Add_dependency build gtkmm2-devel
-Add_dependency build atkmm-devel
-Add_dependency build glibmm-devel
-Add_dependency build libsigc++-devel
-Add_dependency build gtk+-devel
-Add_dependency build glib-devel
-Add_dependency build libstdc++-devel
 
-Add_dependency full lv2core
diff --git a/srcpkgs/abiword/abiword-devel.template b/srcpkgs/abiword/abiword-devel.template
index 8b7df58e2f..c1401a1002 100644
--- a/srcpkgs/abiword/abiword-devel.template
+++ b/srcpkgs/abiword/abiword-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'abiword-devel'.
 #
+depends="glibc-devel libabiword"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libabiword
 
 do_install()
 {
diff --git a/srcpkgs/abiword/depends b/srcpkgs/abiword/depends
deleted file mode 100644
index a8e776978e..0000000000
--- a/srcpkgs/abiword/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.8.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index 8030439083..00a3e548fc 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -9,6 +9,8 @@ configure_args="--enable-shave --enable-collab-backend-telepathy
 --enable-collab-backend-tcp --enable-collab-backend-service
 --enable-templates --enable-clipart --enable-plugins
 --with-gio"
+makedepends="automake pkg-config fribidi-devel libgsf-devel libxml2-devel libpng-devel enchant-devel zlib-devel gtk+-devel atk-devel pango-devel freetype-devel fontconfig-devel librsvg-devel glib-devel gdk-pixbuf-devel cairo-devel libstdc++-devel wv-devel boost-devel readline-devel libxslt-devel libwmf-devel libX11-devel expat-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils"
 short_desc="Free word processing program similar to Microsoft(R) Word."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -26,34 +28,7 @@ subpackages="lib$pkgname $pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build fribidi-devel
-Add_dependency build libgsf-devel
-Add_dependency build libxml2-devel
-Add_dependency build libpng-devel
-Add_dependency build enchant-devel
-Add_dependency build zlib-devel
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build librsvg-devel
-Add_dependency build glib-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
-Add_dependency build libstdc++-devel
-Add_dependency build wv-devel
-Add_dependency build boost-devel
-Add_dependency build readline-devel
-Add_dependency build libxslt-devel
-Add_dependency build libwmf-devel
-Add_dependency build libX11-devel
-Add_dependency build expat-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
 
 CPPFLAGS="-I/usr/include/boost"
 
diff --git a/srcpkgs/accountsservice/accountsservice-devel.template b/srcpkgs/accountsservice/accountsservice-devel.template
index 49f2e8c38c..b63a7a06a5 100644
--- a/srcpkgs/accountsservice/accountsservice-devel.template
+++ b/srcpkgs/accountsservice/accountsservice-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'accountsservice-devel'.
 #
+depends="accountsservice>=0.6.21"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run accountsservice ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/accountsservice/depends b/srcpkgs/accountsservice/depends
deleted file mode 100644
index ac52425fa3..0000000000
--- a/srcpkgs/accountsservice/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index ad16a9331a..90ed99d0df 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -4,6 +4,8 @@ version=0.6.21
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --with-systemdsystemunitdir=/lib/systemd/system"
+depends="ConsoleKit-x11"
+makedepends="pkg-config intltool gobject-introspection polkit-devel systemd-devel"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cgit.freedesktop.org/accountsservice/"
@@ -17,13 +19,7 @@ long_desc="
 systemd_services="accounts-daemon.service on"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build polkit-devel
-Add_dependency build systemd-devel
 
-Add_dependency run ConsoleKit-x11 # uses ConsoleKit dbus stuff.
 
 post_install() {
 	for d in users icons; do
diff --git a/srcpkgs/acl/acl-devel.template b/srcpkgs/acl/acl-devel.template
index 0d343ae945..063142ef98 100644
--- a/srcpkgs/acl/acl-devel.template
+++ b/srcpkgs/acl/acl-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'acl-devel'.
 #
+depends="glibc-devel attr-devel acl"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run attr-devel
-Add_dependency run acl
 
 do_install()
 {
diff --git a/srcpkgs/acl/acl-progs.template b/srcpkgs/acl/acl-progs.template
index b4f85d6602..4ccc37def9 100644
--- a/srcpkgs/acl/acl-progs.template
+++ b/srcpkgs/acl/acl-progs.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains binary utilities provided by the acl package."
 
-Add_dependency run attr
-
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/share/man
diff --git a/srcpkgs/acl/depends b/srcpkgs/acl/depends
deleted file mode 100644
index bcf2cf6696..0000000000
--- a/srcpkgs/acl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.2.47"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index cf92ee3a19..74d7aefdb2 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -7,6 +7,7 @@ configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
 make_install_target="DIST_ROOT=$XBPS_DESTDIR/$pkgname-$version
  install install-lib install-dev"
 revision=3
+makedepends="attr-devel"
 short_desc="Access Control List filesystem support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://savannah.nongnu.org/projects/acl"
@@ -18,4 +19,3 @@ long_desc="
 
 keep_libtool_archives=yes
 subpackages="acl-devel acl-progs"
-Add_dependency build attr-devel
diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 407bd56b99..b8a8e956f7 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -6,6 +6,7 @@ wrksrc=acpica-unix-${version}
 #distfiles="http://acpica.org/downloads/acpica-unix-${version}.tar.gz"
 distfiles="http://xbps.nopcode.org/distfiles/acpica-unix-${version}.tar.gz"
 revision=1
+makedepends="flex"
 short_desc="Intel ACPI CA Unix utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=97fdbf6768f26f15ebf6aa106461e10f8e84bfb2766c7f8fe313fcd08e381d2e
@@ -18,7 +19,6 @@ long_desc="
     * ACPI Simulator (AcpiExec)
     * ACPI Table Extractor"
 
-Add_dependency build flex
 
 do_build()
 {
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 330535befd..092d7e79ac 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -17,6 +17,8 @@ checksum="${_eulacksum} ${_distcksum}"
 skip_extraction="$(basename ${_eula})"
 create_srcdir=yes
 create_wrksrc=yes
+depends="curl>=0 hicolor-icon-theme desktop-file-utils"
+makedepends="libXext-devel libXt-devel gtk+-devel nss-devel libcurl-devel"
 short_desc="Adobe Flash Player plugin"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -26,15 +28,7 @@ build_requires=27 # create_srcdir
 nonfree=yes # restricted use
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run curl ">=0"
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build libXext-devel
-Add_dependency build libXt-devel
-Add_dependency build gtk+-devel
-Add_dependency build nss-devel
-Add_dependency build libcurl-devel
 
 do_install() {
 	vinstall libflashplayer.so 755 usr/lib/mozilla/plugins
diff --git a/srcpkgs/agar/agar-devel.template b/srcpkgs/agar/agar-devel.template
index c033095a3a..d2d419a7b1 100644
--- a/srcpkgs/agar/agar-devel.template
+++ b/srcpkgs/agar/agar-devel.template
@@ -1,17 +1,12 @@
 # Template file for 'agar-devel'.
 #
+depends="glibc freetype-devel jpeg-devel MesaLib-devel SDL-devel agar"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc
-Add_dependency run freetype-devel
-Add_dependency run jpeg-devel
-Add_dependency run MesaLib-devel
-Add_dependency run SDL-devel
-Add_dependency run agar
 
 do_install()
 {
diff --git a/srcpkgs/agar/depends b/srcpkgs/agar/depends
deleted file mode 100644
index 95c1a7350f..0000000000
--- a/srcpkgs/agar/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/agar/template b/srcpkgs/agar/template
index 245becf33c..6be6b59720 100644
--- a/srcpkgs/agar/template
+++ b/srcpkgs/agar/template
@@ -8,6 +8,8 @@ configure_args="--prefix=/usr --without-db4 --enable-nls
 --with-gettext --enable-threads --with-sdl --with-jpeg --with-freetype
 --with-manpages --with-manlinks --with-glx --with-gl"
 make_build_target="depend all"
+depends="glibc freetype jpeg libGL SDL"
+makedepends="perl groff freetype-devel jpeg-devel MesaLib-devel SDL-devel"
 short_desc="Modern open-source, cross-platform toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6af24c3ffecdddc04f28f707065f6fa66c5a8f83062faf62563db09eec1842c4
@@ -25,18 +27,7 @@ long_desc="
 disable_parallel_build=yes
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run freetype
-Add_dependency run jpeg
-Add_dependency run libGL
-Add_dependency run SDL
 
-Add_dependency build perl
-Add_dependency build groff
-Add_dependency build freetype-devel
-Add_dependency build jpeg-devel
-Add_dependency build MesaLib-devel
-Add_dependency build SDL-devel
 
 pre_install()
 {
diff --git a/srcpkgs/alsa-lib/alsa-lib-devel.template b/srcpkgs/alsa-lib/alsa-lib-devel.template
index fd868489ea..52e83f822e 100644
--- a/srcpkgs/alsa-lib/alsa-lib-devel.template
+++ b/srcpkgs/alsa-lib/alsa-lib-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'alsa-lib-devel'.
 #
+depends="glibc-devel alsa-lib"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run alsa-lib
 
 do_install()
 {
diff --git a/srcpkgs/alsa-lib/depends b/srcpkgs/alsa-lib/depends
deleted file mode 100644
index 1572c0e89f..0000000000
--- a/srcpkgs/alsa-lib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.20"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 3aea4152f3..9483fde8dc 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -5,6 +5,7 @@ revision=2
 homepage="http://www.alsa-project.org"
 distfiles="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config python-devel"
 short_desc="The Advanced Linux Sound Architecture (ALSA) library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,5 +19,3 @@ long_desc="
  the older OSS API, providing binary compatibility for most OSS programs."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency build pkg-config
-Add_dependency build python-devel
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 48bd0397f5..7a1d05f4d8 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -6,6 +6,7 @@ homepage="http://www.alsa-project.org"
 distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-maemo-plugin --with-speex=lib"
+makedepends="pkg-config alsa-lib-devel speex-devel ffmpeg-devel libsamplerate-devel pulseaudio-devel jack-devel"
 short_desc="Advanced Linux Sound Architecture (ALSA) extra plugins"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -19,13 +20,6 @@ long_desc="
 
 conf_files="/etc/asound.conf"
 
-Add_dependency build pkg-config
-Add_dependency build alsa-lib-devel
-Add_dependency build speex-devel
-Add_dependency build ffmpeg-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build jack-devel
 
 post_install() {
 	vinstall ${FILESDIR}/asound.conf 644 etc
diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 91643b9d1c..5ba34195e3 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -4,6 +4,7 @@ version=1.0.25
 distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-systemdsystemunitdir=/lib/systemd/system"
+makedepends="pkg-config alsa-lib-devel xmlto libsamplerate-devel"
 short_desc="The Advanced Linux Sound Architecture (ALSA) utils"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.alsa-project.org"
@@ -17,7 +18,3 @@ long_desc="
 
 make_dirs="/var/lib/alsa 0750 root root"
 
-Add_dependency build pkg-config
-Add_dependency build alsa-lib-devel
-Add_dependency build xmlto
-Add_dependency build libsamplerate-devel
diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template
index b27370ccbb..c2f2bc6d12 100644
--- a/srcpkgs/apache-mpm-event/template
+++ b/srcpkgs/apache-mpm-event/template
@@ -10,6 +10,8 @@ unset post_install pre_configure run_depends
 # Override some vars.
 pkgname=apache-mpm-event
 configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=event"
+depends="libdb gdbm expat libuuid expat libdb gdbm apache>=2.2.22"
+makedepends="pkg-config perl>=0 zlib-devel libuuid-devel pcre-devel openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-devel apr-util-devel"
 short_desc="Apache HTTP Server - event driven model"
 long_desc="
  Each Apache Multi-Processing Module provides a different flavor of web
@@ -25,12 +27,7 @@ long_desc="
 systemd_services="apache-mpm-event.service on"
 
 # dlopen(3) run-time dependencies.
-Add_dependency run libuuid
-Add_dependency run expat
-Add_dependency run libdb
-Add_dependency run gdbm
 
-Add_dependency run apache ">=${version}"
 
 pre_configure() {
 	cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template
index 104178f0d6..3973c864d5 100644
--- a/srcpkgs/apache-mpm-worker/template
+++ b/srcpkgs/apache-mpm-worker/template
@@ -10,6 +10,7 @@ unset post_install pre_configure run_depends
 # Override some vars.
 pkgname=apache-mpm-worker
 configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=worker"
+depends="libuuid expat libdb gdbm apache>=2.2.22"
 short_desc="Apache HTTP Server - high speed threaded mode"
 long_desc="
  Each Apache Multi-Processing Module provides a different flavor of web
@@ -22,12 +23,7 @@ long_desc="
 systemd_services="${pkgname}.service on"
 
 # dlopen(3) run-time dependencies.
-Add_dependency run libuuid
-Add_dependency run expat
-Add_dependency run libdb
-Add_dependency run gdbm
 
-Add_dependency run apache ">=${version}"
 
 pre_configure() {
 	cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
diff --git a/srcpkgs/apache/apache-devel.template b/srcpkgs/apache/apache-devel.template
index 6d682936a3..a9a6760141 100644
--- a/srcpkgs/apache/apache-devel.template
+++ b/srcpkgs/apache/apache-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'apache-devel'.
 #
+depends="coreutils apr-devel apr-util-devel apache perl>=0"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
@@ -7,11 +8,6 @@ long_desc="
  This packages contains files for development, static files, headers, etc."
 
 noarch=yes
-Add_dependency run coreutils
-Add_dependency run apr-devel
-Add_dependency run apr-util-devel
-Add_dependency run apache
-Add_dependency run perl			">=0"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 1ec152bcd6..8b02a26a32 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -19,6 +19,8 @@ configure_args="--prefix= --enable-pie --enable-modules=all
 --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs
 --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
 --enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd"
+depends="libdb gdbm expat"
+makedepends="pkg-config perl>=0 zlib-devel libuuid-devel pcre-devel openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-devel apr-util-devel"
 short_desc="The Number One HTTP Server On The Internet"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
@@ -55,22 +57,7 @@ system_accounts="httpd"
 httpd_descr="Apache HTTP server"
 httpd_homedir="/srv/httpd"
 
-Add_dependency run libdb
-Add_dependency run gdbm
-Add_dependency run expat
 
-Add_dependency build pkg-config
-Add_dependency build perl ">=0"
-Add_dependency build zlib-devel
-Add_dependency build libuuid-devel
-Add_dependency build pcre-devel
-Add_dependency build openssl-devel
-Add_dependency build db-devel
-Add_dependency build gdbm-devel
-Add_dependency build expat-devel
-Add_dependency build libldap-devel
-Add_dependency build apr-devel
-Add_dependency build apr-util-devel
 
 pre_configure() {
         # set default user
diff --git a/srcpkgs/apr-util/apr-util-db.template b/srcpkgs/apr-util/apr-util-db.template
index c8a775c54b..3612605c55 100644
--- a/srcpkgs/apr-util/apr-util-db.template
+++ b/srcpkgs/apr-util/apr-util-db.template
@@ -1,12 +1,12 @@
 # Template file for 'apr-util-db'.
 #
+depends="apr-util"
 short_desc="${short_desc} - Berkeley DB module"
 long_desc="
  ${long_desc}
  
  This packages contains APR Utility module for Berkeley DB."
 
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/apr-util-devel.template b/srcpkgs/apr-util/apr-util-devel.template
index fa2df8f9f7..c316752a5b 100644
--- a/srcpkgs/apr-util/apr-util-devel.template
+++ b/srcpkgs/apr-util/apr-util-devel.template
@@ -1,23 +1,12 @@
 # Template file for 'apr-util-devel'.
 #
+depends="zlib-devel openssl-devel apr-devel libuuid-devel expat-devel db-devel gdbm-devel sqlite-devel libldap-devel libmysqlclient-devel postgresql-libs-devel apr-util"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
  
  This packages contains files for development, static files, headers, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run openssl-devel
-Add_dependency run apr-devel
-Add_dependency run libuuid-devel
-Add_dependency run expat-devel
-Add_dependency run db-devel
-Add_dependency run gdbm-devel
-Add_dependency run sqlite-devel
-Add_dependency run libldap-devel
-Add_dependency run libmysqlclient-devel
-Add_dependency run postgresql-libs-devel
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/apr-util-gdbm.template b/srcpkgs/apr-util/apr-util-gdbm.template
index d4f7813acf..35572e7aa0 100644
--- a/srcpkgs/apr-util/apr-util-gdbm.template
+++ b/srcpkgs/apr-util/apr-util-gdbm.template
@@ -1,12 +1,12 @@
 # Template file for 'apr-util-gdbm'.
 #
+depends="apr-util"
 short_desc="${short_desc} - GDBM module"
 long_desc="
  ${long_desc}
  
  This packages contains the APR Utility module for GDBM."
 
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/apr-util-ldap.template b/srcpkgs/apr-util/apr-util-ldap.template
index 15fa4842f9..d50c44d835 100644
--- a/srcpkgs/apr-util/apr-util-ldap.template
+++ b/srcpkgs/apr-util/apr-util-ldap.template
@@ -1,12 +1,12 @@
 # Template file for 'apr-util-ldap'.
 #
+depends="apr-util"
 short_desc="${short_desc} - LDAP support"
 long_desc="
  ${long_desc}
  
  This packages contains APR Utility support for LDAP."
 
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/apr-util-mysql.template b/srcpkgs/apr-util/apr-util-mysql.template
index de17a21f14..9a89ea4b5f 100644
--- a/srcpkgs/apr-util/apr-util-mysql.template
+++ b/srcpkgs/apr-util/apr-util-mysql.template
@@ -1,12 +1,12 @@
 # Template file for 'apr-util-mysql'.
 #
+depends="apr-util"
 short_desc="${short_desc} - MySQL module"
 long_desc="
  ${long_desc}
  
  This packages contains the APR Utility module for MySQL."
 
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/apr-util-pgsql.template b/srcpkgs/apr-util/apr-util-pgsql.template
index 9dbf5995b4..1a42c09dce 100644
--- a/srcpkgs/apr-util/apr-util-pgsql.template
+++ b/srcpkgs/apr-util/apr-util-pgsql.template
@@ -1,12 +1,12 @@
 # Template file for 'apr-util-pgsql'.
 #
+depends="apr-util"
 short_desc="${short_desc} - PostgreSQL module"
 long_desc="
  ${long_desc}
  
  This packages contains the APR Utility module for PostgreSQL."
 
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/apr-util-sqlite.template b/srcpkgs/apr-util/apr-util-sqlite.template
index ffeda42f68..75a6c4e0ea 100644
--- a/srcpkgs/apr-util/apr-util-sqlite.template
+++ b/srcpkgs/apr-util/apr-util-sqlite.template
@@ -1,12 +1,12 @@
 # Template file for 'apr-util-sqlite'.
 #
+depends="apr-util"
 short_desc="${short_desc} - SQLite module"
 long_desc="
  ${long_desc}
  
  This packages contains the APR Utility module for SQLite."
 
-Add_dependency run apr-util
 
 do_install()
 {
diff --git a/srcpkgs/apr-util/depends b/srcpkgs/apr-util/depends
deleted file mode 100644
index 02ffa848c3..0000000000
--- a/srcpkgs/apr-util/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 8cccbc5c77..23838d2a45 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -7,6 +7,7 @@ configure_args="--with-pgsql --with-mysql --with-sqlite3 --with-ldap
 --with-berkeley-db --with-gdbm --with-apr=/usr --without-odbc
 --with-expat=/usr --without-oracle"
 revision=3
+makedepends="apr-devel db-devel expat-devel gdbm-devel libldap-devel libmysqlclient-devel libuuid-devel openssl-devel postgresql-libs-devel sqlite-devel zlib-devel"
 short_desc="The Apache Portable Runtime Utility Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://apr.apache.org/"
@@ -25,17 +26,6 @@ subpackages="$pkgname-db $pkgname-gdbm $pkgname-sqlite $pkgname-mysql"
 subpackages="${subpackages} $pkgname-pgsql $pkgname-ldap $pkgname-devel"
 
 
-Add_dependency build apr-devel
-Add_dependency build db-devel
-Add_dependency build expat-devel
-Add_dependency build gdbm-devel
-Add_dependency build libldap-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build libuuid-devel
-Add_dependency build openssl-devel
-Add_dependency build postgresql-libs-devel
-Add_dependency build sqlite-devel
-Add_dependency build zlib-devel
 
 post_install()
 {
diff --git a/srcpkgs/apr/apr-devel.template b/srcpkgs/apr/apr-devel.template
index c45effbf9c..942e729d4f 100644
--- a/srcpkgs/apr/apr-devel.template
+++ b/srcpkgs/apr/apr-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'apr-devel'.
 #
+depends="libuuid-devel apr>=1.4.6"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
  
  This packages contains files for development, static files, headers, etc."
 
-Add_dependency run libuuid-devel
-Add_dependency run apr ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/apr/depends b/srcpkgs/apr/depends
deleted file mode 100644
index d4db4c87cf..0000000000
--- a/srcpkgs/apr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index 891ff896fa..d69896fc90 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -5,6 +5,7 @@ distfiles="http://www.apache.org/dist/apr/apr-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-devrandom=/dev/urandom
 --with-installbuilddir=/usr/share/apr-1/build"
+makedepends="libuuid-devel"
 short_desc="Apache Portable Runtime Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc
@@ -17,4 +18,3 @@ long_desc="
 
 subpackages="apr-devel"
 
-Add_dependency build libuuid-devel
diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template
index edf8620bfb..9d6f398ad0 100644
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@@ -5,6 +5,8 @@ distfiles="${SOURCEFORGE_SITE}/aqemu/aqemu-$version.tar.bz2"
 build_style=cmake
 configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
 revision=1
+makedepends="cmake qt-devel"
+fulldepends="qemu desktop-file-utils"
 short_desc="GUI to QEMU and KVM emulators, written in Qt4"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://aqemu.sourceforge.net"
@@ -15,8 +17,4 @@ long_desc="
  user-friendly interface and allows to set up the majority of QEMU and KVM
  options."
 
-Add_dependency build cmake
-Add_dependency build qt-devel
 
-Add_dependency full qemu
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 01ca18ed93..f5b383aa56 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -3,6 +3,7 @@ pkgname=asciidoc
 version=8.6.7
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+fulldepends="python>=0 libxslt docbook-xsl"
 short_desc="Text based document generation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.methods.co.nz/asciidoc/"
@@ -44,6 +45,3 @@ conf_files="
 /etc/asciidoc/xhtml11.conf
 /etc/asciidoc/xhtml11-quirks.conf"
 
-Add_dependency full python	">=0"
-Add_dependency full libxslt
-Add_dependency full docbook-xsl
diff --git a/srcpkgs/aspell/aspell-devel.template b/srcpkgs/aspell/aspell-devel.template
index 2bde450cbc..a8158f60db 100644
--- a/srcpkgs/aspell/aspell-devel.template
+++ b/srcpkgs/aspell/aspell-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'aspell-devel'.
 #
+depends="ncurses-devel libstdc++-devel aspell"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ncurses-devel
-Add_dependency run libstdc++-devel
-Add_dependency run aspell
 
 do_install()
 {
diff --git a/srcpkgs/aspell/depends b/srcpkgs/aspell/depends
deleted file mode 100644
index 874dd8e07c..0000000000
--- a/srcpkgs/aspell/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.60"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index cfa0a7dd92..a880453cb0 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -4,6 +4,8 @@ version=0.60.6.1
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-compile-in-filters"
+makedepends="ncurses-devel"
+fulldepends="perl>=0"
 short_desc="Spell checker with good multi-language support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1
@@ -18,5 +20,3 @@ long_desc="
  process is open at once."
 
 subpackages="$pkgname-devel"
-Add_dependency full perl		">=0"
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
index e549e63bf4..153b31352d 100644
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@@ -3,6 +3,7 @@ pkgname=at-spi2-atk
 version=2.4.0
 distfiles="${GNOME_SITE}/$pkgname/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+3-devel at-spi2-core-devel"
 short_desc="A GTK+ module that bridges ATK to D-Bus at-spi"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf
@@ -14,7 +15,3 @@ long_desc="
  registering applications, D-Bus helper libraries and te AT-SPI D-Bus
  specifications."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build at-spi2-core-devel
diff --git a/srcpkgs/at-spi2-core/at-spi2-core-devel.template b/srcpkgs/at-spi2-core/at-spi2-core-devel.template
index 9e587518fd..f00fcba29f 100644
--- a/srcpkgs/at-spi2-core/at-spi2-core-devel.template
+++ b/srcpkgs/at-spi2-core/at-spi2-core-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'at-spi2-core-devel'.
 #
+depends="dbus-devel at-spi2-core>=2.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dbus-devel
-Add_dependency run at-spi2-core ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/at-spi2-core/depends b/srcpkgs/at-spi2-core/depends
deleted file mode 100644
index 8c79141c83..0000000000
--- a/srcpkgs/at-spi2-core/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.91.91"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index a7f08c06b8..01bb46aa55 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -5,6 +5,8 @@ homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gobject-introspection libXtst-devel libXevie-devel libXi-devel dbus-devel"
+fulldepends="dbus"
 short_desc="Assistive Technology Service Provider Interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd
@@ -18,12 +20,4 @@ long_desc="
 conf_files="/etc/at-spi2/accessibility.conf"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build libXtst-devel
-Add_dependency build libXevie-devel
-Add_dependency build libXi-devel
-Add_dependency build dbus-devel
 
-Add_dependency full dbus
diff --git a/srcpkgs/atf/atf-devel.template b/srcpkgs/atf/atf-devel.template
index 23547dbead..a14f67b259 100644
--- a/srcpkgs/atf/atf-devel.template
+++ b/srcpkgs/atf/atf-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'atf-devel'.
 #
+depends="atf"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run atf
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template
index e88fd12f21..b477d4be0a 100644
--- a/srcpkgs/atf/template
+++ b/srcpkgs/atf/template
@@ -4,6 +4,7 @@ version=0.15
 revision=2
 distfiles="https://kyua.googlecode.com/files/atf-$version.tar.gz"
 build_style=gnu-configure
+fulldepends="gdb xmlcatmgr"
 short_desc="Automated Testing Framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.netbsd.org/~jmmv/atf/"
@@ -29,5 +30,3 @@ long_desc="
 subpackages="atf-devel"
 xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
 
-Add_dependency full gdb
-Add_dependency full xmlcatmgr
diff --git a/srcpkgs/atk/atk-devel.template b/srcpkgs/atk/atk-devel.template
index 24d640ac79..101e3b2025 100644
--- a/srcpkgs/atk/atk-devel.template
+++ b/srcpkgs/atk/atk-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'atk-devel'.
 #
+depends="glib-devel atk>=2.4.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run atk ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/atk/depends b/srcpkgs/atk/depends
deleted file mode 100644
index 75ebe993f1..0000000000
--- a/srcpkgs/atk/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.26.0"
-api_depends=">=1.33.6"
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index d4d1aee18a..b3f629f75c 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -3,6 +3,7 @@ pkgname=atk
 version=2.4.0
 distfiles="${GNOME_SITE}/atk/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config glib-devel gobject-introspection"
 short_desc="Set of interfaces for accessibility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -21,6 +22,3 @@ long_desc="
  additional accessibility information to assistive technology tools."
 
 subpackages="atk-devel"
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/atkmm/atkmm-devel.template b/srcpkgs/atkmm/atkmm-devel.template
index 40ee3d2296..7c295047e7 100644
--- a/srcpkgs/atkmm/atkmm-devel.template
+++ b/srcpkgs/atkmm/atkmm-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'atkmm-devel'.
 #
+depends="glibmm-devel atk-devel atkmm"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
@@ -7,9 +8,6 @@ long_desc="${long_desc}
 
 replaces="gtkmm-devel<2.22"
 
-Add_dependency run glibmm-devel
-Add_dependency run atk-devel
-Add_dependency run atkmm
 
 do_install()
 {
diff --git a/srcpkgs/atkmm/depends b/srcpkgs/atkmm/depends
deleted file mode 100644
index df4441d74e..0000000000
--- a/srcpkgs/atkmm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.22.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template
index 7787cf044d..d84366e4be 100644
--- a/srcpkgs/atkmm/template
+++ b/srcpkgs/atkmm/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/atkmm/2.22/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-documentation"
 revision=2
+makedepends="pkg-config atk-devel glibmm-devel libsigc++-devel"
 short_desc="Set of interfaces for accessibility (C++ bindings)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gtkmm.sourceforge.net/"
@@ -27,7 +28,3 @@ long_desc="
 subpackages="atkmm-devel"
 replaces="gtkmm<2.22"
 
-Add_dependency build pkg-config
-Add_dependency build atk-devel
-Add_dependency build glibmm-devel
-Add_dependency build libsigc++-devel
diff --git a/srcpkgs/attr/attr-devel.template b/srcpkgs/attr/attr-devel.template
index d1e1fc347a..c7c3a4b27e 100644
--- a/srcpkgs/attr/attr-devel.template
+++ b/srcpkgs/attr/attr-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'attr-devel'.
 #
+depends="glibc-devel attr"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run attr
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/attr/depends b/srcpkgs/attr/depends
deleted file mode 100644
index b5f42b90ec..0000000000
--- a/srcpkgs/attr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.4.43"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/aubio/aubio-devel.template b/srcpkgs/aubio/aubio-devel.template
index ad0f876a80..1438824637 100644
--- a/srcpkgs/aubio/aubio-devel.template
+++ b/srcpkgs/aubio/aubio-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'aubio-devel'.
 #
+depends="libaubio"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run lib${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/aubio/depends b/srcpkgs/aubio/depends
deleted file mode 100644
index d0f82907b9..0000000000
--- a/srcpkgs/aubio/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.3.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 80310b869f..91bc3537e3 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -5,6 +5,7 @@ homepage="http://aubio.org"
 distfiles="${homepage}/pub/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="pkg-config libsamplerate-devel fftw-devel jack-devel"
 short_desc="A library for audio labelling"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -18,7 +19,3 @@ long_desc="
 subpackages="lib${pkgname} ${pkgname}-devel"
 
 # XXX lash, pure and swig support.
-Add_dependency build pkg-config
-Add_dependency build libsamplerate-devel
-Add_dependency build fftw-devel
-Add_dependency build jack-devel
diff --git a/srcpkgs/autoconf/template b/srcpkgs/autoconf/template
index 76a5abcdbf..a718a85a6f 100644
--- a/srcpkgs/autoconf/template
+++ b/srcpkgs/autoconf/template
@@ -4,6 +4,8 @@ version=2.69
 homepage="http://www.gnu.org/software/autoconf"
 distfiles="http://ftp.gnu.org/gnu/autoconf/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="gawk diffutils m4"
+fulldepends="perl>=0"
 short_desc="Generates automatic source code configuration scripts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, GPL-3"
@@ -18,7 +20,3 @@ long_desc="
  macro calls."
 
 noarch=yes
-Add_dependency run gawk
-Add_dependency run diffutils
-Add_dependency run m4
-Add_dependency full perl	">=0"
diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template
index f907920b74..209ef3cdf9 100644
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@@ -4,6 +4,7 @@ version=1.12
 homepage="http://www.gnu.org/software/automake"
 distfiles="http://ftp.gnu.org/gnu/automake/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+fulldepends="autoconf>=2.60 libtool>=2.4.2_3"
 short_desc="GNU Standards-compliant Makefile generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,5 +18,3 @@ long_desc="
  dependency tracking support, the use of GNU make is also required."
 
 noarch=yes
-Add_dependency full autoconf	">=2.60"
-Add_dependency full libtool	">=2.4.2_3"
diff --git a/srcpkgs/automoc4/template b/srcpkgs/automoc4/template
index bdcb140e5c..ab74bd19d5 100644
--- a/srcpkgs/automoc4/template
+++ b/srcpkgs/automoc4/template
@@ -4,12 +4,10 @@ version=0.9.88
 distfiles="ftp://ftp.kde.org/pub/kde/stable/$pkgname/$version/$pkgname-$version.tar.bz2"
 build_style=cmake
 revision=1
+makedepends="pkg-config cmake qt-devel"
 short_desc="Automatic moc for Qt 4 packages"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49
 long_desc="
  automoc4 tool, used to build KDE4 and related packages."
 
-Add_dependency build pkg-config
-Add_dependency build cmake
-Add_dependency build qt-devel
diff --git a/srcpkgs/avahi/avahi-autoipd.template b/srcpkgs/avahi/avahi-autoipd.template
index 24712b85d6..246fcd0f3c 100644
--- a/srcpkgs/avahi/avahi-autoipd.template
+++ b/srcpkgs/avahi/avahi-autoipd.template
@@ -1,5 +1,6 @@
 # Template file for 'avahi-autoipd'.
 #
+depends="net-tools"
 short_desc="Avahi IPv4LL network address configuration daemon"
 long_desc="${long_desc}
 
@@ -9,7 +10,6 @@ long_desc="${long_desc}
  server. It is primarily intended to be used in ad-hoc networks which lack a
  DHCP server."
 
-Add_dependency run net-tools
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index ab66390c4e..d1f2ff3307 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'avahi-compat-libs-devel'.
 #
+depends="avahi-libs-devel avahi-compat-libs"
 short_desc="Avahi compat libraries (development files)"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
  libraries provided by Avahi."
 
 
-Add_dependency run avahi-libs-devel
-Add_dependency run avahi-compat-libs
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template
index ea62bb356a..77f2a902f8 100644
--- a/srcpkgs/avahi/avahi-discover.template
+++ b/srcpkgs/avahi/avahi-discover.template
@@ -1,5 +1,6 @@
 # Template file for 'avahi-discover'.
 #
+depends="avahi python avahi-python dbus-python pygtk desktop-file-utils"
 short_desc="Service discover user interface for avahi"
 long_desc="${long_desc}
 
@@ -8,12 +9,6 @@ long_desc="${long_desc}
 noarch=yes
 pycompile_module="avahi_discover"
 
-Add_dependency run avahi
-Add_dependency run python
-Add_dependency run avahi-python
-Add_dependency run dbus-python
-Add_dependency run pygtk
-Add_dependency run desktop-file-utils
 
 
 do_install() {
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 72211d518a..406cdbebd3 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'avahi-glib-libs-devel'.
 #
+depends="avahi-libs-devel avahi-glib-libs"
 short_desc="Avahi glib libraries (development files)"
 long_desc="${long_desc}
 
  This package contains development files for the glib libraries
  provided by Avahi."
 
-Add_dependency run avahi-libs-devel
-Add_dependency run avahi-glib-libs
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index c1729e06a7..090286fa0a 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'avahi-libs-devel'.
 #
+depends="glibc-devel libssp-devel dbus-devel avahi-libs"
 short_desc="Avahi core libraries (development files)"
 long_desc="${long_desc}
 
@@ -7,10 +8,6 @@ long_desc="${long_desc}
  provided by Avahi."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libssp-devel
-Add_dependency run dbus-devel
-Add_dependency run avahi-libs
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index 39ded5f6f3..0e71c4863f 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -1,12 +1,12 @@
 # Template file for 'avahi-libs'.
 #
+depends="gdbm"
 short_desc="Avahi shared libraries"
 long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
 
-Add_dependency run gdbm
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-python-utils.template b/srcpkgs/avahi/avahi-python-utils.template
index 4cc1c6696f..770115e6a5 100644
--- a/srcpkgs/avahi/avahi-python-utils.template
+++ b/srcpkgs/avahi/avahi-python-utils.template
@@ -1,11 +1,11 @@
 # Template file for 'avahi-python-utils'.
 #
+depends="avahi-python"
 short_desc="Avahi python utils"
 long_desc="${long_desc}
 
  This package contains the python utilities provided by Avahi."
 
-Add_dependency run avahi-python
 
 noarch=yes
 
diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template
index 41a7cb9c8f..56393e6456 100644
--- a/srcpkgs/avahi/avahi-python.template
+++ b/srcpkgs/avahi/avahi-python.template
@@ -1,5 +1,6 @@
 # Template file for 'avahi-python'.
 #
+depends="python dbus-python"
 short_desc="Python utility package for Avahi"
 long_desc="${long_desc}
 
@@ -8,8 +9,6 @@ long_desc="${long_desc}
 noarch=yes
 pycompile_module="avahi"
 
-Add_dependency run python
-Add_dependency run dbus-python
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index ec4f8ff234..75843572db 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'avahi-ui-libs-devel'.
 #
+depends="glibc-devel gtk+-devel gtk+3-devel gdbm-devel avahi-libs-devel avahi-ui-libs avahi-ui-libs-gtk3"
 short_desc="Avahi UI libraries (development files)"
 long_desc="${long_desc}
 
@@ -7,13 +8,6 @@ long_desc="${long_desc}
  provided by Avahi."
 
 
-Add_dependency run glibc-devel
-Add_dependency run gtk+-devel
-Add_dependency run gtk+3-devel
-Add_dependency run gdbm-devel
-Add_dependency run avahi-libs-devel
-Add_dependency run avahi-ui-libs
-Add_dependency run avahi-ui-libs-gtk3
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template
index c080877211..27fa92986b 100644
--- a/srcpkgs/avahi/avahi-ui-utils.template
+++ b/srcpkgs/avahi/avahi-ui-utils.template
@@ -1,12 +1,11 @@
 # Template file for 'avahi-ui-utils'.
 #
+depends="desktop-file-utils avahi"
 short_desc="Avahi GTK+ utilities"
 long_desc="${long_desc}
 
  This package contains some small GTK+ utilities to discover services."
 
-Add_dependency run desktop-file-utils
-Add_dependency run avahi
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-utils.template b/srcpkgs/avahi/avahi-utils.template
index ae633a4688..ef21899149 100644
--- a/srcpkgs/avahi/avahi-utils.template
+++ b/srcpkgs/avahi/avahi-utils.template
@@ -1,13 +1,12 @@
 # Template file for 'avahi-utils'.
 #
+depends="dbus-libs avahi"
 short_desc="Avahi browsing, publishing and discovery utilities"
 long_desc="${long_desc}
 
  This package contains several utilities that allow you to interact with the
  Avahi daemon, including publish, browsing and discovering services."
 
-Add_dependency run dbus-libs
-Add_dependency run avahi
 
 do_install()
 {
diff --git a/srcpkgs/avahi/depends b/srcpkgs/avahi/depends
deleted file mode 100644
index d628a4ac57..0000000000
--- a/srcpkgs/avahi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.25"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index c5891108ff..4c66713ee4 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -11,6 +11,8 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
 --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
 --disable-dbm --with-systemdsystemunitdir=/lib/systemd/system"
 revision=2
+depends="dbus"
+makedepends="pkg-config intltool libssp-devel dbus-devel libcap-devel libdaemon-devel gdbm-devel expat-devel pygtk-devel dbus-python gtk+3-devel gobject-introspection"
 short_desc="Multicast DNS Service Discovery"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -41,17 +43,4 @@ subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
 subpackages="$subpackages $pkgname-python"
 
-Add_dependency run dbus
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libssp-devel
-Add_dependency build dbus-devel
-Add_dependency build libcap-devel
-Add_dependency build libdaemon-devel
-Add_dependency build gdbm-devel
-Add_dependency build expat-devel
-Add_dependency build pygtk-devel
-Add_dependency build dbus-python
-Add_dependency build gtk+3-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template
index e8284dfe9e..8f37f727a4 100644
--- a/srcpkgs/awesome/template
+++ b/srcpkgs/awesome/template
@@ -5,6 +5,7 @@ build_style=cmake
 homepage="http://awesome.naquadah.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
 revision=3
+makedepends="cmake gperf asciidoc xmlto ImageMagick libxcb-devel libX11-devel pango-devel glib-devel xcb-util-devel startup-notification-devel imlib2-devel libxdg-basedir-devel>=1.1.1_1 libev-devel>=4.04_1 lua-devel dbus-devel"
 short_desc="Highly configurable, next gen framework window manager for X."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -20,22 +21,6 @@ long_desc="
 
 conf_files="/etc/xdg/awesome/rc.lua"
 
-Add_dependency build cmake
-Add_dependency build gperf
-Add_dependency build asciidoc
-Add_dependency build xmlto
-Add_dependency build ImageMagick # needs convert
-Add_dependency build libxcb-devel
-Add_dependency build libX11-devel
-Add_dependency build pango-devel
-Add_dependency build glib-devel
-Add_dependency build xcb-util-devel
-Add_dependency build startup-notification-devel
-Add_dependency build imlib2-devel
-Add_dependency build libxdg-basedir-devel	">=1.1.1_1"
-Add_dependency build libev-devel		">=4.04_1"
-Add_dependency build lua-devel
-Add_dependency build dbus-devel
 
 post_install()
 {
diff --git a/srcpkgs/babl/babl-devel.template b/srcpkgs/babl/babl-devel.template
index 3220590d35..2de0bd472d 100644
--- a/srcpkgs/babl/babl-devel.template
+++ b/srcpkgs/babl/babl-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'babl-devel'.
 #
+depends="glibc-devel babl>=0.1.10"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run babl ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/babl/depends b/srcpkgs/babl/depends
deleted file mode 100644
index 8e56aad912..0000000000
--- a/srcpkgs/babl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 124f38d417..3ee5db5502 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -3,6 +3,7 @@ pkgname=babl
 version=0.1.10
 distfiles="ftp://ftp.gimp.org/pub/babl/0.1/babl-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config vala-devel"
 short_desc="Dynamic pixel format translation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gegl.org/babl/"
@@ -20,5 +21,3 @@ long_desc="
 
 subpackages="babl-devel"
 
-Add_dependency build pkg-config
-Add_dependency build vala-devel
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index e40b8ac618..271dff5615 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -4,6 +4,9 @@ version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool itstool gnome-doc-utils gtk+3-devel libgtop-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="A graphical directory tree analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -19,14 +22,5 @@ long_desc="
 replaces="gnome-utils>=3.0"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build libgtop-devel
 
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index df803b328d..45fc9ca241 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -3,6 +3,7 @@ pkgname=base-chroot
 version=0.28
 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"
 short_desc="Bootstrap packages for xbps-src"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 80129a7731..51d9ecb6f4 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.62
+fulldepends="base-directories xbps-triggers"
 short_desc="Void GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -24,8 +25,6 @@ conf_files="
 /etc/skel/.inputrc
 /etc/issue"
 
-Add_dependency full base-directories
-Add_dependency full xbps-triggers
 
 do_install() {
 	# Install misc config files.
diff --git a/srcpkgs/base-system-live-busybox/template b/srcpkgs/base-system-live-busybox/template
index 7b3b650c9e..8fe352b52e 100644
--- a/srcpkgs/base-system-live-busybox/template
+++ b/srcpkgs/base-system-live-busybox/template
@@ -5,6 +5,7 @@ revision=1
 wrksrc="busybox-${version}"
 homepage="http://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
+makedepends="perl>=0"
 short_desc="The Swiss Army Knife of Embedded Linux - for base-system-live"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,7 +23,6 @@ long_desc="
  not be installed into a running system."
 
 replaces="base-busybox>=0"
-Add_dependency build perl ">=0"
 
 do_build() {
 	cp -f ${FILESDIR}/dotconfig .config
diff --git a/srcpkgs/base-system-live/template b/srcpkgs/base-system-live/template
index 417848483f..a4bcdaeb55 100644
--- a/srcpkgs/base-system-live/template
+++ b/srcpkgs/base-system-live/template
@@ -3,6 +3,7 @@ pkgname=base-system-live
 version=0.10
 build_style=meta-template
 homepage="http://code.google.com/p/xbps"
+depends="base-files ncurses-base shadow kmod chroot-grep chroot-findutils base-system-live-busybox e2fsprogs btrfs-progs xfsprogs nilfs-utils parted dialog kbd sudo iana-etc udev systemd wpa_supplicant xbps wifi-firmware linux-firmware-network void-artwork void-installer"
 short_desc="Void Linux live base system meta package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
@@ -15,27 +16,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency run base-files
-Add_dependency run ncurses-base
-Add_dependency run shadow
-Add_dependency run kmod
-Add_dependency run chroot-grep
-Add_dependency run chroot-findutils
-Add_dependency run base-system-live-busybox
-Add_dependency run e2fsprogs
-Add_dependency run btrfs-progs
-Add_dependency run xfsprogs
-Add_dependency run nilfs-utils
-Add_dependency run parted
-Add_dependency run dialog
-Add_dependency run kbd
-Add_dependency run sudo
-Add_dependency run iana-etc
-Add_dependency run udev
-Add_dependency run systemd
-Add_dependency run wpa_supplicant
-Add_dependency run xbps
-Add_dependency run wifi-firmware
-Add_dependency run linux-firmware-network
-Add_dependency run void-artwork
-Add_dependency run void-installer
diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index f30045aef4..c2947bd1fa 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -3,6 +3,7 @@ pkgname=base-system
 version=0.55
 build_style=meta-template
 homepage="http://code.google.com/p/xbps"
+depends="base-files ncurses coreutils findutils diffutils dash bash grep texinfo file sed gawk less which tar man-pages man-db shadow e2fsprogs btrfs-progs xfsprogs nilfs-utils eject kbd psmisc procps sudo tzdata iana-etc udev systemd logrotate cron-daemon syslog-daemon acpid openssh-client dhcpcd iproute2 iputils bridge-utils ifenslave wireless_tools wpa_supplicant xbps wifi-firmware kernel void-artwork"
 short_desc="Void GNU/Linux base system meta package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
@@ -13,50 +14,3 @@ long_desc="
 replaces="xbps-base-system>=0"
 noarch=yes
 
-Add_dependency run base-files
-Add_dependency run ncurses
-Add_dependency run coreutils
-Add_dependency run findutils
-Add_dependency run diffutils
-Add_dependency run dash
-Add_dependency run bash
-Add_dependency run grep
-Add_dependency run texinfo
-Add_dependency run file
-Add_dependency run sed
-Add_dependency run gawk
-Add_dependency run less
-Add_dependency run which
-Add_dependency run tar
-Add_dependency run man-pages
-Add_dependency run man-db
-Add_dependency run shadow
-Add_dependency run e2fsprogs
-Add_dependency run btrfs-progs
-Add_dependency run xfsprogs
-Add_dependency run nilfs-utils
-Add_dependency run eject
-Add_dependency run kbd
-Add_dependency run psmisc
-Add_dependency run procps
-Add_dependency run sudo
-Add_dependency run tzdata
-Add_dependency run iana-etc
-Add_dependency run udev
-Add_dependency run systemd
-Add_dependency run logrotate
-Add_dependency run cron-daemon
-Add_dependency run syslog-daemon
-Add_dependency run acpid
-Add_dependency run openssh-client
-Add_dependency run dhcpcd
-Add_dependency run iproute2
-Add_dependency run iputils
-Add_dependency run bridge-utils
-Add_dependency run ifenslave
-Add_dependency run wireless_tools
-Add_dependency run wpa_supplicant
-Add_dependency run xbps
-Add_dependency run wifi-firmware
-Add_dependency run kernel
-Add_dependency run void-artwork
diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index 4080dbd906..ae9bc3e39b 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -4,6 +4,7 @@ version=1.99
 homepage="http://bash-completion.alioth.debian.org/"
 distfiles="http://${pkgname}.alioth.debian.org/files/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
+fulldepends="bash"
 short_desc="Programmable completion for the GNU Bash shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,4 +17,3 @@ long_desc="
  do on a daily basis."
 
 noarch=yes
-Add_dependency full bash
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 7050c61763..7b7b4780fb 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -16,6 +16,7 @@ configure_args="--without-bash-malloc --with-curses --bindir=/bin
 --enable-process-substitution --enable-progcomp --enable-prompt-string-decoding
 --enable-select --enable-net-redirections --enable-restricted --enable-readline
 --with-installed-readline"
+makedepends="readline-devel ncurses-devel bison"
 short_desc="The GNU Bourne Again Shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/bash/bash.html"
@@ -35,9 +36,6 @@ long_desc="
 
 register_shell="/bin/bash"
 
-Add_dependency build readline-devel
-Add_dependency build ncurses-devel
-Add_dependency build bison
 
 pre_configure() {
 	local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches"
diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template
index 33cae7525e..a96fa80efb 100644
--- a/srcpkgs/bc/template
+++ b/srcpkgs/bc/template
@@ -4,6 +4,7 @@ version=1.06.95
 distfiles="http://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-readline"
+makedepends="flex readline-devel"
 short_desc="An arbitrary precision numeric processing language."
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnu.org/software/${pkgname}/"
@@ -21,8 +22,6 @@ long_desc="
  language and runs the resulting byte code. The byte code is not the dc
  language."
 
-Add_dependency build flex
-Add_dependency build readline-devel
 
 do_build()
 {
diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template
index d0187c8a0c..e11d104889 100644
--- a/srcpkgs/bdftopcf/template
+++ b/srcpkgs/bdftopcf/template
@@ -4,6 +4,7 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libXfont-devel"
 short_desc="BDF to PCF font converter for X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9c90b408b2fe079495697bfc8fb13da940b2b70f4907213bf5dcc9e3024a1d0a
@@ -17,5 +18,3 @@ long_desc="
  allows fast reading on the appropriate machine, but the files
  are still portable (but read more slowly) on other machines."
 
-Add_dependency build pkg-config
-Add_dependency build libXfont-devel
diff --git a/srcpkgs/bind/bind-devel.template b/srcpkgs/bind/bind-devel.template
index 690804e00d..e0585040d5 100644
--- a/srcpkgs/bind/bind-devel.template
+++ b/srcpkgs/bind/bind-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'bind-devel'.
 #
+depends="bind-libs"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains development files, static files, headers, etc."
 
-Add_dependency run bind-libs
 
 do_install() {
 	vmove usr/bin/isc-config.sh usr/bin
diff --git a/srcpkgs/bind/depends b/srcpkgs/bind/depends
deleted file mode 100644
index 2d13fbf00e..0000000000
--- a/srcpkgs/bind/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=9.9.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 6a9a2e763d..125ee0b060 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
 configure_args="--disable-static --with-openssl --with-libxml2
 --enable-threads --enable-largefile --enable-ipv6 --with-libtool
 --enable-atomic --sysconfdir=/etc/named"
+makedepends="perl>=0 openssl-devel mit-krb5-devel libxml2-devel libcap-devel"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
@@ -30,11 +31,6 @@ named_desc="BIND DNS server"
 named_homedir="/var/named"
 named_shell="/bin/false"
 
-Add_dependency build perl ">=0"
-Add_dependency build openssl-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build libxml2-devel
-Add_dependency build libcap-devel
 
 post_install() {
 	vinstall ${FILESDIR}/named.service 644 lib/systemd/system
diff --git a/srcpkgs/binutils/binutils-devel.template b/srcpkgs/binutils/binutils-devel.template
index 9e03c66de1..a2c343f1c5 100644
--- a/srcpkgs/binutils/binutils-devel.template
+++ b/srcpkgs/binutils/binutils-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'binutils-devel'.
 #
+depends="glibc-devel binutils"
 short_desc="binutils development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run binutils
 
 do_install()
 {
diff --git a/srcpkgs/binutils/depends b/srcpkgs/binutils/depends
deleted file mode 100644
index 3b2e991f50..0000000000
--- a/srcpkgs/binutils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.22_1<2.23"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index 04149b6af8..087cb8a4a1 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -4,6 +4,7 @@ version=2.5
 distfiles="http://ftp.gnu.org/pub/gnu/bison/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+depends="m4"
 short_desc="GNU yacc(1) replacement"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0a370df6ee2b23e9ec3043e1ab78878241aa008ec424926294dd4cb3475439b8
@@ -11,7 +12,6 @@ long_desc="
  Bison is the GNU replacement for yacc(1). Some programs depend on
  extensions present in Bison."
 
-Add_dependency run m4
 
 pre_configure() {
 	echo '#define YYENABLE_NLS 1' >> lib/config.h
diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index bbccad574b..c05dac496a 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -5,6 +5,9 @@ revision=6
 distfiles="http://download.tuxfamily.org/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-polkit=yes --enable-hal=no"
+depends="pygtk"
+makedepends="intltool Pyrex libbluetooth-devel startup-notification-devel gdk-pixbuf-devel libpng-devel gtk+-devel pango-devel cairo-devel glib-devel glibc-devel pygtk-devel"
+fulldepends="bluez notify-python dbus-python obexd desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Bluetooth Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
@@ -22,24 +25,5 @@ long_desc="
 pycompile_module="$pkgname"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run pygtk
 
-Add_dependency build intltool
-Add_dependency build Pyrex
-Add_dependency build libbluetooth-devel
-Add_dependency build startup-notification-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build glib-devel
-Add_dependency build glibc-devel
-Add_dependency build pygtk-devel
 
-Add_dependency full bluez
-Add_dependency full notify-python
-Add_dependency full dbus-python
-Add_dependency full obexd
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/bluez/bluez-alsa.template b/srcpkgs/bluez/bluez-alsa.template
index 0ddf6ec027..5c046c0535 100644
--- a/srcpkgs/bluez/bluez-alsa.template
+++ b/srcpkgs/bluez/bluez-alsa.template
@@ -1,5 +1,6 @@
 # Template file for 'bluez-alsa'.
 #
+depends="bluez"
 short_desc="Bluetooth ALSA support"
 long_desc="
  This package contains a driver to operate with the ALSA stack.
@@ -9,7 +10,6 @@ long_desc="
 
 conf_files="/usr/share/alsa/bluetooth.conf"
 
-Add_dependency run bluez
 
 do_install()
 {
diff --git a/srcpkgs/bluez/bluez-gstreamer.template b/srcpkgs/bluez/bluez-gstreamer.template
index 9a208b4422..3fa4875cd3 100644
--- a/srcpkgs/bluez/bluez-gstreamer.template
+++ b/srcpkgs/bluez/bluez-gstreamer.template
@@ -1,5 +1,6 @@
 # Template file for 'bluez-gstreamer'.
 #
+depends="bluez"
 short_desc="Bluetooth GStreamer support"
 long_desc="
  This package contains a plugin to operate with GStreamer applications.
@@ -7,7 +8,6 @@ long_desc="
  BlueZ is the official Linux Bluetooth Stack. It is an Open Source project
  distributed under GNU General Public License (GPL)."
 
-Add_dependency run bluez
 
 do_install()
 {
diff --git a/srcpkgs/bluez/depends b/srcpkgs/bluez/depends
deleted file mode 100644
index d805b630e8..0000000000
--- a/srcpkgs/bluez/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.58"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/bluez/libbluetooth-devel.template b/srcpkgs/bluez/libbluetooth-devel.template
index 899698e0d1..374edb3b8f 100644
--- a/srcpkgs/bluez/libbluetooth-devel.template
+++ b/srcpkgs/bluez/libbluetooth-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libbluetooth-devel'.
 #
+depends="glibc-devel libbluetooth"
 short_desc="Development files to use the BlueZ Linux Bluetooth library"
 long_desc="
  BlueZ is the official Linux Bluetooth Stack. It is an Open Source project
  distributed under GNU General Public License (GPL)."
 
-Add_dependency run glibc-devel
-Add_dependency run libbluetooth
 
 do_install()
 {
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index fa2fb4e1e9..5351b83f62 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -9,6 +9,7 @@ configure_args="--libexecdir=/lib --enable-gstreamer --enable-dund
 --enable-hid2hci --enable-dfutool --enable-hidd --enable-pand
 --enable-cups --enable-capng --enable-pnat --enable-wiimote
 --with-systemdsystemunitdir=/lib/systemd/system --disable-test"
+makedepends="automake>=1.11.3_1 pkg-config flex libudev-devel readline-devel gst-plugins-base-devel alsa-lib-devel dbus-devel glib-devel libusb-compat-devel libcap-ng-devel libsndfile-devel cups-devel"
 short_desc="Bluetooth tools and daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
@@ -32,19 +33,6 @@ conf_files="
 subpackages="$pkgname-alsa $pkgname-compat $pkgname-gstreamer libbluetooth"
 subpackages="$subpackages libbluetooth-devel"
 
-Add_dependency build automake ">=1.11.3_1"
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build libudev-devel
-Add_dependency build readline-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build libcap-ng-devel
-Add_dependency build libsndfile-devel
-Add_dependency build cups-devel
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/boost/boost-build.template b/srcpkgs/boost/boost-build.template
index 7a1fa417aa..f1867a5b06 100644
--- a/srcpkgs/boost/boost-build.template
+++ b/srcpkgs/boost/boost-build.template
@@ -1,5 +1,6 @@
 # Template file for 'boost-build'.
 #
+depends="boost-jam boost-devel"
 short_desc="${short_desc} (Boost.Build framework)"
 long_desc="
  Boost is a set of free, peer-reviewed, C++ libraries. The emphasis is on
@@ -11,8 +12,6 @@ long_desc="
 conf_files="/etc/site-config.jam"
 noarch=yes
 
-Add_dependency run boost-jam
-Add_dependency run boost-devel
 
 do_install()
 {
diff --git a/srcpkgs/boost/boost-devel.template b/srcpkgs/boost/boost-devel.template
index 783c3e680b..429547cfaa 100644
--- a/srcpkgs/boost/boost-devel.template
+++ b/srcpkgs/boost/boost-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'boost-devel'.
 #
+depends="libstdc++-devel zlib-devel bzip2-devel python-devel boost"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -7,11 +8,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run libstdc++-devel
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run python-devel
-Add_dependency run boost
 
 do_install()
 {
diff --git a/srcpkgs/boost/boost-python.template b/srcpkgs/boost/boost-python.template
index 1c4bc1149b..f164dcc543 100644
--- a/srcpkgs/boost/boost-python.template
+++ b/srcpkgs/boost/boost-python.template
@@ -1,5 +1,6 @@
 # Template file for 'boost-python'.
 #
+depends="boost python"
 short_desc="${short_desc} - python bindings"
 long_desc="
  Boost is a set of free, peer-reviewed, C++ libraries. The emphasis is on
@@ -9,8 +10,6 @@ long_desc="
  the Boost Python library."
 
 
-Add_dependency run boost
-Add_dependency run python
 
 do_install()
 {
diff --git a/srcpkgs/boost/depends b/srcpkgs/boost/depends
deleted file mode 100644
index 04f7a855ba..0000000000
--- a/srcpkgs/boost/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-# SONAME always change when boost version is bumped!
-abi_depends=">=1.44<1.45"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 34cdedb0e0..fd06512d6f 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -5,6 +5,7 @@ revision=3
 _boostver="$(echo $version|sed 's|\.|_|g')"
 wrksrc=${pkgname}_${_boostver}
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2"
+makedepends="zlib-devel icu-devel python-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=45c328029d97d1f1dc7ff8c9527cd0c5cc356636084a800bca2ee4bfab1978db
@@ -14,9 +15,6 @@ long_desc="
  netlink family specific interfaces."
 
 subpackages="boost-build boost-devel boost-jam boost-python"
-Add_dependency build zlib-devel
-Add_dependency build icu-devel
-Add_dependency build python-devel
 
 do_build()
 {
diff --git a/srcpkgs/brasero/brasero-devel.template b/srcpkgs/brasero/brasero-devel.template
index 602b7ef46d..0fd64635b2 100644
--- a/srcpkgs/brasero/brasero-devel.template
+++ b/srcpkgs/brasero/brasero-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'brasero-devel'.
 #
+depends="gst-plugins-base-devel totem-pl-parser-devel libnotify-devel libcanberra-devel nautilus-devel brasero>=3.4.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gst-plugins-base-devel
-Add_dependency run totem-pl-parser-devel
-Add_dependency run libnotify-devel
-Add_dependency run libcanberra-devel
-Add_dependency run nautilus-devel
-Add_dependency run brasero ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/brasero/depends b/srcpkgs/brasero/depends
deleted file mode 100644
index e7e77019f3..0000000000
--- a/srcpkgs/brasero/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.90"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index f3df0612c7..7d123583b1 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -6,6 +6,8 @@ license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-caches"
+depends="cdrtools dconf>=0 shared-mime-info hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection gst-plugins-base-devel totem-pl-parser-devel libnotify-devel libcanberra-devel nautilus-devel tracker-devel libisofs-devel libburn-devel"
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6
@@ -26,22 +28,4 @@ long_desc="
 subpackages="$pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build which
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build gst-plugins-base-devel
-Add_dependency build totem-pl-parser-devel
-Add_dependency build libnotify-devel
-Add_dependency build libcanberra-devel
-Add_dependency build nautilus-devel
-Add_dependency build tracker-devel
-Add_dependency build libisofs-devel
-Add_dependency build libburn-devel
 
-Add_dependency run cdrtools
-Add_dependency run dconf	">=0"
-Add_dependency run shared-mime-info
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template
index 8e406f414e..aab759d3f6 100644
--- a/srcpkgs/bridge-utils/template
+++ b/srcpkgs/bridge-utils/template
@@ -5,6 +5,7 @@ homepage="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridg
 distfiles="${SOURCEFORGE_SITE}/bridge/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="automake"
 short_desc="Layer2 ethernet bridging for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,7 +18,6 @@ long_desc="
 
  The Linux bridge code implements a subset of the ANSI/IEEE 802.1d standard."
 
-Add_dependency build automake
 
 pre_configure()
 {
diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template
index 3c15de6aad..7d7731416a 100644
--- a/srcpkgs/bsdbuild/template
+++ b/srcpkgs/bsdbuild/template
@@ -9,6 +9,7 @@ make_install_args="
 SHAREDIR=${XBPS_DESTDIR}/${pkgname}-${version}/usr/share/bsdbuild
 BINDIR=${XBPS_DESTDIR}/${pkgname}-${version}/usr/bin
 MANDIR=${XBPS_DESTDIR}/${pkgname}-${version}/usr/share/man"
+fulldepends="perl>=0"
 short_desc="Simple, self-contained and portable build system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b84dc117a353c0ade3cda9696d160983094cb86ff2262fc2bb9060e46f54a8ba
@@ -28,7 +29,6 @@ long_desc="
  compatibility of various software, and writing new tests is easy."
 
 noarch=yes
-Add_dependency full perl	">=0"
 
 pre_install()
 {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 8e6aef9c47..4ba74d0c57 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -7,6 +7,7 @@ wrksrc="${pkgname}-${_distver}.${_snapver}"
 revision=1
 homepage="http://btrfs.wiki.kernel.org/"
 distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-${_distver}.${_snapver}.tar.xz"
+makedepends="acl-devel libuuid-devel e2fsprogs-devel"
 short_desc="Btrfs filesystem utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,9 +16,6 @@ long_desc="
  This packages provides the userspace utilities required to
  create/format/manipulate Btrfs filesystems."
 
-Add_dependency build acl-devel
-Add_dependency build libuuid-devel
-Add_dependency build e2fsprogs-devel
 
 do_build() {
 	make CFLAGS="${CFLAGS}" ${makejobs}
diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
index 07ad79b18d..15b9d9a9eb 100644
--- a/srcpkgs/buildbot-slave/template
+++ b/srcpkgs/buildbot-slave/template
@@ -3,6 +3,7 @@ pkgname=buildbot-slave
 version=0.8.6
 distfiles="http://buildbot.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=python-module
+fulldepends="python Twisted"
 short_desc="BuildBot Slave Daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://trac.buildbot.net/"
@@ -27,5 +28,3 @@ long_desc="
 noarch=yes
 pycompile_module="buildslave"
 
-Add_dependency full python
-Add_dependency full Twisted
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index 288748ca5f..e69d4eb3cb 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -3,6 +3,7 @@ pkgname=buildbot
 version=0.8.6
 distfiles="http://buildbot.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=python-module
+fulldepends="python python-jinja Twisted"
 short_desc="A system to automate the compile/test cycle"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://trac.buildbot.net/"
@@ -24,9 +25,6 @@ long_desc="
 pycompile_module="$pkgname"
 noarch=yes
 
-Add_dependency full python
-Add_dependency full python-jinja
-Add_dependency full Twisted
 
 post_install() {
 	# Install all contrib modules.
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index daed4fb5c0..6e397ff3d9 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -3,6 +3,7 @@ pkgname=busybox
 version=1.19.4
 homepage="http://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
+makedepends="perl>=0"
 short_desc="The Swiss Army Knife of Embedded Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,7 +17,6 @@ long_desc="
  very much like their GNU counterparts. BusyBox provides a fairly complete
  environment for any small or embedded system."
 
-Add_dependency build perl ">=0"
 
 do_build() {
 	cp -f ${FILESDIR}/dotconfig .config
diff --git a/srcpkgs/bzip2/bzip2-devel.template b/srcpkgs/bzip2/bzip2-devel.template
index 9097c4eaca..f0b8d67343 100644
--- a/srcpkgs/bzip2/bzip2-devel.template
+++ b/srcpkgs/bzip2/bzip2-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'bzip2-devel'.
 #
+depends="glibc-devel bzip2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run bzip2
 
 do_install()
 {
diff --git a/srcpkgs/bzip2/depends b/srcpkgs/bzip2/depends
deleted file mode 100644
index 66a8f8ac96..0000000000
--- a/srcpkgs/bzip2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template
index 6ea5517919..b12e459427 100644
--- a/srcpkgs/bzr/template
+++ b/srcpkgs/bzr/template
@@ -4,6 +4,7 @@ version=2.5.0
 homepage="http://http://bazaar.canonical.com"
 distfiles="http://launchpad.net/bzr/2.5/$version/+download/bzr-$version.tar.gz"
 build_style=python-module
+makedepends="zlib-devel python-devel"
 short_desc="Distributed version control system that Just Works"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,8 +17,6 @@ long_desc="
 
 pycompile_module="bzrlib"
 
-Add_dependency build zlib-devel
-Add_dependency build python-devel
 
 pre_install() {
 	sed -i -e "s|man/man1|share/man/man1|" setup.py
diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
index 560d55f107..b85bd2c1a0 100644
--- a/srcpkgs/bzrtools/template
+++ b/srcpkgs/bzrtools/template
@@ -6,6 +6,7 @@ homepage="http://bazaar-vcs.org/BzrTools"
 license="GPL-2"
 distfiles="http://launchpad.net/$pkgname/stable/$version/+download/$pkgname-$version.tar.gz"
 build_style=python-module
+fulldepends="python bzr"
 short_desc="Plugin providing a collection of utilities for bzr"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f62771dd221ad820e0363386608985e282cb88b52b5a6f0ed7b7fb2e99804def
@@ -15,5 +16,3 @@ long_desc="
 pycompile_module="bzrlib/plugins/bzrtools"
 noarch=yes
 
-Add_dependency full python
-Add_dependency full bzr
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 7316091378..53a8aa8db4 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -2,6 +2,8 @@
 pkgname=ca-certificates
 version=20120212
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.gz"
+makedepends="python"
+fulldepends="findutils sed openssl run-parts"
 short_desc="Common CA certificates"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://packages.qa.debian.org/c/ca-certificates.html"
@@ -14,11 +16,6 @@ long_desc="
 conf_files="/etc/ca-certificates.conf"
 noarch=yes
 
-Add_dependency full findutils
-Add_dependency full sed
-Add_dependency full openssl
-Add_dependency full run-parts
-Add_dependency build python
 
 do_build() {
 	make ${makejobs}
diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 300f8df1bf..57ec2bbe6e 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -1,20 +1,11 @@
 # Template file for 'cairo-devel'.
 #
+depends="freetype-devel fontconfig-devel glib-devel libpng-devel libxcb-devel libX11-devel libXrender-devel pixman-devel MesaLib-devel cairo>=1.12.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run glib-devel
-Add_dependency run libpng-devel
-Add_dependency run libxcb-devel
-Add_dependency run libX11-devel
-Add_dependency run libXrender-devel
-Add_dependency run pixman-devel
-Add_dependency run MesaLib-devel
-Add_dependency run cairo ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/cairo/depends b/srcpkgs/cairo/depends
deleted file mode 100644
index 2aebfce1ea..0000000000
--- a/srcpkgs/cairo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.8.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index eb2c099c41..04a075e701 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -5,6 +5,7 @@ homepage="http://cairographics.org"
 distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-tee --enable-gl"
+makedepends="pkg-config zlib-devel fontconfig-devel freetype-devel pixman-devel libpng-devel libxcb-devel libX11-devel libXrender-devel glib-devel MesaLib-devel"
 short_desc="Vector graphics library with cross-device output support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1, MPL-1.1"
@@ -23,14 +24,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build fontconfig-devel
-Add_dependency build freetype-devel
-Add_dependency build pixman-devel
-Add_dependency build libpng-devel
-Add_dependency build libxcb-devel
-Add_dependency build libX11-devel
-Add_dependency build libXrender-devel
-Add_dependency build glib-devel
-Add_dependency build MesaLib-devel
diff --git a/srcpkgs/cairomm/cairomm-devel.template b/srcpkgs/cairomm/cairomm-devel.template
index 2c48fa9df8..15f64ea2f1 100644
--- a/srcpkgs/cairomm/cairomm-devel.template
+++ b/srcpkgs/cairomm/cairomm-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'cairomm-devel'.
 #
+depends="pkg-config libsigc++-devel cairo-devel>=1.10.0 cairomm"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run libsigc++-devel
-Add_dependency run cairo-devel		">=1.10.0"
-Add_dependency run cairomm
 
 do_install()
 {
diff --git a/srcpkgs/cairomm/depends b/srcpkgs/cairomm/depends
deleted file mode 100644
index 6819f8d431..0000000000
--- a/srcpkgs/cairomm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.8.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cairomm/template b/srcpkgs/cairomm/template
index 2a0fd8339a..48bcfbfa8f 100644
--- a/srcpkgs/cairomm/template
+++ b/srcpkgs/cairomm/template
@@ -4,6 +4,7 @@ version=1.10.0
 distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="pkg-config libsigc++-devel freetype-devel fontconfig-devel libpng-devel zlib-devel libX11-devel libXrender-devel cairo-devel>=1.10.0"
 short_desc="C++ bindings to Cairo vector graphics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=068d96c43eae7b0a3d98648cbfc6fbd16acc385858e9ba6d37b5a47e4dba398f
@@ -13,12 +14,3 @@ long_desc="
  the Standard Template Library where it makes sense."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libsigc++-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libpng-devel
-Add_dependency build zlib-devel
-Add_dependency build libX11-devel
-Add_dependency build libXrender-devel
-Add_dependency build cairo-devel	">=1.10.0"
diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template
index f2b3fe9a13..b25ecd866a 100644
--- a/srcpkgs/cantarell-fonts/template
+++ b/srcpkgs/cantarell-fonts/template
@@ -3,6 +3,8 @@ pkgname=cantarell-fonts
 version=0.0.8
 distfiles="${GNOME_SITE}/$pkgname/0.0/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config"
+fulldepends="fontconfig"
 short_desc="Cantarell family of TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e5468861cee84c034dfc53ed9836a360bea45767873dd7840fe403a06bcc61fb
@@ -12,8 +14,6 @@ long_desc="
  interface and the Fedora project."
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency full fontconfig
 
 post_install() {
 	vmkdir etc/fonts/conf.d
diff --git a/srcpkgs/capchroot/template b/srcpkgs/capchroot/template
index 451761173e..65cd1d0e04 100644
--- a/srcpkgs/capchroot/template
+++ b/srcpkgs/capchroot/template
@@ -3,6 +3,8 @@ pkgname=capchroot
 version=0.1
 distfiles="http://xbps.nopcode.org/distfiles/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
+depends="glibc libcap"
+makedepends="libcap-devel"
 short_desc="Use chroot with capabilities as normal user"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9e28571684022698921f25711f60f3e634206412851150905ec73cfd63bc0e92
@@ -12,6 +14,3 @@ long_desc="
 
 conf_files="/etc/capchroot.allow"
 
-Add_dependency run glibc
-Add_dependency run libcap
-Add_dependency build libcap-devel
diff --git a/srcpkgs/caribou/caribou-devel.template b/srcpkgs/caribou/caribou-devel.template
index 0e0d3dd011..b9169d946e 100644
--- a/srcpkgs/caribou/caribou-devel.template
+++ b/srcpkgs/caribou/caribou-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'caribou-devel'.
 #
+depends="pygobject-devel"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pygobject-devel
 
 noarch=yes
 
diff --git a/srcpkgs/caribou/depends b/srcpkgs/caribou/depends
deleted file mode 100644
index ff533ec2cc..0000000000
--- a/srcpkgs/caribou/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.0"
-api_depends=">=0.4.2"
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index 55c3ab2c99..c458e5c7c9 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -6,6 +6,8 @@ distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static
 --disable-gtk2-module"
+makedepends="pkg-config intltool gnome-doc-utils gobject-introspection vala-devel libxklavier-devel libgee-devel pygobject-devel clutter-devel gtk+3-devel libXtst-devel"
+fulldepends="pyatspi dbus-python pygobject gir-freedesktop at-spi2-atk desktop-file-utils"
 short_desc="An alternative to the Gnome On-screen Keyboard"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad
@@ -22,21 +24,4 @@ long_desc="
 pycompile_module="$pkgname"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build vala-devel
-Add_dependency build libxklavier-devel
-Add_dependency build libgee-devel
-Add_dependency build pygobject-devel
-Add_dependency build clutter-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libXtst-devel
 
-Add_dependency full pyatspi
-Add_dependency full dbus-python
-Add_dependency full pygobject
-Add_dependency full gir-freedesktop
-Add_dependency full at-spi2-atk
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index b2cac3bd27..57514a9663 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -3,6 +3,7 @@ pkgname=ccache
 version=3.1.7
 distfiles="http://samba.org/ftp/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="zlib-devel"
 short_desc="compiler cache"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cache.samba.org"
@@ -14,7 +15,6 @@ long_desc="
  Supported languages are C, C++, Objective-C and Objective-C++."
 
 bootstrap=yes
-Add_dependency build zlib-devel
 
 post_install() {
 	vmkdir usr/lib/ccache/bin
diff --git a/srcpkgs/cdparanoia/cdparanoia-devel.template b/srcpkgs/cdparanoia/cdparanoia-devel.template
index 31a5c78435..912ba20594 100644
--- a/srcpkgs/cdparanoia/cdparanoia-devel.template
+++ b/srcpkgs/cdparanoia/cdparanoia-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'cdparanoia-devel'.
 #
+depends="cdparanoia"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run cdparanoia
 
 do_install()
 {
diff --git a/srcpkgs/cdparanoia/depends b/srcpkgs/cdparanoia/depends
deleted file mode 100644
index ec4753951d..0000000000
--- a/srcpkgs/cdparanoia/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=10.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template
index 6b1a3d85f1..c169e4a3fa 100644
--- a/srcpkgs/cdrtools/template
+++ b/srcpkgs/cdrtools/template
@@ -6,6 +6,7 @@ build_style=gnu-makefile
 make_build_args="CCOM=gcc RUNPATH= LDPATH= NOWARN=true"
 make_install_args="INS_BASE=/usr MANDIR=/man"
 revision=1
+makedepends="acl-devel"
 short_desc="Highly portable CD/DVD/BluRay command line recording software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
@@ -28,7 +29,6 @@ long_desc="
 
 conf_files="/etc/default/rscsi /etc/default/cdrecord"
 
-Add_dependency build acl-devel
 
 post_install()
 {
diff --git a/srcpkgs/celt/celt-devel.template b/srcpkgs/celt/celt-devel.template
index 6c33837c5f..d680df61fb 100644
--- a/srcpkgs/celt/celt-devel.template
+++ b/srcpkgs/celt/celt-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'celt-devel'.
 #
+depends="libogg-devel celt"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libogg-devel
-Add_dependency run celt
 
 do_install()
 {
diff --git a/srcpkgs/celt/depends b/srcpkgs/celt/depends
deleted file mode 100644
index 3312da00ad..0000000000
--- a/srcpkgs/celt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.11.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/celt/template b/srcpkgs/celt/template
index bf1356510b..91a20faf86 100644
--- a/srcpkgs/celt/template
+++ b/srcpkgs/celt/template
@@ -7,6 +7,7 @@ configure_args="--enable-float-approx --enable-custom-modes --disable-oggtest"
 homepage="http://www.celt-codec.org/"
 license="BSD"
 revision=2
+makedepends="pkg-config libogg-devel"
 short_desc="An audio codec for use in low-delay speech and audio communication"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=01c2579fba8b283c9068cb704a70a6e654aa74ced064c091cafffbe6fb1d4cbf
@@ -17,5 +18,3 @@ long_desc="
  (such as Speex) and traditional audio codecs (such as Vorbis)."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libogg-devel
diff --git a/srcpkgs/celt051/celt051-devel.template b/srcpkgs/celt051/celt051-devel.template
index 37a527086d..e660a7217a 100644
--- a/srcpkgs/celt051/celt051-devel.template
+++ b/srcpkgs/celt051/celt051-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'celt501-devel'.
 #
+depends="libogg-devel celt051"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libogg-devel
-Add_dependency run celt051
 
 do_install()
 {
diff --git a/srcpkgs/celt051/depends b/srcpkgs/celt051/depends
deleted file mode 100644
index 668e19ae43..0000000000
--- a/srcpkgs/celt051/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.5.1.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/celt051/template b/srcpkgs/celt051/template
index 3f5528dfea..4d366a9ec3 100644
--- a/srcpkgs/celt051/template
+++ b/srcpkgs/celt051/template
@@ -5,6 +5,7 @@ revision=3
 wrksrc=celt-${version}
 distfiles="http://downloads.us.xiph.org/releases/celt/celt-${version}.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libogg-devel"
 short_desc="An audio codec for use in low-delay speech and audio communication"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e
@@ -20,5 +21,3 @@ long_desc="
  the normal celt for packages requiring this particular bitstream format."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libogg-devel
diff --git a/srcpkgs/cheese/cheese-devel.template b/srcpkgs/cheese/cheese-devel.template
index 5e76d8f49a..1022bf9ea2 100644
--- a/srcpkgs/cheese/cheese-devel.template
+++ b/srcpkgs/cheese/cheese-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'cheese-devel'.
 #
+depends="gst-plugins-base-devel libcanberra-devel clutter-gst-devel clutter-gtk-devel libcheese>=3.4.2"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gst-plugins-base-devel
-Add_dependency run libcanberra-devel
-Add_dependency run clutter-gst-devel
-Add_dependency run clutter-gtk-devel
-Add_dependency run libcheese ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/cheese/depends b/srcpkgs/cheese/depends
deleted file mode 100644
index 46f353795b..0000000000
--- a/srcpkgs/cheese/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 2054ba6e39..a58b005f5e 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -4,6 +4,9 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
+depends="desktop-file-utils hicolor-icon-theme nautilus-sendto"
+makedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection gst-plugins-base-devel clutter-gtk-devel clutter-gst-devel mx-devel libgee-devel libcanberra-devel librsvg-devel gnome-desktop-devel"
+fulldepends="gst-plugins-good gst-plugins-bad gnome-video-effects gsettings-desktop-schemas"
 short_desc="GNOME tool to take pictures and videos from your webcam"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/cheese/"
@@ -18,26 +21,5 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build itstool
-Add_dependency build gobject-introspection
-Add_dependency build gst-plugins-base-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build clutter-gst-devel
-Add_dependency build mx-devel
-Add_dependency build libgee-devel
-Add_dependency build libcanberra-devel
-Add_dependency build librsvg-devel
-Add_dependency build gnome-desktop-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
-Add_dependency run nautilus-sendto
 
-Add_dependency full gst-plugins-good
-Add_dependency full gst-plugins-bad
-Add_dependency full gnome-video-effects
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/cherokee/cherokee-devel.template b/srcpkgs/cherokee/cherokee-devel.template
index 1a22539a8e..e3ca41665b 100644
--- a/srcpkgs/cherokee/cherokee-devel.template
+++ b/srcpkgs/cherokee/cherokee-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'cherokee-devel'.
 #
+depends="libcherokee"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libcherokee
 
 do_install() {
 	vmove usr/bin/cherokee-config usr/bin
diff --git a/srcpkgs/cherokee/depends b/srcpkgs/cherokee/depends
deleted file mode 100644
index 4d7cc272c6..0000000000
--- a/srcpkgs/cherokee/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.101"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template
index a45c01a703..201fcd5b3f 100644
--- a/srcpkgs/cherokee/template
+++ b/srcpkgs/cherokee/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
 configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var
 --disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd
 --with-wwwgroup=httpd --with-python=python --enable-os-string=Linux"
+makedepends="pcre-devel python-devel libldap-devel pam-devel libmysqlclient-devel ffmpeg-devel geoip-devel"
 short_desc="An innovative, feature rich, and yet easy to configure open source Web Server"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.cherokee-project.com/"
@@ -31,13 +32,6 @@ system_accounts="httpd"
 httpd_descr="Cherokee HTTP server"
 httpd_homedir="/srv/httpd"
 
-Add_dependency build pcre-devel
-Add_dependency build python-devel
-Add_dependency build libldap-devel
-Add_dependency build pam-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build ffmpeg-devel
-Add_dependency build geoip-devel
 
 pre_configure() {
 	# use /var/log/cherokee instead of /var/log
diff --git a/srcpkgs/chicken/chicken-devel.template b/srcpkgs/chicken/chicken-devel.template
index 5af9b27a00..7510f6d54c 100644
--- a/srcpkgs/chicken/chicken-devel.template
+++ b/srcpkgs/chicken/chicken-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'chicken-devel'.
 #
+depends="libchicken"
 short_desc="Chiken development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libchicken
 
 do_install() {
         vmove usr/include usr
diff --git a/srcpkgs/chicken/depends b/srcpkgs/chicken/depends
deleted file mode 100644
index 2b9120baf8..0000000000
--- a/srcpkgs/chicken/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.7.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/chromium-bsu/template b/srcpkgs/chromium-bsu/template
index eb6587542c..93f401c743 100644
--- a/srcpkgs/chromium-bsu/template
+++ b/srcpkgs/chromium-bsu/template
@@ -6,6 +6,8 @@ homepage="http://chromium-bsu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Chromium%20B.S.U.%20source%20code/${version}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-openal --disable-sdlmixer --disable-glpng"
+makedepends="MesaLib-devel ftgl-devel fontconfig-devel SDL-devel SDL_image-devel libopenal-devel freealut-devel"
+fulldepends="desktop-file-utils"
 short_desc="Fast paced, arcade-style, top-scrolling space shooter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="${pkgname}"
@@ -18,15 +20,7 @@ long_desc="
  ship has a small fleet of robotic fighters which you control from the relative
  safety of the Chromium vessel."
 
-Add_dependency build MesaLib-devel
-Add_dependency build ftgl-devel
-Add_dependency build fontconfig-devel
-Add_dependency build SDL-devel
-Add_dependency build SDL_image-devel
-Add_dependency build libopenal-devel
-Add_dependency build freealut-devel
 
-Add_dependency full desktop-file-utils
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/chromium-unstable/template b/srcpkgs/chromium-unstable/template
index a615a12432..3985470d3e 100644
--- a/srcpkgs/chromium-unstable/template
+++ b/srcpkgs/chromium-unstable/template
@@ -3,6 +3,9 @@ __pkgname=chromium
 pkgname=${__pkgname}-unstable
 version=19.0.1049.0
 distfiles="http://commondatastorage.googleapis.com/chromium-browser-official/${__pkgname}-$version.tar.bz2"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config yasm flex gperf libXrender-devel libXScrnSaver-devel gtk+-devel libevent-devel icu-devel nss-devel libxslt-devel alsa-lib-devel libflac-devel dbus-glib-devel libXdamage-devel libXtst-devel pam-devel GConf-devel libgnome-keyring-devel libvpx-devel speex-devel libwebp-devel pulseaudio-devel v8-devel libxml2-devel zlib-devel expat-devel libpng-devel jpeg-devel mit-krb5-devel libXcomposite-devel"
+fulldepends="xdg-utils"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.chromium.org/"
@@ -24,42 +27,8 @@ build_requires=11
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
-Add_dependency build pkg-config
-Add_dependency build yasm
-Add_dependency build flex
-Add_dependency build gperf
-Add_dependency build libXrender-devel
-Add_dependency build libXScrnSaver-devel
-Add_dependency build gtk+-devel
-Add_dependency build libevent-devel
-Add_dependency build icu-devel
-Add_dependency build nss-devel
-Add_dependency build libxslt-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libflac-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXtst-devel
-Add_dependency build pam-devel
-Add_dependency build GConf-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build libvpx-devel
-Add_dependency build speex-devel
-Add_dependency build libwebp-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build v8-devel
-Add_dependency build libxml2-devel
-Add_dependency build zlib-devel
-Add_dependency build expat-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build libXcomposite-devel
 
-Add_dependency full xdg-utils
 
 wrksrc=chromium-$version
 
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 0417eeb56c..ea9a22fb53 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -9,6 +9,8 @@ build_wrksrc=${pkgname}-${version}
 distfiles="
 http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2
 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"
 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,38 +30,6 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build which
-Add_dependency build unzip
-Add_dependency build yasm
-Add_dependency build flex
-Add_dependency build gperf
-Add_dependency build perl ">=0"
-Add_dependency build python ">=0"
-Add_dependency build libgcrypt-devel
-Add_dependency build libelf-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXScrnSaver-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libX11-devel
-Add_dependency build libXi-devel
-Add_dependency build gtk+-devel
-Add_dependency build libevent-devel
-Add_dependency build nss-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXtst-devel
-Add_dependency build pam-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build libvpx-devel
-Add_dependency build speex-devel
-Add_dependency build libwebp-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build cups-devel
-Add_dependency build hunspell-devel
-Add_dependency build libflac-devel
 
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	Add_dependency build zlib32
@@ -67,8 +37,6 @@ if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	Add_dependency build gcc-multilib
 fi
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
 pre_configure() {
 	# http://code.google.com/p/chromium/issues/detail?id=109527
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index fa2ff6924f..b2ea4de139 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -5,6 +5,7 @@ revision=6
 homepage="http://chrony.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="libcap-devel readline-devel"
 short_desc="Sets your computer's clock from time servers on the Net"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -29,8 +30,6 @@ make_dirs="
 /var/db/chrony	0755 chrony chrony"
 
 
-Add_dependency build libcap-devel
-Add_dependency build readline-devel
 
 post_install() {
 	vinstall ${FILESDIR}/chrony.conf 644 etc
diff --git a/srcpkgs/chroot-fakeroot/template b/srcpkgs/chroot-fakeroot/template
index a7f1b0bf70..a6e5f6c221 100644
--- a/srcpkgs/chroot-fakeroot/template
+++ b/srcpkgs/chroot-fakeroot/template
@@ -4,6 +4,7 @@ version=1.18.3
 wrksrc="fakeroot-${version}"
 distfiles="${DEBIAN_SITE}/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2"
 build_style=gnu-configure
+fulldepends="chroot-util-linux"
 short_desc="Gives a fake root environment -- for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://packages.debian.org/fakeroot"
@@ -21,7 +22,6 @@ bootstrap=yes
 conflicts="fakeroot>=0"
 provides="fakeroot-${version}"
 
-Add_dependency full chroot-util-linux
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/chroot-file/template b/srcpkgs/chroot-file/template
index 9b3fbaa89c..8e7970ddfd 100644
--- a/srcpkgs/chroot-file/template
+++ b/srcpkgs/chroot-file/template
@@ -5,6 +5,7 @@ revision=1
 wrksrc="file-${version}"
 distfiles="ftp://ftp.astron.com/pub/file/file-$version.tar.gz"
 build_style=gnu-configure
+makedepends="zlib-devel"
 short_desc="File type identification utility -- for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.darwinsys.com/file/"
@@ -16,7 +17,6 @@ long_desc="
 
  This package is only meant to be used by xbps-src, don't install it manually."
 
-Add_dependency build zlib-devel
 
 noverifyrdeps=yes
 bootstrap=yes
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 4271347d24..73c67595d3 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -4,6 +4,7 @@ version=5.3
 homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 distfiles="ftp://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="mit-krb5-devel talloc-devel libcap-ng-devel samba-devel keyutils-devel"
 short_desc="CIFS filesystem user-space tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,11 +16,6 @@ long_desc="
  This package provides utilities for managing mounts of CIFS network file
  systems."
 
-Add_dependency build mit-krb5-devel
-Add_dependency build talloc-devel
-Add_dependency build libcap-ng-devel
-Add_dependency build samba-devel
-Add_dependency build keyutils-devel
 
 post_install() {
 	vmove "sbin/*" usr/sbin
diff --git a/srcpkgs/cloog-ppl/cloog-ppl-devel.template b/srcpkgs/cloog-ppl/cloog-ppl-devel.template
index 2b92ffe01e..76fca0c589 100644
--- a/srcpkgs/cloog-ppl/cloog-ppl-devel.template
+++ b/srcpkgs/cloog-ppl/cloog-ppl-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'cloog-ppl-devel'.
 #
+depends="gmp-devel ppl-devel cloog-ppl"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gmp-devel
-Add_dependency run ppl-devel
-Add_dependency run cloog-ppl
 
 do_install()
 {
diff --git a/srcpkgs/cloog-ppl/depends b/srcpkgs/cloog-ppl/depends
deleted file mode 100644
index 7f22326b14..0000000000
--- a/srcpkgs/cloog-ppl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.15.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cloog-ppl/template b/srcpkgs/cloog-ppl/template
index a46b50ecdf..672ee04ab0 100644
--- a/srcpkgs/cloog-ppl/template
+++ b/srcpkgs/cloog-ppl/template
@@ -4,6 +4,7 @@ version=0.15.11
 distfiles="ftp://gcc.gnu.org/pub/gcc/infrastructure/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--with-bits=gmp --with-ppl=${XBPS_MASTERDIR}/usr"
+makedepends="gmp-devel ppl-devel"
 short_desc="The Chunky Loop Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7cd634d0b2b401b04096b545915ac67f883556e9a524e8e803a6bf6217a84d5f
@@ -15,5 +16,3 @@ long_desc="
 
 bootstrap=yes
 subpackages="$pkgname-devel" 
-Add_dependency build gmp-devel
-Add_dependency build ppl-devel
diff --git a/srcpkgs/clucene/clucene-devel.template b/srcpkgs/clucene/clucene-devel.template
index 6923dbaf65..ac47623443 100644
--- a/srcpkgs/clucene/clucene-devel.template
+++ b/srcpkgs/clucene/clucene-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'clucene-devel'.
 #
+depends="libstdc++-devel clucene"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libstdc++-devel
-Add_dependency run clucene
 
 do_install()
 {
diff --git a/srcpkgs/clucene/depends b/srcpkgs/clucene/depends
deleted file mode 100644
index ce2e979a0e..0000000000
--- a/srcpkgs/clucene/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.21b"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template
index 7f7f84e5d7..46f0acabbd 100644
--- a/srcpkgs/clucene/template
+++ b/srcpkgs/clucene/template
@@ -5,6 +5,7 @@ revision=3
 wrksrc=${pkgname}-core-${version}
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.bz2"
 build_style=gnu-configure
+makedepends="libstdc++-devel"
 short_desc="Text search engine written in C++"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317
@@ -18,4 +19,3 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build libstdc++-devel
diff --git a/srcpkgs/clutter-gst/clutter-gst-devel.template b/srcpkgs/clutter-gst/clutter-gst-devel.template
index ee84d41dad..9d1957c440 100644
--- a/srcpkgs/clutter-gst/clutter-gst-devel.template
+++ b/srcpkgs/clutter-gst/clutter-gst-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'clutter-gst--devel'.
 #
+depends="clutter-devel gst-plugins-base-devel clutter-gst>=1.5.4"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run clutter-devel
-Add_dependency run gst-plugins-base-devel
-Add_dependency run clutter-gst ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/clutter-gst/depends b/srcpkgs/clutter-gst/depends
deleted file mode 100644
index c5b86ca40a..0000000000
--- a/srcpkgs/clutter-gst/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.5.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/clutter-gst/template b/srcpkgs/clutter-gst/template
index 67f0bf931e..fba1756ffe 100644
--- a/srcpkgs/clutter-gst/template
+++ b/srcpkgs/clutter-gst/template
@@ -4,6 +4,7 @@ version=1.5.4
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-debug"
+makedepends="pkg-config intltool gobject-introspection clutter-devel libXdamage-devel gst-plugins-base-devel"
 short_desc="GStreamer bindings for the Clutter Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -14,9 +15,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build clutter-devel
-Add_dependency build libXdamage-devel
-Add_dependency build gst-plugins-base-devel
diff --git a/srcpkgs/clutter-gtk/clutter-gtk-devel.template b/srcpkgs/clutter-gtk/clutter-gtk-devel.template
index 8fd03b2d78..6f3a66a55c 100644
--- a/srcpkgs/clutter-gtk/clutter-gtk-devel.template
+++ b/srcpkgs/clutter-gtk/clutter-gtk-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'clutter-gtk--devel'.
 #
+depends="gtk+3-devel clutter-devel clutter-gtk>=1.2.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run clutter-devel
-Add_dependency run clutter-gtk ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/clutter-gtk/depends b/srcpkgs/clutter-gtk/depends
deleted file mode 100644
index 087e37f43a..0000000000
--- a/srcpkgs/clutter-gtk/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template
index 9636a80017..c1903a566d 100644
--- a/srcpkgs/clutter-gtk/template
+++ b/srcpkgs/clutter-gtk/template
@@ -3,6 +3,7 @@ pkgname=clutter-gtk
 version=1.2.0
 distfiles="${GNOME_SITE}/$pkgname/1.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gobject-introspection gtk+3-devel clutter-devel"
 short_desc="GTK+3 bindings for the Clutter Tolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a
@@ -10,8 +11,3 @@ long_desc="
  This packages contains the GTK+3 bindings for the Clutter Toolkit."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build clutter-devel
diff --git a/srcpkgs/clutter/clutter-devel.template b/srcpkgs/clutter/clutter-devel.template
index c02b5432c0..e7dc92f362 100644
--- a/srcpkgs/clutter/clutter-devel.template
+++ b/srcpkgs/clutter/clutter-devel.template
@@ -1,24 +1,11 @@
 # Template file for 'clutter-devel'.
 #
+depends="cogl-devel cairo-devel atk-devel pango-devel json-glib-devel MesaLib-devel libdrm-devel libX11-devel libXext-devel libXfixes-devel libXdamage-devel libXcomposite-devel libXi-devel clutter>=1.10.4"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run cogl-devel
-Add_dependency run cairo-devel
-Add_dependency run atk-devel
-Add_dependency run pango-devel
-Add_dependency run json-glib-devel
-Add_dependency run MesaLib-devel
-Add_dependency run libdrm-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXfixes-devel
-Add_dependency run libXdamage-devel
-Add_dependency run libXcomposite-devel
-Add_dependency run libXi-devel
-Add_dependency run clutter ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/clutter/depends b/srcpkgs/clutter/depends
deleted file mode 100644
index b04038b457..0000000000
--- a/srcpkgs/clutter/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.9.16"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index 53a57848c2..ac00f82340 100644
--- a/srcpkgs/clutter/template
+++ b/srcpkgs/clutter/template
@@ -4,6 +4,7 @@ version=1.10.4
 distfiles="${GNOME_SITE}/clutter/1.10/clutter-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection"
+makedepends="pkg-config intltool libXi-devel libXcomposite-devel libdrm-devel json-glib-devel gtk+-devel cogl-devel gobject-introspection"
 short_desc="OpenGL based interactive canvas library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
@@ -15,12 +16,3 @@ long_desc="
 
 subpackages="clutter-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libXi-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libdrm-devel
-Add_dependency build json-glib-devel
-Add_dependency build gtk+-devel
-Add_dependency build cogl-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/cmake/cmake-gui.template b/srcpkgs/cmake/cmake-gui.template
index bc20c7379c..3b959b1a63 100644
--- a/srcpkgs/cmake/cmake-gui.template
+++ b/srcpkgs/cmake/cmake-gui.template
@@ -1,11 +1,11 @@
 # Template file for 'cmake-gui'.
 #
+depends="cmake>=2.8.8"
 short_desc="cmake QT GUI"
 long_desc="${long_desc}
 
  This package contains cmake-gui, a QT GUI for cmake."
 
-Add_dependency run cmake ">=${version}"
 
 do_install() {
 	vmove usr/bin/cmake-gui usr/bin
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index e767c4e939..e4e555e520 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -10,6 +10,7 @@ configure_args="--prefix=/usr --mandir=/share/man
 if [ -n "$XBPS_MAKEJOBS" ]; then
 	configure_args="$configure_args --parallel=$XBPS_MAKEJOBS"
 fi
+makedepends="zlib-devel expat-devel libarchive-devel libcurl-devel ncurses-devel libarchive-devel qt-devel"
 short_desc="Cross-platform, open-source build system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -24,10 +25,3 @@ long_desc="
 
 subpackages="cmake-gui"
 
-Add_dependency build zlib-devel
-Add_dependency build expat-devel
-Add_dependency build libarchive-devel
-Add_dependency build libcurl-devel
-Add_dependency build ncurses-devel
-Add_dependency build libarchive-devel
-Add_dependency build qt-devel
diff --git a/srcpkgs/cogl/cogl-devel.template b/srcpkgs/cogl/cogl-devel.template
index 28e790aa7d..ba1cce54c0 100644
--- a/srcpkgs/cogl/cogl-devel.template
+++ b/srcpkgs/cogl/cogl-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'cogl-devel'.
 #
+depends="libdrm-devel libXcomposite-devel libXdamage-devel gdk-pixbuf-devel glib-devel cogl>=1.10.2"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libdrm-devel
-Add_dependency run libXcomposite-devel
-Add_dependency run libXdamage-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run glib-devel
-Add_dependency run cogl ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/cogl/depends b/srcpkgs/cogl/depends
deleted file mode 100644
index 485a7a5596..0000000000
--- a/srcpkgs/cogl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.10.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template
index 6864e6a40d..2c13af001f 100644
--- a/srcpkgs/cogl/template
+++ b/srcpkgs/cogl/template
@@ -4,6 +4,7 @@ version=1.10.2
 distfiles="${GNOME_SITE}/$pkgname/1.10/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection"
+makedepends="pkg-config intltool gobject-introspection libXcomposite-devel libXdamage-devel pango-devel gdk-pixbuf-devel"
 short_desc="Library for using 3D graphics hardware for rendering"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
@@ -28,10 +29,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build libXcomposite-devel
-Add_dependency build libXdamage-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
diff --git a/srcpkgs/colord/colord-devel.template b/srcpkgs/colord/colord-devel.template
index f3a7ab190a..2a173d3cd8 100644
--- a/srcpkgs/colord/colord-devel.template
+++ b/srcpkgs/colord/colord-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'colord-devel'.
 #
+depends="dbus-devel glib-devel lcms2-devel colord>=0.1.19"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dbus-devel
-Add_dependency run glib-devel
-Add_dependency run lcms2-devel
-Add_dependency run colord ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/colord/depends b/srcpkgs/colord/depends
deleted file mode 100644
index 913ff191cb..0000000000
--- a/srcpkgs/colord/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.12"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index d2a9e77fd5..7bc0777518 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -7,6 +7,9 @@ distfiles="$homepage/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
 --with-systemdsystemunitdir=/lib/systemd/system --enable-volume-search"
+depends="dbus sane"
+makedepends="pkg-config intltool gobject-introspection docbook2x sqlite-devel vala-devel libgudev-devel polkit-devel lcms2-devel libusb-devel dbus-devel libgusb-devel sane-devel"
+fulldepends="shared-color-profiles"
 short_desc="Color daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ae102b93f1ebd9dc0a9f6787670860fdd12e45e955d268a6ae088b9146e24214
@@ -29,20 +32,4 @@ conf_files="/etc/colord.conf"
 subpackages="$pkgname-devel"
 systemd_services="colord.service on"
 
-Add_dependency run dbus
-Add_dependency run sane
-Add_dependency full shared-color-profiles
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build docbook2x
-Add_dependency build sqlite-devel
-Add_dependency build vala-devel
-Add_dependency build libgudev-devel
-Add_dependency build polkit-devel
-Add_dependency build lcms2-devel
-Add_dependency build libusb-devel
-Add_dependency build dbus-devel
-Add_dependency build libgusb-devel
-Add_dependency build sane-devel
diff --git a/srcpkgs/confuse/confuse-devel.template b/srcpkgs/confuse/confuse-devel.template
index 63e9dbbf73..2042243965 100644
--- a/srcpkgs/confuse/confuse-devel.template
+++ b/srcpkgs/confuse/confuse-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'confuse-devel'.
 #
+depends="confuse"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run confuse
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/confuse/depends b/srcpkgs/confuse/depends
deleted file mode 100644
index f9c802c81c..0000000000
--- a/srcpkgs/confuse/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/connman-gnome/template b/srcpkgs/connman-gnome/template
index 27f7acd1b5..fc583ab2a9 100644
--- a/srcpkgs/connman-gnome/template
+++ b/srcpkgs/connman-gnome/template
@@ -4,6 +4,8 @@ version=0.5
 revision=2
 distfiles="${KERNEL_SITE}/network/connman/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel gtk+-devel dbus-glib-devel"
+fulldepends="connman desktop-file-utils hicolor-icon-theme"
 short_desc="Open Source CONNection MANager GTK+2 frontend"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e2bab2c3d8efea54bb57bc98821b56de4a82e284281f26b8ea162d9ce30ce79e
@@ -21,12 +23,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
 
-Add_dependency full connman
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/connman/connman-devel.template b/srcpkgs/connman/connman-devel.template
index 3ba6fa425b..e0eec021ce 100644
--- a/srcpkgs/connman/connman-devel.template
+++ b/srcpkgs/connman/connman-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'connman-devel'.
 #
+depends="dbus-devel glib-devel"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dbus-devel
-Add_dependency run glib-devel
 
 noarch=yes
 
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index 07f73bc95a..dfd050127b 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -7,6 +7,8 @@ build_style=gnu-configure
 configure_args="--enable-pie --enable-threads --enable-ethernet
 --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
 --enable-polkit --enable-client --with-systemdunitdir=/lib/systemd/system"
+makedepends="pkg-config glib-devel dbus-devel iptables-devel gnutls-devel"
+fulldepends="dbus bluez wpa_supplicant"
 short_desc="Open Source CONNection MANager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -23,12 +25,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build dbus-devel
-Add_dependency build iptables-devel
-Add_dependency build gnutls-devel
 
-Add_dependency full dbus
-Add_dependency full bluez
-Add_dependency full wpa_supplicant
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 8741c07d94..0bcf5f70f8 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -4,6 +4,7 @@ version=8.17
 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-install-program=hostname --bindir=/bin"
+makedepends="perl gmp-devel acl-devel libcap-devel"
 short_desc="The GNU core utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/coreutils"
@@ -14,10 +15,6 @@ long_desc="
  utilities of the GNU operating system. These are the core utilities
  which are expected to exist on every operating system."
 
-Add_dependency build perl
-Add_dependency build gmp-devel
-Add_dependency build acl-devel
-Add_dependency build libcap-devel
 
 post_install() {
 	# Most programs expect /usr/bin/env.
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index fdf1fc7645..febfadddac 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -5,6 +5,7 @@ homepage="http://cppcheck.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
 make_build_target="all man"
+makedepends="libxslt docbook-xsl"
 short_desc="Static analysis of C/C++ code"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,5 +19,3 @@ long_desc="
  various compiler extensions, inline assembly code, etc. The goal is no
  false positives."
 
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
diff --git a/srcpkgs/cpufrequtils/depends b/srcpkgs/cpufrequtils/depends
deleted file mode 100644
index 54c3e3211f..0000000000
--- a/srcpkgs/cpufrequtils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=007"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cpufrequtils/libcpufreq-devel.template b/srcpkgs/cpufrequtils/libcpufreq-devel.template
index 951d138dfa..d6e5876364 100644
--- a/srcpkgs/cpufrequtils/libcpufreq-devel.template
+++ b/srcpkgs/cpufrequtils/libcpufreq-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libcpufreq-devel'.
 #
+depends="glibc-devel libcpufreq"
 short_desc="libcpufreq - development tools"
 long_desc="
  This package provides everything that is needed for developing own
  programs using libcpufreq."
 
-Add_dependency run glibc-devel
-Add_dependency run libcpufreq
 
 do_install()
 {
diff --git a/srcpkgs/cracklib/cracklib-devel.template b/srcpkgs/cracklib/cracklib-devel.template
index a3fff8fa99..f9403e3d8d 100644
--- a/srcpkgs/cracklib/cracklib-devel.template
+++ b/srcpkgs/cracklib/cracklib-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'cracklib-devel'.
 #
+depends="zlib-devel cracklib"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run cracklib
 
 do_install()
 {
diff --git a/srcpkgs/cracklib/cracklib-python.template b/srcpkgs/cracklib/cracklib-python.template
index e679429db8..dd32122348 100644
--- a/srcpkgs/cracklib/cracklib-python.template
+++ b/srcpkgs/cracklib/cracklib-python.template
@@ -1,5 +1,6 @@
 # Template file for 'cracklib-python'.
 #
+depends="python"
 short_desc="${sourcepkg} python bindings"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 pycompile_module="."
 
-Add_dependency run python
 
 do_install()
 {
diff --git a/srcpkgs/cracklib/depends b/srcpkgs/cracklib/depends
deleted file mode 100644
index f0b94b1389..0000000000
--- a/srcpkgs/cracklib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.8.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index 1adc4e3753..81a04ee441 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -5,6 +5,7 @@ revision=7
 homepage="http://cracklib.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/cracklib/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="python-devel zlib-devel"
 short_desc="Password Checking Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,8 +16,6 @@ long_desc="
  dictionary attacks)."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency build python-devel
-Add_dependency build zlib-devel
 
 post_install() {
 	# Create default small wordlist.
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 90dffa4458..01b9622270 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -6,6 +6,8 @@ distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-inotify --without-selinux --with-pam --disable-anacron
 --localstatedir=/var"
+makedepends="pam-devel"
+fulldepends="run-parts"
 short_desc="Runs specified programs at scheduled times"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://fedorahosted.org/cronie/"
@@ -23,8 +25,6 @@ systemd_services="cronie.service on"
 provides="cron-daemon-0"
 replaces="cron-daemon>=0"
 
-Add_dependency full run-parts
-Add_dependency build pam-devel
 
 post_install()
 {
diff --git a/srcpkgs/cryptsetup/cryptsetup-devel.template b/srcpkgs/cryptsetup/cryptsetup-devel.template
index 0a5602b16d..54f13acef9 100644
--- a/srcpkgs/cryptsetup/cryptsetup-devel.template
+++ b/srcpkgs/cryptsetup/cryptsetup-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'cryptsetup-devel'.
 #
+depends="libcryptsetup>=1.4.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains development files: headers, static libs, etc."
 
-Add_dependency run libcryptsetup ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/cryptsetup/depends b/srcpkgs/cryptsetup/depends
deleted file mode 100644
index eaf929f4dc..0000000000
--- a/srcpkgs/cryptsetup/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index b5fef6cbfe..cec499547c 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -4,6 +4,7 @@ version=1.4.1
 homepage="http://code.google.com/p/cryptsetup"
 distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config popt-devel libuuid-devel device-mapper-devel libgcrypt-devel"
 short_desc="Setup virtual encryption devices under dm-crypt Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -21,8 +22,3 @@ long_desc="
 
 subpackages="libcryptsetup cryptsetup-devel"
 
-Add_dependency build pkg-config
-Add_dependency build popt-devel
-Add_dependency build libuuid-devel
-Add_dependency build device-mapper-devel
-Add_dependency build libgcrypt-devel
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index ac6b0892d9..69211a082a 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -6,6 +6,8 @@ homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 distfiles="http://www.openprinting.org/download/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 make_install_target="BUILDROOT=${XBPS_DESTDIR}/${pkgname}-${version} install"
+makedepends="pkg-config cups-devel lcms2-devel libpng-devel tiff-devel poppler-devel fontconfig-devel ghostscript-devel"
+fulldepends="ghostscript poppler-utils"
 short_desc="OpenPrinting CUPS Filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1, MIT"
@@ -17,17 +19,7 @@ long_desc="
   independently of Apple, especially filters for the PDF-centric printing
   workflow introduced by OpenPrinting."
 
-Add_dependency build pkg-config
-Add_dependency build cups-devel
-Add_dependency build lcms2-devel
-Add_dependency build libpng-devel
-Add_dependency build tiff-devel
-Add_dependency build poppler-devel
-Add_dependency build fontconfig-devel
-Add_dependency build ghostscript-devel
 
-Add_dependency full ghostscript
-Add_dependency full poppler-utils
 
 post_install() {
 	# remove development stuff.
diff --git a/srcpkgs/cups/cups-devel.template b/srcpkgs/cups/cups-devel.template
index 9b9865c96d..989c4a899b 100644
--- a/srcpkgs/cups/cups-devel.template
+++ b/srcpkgs/cups/cups-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'cups-devel'.
 #
+depends="gnutls-devel libcups>=1.5.3"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gnutls-devel
-Add_dependency run libcups ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/cups/depends b/srcpkgs/cups/depends
deleted file mode 100644
index a229574c07..0000000000
--- a/srcpkgs/cups/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.5.3"
-api_depends=">=1.5.3_1"
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 3d9cbebc2a..3b48be39d9 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -6,6 +6,8 @@ patch_args="-Np1"
 homepage="http://www.cups.org/"
 license="GPL-2"
 distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
+depends="libcups>=1.5.3_1"
+makedepends="automake acl-devel jpeg-devel libpng-devel tiff-devel openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel systemd-devel gnutls-devel"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
@@ -37,22 +39,6 @@ conf_files="
 
 subpackages="libcups cups-devel"
 
-shlib_depends="libcups>=1.5.3_1" # gnutls switch
-
-Add_dependency build automake
-Add_dependency build acl-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build tiff-devel
-Add_dependency build openssl-devel
-Add_dependency build pam-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build poppler-devel
-Add_dependency build libusb-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build systemd-devel
-Add_dependency build gnutls-devel
-
 pre_configure() {
 	aclocal -I config-scripts
 	autoconf -I config-scripts
diff --git a/srcpkgs/curl/depends b/srcpkgs/curl/depends
deleted file mode 100644
index b71ac33737..0000000000
--- a/srcpkgs/curl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=7.19"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/curl/libcurl-devel.template b/srcpkgs/curl/libcurl-devel.template
index 349cf2eb66..8036eddffa 100644
--- a/srcpkgs/curl/libcurl-devel.template
+++ b/srcpkgs/curl/libcurl-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'curl-devel'.
 #
+depends="libidn-devel openssl-devel libldap-devel mit-krb5-devel libcurl"
 short_desc="The multiprotocol file transfer library - development files"
 long_desc="
  libcurl is a free and easy-to-use client-side URL transfer library,
@@ -13,11 +14,6 @@ long_desc="
 
 replaces="curl-devel<7.20.1"
 
-Add_dependency run libidn-devel
-Add_dependency run openssl-devel
-Add_dependency run libldap-devel
-Add_dependency run mit-krb5-devel
-Add_dependency run libcurl
 
 do_install() {
 	vmove usr/bin/curl-config usr/bin
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index fad4f94f54..638549eb8b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -6,6 +6,8 @@ distfiles="$homepage/download/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ldaps --with-gssapi=/usr
 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+depends="ca-certificates"
+makedepends="pkg-config perl>=0 groff libidn-devel glibc-devel openssl-devel zlib-devel libldap-devel mit-krb5-devel"
 short_desc="Client that groks URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -20,14 +22,4 @@ long_desc="
 
 subpackages="libcurl libcurl-devel"
 
-Add_dependency run ca-certificates
 
-Add_dependency build pkg-config
-Add_dependency build perl ">=0"
-Add_dependency build groff
-Add_dependency build libidn-devel
-Add_dependency build glibc-devel
-Add_dependency build openssl-devel
-Add_dependency build zlib-devel
-Add_dependency build libldap-devel
-Add_dependency build mit-krb5-devel
diff --git a/srcpkgs/curlftpfs/template b/srcpkgs/curlftpfs/template
index 4bb12470ab..47ab6615ff 100644
--- a/srcpkgs/curlftpfs/template
+++ b/srcpkgs/curlftpfs/template
@@ -5,6 +5,7 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="ac_cv_func_working_mktime=yes"
 revision=1
+makedepends="pkg-config glib-devel fuse-devel libcurl-devel"
 short_desc="A FTP filesystem based on cURL and FUSE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://curlftpfs.sourceforge.net/"
@@ -20,7 +21,3 @@ long_desc="
 "
 
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build fuse-devel
-Add_dependency build libcurl-devel
diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index db647cf836..720ccaf08e 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -5,6 +5,8 @@ patch_args="-Np1"
 distfiles="http://ftp.gnu.org/non-gnu/cvs/source/stable/$version/cvs-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="mit-krb5-devel"
+fulldepends="openssh-client"
 short_desc="Concurrent Versions System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9
@@ -17,5 +19,3 @@ long_desc="
  CVS is a production quality system in wide use around the world, including
  many free software projects."
 
-Add_dependency build mit-krb5-devel
-Add_dependency full openssh-client
diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template
index 117e5a156c..8752de98f9 100644
--- a/srcpkgs/cvs2svn/template
+++ b/srcpkgs/cvs2svn/template
@@ -8,6 +8,8 @@ version=2.3.0
 distfiles="http://cvs2svn.tigris.org/files/documents/1462/46528/cvs2svn-2.3.0.tar.gz"
 build_style=gnu-makefile
 make_build_args="man"
+makedepends="wget"
+fulldepends="cvs python>=0"
 short_desc="CVS to Subversion, git and bazaar repository conversion tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d9d835e0c7df48966fbadf51527c25ebf1343b25179e3802f4637d4b96ba363e
@@ -25,9 +27,6 @@ long_desc="
  SCM. cvs2svn also deals with many CVS quirks and is highly configurable."
 
 noarch=yes
-Add_dependency full cvs
-Add_dependency full python ">=0"
-Add_dependency build wget
 
 post_install()
 {
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 094f953dcc..e50e9cc24b 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -8,6 +8,8 @@ pkgname=cyrus-sasl
 configure_args="--with-saslauthd=/run/saslauthd
 --enable-login --enable-plain --enable-sql --disable-sqlite
 --enable-postgresql --enable-mysql --enable-ldapdb --with-ldap=/usr"
+depends="e2fsprogs-libs cyrus-sasl-modules"
+makedepends="libsasl-devel libldap-devel mit-krb5-devel e2fsprogs-devel pam-devel openssl-devel postgresql-libs-devel libmysqlclient-devel"
 short_desc="Cyrus SASL - auth daemon and administration tools"
 long_desc="${long_desc}
 
@@ -20,17 +22,7 @@ subpackages="${pkgname}-modules-ldap ${pkgname}-modules-sql ${pkgname}-modules"
 systemd_services="saslauthd.service on"
 conf_files="/etc/conf.d/saslauthd"
 
-Add_dependency run e2fsprogs-libs
-Add_dependency run cyrus-sasl-modules
 
-Add_dependency build libsasl-devel
-Add_dependency build libldap-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build pam-devel
-Add_dependency build openssl-devel
-Add_dependency build postgresql-libs-devel
-Add_dependency build libmysqlclient-devel
 
 post_install()
 {
diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template
index 0db6ddffb8..6905e68c94 100644
--- a/srcpkgs/darkice/template
+++ b/srcpkgs/darkice/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://code.google.com/p/${pkgname}/"
 distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.gz"
 revision=1
+makedepends="pkg-config lame-devel libogg-devel libvorbis-devel faac-devel alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel libstdc++-devel"
 short_desc="A live audio streamer source client for icecast"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -15,14 +16,4 @@ long_desc="
 
 conf_files="/etc/darkice.cfg"
 
-Add_dependency build pkg-config
-Add_dependency build lame-devel
-Add_dependency build libogg-devel
-Add_dependency build libvorbis-devel
-Add_dependency build faac-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build jack-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build libstdc++-devel
 
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index 158416aa83..eff46f5977 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -5,6 +5,8 @@ distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.
 build_style=gnu-configure
 configure_args="--exec-prefix= LANG=C"
 revision=1
+depends="coreutils"
+makedepends="bison"
 short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gondor.apana.org.au/~herbert/dash/"
@@ -19,5 +21,3 @@ long_desc="
  dash in 2002."
 
 register_shell="/bin/sh"
-Add_dependency run coreutils
-Add_dependency build bison
diff --git a/srcpkgs/db/db-devel.template b/srcpkgs/db/db-devel.template
index f17f2982b5..9edaae683c 100644
--- a/srcpkgs/db/db-devel.template
+++ b/srcpkgs/db/db-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'db-devel'.
 #
+depends="libdb libdb-cxx"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libdb
-Add_dependency run libdb-cxx
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/db/depends b/srcpkgs/db/depends
deleted file mode 100644
index 00477b675c..0000000000
--- a/srcpkgs/db/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.8.24"
-api_depends=">=4.8.30_1" # libdb-cxx
diff --git a/srcpkgs/dbus-glib/dbus-glib-devel.template b/srcpkgs/dbus-glib/dbus-glib-devel.template
index ab3c1409b7..ce82c7b8ba 100644
--- a/srcpkgs/dbus-glib/dbus-glib-devel.template
+++ b/srcpkgs/dbus-glib/dbus-glib-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'dbus-glib-devel'.
 #
+depends="dbus-devel"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 # For dbus-binding-tool(1)
 
-Add_dependency run dbus-devel
 
 do_install()
 {
diff --git a/srcpkgs/dbus-glib/depends b/srcpkgs/dbus-glib/depends
deleted file mode 100644
index 42cbb3f1e6..0000000000
--- a/srcpkgs/dbus-glib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.80"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template
index 75f568a5ca..c23819276a 100644
--- a/srcpkgs/dbus-glib/template
+++ b/srcpkgs/dbus-glib/template
@@ -6,6 +6,8 @@ distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.g
 build_style=gnu-configure
 configure_args="--disable-static --disable-bash-completion"
 revision=2
+depends="expat"
+makedepends="pkg-config glib-devel dbus-devel expat-devel"
 short_desc="GLib bindings for D-Bus"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,9 +17,4 @@ long_desc="
  the GLib thread abstraction and main loop."
 
 subpackages="$pkgname-devel"
-Add_dependency run expat
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build dbus-devel
-Add_dependency build expat-devel
diff --git a/srcpkgs/dbus-python/depends b/srcpkgs/dbus-python/depends
deleted file mode 100644
index 1e79c9a3c4..0000000000
--- a/srcpkgs/dbus-python/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.83.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template
index ce5a5da451..7c502a9f5b 100644
--- a/srcpkgs/dbus-python/template
+++ b/srcpkgs/dbus-python/template
@@ -5,6 +5,8 @@ homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+depends="python"
+makedepends="dbus-glib-devel python-devel"
 short_desc="D-Bus Python bindings"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -14,10 +16,7 @@ long_desc="
 
 pycompile_module="dbus"
 
-Add_dependency run python
 
-Add_dependency build dbus-glib-devel
-Add_dependency build python-devel
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
diff --git a/srcpkgs/dbus/dbus-devel.template b/srcpkgs/dbus/dbus-devel.template
index 933cded559..ae17dd3e86 100644
--- a/srcpkgs/dbus/dbus-devel.template
+++ b/srcpkgs/dbus/dbus-devel.template
@@ -1,17 +1,12 @@
 # Template file for 'dbus-devel'.
 #
+depends="pkg-config expat-devel libSM-devel libICE-devel libX11-devel dbus-libs"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run expat-devel
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run dbus-libs
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
index 24d13ed651..703ee2655e 100644
--- a/srcpkgs/dbus/dbus-x11.template
+++ b/srcpkgs/dbus/dbus-x11.template
@@ -1,5 +1,6 @@
 # Template file for 'dbus-x11'.
 #
+depends="dbus-libs"
 short_desc="${short_desc} (X11 support)"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 
 replaces="dbus<1.4.16_2"
 
-Add_dependency run dbus-libs
 
 do_install()
 {
diff --git a/srcpkgs/dbus/depends b/srcpkgs/dbus/depends
deleted file mode 100644
index a24e33ec00..0000000000
--- a/srcpkgs/dbus/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index f90fb94671..c83ed47360 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -8,6 +8,7 @@ configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
 --disable-dnotify --enable-inotify --with-dbus-user=dbus
 --disable-doxygen-docs --disable-xml-docs --disable-tests
 --with-systemdsystemunitdir=/lib/systemd/system"
+makedepends="pkg-config expat-devel libX11-devel"
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -28,6 +29,3 @@ subpackages="dbus-devel dbus-libs dbus-x11"
 systemd_services="dbus.service off"
 system_accounts="dbus"
 
-Add_dependency build pkg-config
-Add_dependency build expat-devel
-Add_dependency build libX11-devel
diff --git a/srcpkgs/dconf/dconf-devel.template b/srcpkgs/dconf/dconf-devel.template
index 114ac7804d..6c766e9e0e 100644
--- a/srcpkgs/dconf/dconf-devel.template
+++ b/srcpkgs/dconf/dconf-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'dconf-devel'.
 #
+depends="glib-devel vala-devel dconf>=0.12.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run vala-devel
-Add_dependency run dconf ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/dconf/depends b/srcpkgs/dconf/depends
deleted file mode 100644
index c483c1e92d..0000000000
--- a/srcpkgs/dconf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.5.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 7732c47ab6..765d072f0d 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -3,6 +3,8 @@ pkgname=dconf
 version=0.12.1
 distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="dbus"
+makedepends="pkg-config vala-devel dbus-devel gtk+3-devel libxml2-devel"
 short_desc="A low-level configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/dconf"
@@ -15,9 +17,3 @@ long_desc="
 
 subpackages="dconf-devel dconf-editor"
 
-Add_dependency run dbus
-Add_dependency build pkg-config
-Add_dependency build vala-devel
-Add_dependency build dbus-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index 6b5398f8eb..820ce6bbb7 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -2,6 +2,7 @@
 pkgname=deheader
 version=0.6
 distfiles="http://www.catb.org/~esr/deheader/$pkgname-$version.tar.gz"
+fulldepends="python"
 short_desc="C and C++ header analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=643040b241eb47504624e9c2cc4c0f8865bf0ee2b9317ee36ee9195c75e17d4b
@@ -12,7 +13,6 @@ long_desc="
  sometimes exposes dependencies and cohesions of which developers were unaware."
 
 noarch=yes
-Add_dependency full python
 
 do_install()
 {
diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template
index 8b438baabc..aa6d1b4af1 100644
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/srcpkgs/dejavu-fonts-ttf/template
@@ -2,6 +2,7 @@
 pkgname=dejavu-fonts-ttf
 version=2.33
 distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2"
+fulldepends="font-util"
 short_desc="DejaVu family of TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=82a5823a270715913af51915cc20594568f57afb7450abb989695d8808a4194d
@@ -15,7 +16,6 @@ long_desc="
 noarch=yes
 font_dirs="/usr/share/fonts/TTF"
 
-Add_dependency full font-util
 
 do_install()
 {
diff --git a/srcpkgs/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template
index 0c8497c4ca..419596941b 100644
--- a/srcpkgs/desktop-file-utils/template
+++ b/srcpkgs/desktop-file-utils/template
@@ -4,6 +4,7 @@ version=0.20
 homepage="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
 distfiles="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config glib-devel"
 short_desc="Utilities to manage desktop entries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,5 +15,3 @@ long_desc="
  it contains the update-desktop-database utility, used to rebuild the database
  that connects MIME types to applications."
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template
index 338f001b6f..b19bc29de6 100644
--- a/srcpkgs/dev86/template
+++ b/srcpkgs/dev86/template
@@ -4,6 +4,7 @@ version=0.16.18
 patch_args="-Np1"
 distfiles="http://www.debath.co.uk/dev86/Dev86src-$version.tar.gz"
 revision=1
+fulldepends="bin86"
 short_desc="8086 cross development compiler, assembler and linker"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=049852a83898d3ee0ba97b88e526897ec6eaf0a051f4af1e9e073b1151178ff1
@@ -12,7 +13,6 @@ long_desc="
  environment for the production of 8086 executables (Optionally MSDOS COM)."
 
 nostrip=yes
-Add_dependency full bin86
 
 do_build()
 {
diff --git a/srcpkgs/dhcpcd-dbus/template b/srcpkgs/dhcpcd-dbus/template
index 245df7454c..e796036de2 100644
--- a/srcpkgs/dhcpcd-dbus/template
+++ b/srcpkgs/dhcpcd-dbus/template
@@ -4,6 +4,8 @@ version=0.4.2
 revision=2
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$version.tar.bz2"
 build_style=gnu-makefile
+makedepends="pkg-config dbus-devel"
+fulldepends="dhcpcd dbus"
 short_desc="dhcpcd D-Bus interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=beaf6c45b0066530576d44357ae8a4b32dd036c200910eb5ca5364dc8d4dc996
@@ -11,7 +13,3 @@ long_desc="
  dhcpcd-dbus is the dhcpcd D-Bus interface, receives interface configuration
  events from the dhcpcd control socket and emits them to the DBus listeners."
 
-Add_dependency build pkg-config
-Add_dependency build dbus-devel
-Add_dependency full dhcpcd
-Add_dependency full dbus
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 0df689544b..328b560d5f 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -5,6 +5,9 @@ revision=2
 wrksrc=dhcpcd-ui-${version}
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.bz2"
 build_style=gnu-makefile
+depends="glibc dbus-libs gtk+ libnotify"
+makedepends="pkg-config gtk+-devel libnotify-devel dbus-devel"
+fulldepends="dhcpcd dhcpcd-dbus"
 short_desc="GTK+ monitor and configuration GUI for dhcpcd"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=95bfa51339f443530786f3d3f4dede595a168f7e1897cc7b93ac37aa8df96451
@@ -21,13 +24,3 @@ long_desc="
  to, if they're encrypted or not and their overall quality. You can click
  on one to configure the PSK or WEP key 0 for it."
 
-Add_dependency run glibc
-Add_dependency run dbus-libs
-Add_dependency run gtk+
-Add_dependency run libnotify
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build libnotify-devel
-Add_dependency build dbus-devel
-Add_dependency full dhcpcd
-Add_dependency full dhcpcd-dbus
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 4a89f57711..f51dcd4b4d 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -5,6 +5,7 @@ homepage="http://roy.marples.name/projects/dhcpcd"
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
 build_style=configure
 configure_args="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --rundir=/run"
+makedepends="ntp"
 short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Simplified BSD"
@@ -17,7 +18,6 @@ long_desc="
  computer to work on the attached networks without trouble and mostly without
  configuration."
 
-Add_dependency build ntp
 
 conf_files="/etc/dhcpcd.conf"
 
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index b973ed5b8c..97b11e1e30 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -8,6 +8,7 @@ homepage="http://invisible-island.net/dialog/"
 distfiles="ftp://invisible-island.net/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
 build_style=gnu-configure
 configure_args="--with-ncursesw --enable-nls"
+makedepends="ncurses-devel"
 short_desc="A tool to display dialog boxes from shell scripts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -19,4 +20,3 @@ long_desc="
  yes/no box, menu box, input box, message box, text box, info box,
  guage box, checklist box, and radiolist box."
 
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/djvulibre/depends b/srcpkgs/djvulibre/depends
deleted file mode 100644
index c9abcc77b4..0000000000
--- a/srcpkgs/djvulibre/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.5.24"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/djvulibre/djvulibre-devel.template b/srcpkgs/djvulibre/djvulibre-devel.template
index e27f5a3f54..b52014e863 100644
--- a/srcpkgs/djvulibre/djvulibre-devel.template
+++ b/srcpkgs/djvulibre/djvulibre-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'djvulibre-devel'.
 #
+depends="jpeg-devel libdjvulibre"
 short_desc="Development files for the DjVu image format"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run jpeg-devel
-Add_dependency run libdjvulibre
 
 do_install()
 {
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 331e6ed2ce..bbe90aae67 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -6,6 +6,7 @@ distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-desktopfiles"
 revision=3
+makedepends="pkg-config tiff-devel"
 short_desc="Utilities for the DjVu image format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -24,6 +25,4 @@ long_desc="
 
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build tiff-devel
 
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index dde74b4ccc..cfa5214a71 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -3,6 +3,7 @@ pkgname=dkms
 version=2.2.0.3
 homepage="http://linux.dell.com/dkms"
 distfiles="${homepage}/permalink/dkms-$version.tar.gz"
+depends="bash module-init-tools gcc make coreutils kernel-headers"
 short_desc="Dynamic Kernel Modules System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,12 +15,6 @@ long_desc="
 conf_files="/etc/dkms/framework.conf"
 noarch=yes
 
-Add_dependency run bash
-Add_dependency run module-init-tools
-Add_dependency run gcc
-Add_dependency run make
-Add_dependency run coreutils
-Add_dependency run kernel-headers
 
 do_install()
 {
diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template
index 0dbd584c45..d5d94c8c7b 100644
--- a/srcpkgs/dmenu/template
+++ b/srcpkgs/dmenu/template
@@ -3,6 +3,7 @@ pkgname=dmenu
 version=4.4.1
 homepage="http://tools.suckless.org/dmenu/"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
+makedepends="libXinerama-devel"
 short_desc="A generic menu for X"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="MIT"
@@ -11,7 +12,6 @@ long_desc="
  dmenu is a dynamic menu for X, originally designed for dwm. It manages large
  numbers of user-defined menu items efficiently."
 
-Add_dependency build libXinerama-devel
 
 do_build() {
 	make ${makejobs} X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template
index 4410f2bf0a..653821097b 100644
--- a/srcpkgs/dmidecode/template
+++ b/srcpkgs/dmidecode/template
@@ -6,6 +6,7 @@ build_style=gnu-makefile
 make_build_args="prefix=/usr"
 make_install_args="prefix=/usr"
 revision=1
+fulldepends="glibc"
 short_desc="Desktop Management Interface table related utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.nongnu.org/dmidecode"
@@ -22,4 +23,3 @@ long_desc="
  slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of
  I/O ports (e.g. serial, parallel, USB)."
 
-Add_dependency full glibc
diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template
index 3799c4272c..666652ed16 100644
--- a/srcpkgs/dmraid/template
+++ b/srcpkgs/dmraid/template
@@ -9,6 +9,8 @@ homepage="http://people.redhat.com/~heinzm/sw/dmraid/"
 distfiles="${homepage}/src/dmraid-${_distver}-${_patchver}.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-led --enable-intel_led --enable-shared_lib"
+depends="device-mapper>=2.02.95_3"
+makedepends="device-mapper-devel>=2.02.95_1"
 short_desc="Device mapper RAID interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -31,11 +33,8 @@ long_desc="
   VIA Software RAID"
 
 systemd_services="dmraid.service off"
-shlib_depends="device-mapper>=2.02.95_3"
 triggers="initramfs-tools"
 
-Add_dependency build device-mapper-devel ">=2.02.95_1"
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
 	rm -f ${DESTDIR}/usr/lib/*.a
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index d1a1530823..527ca955b1 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -4,6 +4,8 @@ version=2.58
 revision=3
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz"
+depends="libcap libidn dbus"
+makedepends="dbus-devel libcap-devel libidn-devel"
 short_desc="Lightweight, easy to configure DNS forwarder and DHCP server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -21,13 +23,7 @@ system_accounts="dnsmasq"
 conf_files="/etc/dnsmasq.conf /etc/conf.d/dnsmasq"
 systemd_services="dnsmasq.service on"
 
-Add_dependency run libcap
-Add_dependency run libidn
-Add_dependency run dbus
 
-Add_dependency build dbus-devel
-Add_dependency build libcap-devel
-Add_dependency build libidn-devel
 
 do_build()
 {
diff --git a/srcpkgs/docbook-dsssl/template b/srcpkgs/docbook-dsssl/template
index 5ccc8dfea9..3289974342 100644
--- a/srcpkgs/docbook-dsssl/template
+++ b/srcpkgs/docbook-dsssl/template
@@ -2,6 +2,7 @@
 pkgname=docbook-dsssl
 version=1.79
 distfiles="${SOURCEFORGE_SITE}/docbook/$pkgname-$version.tar.bz2"
+fulldepends="xmlcatmgr docbook-xml>=4.2"
 short_desc="DSSSL stylesheets for the DocBook DTD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.docbook.org/"
@@ -20,8 +21,6 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full xmlcatmgr
-Add_dependency full docbook-xml ">=4.2"
 
 export sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --"
 
diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template
index 7ca60226f2..ed50821f61 100644
--- a/srcpkgs/docbook-xml/template
+++ b/srcpkgs/docbook-xml/template
@@ -8,6 +8,8 @@ http://www.oasis-open.org/docbook/xml/$version/$pkgname-$version.zip
 http://www.oasis-open.org/docbook/xml/4.4/$pkgname-4.4.zip
 http://www.oasis-open.org/docbook/xml/4.3/$pkgname-4.3.zip
 http://www.oasis-open.org/docbook/xml/4.2/$pkgname-4.2.zip"
+makedepends="bsdtar"
+fulldepends="xmlcatmgr"
 short_desc="XML DTD designed for computer documentation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
@@ -28,8 +30,6 @@ long_desc="
 noarch=yes
 noextract=yes
 
-Add_dependency full xmlcatmgr
-Add_dependency build bsdtar
 
 export xml_entries="
 rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2
diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template
index a666dead97..1b99179c48 100644
--- a/srcpkgs/docbook-xsl/template
+++ b/srcpkgs/docbook-xsl/template
@@ -3,6 +3,7 @@ pkgname=docbook-xsl
 version=1.75.2
 revision=1
 distfiles="${SOURCEFORGE_SITE}/docbook/$pkgname-$version.tar.bz2"
+fulldepends="xmlcatmgr docbook-xml>=4.2"
 short_desc="Docbook XSL modular stylesheet"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0dcc3aebd2ada8719e47b77c62ab986c4f2747f9a7cab6f629b6472e6d058e09
@@ -19,8 +20,6 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full xmlcatmgr
-Add_dependency full docbook-xml ">=4.2"
 
 export xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --"
 
diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template
index 3e076b71b0..1c310178f3 100644
--- a/srcpkgs/docbook/template
+++ b/srcpkgs/docbook/template
@@ -11,6 +11,8 @@ http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
 http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
 http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
 http://www.oasis-open.org/docbook/sgml/2.4.1/docbk241.zip"
+makedepends="bsdtar"
+fulldepends="xmlcatmgr ISOEnts"
 short_desc="SGML DTD designed for computer documentation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
@@ -36,9 +38,6 @@ long_desc="
 noarch=yes
 noextract=yes
 
-Add_dependency full xmlcatmgr
-Add_dependency full ISOEnts
-Add_dependency build bsdtar
 
 export sgml_entries="
 CATALOG /usr/share/sgml/docbook/2.4.1/catalog --
diff --git a/srcpkgs/docbook2x/template b/srcpkgs/docbook2x/template
index 2c7a461b30..0590eb727e 100644
--- a/srcpkgs/docbook2x/template
+++ b/srcpkgs/docbook2x/template
@@ -6,6 +6,7 @@ wrksrc="docbook2X-${version}"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/docbook2X-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+fulldepends="texinfo libxslt docbook docbook-dsssl docbook-xml docbook-xsl perl-XML-SAX xmlcatmgr"
 short_desc="DocBook converter to UNIX manpage and GNU Texinfo format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://docbook2x.sourceforge.net"
@@ -19,14 +20,6 @@ export xml_entries="
 nextCatalog /usr/share/docbook2X/dtd/catalog.xml --
 nextCatalog /usr/share/docbook2X/xslt/catalog.xml --"
 
-Add_dependency full texinfo
-Add_dependency full libxslt
-Add_dependency full docbook
-Add_dependency full docbook-dsssl
-Add_dependency full docbook-xml
-Add_dependency full docbook-xsl
-Add_dependency full perl-XML-SAX
-Add_dependency full xmlcatmgr
 
 post_install() {
 	sed -i -e 's|${prefix}|/usr|g' ${DESTDIR}/usr/bin/*
diff --git a/srcpkgs/dovecot/dovecot-plugin-ldap.template b/srcpkgs/dovecot/dovecot-plugin-ldap.template
index d6b3436260..0c188e015a 100644
--- a/srcpkgs/dovecot/dovecot-plugin-ldap.template
+++ b/srcpkgs/dovecot/dovecot-plugin-ldap.template
@@ -1,11 +1,11 @@
 # Template file for 'dovecot-plugin-ldap'.
 #
+depends="dovecot>=2.1.3"
 short_desc="${short_desc} - LDAP plugin"
 long_desc="${long_desc}
 
  This package contains a plugin for LDAP authentication."
 
-Add_dependency run dovecot ">=${version}"
 
 conf_files="/etc/dovecot/conf.d/auth-ldap.conf.ext"
 
diff --git a/srcpkgs/dovecot/dovecot-plugin-mysql.template b/srcpkgs/dovecot/dovecot-plugin-mysql.template
index 4350e2209a..eb8996b686 100644
--- a/srcpkgs/dovecot/dovecot-plugin-mysql.template
+++ b/srcpkgs/dovecot/dovecot-plugin-mysql.template
@@ -1,11 +1,11 @@
 # Template file for 'dovecot-plugin-mysql'.
 #
+depends="dovecot>=2.1.3"
 short_desc="${short_desc} - MySQL plugin"
 long_desc="${long_desc}
 
  This package contains a plugin for MySQL authentication and dictionaries."
 
-Add_dependency run dovecot ">=${version}"
 
 do_install() {
 	vmove usr/lib/dovecot/modules/auth/libdriver_mysql.so \
diff --git a/srcpkgs/dovecot/dovecot-plugin-pgsql.template b/srcpkgs/dovecot/dovecot-plugin-pgsql.template
index 93b04fbcca..71e2617b19 100644
--- a/srcpkgs/dovecot/dovecot-plugin-pgsql.template
+++ b/srcpkgs/dovecot/dovecot-plugin-pgsql.template
@@ -1,12 +1,12 @@
 # Template file for 'dovecot-plugin-pgsql'.
 #
+depends="dovecot>=2.1.3"
 short_desc="${short_desc} - PostgreSQL plugin"
 long_desc="${long_desc}
 
  This package contains a plugin for PostgreSQL authentication
  and dictionaries."
 
-Add_dependency run dovecot ">=${version}"
 
 do_install() {
 	vmove usr/lib/dovecot/modules/auth/libdriver_pgsql.so \
diff --git a/srcpkgs/dovecot/dovecot-plugin-sqlite.template b/srcpkgs/dovecot/dovecot-plugin-sqlite.template
index 1bf5c84ce0..9f6529f851 100644
--- a/srcpkgs/dovecot/dovecot-plugin-sqlite.template
+++ b/srcpkgs/dovecot/dovecot-plugin-sqlite.template
@@ -1,11 +1,11 @@
 # Template file for 'dovecot-plugin-sqlite'.
 #
+depends="dovecot>=2.1.3"
 short_desc="${short_desc} - SQLite plugin"
 long_desc="${long_desc}
 
  This package contains a plugin for SQLite authentication and dictionaries."
 
-Add_dependency run dovecot ">=${version}"
 
 do_install() {
 	vmove usr/lib/dovecot/modules/auth/libdriver_sqlite.so \
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 402f44dc37..9d7093acf2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -9,6 +9,8 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
 --with-sqlite --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl
 --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-libcap
 --with-solr --with-docs --with-systemdsystemunitdir=/lib/systemd/system"
+depends="openssl>=0"
+makedepends="openssl-devel mit-krb5-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel"
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -52,18 +54,7 @@ conf_files="
 /etc/dovecot/dovecot.conf
 /etc/ssl/dovecot-openssl.cnf"
 
-Add_dependency run openssl ">=0" # for mkcert.sh
 
-Add_dependency build openssl-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build postgresql-libs-devel
-Add_dependency build sqlite-devel
-Add_dependency build libldap-devel
-Add_dependency build libcap-devel
-Add_dependency build pam-devel
-Add_dependency build libcurl-devel
-Add_dependency build expat-devel
 
 post_install() {
 	local econfdir=usr/share/doc/dovecot/example-config
diff --git a/srcpkgs/doxygen/doxygen-gui.template b/srcpkgs/doxygen/doxygen-gui.template
index addaffabe3..d0e4be76f1 100644
--- a/srcpkgs/doxygen/doxygen-gui.template
+++ b/srcpkgs/doxygen/doxygen-gui.template
@@ -1,12 +1,12 @@
 # Template file for 'doxygen-gui'.
 #
+depends="doxygen"
 short_desc="Qt GUI configuration tool for doxygen"
 long_desc="${long_desc}
 
  This package contains doxywizard, a Qt GUI configuration tool for
  doxygen."
 
-Add_dependency run doxygen
 
 do_install()
 {
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 6b8ce01982..f4ab977822 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -2,6 +2,7 @@
 pkgname=doxygen
 version=1.8.0
 distfiles="http://ftp.stack.nl/pub/users/dimitri/$pkgname-$version.src.tar.gz"
+makedepends="perl flex qt-devel"
 short_desc="Source code documentation generator tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.doxygen.org/"
@@ -13,9 +14,6 @@ long_desc="
  extent D."
 
 subpackages="$pkgname-gui"
-Add_dependency build perl
-Add_dependency build flex
-Add_dependency build qt-devel
 
 do_configure() {
 	env QTDIR=/usr ./configure --prefix /usr --with-doxywizard --with-doxyapp
diff --git a/srcpkgs/dracut/dracut-network.template b/srcpkgs/dracut/dracut-network.template
index 9dae91ea5f..3082696ead 100644
--- a/srcpkgs/dracut/dracut-network.template
+++ b/srcpkgs/dracut/dracut-network.template
@@ -1,12 +1,12 @@
 # Template file for 'dracut-network'
 pkgname=dracut
+depends="dracut>=014"
 short_desc="${short_desc} - network modules"
 long_desc="${long_desc}
  This package contains some modules to allow booting from network, such as
  via ISCSI, NFS, etc."
 
 noarch=yes
-Add_dependency run dracut ">=${version}"
 
 do_install() {
 	for f in 40network 90livenet 95fcoe 95iscsi \
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 08eefe67d2..19d1d730f7 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -6,6 +6,8 @@ distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-makefile
 make_build_args="sysconfdir=/etc"
 make_install_args="sysconfdir=/etc"
+depends="busybox psmisc>=22.14_2"
+makedepends="libxslt docbook-xsl"
 short_desc="A new initramfs infrastructure"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8766a0eecd51b4bc6647e7870ba269dffbbbe21954984b23c77f21ce1fd034d1
@@ -24,11 +26,7 @@ subpackages="dracut-network"
 conf_files="/etc/dracut.conf"
 make_dirs="/etc/dracut.conf.d 0755 root root"
 
-Add_dependency run busybox
-Add_dependency run psmisc ">=22.14_2" # pidof
 
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
 
 pre_install() {
 	# fix path to busybox.
diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template
index dfb74d9ca0..780e2c0979 100644
--- a/srcpkgs/dssi-vst/template
+++ b/srcpkgs/dssi-vst/template
@@ -4,6 +4,8 @@ version=0.9.2
 revision=3
 homepage="http://breakfastquay.com/dssi-vst/"
 distfiles="http://code.breakfastquay.com/attachments/download/10/${pkgname}-${version}.tar.bz2"
+depends="dssi ladspa-sdk ladspa-sdk-progs"
+makedepends="jack-devel alsa-lib-devel libstdc++-devel liblo-devel dssi-devel ladspa-sdk wine-unstable wine-unstable-devel"
 short_desc="Run Windows VST plugins on Linux"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL"
@@ -17,18 +19,7 @@ long_desc="
 
 only_for_archs=i686
 
-Add_dependency run dssi
-Add_dependency run ladspa-sdk
-Add_dependency run ladspa-sdk-progs
 
-Add_dependency build jack-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libstdc++-devel
-Add_dependency build liblo-devel
-Add_dependency build dssi-devel
-Add_dependency build ladspa-sdk
-Add_dependency build wine-unstable		# Needs wineg++ to build
-Add_dependency build wine-unstable-devel	# Needs windows.h to build
 
 do_configure()
 {
diff --git a/srcpkgs/dssi/dssi-devel.template b/srcpkgs/dssi/dssi-devel.template
index 16100d5047..22f411417f 100644
--- a/srcpkgs/dssi/dssi-devel.template
+++ b/srcpkgs/dssi/dssi-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'dssi-devel'.
 #
+depends="glibc-devel dssi"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run dssi
 
 do_install()
 {
diff --git a/srcpkgs/dssi/dssi-example-plugins.template b/srcpkgs/dssi/dssi-example-plugins.template
index 6b8a2a1b88..33856e865a 100644
--- a/srcpkgs/dssi/dssi-example-plugins.template
+++ b/srcpkgs/dssi/dssi-example-plugins.template
@@ -1,11 +1,11 @@
 # Template file for 'dssi-example-plugins-devel'.
 #
+depends="dssi"
 short_desc="${short_desc} - Example plugins"
 long_desc="${long_desc}
 
  This package contains the example plugins."
 
-Add_dependency run dssi
 
 do_install()
 {
diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index 4d8fcff833..739e3ab43a 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://dssi.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 revision=2
+makedepends="pkg-config glibc-devel libstdc++-devel qt-devel libX11-devel liblo-devel libsndfile-devel libsamplerate-devel alsa-lib-devel jack-devel ladspa-sdk libSM-devel"
 short_desc="API for audio processing plugins"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -16,15 +17,3 @@ long_desc="
 subpackages="$pkgname-devel $pkgname-example-plugins"
 
 
-Add_dependency build pkg-config
-Add_dependency build glibc-devel
-Add_dependency build libstdc++-devel
-Add_dependency build qt-devel
-Add_dependency build libX11-devel
-Add_dependency build liblo-devel
-Add_dependency build libsndfile-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build jack-devel
-Add_dependency build ladspa-sdk
-Add_dependency build libSM-devel
diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template
index ea76ddbd87..d687b808dd 100644
--- a/srcpkgs/dtach/template
+++ b/srcpkgs/dtach/template
@@ -3,6 +3,7 @@ pkgname=dtach
 version=0.8
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 revision=1
+makedepends="glibc-devel"
 short_desc="dtach is a tiny program that emulates the detach feature of screen"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dtach.sourceforge.net/"
@@ -15,7 +16,6 @@ long_desc="
  the screen, and thus works best with programs that know how to redraw 
  themselves."
 
-Add_dependency build glibc-devel
 
 do_build()
 {
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index ee4a025d2f..3a179c3baf 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -3,6 +3,7 @@ pkgname=dwm
 version=6.0
 homepage="http://dwm.suckless.org"
 distfiles="http://dl.suckless.org/dwm/dwm-$version.tar.gz"
+makedepends="libX11-devel libXinerama-devel"
 short_desc="A dynamic window manager for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,8 +13,6 @@ long_desc="
  and floating layouts. All of the layouts can be applied dynamically,
  optimising the environment for the application in use and the task performed."
 
-Add_dependency build libX11-devel
-Add_dependency build libXinerama-devel
 
 do_build() {
 	cp ${FILESDIR}/config.h config.h
diff --git a/srcpkgs/e2fsprogs/depends b/srcpkgs/e2fsprogs/depends
deleted file mode 100644
index 45fed374c9..0000000000
--- a/srcpkgs/e2fsprogs/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.41.5_1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/e2fsprogs/e2fsprogs-devel.template b/srcpkgs/e2fsprogs/e2fsprogs-devel.template
index 066a2015da..911a86f4ae 100644
--- a/srcpkgs/e2fsprogs/e2fsprogs-devel.template
+++ b/srcpkgs/e2fsprogs/e2fsprogs-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'e2fsprogs-devel'.
 #
+depends="libuuid-devel libblkid-devel e2fsprogs-libs"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libuuid-devel
-Add_dependency run libblkid-devel
-Add_dependency run e2fsprogs-libs
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index fe1b4ac6b3..445585eca2 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -10,6 +10,7 @@ configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
 --enable-symlink-build --enable-symlink-install
 --libdir=/usr/lib --libexecdir=/usr/lib"
 make_install_args="install-libs"
+makedepends="pkg-config libuuid-devel libblkid-devel"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -21,9 +22,6 @@ long_desc="
 subpackages="$pkgname-devel $pkgname-libs"
 conf_files="/etc/mke2fs.conf"
 
-Add_dependency build pkg-config
-Add_dependency build libuuid-devel
-Add_dependency build libblkid-devel
 
 post_install() {
 	# Remove stuff belonging to libblkid or libuuid pkgs.
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index 090d7c97d4..b8467fa9da 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -4,6 +4,9 @@ version=3.4.2.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
+depends="webkit-gtk3>=1.6.3"
+makedepends="pkg-config intltool gnome-doc-utils itstool telepathy-glib-devel>=0.15.5 telepathy-logger-devel telepathy-farstream-devel telepathy-mission-control-devel evolution-data-server-devel geoclue-devel folks-devel libcanberra-devel libnotify-devel clutter-gtk-devel clutter-gst-devel webkit-gtk3-devel gcr-devel pulseaudio-devel enchant-devel NetworkManager-devel gnome-online-accounts-devel libchamplain-devel nautilus-sendto-devel cheese-devel gnutls-devel"
+fulldepends="iso-codes"
 short_desc="GNOME instant messaging client using the Telepathy framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Empathy"
@@ -15,33 +18,6 @@ long_desc="
  AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, Gadu-Gadu,
  Groupwise, ICQ and QQ."
 
-shlib_depends="webkit-gtk3>=1.6.3"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build itstool
-Add_dependency build telepathy-glib-devel	">=0.15.5"
-Add_dependency build telepathy-logger-devel
-Add_dependency build telepathy-farstream-devel
-Add_dependency build telepathy-mission-control-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build geoclue-devel
-Add_dependency build folks-devel
-Add_dependency build libcanberra-devel
-Add_dependency build libnotify-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build clutter-gst-devel
-Add_dependency build webkit-gtk3-devel
-Add_dependency build gcr-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build enchant-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build gnome-online-accounts-devel
-Add_dependency build libchamplain-devel
-Add_dependency build nautilus-sendto-devel
-Add_dependency build cheese-devel
-Add_dependency build gnutls-devel
 
-Add_dependency full iso-codes
diff --git a/srcpkgs/enca/depends b/srcpkgs/enca/depends
deleted file mode 100644
index e5a81ba3c7..0000000000
--- a/srcpkgs/enca/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.13"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/enca/enca-devel.template b/srcpkgs/enca/enca-devel.template
index 00d15d2818..aeaeec9c07 100644
--- a/srcpkgs/enca/enca-devel.template
+++ b/srcpkgs/enca/enca-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'recode-devel'.
 #
+depends="recode-devel libenca"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run recode-devel
-Add_dependency run libenca
 
 do_install()
 {
diff --git a/srcpkgs/enca/template b/srcpkgs/enca/template
index 825a5a5c25..1054aeae88 100644
--- a/srcpkgs/enca/template
+++ b/srcpkgs/enca/template
@@ -5,6 +5,7 @@ distfiles="http://dl.cihar.com/enca/enca-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-external"
 revision=2
+makedepends="pkg-config recode-devel"
 short_desc="Extremely Naive Charset Analyser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432
@@ -13,5 +14,3 @@ long_desc="
  the encoding of text files and can also convert them to other encodings."
  
 subpackages="libenca enca-devel"
-Add_dependency build pkg-config
-Add_dependency build recode-devel
diff --git a/srcpkgs/enchant/depends b/srcpkgs/enchant/depends
deleted file mode 100644
index d4db4c87cf..0000000000
--- a/srcpkgs/enchant/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/enchant/enchant-devel.template b/srcpkgs/enchant/enchant-devel.template
index a48898e132..33a98d29ff 100644
--- a/srcpkgs/enchant/enchant-devel.template
+++ b/srcpkgs/enchant/enchant-devel.template
@@ -1,16 +1,12 @@
 # Template file for 'enchant-devel'.
 #
+depends="pkg-config glib-devel aspell-devel hunspell-devel enchant"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run aspell-devel
-Add_dependency run hunspell-devel
-Add_dependency run enchant
 
 do_install()
 {
diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template
index 4a11c44b6f..51f4a2844c 100644
--- a/srcpkgs/enchant/template
+++ b/srcpkgs/enchant/template
@@ -5,6 +5,7 @@ revision=4
 distfiles="http://www.abisource.com/downloads/enchant/$version/enchant-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-zemberek --disable-ispell"
+makedepends="pkg-config libstdc++-devel glib-devel aspell-devel hunspell-devel"
 short_desc="Generic spell checking library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=95c8dd998c8fb436329d204e0edde4400b889e4e26d3f8cb888c408c9a9acc6a
@@ -33,8 +34,3 @@ long_desc="
  this, all of Enchant's providers are DLLs."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libstdc++-devel
-Add_dependency build glib-devel
-Add_dependency build aspell-devel
-Add_dependency build hunspell-devel
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index 1b3e187659..3612a525d4 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -3,6 +3,7 @@ pkgname=encodings
 version=1.0.4
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+fulldepends="mkfontscale"
 short_desc="X11 Font Index Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539
@@ -11,5 +12,4 @@ long_desc="
  adobe-dingbats.enc.gz, ibm-cp866.enc, jisx0212.1990-0.enc.gz,
  and others. This is from the modular X.org project."
 
-Add_dependency full mkfontscale
 noarch=yes
diff --git a/srcpkgs/enscript/template b/srcpkgs/enscript/template
index 4f9304605c..dc9110126a 100644
--- a/srcpkgs/enscript/template
+++ b/srcpkgs/enscript/template
@@ -4,6 +4,7 @@ version=1.6.5.2
 homepage="http://git.savannah.gnu.org/cgit/enscript.git"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="perl"
 short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,4 +20,3 @@ long_desc="
 
 conf_files="/etc/enscript.cfg"
 
-Add_dependency build perl
diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e0412c785e..fe93383adf 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -4,6 +4,8 @@ version=3.4.0
 revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="eog>=3.4.0"
+makedepends="pkg-config intltool eog-devel libgdata-devel libchamplain-devel libpeas-devel libexif-devel"
 short_desc="Eye of GNOME plugins"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -20,12 +22,4 @@ long_desc="
 pycompile_dirs="usr/lib/eog/plugins"
 
 # XXX postr plugin.
-Add_dependency run eog ">=${version}"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build eog-devel
-Add_dependency build libgdata-devel
-Add_dependency build libchamplain-devel
-Add_dependency build libpeas-devel
-Add_dependency build libexif-devel
diff --git a/srcpkgs/eog/depends b/srcpkgs/eog/depends
deleted file mode 100644
index 88592da749..0000000000
--- a/srcpkgs/eog/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/eog/eog-devel.template b/srcpkgs/eog/eog-devel.template
index cf85d8048e..f3a95d4c28 100644
--- a/srcpkgs/eog/eog-devel.template
+++ b/srcpkgs/eog/eog-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'eog-devel'.
 #
+depends="gtk+3-devel"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
 
 noarch=yes
 
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index e88afd2260..f9fe37f9da 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -4,6 +4,9 @@ version=3.4.1
 distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils gnome-desktop-devel libpeas-devel lcms2-devel exempi-devel libexif-devel librsvg-devel"
+fulldepends="gnome-icon-theme gsettings-desktop-schemas shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -18,20 +21,5 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="eog-devel"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gnome-desktop-devel
-Add_dependency build libpeas-devel
-Add_dependency build lcms2-devel
-Add_dependency build exempi-devel
-Add_dependency build libexif-devel
-Add_dependency build librsvg-devel
 
-Add_dependency full gnome-icon-theme
-Add_dependency full gsettings-desktop-schemas
-Add_dependency full shared-mime-info
diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index bd583af98f..d885597074 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -4,6 +4,8 @@ version=0.1.8
 revision=3
 distfiles="http://trac.emma-soft.com/$pkgname/chrome/site/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config gtk+-devel poppler-glib-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils"
 short_desc="Lightweight PDF viewer using Poppler and GTK+"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0
@@ -18,12 +20,7 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build poppler-glib-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
 
 post_install()
 {
diff --git a/srcpkgs/epiphany-extensions/template b/srcpkgs/epiphany-extensions/template
index cbadda9f78..32fe4883f1 100644
--- a/srcpkgs/epiphany-extensions/template
+++ b/srcpkgs/epiphany-extensions/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
 --disable-debug"
+depends="epiphany webkit-gtk3>=1.8.0"
+makedepends="which pkg-config intltool gnome-doc-utils webkit-gtk3-devel epiphany-devel>=3.4.0 opensp-devel"
 short_desc="Extensions for Epiphany - The GNOME web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/epiphany/"
@@ -21,15 +23,3 @@ long_desc="
  integration with the GNOME desktop.
 
  This package contains some extensions for use with Epiphany."
-
-shlib_depends="webkit-gtk3>=1.8.0"
-
-Add_dependency run epiphany
-
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build webkit-gtk3-devel
-Add_dependency build epiphany-devel ">=${version}"
-Add_dependency build opensp-devel
diff --git a/srcpkgs/epiphany/depends b/srcpkgs/epiphany/depends
deleted file mode 100644
index 6e8d7e9a54..0000000000
--- a/srcpkgs/epiphany/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.90"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/epiphany/epiphany-devel.template b/srcpkgs/epiphany/epiphany-devel.template
index 28f1bd1d0f..cbdadab505 100644
--- a/srcpkgs/epiphany/epiphany-devel.template
+++ b/srcpkgs/epiphany/epiphany-devel.template
@@ -1,21 +1,11 @@
 # Template file for 'epiphany-devel'.
 #
+depends="nss-devel libgnome-keyring-devel libsoup-gnome-devel webkit-gtk3-devel startup-notification-devel NetworkManager-devel libseed-devel libnotify-devel avahi-libs-devel avahi-glib-libs-devel epiphany>=3.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run nss-devel
-Add_dependency run libgnome-keyring-devel
-Add_dependency run libsoup-gnome-devel
-Add_dependency run webkit-gtk3-devel
-Add_dependency run startup-notification-devel
-Add_dependency run NetworkManager-devel
-Add_dependency run libseed-devel
-Add_dependency run libnotify-devel
-Add_dependency run avahi-libs-devel
-Add_dependency run avahi-glib-libs-devel
-Add_dependency run epiphany ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c169937127..f24cc57fc8 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
 --disable-tests --enable-seed"
+depends="ca-certificates hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.8.0"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection nss-devel libgnome-keyring-devel libsoup-gnome-devel webkit-gtk3-devel>=1.8.0 startup-notification-devel NetworkManager-devel libseed-devel libnotify-devel avahi-libs-devel avahi-glib-libs-devel"
+fulldepends="iso-codes gsettings-desktop-schemas"
 short_desc="Intuitive GNOME web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/epiphany/"
@@ -20,29 +23,5 @@ long_desc="
  by closely following the GNOME Human Interface Guidelines (HIG) and by close
  integration with the GNOME desktop."
 
-shlib_depends="webkit-gtk3>=1.8.0"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
-
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build nss-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build webkit-gtk3-devel ">=1.8.0"
-Add_dependency build startup-notification-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build libseed-devel
-Add_dependency build libnotify-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build avahi-glib-libs-devel
-
-Add_dependency run ca-certificates
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
-
-Add_dependency full iso-codes
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/epson-inkjet-printer-escpr/template b/srcpkgs/epson-inkjet-printer-escpr/template
index be0777a739..50fa74d6d3 100644
--- a/srcpkgs/epson-inkjet-printer-escpr/template
+++ b/srcpkgs/epson-inkjet-printer-escpr/template
@@ -8,6 +8,7 @@ homepage="http://www.gnu.org/software/sed"
 distfiles="http://linux.avasys.jp/drivers/lsb/epson-inkjet/escpr/src/$pkgname-${_distver}-${_lsbver}.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="cups-devel"
 short_desc="Epson Inkjet Printer Driver (ESC/P-R)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,7 +20,6 @@ long_desc="
 
  This product can only be used with printers that support the Epson ESC/P-R language."
 
-Add_dependency build cups-devel
 
 post_install() {
 	# gzip ppd files.
diff --git a/srcpkgs/evince/depends b/srcpkgs/evince/depends
deleted file mode 100644
index 46f353795b..0000000000
--- a/srcpkgs/evince/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/evince/evince-devel.template b/srcpkgs/evince/evince-devel.template
index 16bf1bd1a3..eb1aa9ad5c 100644
--- a/srcpkgs/evince/evince-devel.template
+++ b/srcpkgs/evince/evince-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'evince-devel'.
 #
+depends="gtk+3-devel libevince>=3.4.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run libevince ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index e9a0d038d5..37af757113 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -7,6 +7,9 @@ build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile
 --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib
 --disable-tests --disable-static"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection tiff-devel libarchive-devel nautilus-devel poppler-glib-devel libgnome-keyring-devel libxml2-devel djvulibre-devel libgxps-devel libSM-devel libICE-devel gtk+3-devel libspectre-devel"
+fulldepends="gnome-icon-theme gsettings-desktop-schemas"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/evince/"
@@ -27,25 +30,4 @@ long_desc="
 subpackages="lib${pkgname} ${pkgname}-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build tiff-devel
-Add_dependency build libarchive-devel
-Add_dependency build nautilus-devel
-Add_dependency build poppler-glib-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build libxml2-devel
-Add_dependency build djvulibre-devel
-Add_dependency build libgxps-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libspectre-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
-Add_dependency full gnome-icon-theme
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/evolution-data-server/depends b/srcpkgs/evolution-data-server/depends
deleted file mode 100644
index 2f4fcbf32c..0000000000
--- a/srcpkgs/evolution-data-server/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends=">=3.4.2"
diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
index 17589d13c6..b669c18d30 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
@@ -1,21 +1,11 @@
 # Template file for 'evolution-data-server-devel'.
 #
+depends="sqlite-devel GConf-devel mit-krb5-devel nss-devel libical-devel libgweather-devel libldap-devel libgdata-devel gnome-online-accounts-devel vala-devel evolution-data-server>=3.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run sqlite-devel
-Add_dependency run GConf-devel
-Add_dependency run mit-krb5-devel
-Add_dependency run nss-devel
-Add_dependency run libical-devel
-Add_dependency run libgweather-devel
-Add_dependency run libldap-devel
-Add_dependency run libgdata-devel
-Add_dependency run gnome-online-accounts-devel
-Add_dependency run vala-devel
-Add_dependency run evolution-data-server ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 20bd4068d4..479e1062a4 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
 configure_args="--with-openldap
 --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
 --with-nss-includes=/usr/include/nss --enable-vala-bindings"
+makedepends="pkg-config intltool flex gperf gobject-introspection sqlite-devel dbus-glib-devel GConf-devel mit-krb5-devel nss-devel libical-devel libgweather-devel libldap-devel libgdata-devel gnome-online-accounts-devel vala-devel liboauth-devel libgnome-keyring-devel"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,21 +18,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build flex
-Add_dependency build gperf
-Add_dependency build gobject-introspection
-Add_dependency build sqlite-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build GConf-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build nss-devel
-Add_dependency build libical-devel
-Add_dependency build libgweather-devel
-Add_dependency build libldap-devel
-Add_dependency build libgdata-devel
-Add_dependency build gnome-online-accounts-devel
-Add_dependency build vala-devel
-Add_dependency build liboauth-devel
-Add_dependency build libgnome-keyring-devel
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fe9b7614a1..a4d1b65754 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -7,6 +7,8 @@ build_style=gnu-configure
 configure_args="--disable-pst-import --with-clutter --with-openldap
 --with-krb5=/usr --disable-schemas-install --disable-scrollkeeper
 --disable-static --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+makedepends="which pkg-config intltool gnome-doc-utils evolution-data-server-devel gtk+3-devel libical-devel GConf-devel mx-devel clutter-gtk-devel libcanberra-devel gtkhtml-devel nss-devel clutter-devel json-glib-devel libXfixes-devel enchant-devel sqlite-devel libsoup-devel libxml2-devel gnome-desktop-devel libldap-devel libsoup-gnome-devel libnotify-devel gnome-online-accounts-devel libgdata-devel gstreamer-devel libgweather-devel mit-krb5-devel NetworkManager-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Integrated mail, addressbook and calendaring"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -31,41 +33,7 @@ evolution-spamassassin.schemas"
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build evolution-data-server-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libical-devel
-Add_dependency build GConf-devel
-Add_dependency build mx-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build libcanberra-devel
-Add_dependency build gtkhtml-devel
-Add_dependency build nss-devel
-Add_dependency build clutter-devel
-Add_dependency build json-glib-devel
-Add_dependency build libXfixes-devel
-Add_dependency build enchant-devel
-Add_dependency build sqlite-devel
-Add_dependency build libsoup-devel
-Add_dependency build libxml2-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build libldap-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build libnotify-devel
-Add_dependency build gnome-online-accounts-devel
-Add_dependency build libgdata-devel
-Add_dependency build gstreamer-devel
-Add_dependency build libgweather-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build NetworkManager-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
-Add_dependency full gsettings-desktop-schemas
-Add_dependency full iso-codes
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/exempi/depends b/srcpkgs/exempi/depends
deleted file mode 100644
index 612e364770..0000000000
--- a/srcpkgs/exempi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/exempi/exempi-devel.template b/srcpkgs/exempi/exempi-devel.template
index e3f6571f68..52969f0b03 100644
--- a/srcpkgs/exempi/exempi-devel.template
+++ b/srcpkgs/exempi/exempi-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'libnl-devel'.
 #
+depends="zlib-devel expat-devel boost-devel exempi"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run zlib-devel
-Add_dependency run expat-devel
-Add_dependency run boost-devel
-Add_dependency run exempi
 
 do_install()
 {
diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template
index 389f535221..a4a5f643a5 100644
--- a/srcpkgs/exempi/template
+++ b/srcpkgs/exempi/template
@@ -4,6 +4,7 @@ version=2.1.1
 revision=3
 distfiles="http://libopenraw.freedesktop.org/download/exempi-$version.tar.gz"
 build_style=gnu-configure
+makedepends="zlib-devel expat-devel boost-devel"
 short_desc="Library for applications dealing with netlink sockets"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b06b67472ff673e2d4257ae0b687ba421af1f9952428e7caead870868c2a4dd3
@@ -13,6 +14,3 @@ long_desc="
  netlink family specific interfaces."
 
 subpackages="$pkgname-devel"
-Add_dependency build zlib-devel
-Add_dependency build expat-devel
-Add_dependency build boost-devel
diff --git a/srcpkgs/exiv2/depends b/srcpkgs/exiv2/depends
deleted file mode 100644
index d71ea33f28..0000000000
--- a/srcpkgs/exiv2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.22"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/exiv2/exiv2-devel.template b/srcpkgs/exiv2/exiv2-devel.template
index 5d482e67ae..b0e40d9335 100644
--- a/srcpkgs/exiv2/exiv2-devel.template
+++ b/srcpkgs/exiv2/exiv2-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'exiv2-devel'.
 #
+depends="zlib-devel expat-devel libstdc++-devel exiv2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run expat-devel
-Add_dependency run libstdc++-devel
-Add_dependency run exiv2
 
 do_install()
 {
diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template
index f0aca29810..6e8117ac58 100644
--- a/srcpkgs/exiv2/template
+++ b/srcpkgs/exiv2/template
@@ -5,6 +5,7 @@ homepage="http://www.exiv2.org"
 distfiles="${homepage}/exiv2-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="zlib-devel expat-devel libstdc++-devel"
 short_desc="Image metadata manipulation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,6 +16,3 @@ long_desc="
 
 subpackages="exiv2-devel"
 
-Add_dependency build zlib-devel
-Add_dependency build expat-devel
-Add_dependency build libstdc++-devel
diff --git a/srcpkgs/exo/depends b/srcpkgs/exo/depends
deleted file mode 100644
index b3f4f752a0..0000000000
--- a/srcpkgs/exo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/exo/exo-devel.template b/srcpkgs/exo/exo-devel.template
index 02b5556c81..dd87b64039 100644
--- a/srcpkgs/exo/exo-devel.template
+++ b/srcpkgs/exo/exo-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'exo-devel'.
 #
+depends="gtk+-devel libxfce4util-devel exo>=0.8.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run libxfce4util-devel
-Add_dependency run exo ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index edb7ad5754..36452c16af 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -5,6 +5,9 @@ homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/exo/0.8/exo-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gtk+-devel libxfce4util-devel libxfce4ui-devel"
+fulldepends="perl-URI"
 short_desc="Application library for the Xfce desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -16,13 +19,5 @@ conf_files="/etc/xdg/xfce4/helpers.rc"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="exo-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
 
-Add_dependency full perl-URI
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/expat/depends b/srcpkgs/expat/depends
deleted file mode 100644
index fb63eee7d0..0000000000
--- a/srcpkgs/expat/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/expat/expat-devel.template b/srcpkgs/expat/expat-devel.template
index faec33d290..a4b20c7217 100644
--- a/srcpkgs/expat/expat-devel.template
+++ b/srcpkgs/expat/expat-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'expat-devel'.
 #
+depends="expat>=2.1.0"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run expat ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/extundelete/template b/srcpkgs/extundelete/template
index 912a0a47a0..d549efbe62 100644
--- a/srcpkgs/extundelete/template
+++ b/srcpkgs/extundelete/template
@@ -4,6 +4,7 @@ version=0.2.0
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="e2fsprogs-devel"
 short_desc="ext3/ext4 file recover utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://extundelete.sourceforge.net"
@@ -16,4 +17,3 @@ long_desc="
  in the partition's journal to attempt to recover a file that has been
  deleted from the partition."
 
-Add_dependency build e2fsprogs-devel
diff --git a/srcpkgs/faac/depends b/srcpkgs/faac/depends
deleted file mode 100644
index 759a920557..0000000000
--- a/srcpkgs/faac/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.28"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/faac/faac-devel.template b/srcpkgs/faac/faac-devel.template
index db83901aa5..30fbd747c9 100644
--- a/srcpkgs/faac/faac-devel.template
+++ b/srcpkgs/faac/faac-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'faac-devel'.
 #
+depends="libmp4v2-devel faac"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libmp4v2-devel
-Add_dependency run faac
 
 do_install()
 {
diff --git a/srcpkgs/faac/template b/srcpkgs/faac/template
index d5ffee1d93..0c26f27e35 100644
--- a/srcpkgs/faac/template
+++ b/srcpkgs/faac/template
@@ -5,6 +5,7 @@ revision=4
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-mp4v2"
+makedepends="automake libmp4v2-devel"
 short_desc="AAC audio encoder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
@@ -14,8 +15,6 @@ long_desc="
  also supports multichannel and gapless encoding."
 
 subpackages="$pkgname-devel"
-Add_dependency build automake
-Add_dependency build libmp4v2-devel
 
 pre_configure()
 {
diff --git a/srcpkgs/faad2/depends b/srcpkgs/faad2/depends
deleted file mode 100644
index f9c802c81c..0000000000
--- a/srcpkgs/faad2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/faad2/faad2-devel.template b/srcpkgs/faad2/faad2-devel.template
index ddbd4ed870..7ded8430e9 100644
--- a/srcpkgs/faad2/faad2-devel.template
+++ b/srcpkgs/faad2/faad2-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'faad2-devel'.
 #
+depends="glibc-devel faad2"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run faad2
 
 do_install()
 {
diff --git a/srcpkgs/fakechroot/template b/srcpkgs/fakechroot/template
index c75a4dd0f3..8e8e73529e 100644
--- a/srcpkgs/fakechroot/template
+++ b/srcpkgs/fakechroot/template
@@ -3,6 +3,7 @@ pkgname=fakechroot
 version=2.14
 distfiles="${DEBIAN_SITE}/main/f/$pkgname/${pkgname}_${version}.orig.tar.gz"
 build_style=gnu-configure
+depends="glibc"
 short_desc="Gives a fake chroot environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=da5d61f1c752e2e43400fc6c70cb8ad2f7177a3295534f8e0c6e3c208432d9f5
@@ -10,4 +11,3 @@ long_desc="
  This package provides a library which overrides libc functions, so it is
  possible to use root-specific tools without root privileges."
 
-Add_dependency run glibc
diff --git a/srcpkgs/farstream/depends b/srcpkgs/farstream/depends
deleted file mode 100644
index 56fb9e056a..0000000000
--- a/srcpkgs/farstream/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/farstream/farstream-devel.template b/srcpkgs/farstream/farstream-devel.template
index f00f3d19e3..7d225ef761 100644
--- a/srcpkgs/farstream/farstream-devel.template
+++ b/srcpkgs/farstream/farstream-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'farstream-devel'.
 #
+depends="gst-plugins-base-devel farstream>=0.1.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
 
 replaces="farsight2-devel>=0"
 
-Add_dependency run gst-plugins-base-devel
-Add_dependency run farstream ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template
index 73c560d54e..6f082fe910 100644
--- a/srcpkgs/farstream/template
+++ b/srcpkgs/farstream/template
@@ -5,6 +5,8 @@ homepage="http://www.freedesktop.org/wiki/Software/Farstream"
 distfiles="http://freedesktop.org/software/farstream/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-valgrind --disable-debug --disable-static"
+depends="gst-python pygobject2 pygtk gst-plugins-good gst-plugins-bad"
+makedepends="pkg-config intltool libnice-devel gst-plugins-base-devel python-devel gst-python-devel pygobject2-devel gupnp-devel gobject-introspection"
 short_desc="GStreamer modules and libraries for videoconferencing"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,18 +20,4 @@ long_desc="
 replaces="farsight2>=0"
 subpackages="$pkgname-devel"
 
-Add_dependency run gst-python
-Add_dependency run pygobject2
-Add_dependency run pygtk
-Add_dependency run gst-plugins-good
-Add_dependency run gst-plugins-bad
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libnice-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build python-devel
-Add_dependency build gst-python-devel
-Add_dependency build pygobject2-devel
-Add_dependency build gupnp-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/ffmpeg/depends b/srcpkgs/ffmpeg/depends
deleted file mode 100644
index 110e940a93..0000000000
--- a/srcpkgs/ffmpeg/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.6"
-api_depends=">=0.10" # libswresample
diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template
index a0d401491c..42a44a5727 100644
--- a/srcpkgs/ffmpeg/ffmpeg-devel.template
+++ b/srcpkgs/ffmpeg/ffmpeg-devel.template
@@ -1,18 +1,11 @@
 # Template file for 'ffmpeg-devel'.
 #
+depends="libavcodec libavdevice libavformat libavutil libavfilter libpostproc libswscale libswresample"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libavcodec
-Add_dependency run libavdevice
-Add_dependency run libavformat
-Add_dependency run libavutil
-Add_dependency run libavfilter
-Add_dependency run libpostproc
-Add_dependency run libswscale
-Add_dependency run libswresample
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 96d1848fd7..543de11fd6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -3,6 +3,8 @@ pkgname=ffmpeg
 version=0.10.3
 homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
+depends="faad2 x264 xvidcore libvdpau"
+makedepends="pkg-config perl>=0 yasm zlib-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel libvpx-devel libva-devel libvdpau-devel"
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -22,30 +24,7 @@ long_desc="
 subpackages="libavcodec libavdevice libavformat libavutil libavfilter"
 subpackages="${subpackages} libpostproc libswscale libswresample $pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build perl	">=0"
-Add_dependency build yasm
-Add_dependency build zlib-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXext-devel
-Add_dependency build libXvMC-devel
-Add_dependency build faad2-devel
-Add_dependency build lame-devel
-Add_dependency build libtheora-devel
-Add_dependency build libvorbis-devel
-Add_dependency build x264-devel
-Add_dependency build xvidcore-devel
-Add_dependency build jack-devel
-Add_dependency build SDL-devel
-Add_dependency build libvpx-devel
-Add_dependency build libva-devel
-Add_dependency build libvdpau-devel
 
-Add_dependency run faad2
-Add_dependency run x264
-Add_dependency run xvidcore
-Add_dependency run libvdpau
 
 do_configure() {
 	./configure --prefix=/usr --disable-debug --enable-gpl \
diff --git a/srcpkgs/fftw/depends b/srcpkgs/fftw/depends
deleted file mode 100644
index 16e520eb14..0000000000
--- a/srcpkgs/fftw/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/fftw/fftw-devel.template b/srcpkgs/fftw/fftw-devel.template
index 3147f9208a..d24ddb87be 100644
--- a/srcpkgs/fftw/fftw-devel.template
+++ b/srcpkgs/fftw/fftw-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'fftw-devel'.
 #
+depends="libfftw"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libfftw
 
 do_install()
 {
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index 038c1b457a..24716ffe58 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -3,6 +3,7 @@ pkgname=fftw
 version=3.3.2
 homepage="http://www.fftw.org/"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
+makedepends="gcc-fortran"
 short_desc="Library for computing the discrete Fourier transform (DFT)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,7 +17,6 @@ long_desc="
 
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build gcc-fortran
 
 do_configure() {
 	local CARGS="--enable-shared --enable-threads"
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 3a2f47b1d9..10af76acc6 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --enable-magic
 --disable-schemas-compile --disable-static"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="which pkg-config intltool gnome-doc-utils file-devel nautilus-devel"
 short_desc="GNOME Front-end to archiving programs like tar and zip"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -34,13 +36,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build file-devel
-Add_dependency build nautilus-devel
 
diff --git a/srcpkgs/file/depends b/srcpkgs/file/depends
deleted file mode 100644
index 9c5ab9f67e..0000000000
--- a/srcpkgs/file/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.90"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/file/file-devel.template b/srcpkgs/file/file-devel.template
index 9461acde1e..611d6bef4d 100644
--- a/srcpkgs/file/file-devel.template
+++ b/srcpkgs/file/file-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'file-devel'.
 #
+depends="zlib-devel file"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run file
 
 do_install()
 {
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 5089a46127..aaf264f161 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -3,6 +3,7 @@ pkgname=file
 version=5.11
 distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="zlib-devel"
 short_desc="File type identification utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.darwinsys.com/file/"
@@ -13,4 +14,3 @@ long_desc="
  a description if a match is found."
 
 subpackages="file-devel"
-Add_dependency build zlib-devel
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0fa86f22e1..8fc68bc426 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,6 +3,8 @@ pkgname=firefox
 version=12.0
 wrksrc=mozilla-release
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="unzip zip perl>=0 python>=2.7.2_3 yasm jpeg-devel libpng-devel pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel libXScrnSaver-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel wireless_tools-devel"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/projects/firefox"
@@ -21,32 +23,7 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build unzip
-Add_dependency build zip
-Add_dependency build perl	">=0"
-Add_dependency build python	">=2.7.2_3" # linux2 sys.platform fix
-Add_dependency build yasm
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build pixman-devel
-Add_dependency build libIDL-devel
-Add_dependency build nss-devel ">=3.13.3"
-Add_dependency build sqlite-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXScrnSaver-devel
-Add_dependency build gtk+-devel
-Add_dependency build libevent-devel
-Add_dependency build libnotify-devel
-Add_dependency build libvpx-devel
-Add_dependency build GConf-devel
-Add_dependency build startup-notification-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build hunspell-devel
-Add_dependency build wireless_tools-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
 do_build() {
 	# Fix PRE_RELEASE_SUFFIX
diff --git a/srcpkgs/fixesproto/template b/srcpkgs/fixesproto/template
index 11b84981b2..d7093ec251 100644
--- a/srcpkgs/fixesproto/template
+++ b/srcpkgs/fixesproto/template
@@ -4,6 +4,7 @@ version=5.0
 revision=1
 distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+fulldepends="xextproto"
 short_desc="Fixes extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce
@@ -12,4 +13,3 @@ long_desc="
  project."
 
 noarch=yes
-Add_dependency full xextproto
diff --git a/srcpkgs/flac/depends b/srcpkgs/flac/depends
deleted file mode 100644
index b14f99034b..0000000000
--- a/srcpkgs/flac/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/flac/libflac-devel.template b/srcpkgs/flac/libflac-devel.template
index 212c8ed267..b336c2e7a9 100644
--- a/srcpkgs/flac/libflac-devel.template
+++ b/srcpkgs/flac/libflac-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libflac-devel'.
 #
+depends="libstdc++-devel libogg-devel libflac"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libstdc++-devel
-Add_dependency run libogg-devel
-Add_dependency run libflac
 
 do_install()
 {
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index c7288848e7..7c3d80693b 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin"
+makedepends="nasm libogg-devel"
 short_desc="Free Lossless Audio Codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
@@ -27,5 +28,3 @@ sources for flac and the plugins are available under the GPL."
  
 subpackages="libflac libflac-devel"
 
-Add_dependency build nasm
-Add_dependency build libogg-devel
diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template
index f3c78d4968..c1182d1e9c 100644
--- a/srcpkgs/flex/template
+++ b/srcpkgs/flex/template
@@ -5,6 +5,7 @@ distfiles="$SOURCEFORGE_SITE/flex/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-rpath"
 revision=2
+fulldepends="bison"
 short_desc="The Fast Lexical Analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b
@@ -22,4 +23,3 @@ long_desc="
  its input for occurrences of text matching the regular expressions for each
  rule. Whenever it finds a match, it executes the corresponding C code."
 
-Add_dependency full bison
diff --git a/srcpkgs/fltk/depends b/srcpkgs/fltk/depends
deleted file mode 100644
index c2fc823f30..0000000000
--- a/srcpkgs/fltk/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/fltk/fltk-devel.template b/srcpkgs/fltk/fltk-devel.template
index 6abd85513f..3c9f9880d5 100644
--- a/srcpkgs/fltk/fltk-devel.template
+++ b/srcpkgs/fltk/fltk-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'fltk-devel'.
 #
+depends="fltk>=1.3.0"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run fltk ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template
index 351c61ac9e..7ba6013acc 100644
--- a/srcpkgs/fltk/template
+++ b/srcpkgs/fltk/template
@@ -6,6 +6,7 @@ homepage="http://www.fltk.org/"
 distfiles="http://ftp.easysw.com/pub/fltk/$version/fltk-$version-source.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-threads --enable-xft --enable-shared"
+makedepends="jpeg-devel libpng-devel MesaLib-devel alsa-lib-devel freetype-devel libXinerama-devel libXft-devel"
 short_desc="Cross-platform C++ GUI toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
@@ -20,13 +21,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build MesaLib-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build freetype-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXft-devel
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/man/cat[13]
diff --git a/srcpkgs/fluidsynth/depends b/srcpkgs/fluidsynth/depends
deleted file mode 100644
index 0fabab2982..0000000000
--- a/srcpkgs/fluidsynth/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/fluidsynth/fluidsynth-devel.template b/srcpkgs/fluidsynth/fluidsynth-devel.template
index 8d6a3c354b..7c5575a3fd 100644
--- a/srcpkgs/fluidsynth/fluidsynth-devel.template
+++ b/srcpkgs/fluidsynth/fluidsynth-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'fluidsynth-devel'.
 #
+depends="libfluidsynth"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libfluidsynth
 
 do_install()
 {
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 75354d5d6e..68ec83aa6f 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -6,6 +6,7 @@ homepage="http://www.fluidsynth.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=cmake
 configure_args="-DLIB_SUFFIX="
+makedepends="cmake glib-devel jack-devel pulseaudio-devel dbus-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -21,9 +22,3 @@ long_desc="
 
 subpackages="lib$pkgname $pkgname-devel"
 
-Add_dependency build cmake
-Add_dependency build glib-devel
-Add_dependency build jack-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build dbus-devel
-Add_dependency build readline-devel
diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index e2f5039dde..c34c95131c 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -6,6 +6,7 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-nls"
 revision=1
+makedepends="pkg-config libX11-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel imlib2-devel libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
 short_desc="Highly configurable and low resource X11 Window manager "
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.fluxbox.org"
@@ -16,17 +17,6 @@ long_desc="
  with features such as pwm-style window tabs, configurable key bindings,
  toolbar, and an iconbar. It also includes some cosmetic fixes over blackbox."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXft-devel
-Add_dependency build libXrender-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libXpm-devel
-Add_dependency build imlib2-devel
-Add_dependency build libXext-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXrandr-devel
-Add_dependency build fribidi-devel
 
 post_install()
 {
diff --git a/srcpkgs/folks/depends b/srcpkgs/folks/depends
deleted file mode 100644
index 9f7cc64c23..0000000000
--- a/srcpkgs/folks/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.3.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/folks/folks-devel.template b/srcpkgs/folks/folks-devel.template
index fb0445c8ff..3d9661b67c 100644
--- a/srcpkgs/folks/folks-devel.template
+++ b/srcpkgs/folks/folks-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'folks-devel'.
 #
+depends="telepathy-glib-devel libgee-devel>=0.6.2.1_1 libsocialweb-devel evolution-data-server-devel folks>=0.6.9"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run telepathy-glib-devel
-Add_dependency run libgee-devel ">=0.6.2.1_1" # introspection fix
-Add_dependency run libsocialweb-devel
-Add_dependency run evolution-data-server-devel
-Add_dependency run folks ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 1f47855c34..3c65dcee46 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -5,6 +5,7 @@ homepage="http://telepathy.freedesktop.org/wiki/Folks"
 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-vala --enable-tracker-backend"
+makedepends="pkg-config intltool which gobject-introspection vala-devel dbus-glib-devel telepathy-glib-devel libgee-devel>=0.6.2.1_1 libsocialweb-devel evolution-data-server-devel tracker-devel"
 short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,17 +19,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build which
-Add_dependency build gobject-introspection
-Add_dependency build vala-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build libgee-devel ">=0.6.2.1_1" # introspection fix
-Add_dependency build libsocialweb-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build tracker-devel
 
 pre_configure() {
 	sed -i "s|\(TRACKER_SPARQL_MAJOR=\)0.12|\10.14|" configure
diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template
index 658d76e912..f7138a242f 100644
--- a/srcpkgs/font-adobe-100dpi/template
+++ b/srcpkgs/font-adobe-100dpi/template
@@ -3,6 +3,8 @@ pkgname=font-adobe-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard 100dpi Adobe PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
@@ -16,9 +18,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/100dpi"
diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template
index f04e72c506..f673ffb201 100644
--- a/srcpkgs/font-adobe-75dpi/template
+++ b/srcpkgs/font-adobe-75dpi/template
@@ -3,6 +3,8 @@ pkgname=font-adobe-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard 75pi Adobe PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09
@@ -16,9 +18,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/75dpi"
diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template
index 35a5810404..4ed3da76a1 100644
--- a/srcpkgs/font-adobe-utopia-100dpi/template
+++ b/srcpkgs/font-adobe-utopia-100dpi/template
@@ -3,6 +3,8 @@ pkgname=font-adobe-utopia-100dpi
 version=1.0.4
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5
@@ -12,9 +14,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/100dpi"
diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template
index 1467a75c00..5f679b8452 100644
--- a/srcpkgs/font-adobe-utopia-75dpi/template
+++ b/srcpkgs/font-adobe-utopia-75dpi/template
@@ -3,6 +3,8 @@ pkgname=font-adobe-utopia-75dpi
 version=1.0.4
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94
@@ -12,9 +14,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/75dpi"
diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template
index 5c6e4499c8..e626edd8f7 100644
--- a/srcpkgs/font-adobe-utopia-type1/template
+++ b/srcpkgs/font-adobe-utopia-type1/template
@@ -3,6 +3,8 @@ pkgname=font-adobe-utopia-type1
 version=1.0.4
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Adobe Utopia Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
@@ -12,9 +14,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/Type1"
diff --git a/srcpkgs/font-bh-100dpi/template b/srcpkgs/font-bh-100dpi/template
index 4dddba047a..2c4e61d442 100644
--- a/srcpkgs/font-bh-100dpi/template
+++ b/srcpkgs/font-bh-100dpi/template
@@ -3,6 +3,8 @@ pkgname=font-bh-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard 100dpi Bigelow and Holmes PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481
@@ -14,9 +16,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/100dpi"
diff --git a/srcpkgs/font-bh-75dpi/template b/srcpkgs/font-bh-75dpi/template
index a97266e11e..f599e6affd 100644
--- a/srcpkgs/font-bh-75dpi/template
+++ b/srcpkgs/font-bh-75dpi/template
@@ -3,6 +3,8 @@ pkgname=font-bh-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard 75dpi Bigelow and Holmes PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c
@@ -14,9 +16,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/75dpi"
diff --git a/srcpkgs/font-bh-lucidatypewriter-100dpi/template b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
index c5b1ab70bb..76cc0c385a 100644
--- a/srcpkgs/font-bh-lucidatypewriter-100dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
@@ -3,6 +3,8 @@ pkgname=font-bh-lucidatypewriter-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="100dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb
@@ -13,9 +15,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/100dpi"
diff --git a/srcpkgs/font-bh-lucidatypewriter-75dpi/template b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
index 0a6b9ee3af..82b779ff01 100644
--- a/srcpkgs/font-bh-lucidatypewriter-75dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
@@ -3,6 +3,8 @@ pkgname=font-bh-lucidatypewriter-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="75dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31
@@ -13,9 +15,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/75dpi"
diff --git a/srcpkgs/font-bh-ttf/template b/srcpkgs/font-bh-ttf/template
index bbc433833e..6815c3d27d 100644
--- a/srcpkgs/font-bh-ttf/template
+++ b/srcpkgs/font-bh-ttf/template
@@ -3,6 +3,8 @@ pkgname=font-bh-ttf
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard Bigelow and Holmes TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f
@@ -14,9 +16,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/TTF"
diff --git a/srcpkgs/font-bh-type1/template b/srcpkgs/font-bh-type1/template
index d9d1777024..75460d92da 100644
--- a/srcpkgs/font-bh-type1/template
+++ b/srcpkgs/font-bh-type1/template
@@ -3,6 +3,8 @@ pkgname=font-bh-type1
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard Bigelow and Holmes Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1
@@ -14,9 +16,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/Type1"
diff --git a/srcpkgs/font-bitstream-100dpi/template b/srcpkgs/font-bitstream-100dpi/template
index 2299f0efac..9ebb354cdf 100644
--- a/srcpkgs/font-bitstream-100dpi/template
+++ b/srcpkgs/font-bitstream-100dpi/template
@@ -3,6 +3,8 @@ pkgname=font-bitstream-100dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard 100dpi Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce
@@ -14,9 +16,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/100dpi"
diff --git a/srcpkgs/font-bitstream-75dpi/template b/srcpkgs/font-bitstream-75dpi/template
index 6a19610744..940df73c30 100644
--- a/srcpkgs/font-bitstream-75dpi/template
+++ b/srcpkgs/font-bitstream-75dpi/template
@@ -3,6 +3,8 @@ pkgname=font-bitstream-75dpi
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard 100dpi Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e
@@ -14,9 +16,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/75dpi"
diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
index d1cf15f3eb..09c48cfb42 100644
--- a/srcpkgs/font-bitstream-speedo/template
+++ b/srcpkgs/font-bitstream-speedo/template
@@ -3,6 +3,8 @@ pkgname=font-bitstream-speedo
 version=1.0.0
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard Speedo Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
@@ -12,9 +14,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/lib/X11/fonts/Speedo"
diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template
index de2f74ab79..f581621c4d 100644
--- a/srcpkgs/font-bitstream-type1/template
+++ b/srcpkgs/font-bitstream-type1/template
@@ -3,6 +3,8 @@ pkgname=font-bitstream-type1
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard Type1 Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688
@@ -12,9 +14,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/Type1"
diff --git a/srcpkgs/font-cursor-misc/template b/srcpkgs/font-cursor-misc/template
index d1f70e838b..5c968d3bdc 100644
--- a/srcpkgs/font-cursor-misc/template
+++ b/srcpkgs/font-cursor-misc/template
@@ -3,6 +3,8 @@ pkgname=font-cursor-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard X11 cursors in PCF format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635
@@ -12,9 +14,6 @@ long_desc="
  cursor, crosshair, fleur cursor, iron cross, sailboat cursor, and
  many more."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-daewoo-misc/template b/srcpkgs/font-daewoo-misc/template
index 8adb8704a7..a0aad9ecf8 100644
--- a/srcpkgs/font-daewoo-misc/template
+++ b/srcpkgs/font-daewoo-misc/template
@@ -3,6 +3,8 @@ pkgname=font-daewoo-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Daewoo Gothic PCF format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8
@@ -11,9 +13,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-dec-misc/template b/srcpkgs/font-dec-misc/template
index deed0e5aa1..d934341b8b 100644
--- a/srcpkgs/font-dec-misc/template
+++ b/srcpkgs/font-dec-misc/template
@@ -3,6 +3,8 @@ pkgname=font-dec-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="DEC cursor and session PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b
@@ -13,9 +15,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-ibm-type1/template b/srcpkgs/font-ibm-type1/template
index b2a971cbe6..0ef5c7ee34 100644
--- a/srcpkgs/font-ibm-type1/template
+++ b/srcpkgs/font-ibm-type1/template
@@ -3,6 +3,8 @@ pkgname=font-ibm-type1
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="IBM Courier Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df
@@ -11,9 +13,6 @@ long_desc="
 
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/Type1"
diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template
index 86d518c0c4..b38e8f7b7e 100644
--- a/srcpkgs/font-isas-misc/template
+++ b/srcpkgs/font-isas-misc/template
@@ -3,6 +3,8 @@ pkgname=font-isas-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="72dpi PCF versions of the Chinese Song Ti fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867
@@ -10,9 +12,6 @@ long_desc="
  These are the PCF versions of the Song Si fonts for 72dpi displays.
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-jis-misc/template b/srcpkgs/font-jis-misc/template
index cac5fb5e20..cb0f87de53 100644
--- a/srcpkgs/font-jis-misc/template
+++ b/srcpkgs/font-jis-misc/template
@@ -3,6 +3,8 @@ pkgname=font-jis-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="78dpi PCF versions of the Japanese fixed fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65
@@ -10,9 +12,6 @@ long_desc="
  These are the PCF versions of the JIS fixed fonts for 78dpi displays.
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template
index 0101dc1206..b53f8bef67 100644
--- a/srcpkgs/font-misc-misc/template
+++ b/srcpkgs/font-misc-misc/template
@@ -3,6 +3,8 @@ pkgname=font-misc-misc
 version=1.1.2
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard X11 fixed PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794
@@ -10,9 +12,6 @@ long_desc="
  The standard X11 public domain fixed font that you can
  share and enjoy. It is in PCF format."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template
index 9adb890062..2193857c01 100644
--- a/srcpkgs/font-mutt-misc/template
+++ b/srcpkgs/font-mutt-misc/template
@@ -3,6 +3,8 @@ pkgname=font-mutt-misc
 version=1.0.3
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="100dpi PCF versions of the ClearlyU fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f
@@ -10,9 +12,6 @@ long_desc="
  These are the PCF versions of the ClearlyU fonts for 100dpi displays.
  This is from the modular Xorg project."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/X11/misc"
diff --git a/srcpkgs/font-sony-misc/template b/srcpkgs/font-sony-misc/template
index 78f6560288..b203bafdf7 100644
--- a/srcpkgs/font-sony-misc/template
+++ b/srcpkgs/font-sony-misc/template
@@ -3,6 +3,8 @@ pkgname=font-sony-misc
 version=1.0.0
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-util"
 short_desc="Standard X11 sony PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23
@@ -10,9 +12,6 @@ long_desc="
  The standard X11 sony fonts that you can share and enjoy.
  It is in PCF format."
 
-Add_dependency build pkg-config
-Add_dependency build bdftopcf
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/lib/X11/fonts/misc"
diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index 0e8334627d..533b289da6 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -4,6 +4,7 @@ version=5.1.20080820
 create_wrksrc=yes
 homepage="http://unifoundry.com/unifont.html"
 distfiles="http://unifoundry.com/unifont-${version}.bdf.gz"
+fulldepends="font-util"
 short_desc="GNU Unifont Glyphs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, Freeware"
@@ -12,7 +13,6 @@ long_desc="
  This page contains GNU Unifont, with glyphs for every printable code point
  in the Unicode 5.1 Basic Multilingual Plane (BMP)."
 
-Add_dependency full font-util
 
 noextract=yes
 noarch=yes
diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template
index cebb10e2f3..4e135900d5 100644
--- a/srcpkgs/font-util/template
+++ b/srcpkgs/font-util/template
@@ -4,6 +4,8 @@ version=1.3.0
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config bdftopcf"
+fulldepends="font-alias expat freetype fontconfig mkfontdir mkfontscale"
 short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -15,15 +17,7 @@ long_desc="
  font. It also provides mapping-files (character set tables)
  and the fontutil pkg-config and autoconf macro files."
 
-Add_dependency build pkg-config
 #
 # These aren't really required, but this is to centralize the
 # requirement of dependent packages.
 #
-Add_dependency build bdftopcf
-Add_dependency full font-alias
-Add_dependency full expat
-Add_dependency full freetype
-Add_dependency full fontconfig
-Add_dependency full mkfontdir
-Add_dependency full mkfontscale
diff --git a/srcpkgs/fontconfig/depends b/srcpkgs/fontconfig/depends
deleted file mode 100644
index 4fefeafec7..0000000000
--- a/srcpkgs/fontconfig/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.6.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/fontconfig/fontconfig-devel.template b/srcpkgs/fontconfig/fontconfig-devel.template
index afeafc6ae4..e399575002 100644
--- a/srcpkgs/fontconfig/fontconfig-devel.template
+++ b/srcpkgs/fontconfig/fontconfig-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'fontconfig-devel'.
 #
+depends="expat-devel freetype-devel zlib-devel bzip2-devel fontconfig>=2.9.0"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run expat-devel
-Add_dependency run freetype-devel
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run fontconfig ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 6db10aa916..fe79b2d9fd 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -6,6 +6,7 @@ license="MIT"
 distfiles="http://www.freedesktop.org/software/fontconfig/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-docs --with-cache-dir=/var/cache/$pkgname"
+makedepends="pkg-config expat-devel freetype-devel zlib-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
@@ -38,7 +39,3 @@ long_desc="
 conf_files="/etc/fonts/fonts.conf"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build expat-devel
-Add_dependency build freetype-devel
-Add_dependency build zlib-devel
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index 87e63e4bb1..7806858f2c 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -5,6 +5,8 @@ revision=3
 wrksrc=foobillardplus-${version}
 homepage="http://foobillardplus.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz"
+makedepends="freetype-devel libpng-devel MesaLib-devel SDL_net-devel"
+fulldepends="desktop-file-utils"
 short_desc="An OpenGL billard game - fork of foobillard"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,12 +15,7 @@ long_desc="
  It is not a new game, but an enhanced version of the great foobillard
  3.0a by Florian Berger."
  
-Add_dependency build freetype-devel
-Add_dependency build libpng-devel
-Add_dependency build MesaLib-devel
-Add_dependency build SDL_net-devel
 
-Add_dependency full desktop-file-utils
 
 do_configure() {
 	sed -i 's|$prefix/foobillardplus|$prefix|' configure
diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template
index c591fd655d..b546373c79 100644
--- a/srcpkgs/foomatic-db-engine/template
+++ b/srcpkgs/foomatic-db-engine/template
@@ -4,6 +4,8 @@ version=4.0.8
 homepage="https://www.openprinting.org/"
 distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="libxml2-devel cups-devel"
+fulldepends="wget perl foomatic-db foomatic-filters ghostscript>=0 cups>=0"
 short_desc="OpenPrinting printer support - programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, MIT"
@@ -20,12 +22,4 @@ long_desc="
  using Ghostscript as the print processor, as well as some common glue code
  used in other filter systems."
 
-Add_dependency build libxml2-devel
-Add_dependency build cups-devel
 
-Add_dependency full wget
-Add_dependency full perl
-Add_dependency full foomatic-db 
-Add_dependency full foomatic-filters
-Add_dependency full ghostscript ">=0"
-Add_dependency full cups ">=0"
diff --git a/srcpkgs/foomatic-filters/template b/srcpkgs/foomatic-filters/template
index 395ab237eb..781ecd7dc8 100644
--- a/srcpkgs/foomatic-filters/template
+++ b/srcpkgs/foomatic-filters/template
@@ -5,6 +5,8 @@ homepage="https://www.openprinting.org/"
 distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-dbus"
+makedepends="pkg-config enscript dbus-devel cups-devel"
+fulldepends="perl>=0"
 short_desc="OpenPrinting printer support - filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, MIT"
@@ -23,9 +25,4 @@ long_desc="
 
 conf_files="/etc/foomatic/filter.conf"
 
-Add_dependency build pkg-config
-Add_dependency build enscript
-Add_dependency build dbus-devel
-Add_dependency build cups-devel
 
-Add_dependency full perl ">=0"
diff --git a/srcpkgs/freealut/depends b/srcpkgs/freealut/depends
deleted file mode 100644
index 7d08e28214..0000000000
--- a/srcpkgs/freealut/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/freealut/freealut-devel.template b/srcpkgs/freealut/freealut-devel.template
index ef839f4929..f860d5ec80 100644
--- a/srcpkgs/freealut/freealut-devel.template
+++ b/srcpkgs/freealut/freealut-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'freealut-devel'.
 #
+depends="libopenal-devel freealut"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libopenal-devel
-Add_dependency run freealut
 
 do_install()
 {
diff --git a/srcpkgs/freealut/template b/srcpkgs/freealut/template
index 585e5e8297..a5c3f0e144 100644
--- a/srcpkgs/freealut/template
+++ b/srcpkgs/freealut/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://www.openal.org"
 distfiles="http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$version.tar.gz"
 revision=2
+makedepends="pkg-config libopenal-devel"
 short_desc="OpenAL Utility Toolkit (ALUT)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -15,5 +16,3 @@ long_desc="
 subpackages="$pkgname-devel"
 
 
-Add_dependency build pkg-config
-Add_dependency build libopenal-devel
diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template
index 6a66c55053..48527d6664 100644
--- a/srcpkgs/freefont-ttf/template
+++ b/srcpkgs/freefont-ttf/template
@@ -3,6 +3,7 @@ pkgname=freefont-ttf
 version=20100919
 wrksrc=freefont-${version}
 distfiles="http://ftp.gnu.org/gnu/freefont/${pkgname}-${version}.tar.gz"
+fulldepends="font-util"
 short_desc="Free family of scalable outline fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e471339040cf0aa53e6d5ee5a716fdeae0a0407314f8cea78db3ad1aae2c70e0
@@ -14,7 +15,6 @@ long_desc="
 noarch=yes
 font_dirs="/usr/share/fonts/TTF"
 
-Add_dependency full font-util
 
 do_install()
 {
diff --git a/srcpkgs/freetype/depends b/srcpkgs/freetype/depends
deleted file mode 100644
index 46345ccf78..0000000000
--- a/srcpkgs/freetype/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.3.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/freetype/freetype-devel.template b/srcpkgs/freetype/freetype-devel.template
index ef72f81971..6ba6c27d2a 100644
--- a/srcpkgs/freetype/freetype-devel.template
+++ b/srcpkgs/freetype/freetype-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'freetype-devel'.
 #
+depends="zlib-devel bzip2-devel freetype"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run freetype
 
 do_install() {
 	for f in bin include share; do
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 6887b03a81..e7c74e0c3f 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -4,6 +4,7 @@ version=2.4.9
 patch_args="-Np1"
 distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config zlib-devel"
 short_desc="Font rendering engine and library API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freetype.org/"
@@ -21,5 +22,3 @@ long_desc="
   * An improved anti-aliasing algorithm"
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
diff --git a/srcpkgs/fribidi/depends b/srcpkgs/fribidi/depends
deleted file mode 100644
index d794290ef5..0000000000
--- a/srcpkgs/fribidi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.19.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/fribidi/fribidi-devel.template b/srcpkgs/fribidi/fribidi-devel.template
index b8a8551872..6a8f16e57e 100644
--- a/srcpkgs/fribidi/fribidi-devel.template
+++ b/srcpkgs/fribidi/fribidi-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'fribidi-devel'.
 #
+depends="glib-devel fribidi"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glib-devel
-Add_dependency run fribidi
 
 do_install()
 {
diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index c0fa494d4f..8d8535dce1 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -4,6 +4,7 @@ version=0.19.2
 revision=4
 distfiles="http://fribidi.org/download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="glib"
 short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
@@ -15,4 +16,3 @@ long_desc="
  any conformance bugs."
 
 subpackages="$pkgname-devel"
-Add_dependency run glib
diff --git a/srcpkgs/ftgl/depends b/srcpkgs/ftgl/depends
deleted file mode 100644
index 904577e701..0000000000
--- a/srcpkgs/ftgl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ftgl/ftgl-devel.template b/srcpkgs/ftgl/ftgl-devel.template
index bb4fd4d664..69774219ab 100644
--- a/srcpkgs/ftgl/ftgl-devel.template
+++ b/srcpkgs/ftgl/ftgl-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'ftgl-devel'.
 #
+depends="ftgl"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ftgl
 
 do_install()
 {
diff --git a/srcpkgs/ftgl/template b/srcpkgs/ftgl/template
index 8ff3762ece..27ab35ccbd 100644
--- a/srcpkgs/ftgl/template
+++ b/srcpkgs/ftgl/template
@@ -7,6 +7,7 @@ revision=3
 wrksrc="ftgl-${_distver}~${_distrcver}"
 distfiles="${SOURCEFORGE_SITE}/ftgl/ftgl-${_distver}-${_distrcver}.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config freetype-devel zlib-devel MesaLib-devel"
 short_desc="OpenGL library to use arbitrary fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59
@@ -18,7 +19,3 @@ long_desc="
 
 subpackages="ftgl-devel"
 
-Add_dependency build pkg-config
-Add_dependency build freetype-devel
-Add_dependency build zlib-devel
-Add_dependency build MesaLib-devel
diff --git a/srcpkgs/fuse/depends b/srcpkgs/fuse/depends
deleted file mode 100644
index 20eeb5c236..0000000000
--- a/srcpkgs/fuse/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.8.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/fuse/fuse-devel.template b/srcpkgs/fuse/fuse-devel.template
index 3419637e56..737b4aa54b 100644
--- a/srcpkgs/fuse/fuse-devel.template
+++ b/srcpkgs/fuse/fuse-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'fuse-devel'.
 #
+depends="glibc-devel fuse"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run fuse
 
 do_install()
 {
diff --git a/srcpkgs/garcon/depends b/srcpkgs/garcon/depends
deleted file mode 100644
index 913ff191cb..0000000000
--- a/srcpkgs/garcon/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.12"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/garcon/garcon-devel.template b/srcpkgs/garcon/garcon-devel.template
index 52fa6b98d2..f28cf2bdf2 100644
--- a/srcpkgs/garcon/garcon-devel.template
+++ b/srcpkgs/garcon/garcon-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'garcon-devel'.
 #
+depends="pkg-config glib-devel garcon>=0.2.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run garcon ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index d348297ad7..9195d903dd 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -3,6 +3,7 @@ pkgname=garcon
 version=0.2.0
 distfiles="http://archive.xfce.org/src/xfce/garcon/0.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel libxfce4util-devel"
 short_desc="Glib/GIO freedesktop.org compliant menu implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wiki.xfce.org/dev/garcon"
@@ -18,7 +19,3 @@ long_desc="
 conf_files="/etc/xdg/menus/xfce-applications.menu"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libxfce4util-devel
diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index caa407d5a2..0aa435e2d5 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -5,6 +5,7 @@ homepage="http://www.gnu.org/directory/GNU/gawk.html"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="ac_cv_func_working_mktime=yes --with-readline"
+makedepends="readline-devel"
 short_desc="The GNU awk utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -12,4 +13,3 @@ checksum=476dee8bea8bc3b04af5cae502b83ea16edd5b703d20418918f8773889d78c80
 long_desc="
  The GNU AWK utility, a pattern scanning and processing tool."
 
-Add_dependency build readline-devel
diff --git a/srcpkgs/gc/depends b/srcpkgs/gc/depends
deleted file mode 100644
index b586f5985d..0000000000
--- a/srcpkgs/gc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=7.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gc/gc-devel.template b/srcpkgs/gc/gc-devel.template
index 8ca6794cd7..437f6a8a1e 100644
--- a/srcpkgs/gc/gc-devel.template
+++ b/srcpkgs/gc/gc-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'gc-devel'.
 #
+depends="gc>=7.2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gc ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gcalctool/template b/srcpkgs/gcalctool/template
index f032b26be1..492dc22583 100644
--- a/srcpkgs/gcalctool/template
+++ b/srcpkgs/gcalctool/template
@@ -4,6 +4,8 @@ version=6.4.2.1
 distfiles="${GNOME_SITE}/$pkgname/6.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+depends="dconf desktop-file-utils"
+makedepends="pkg-config intltool gnome-doc-utils itstool flex gtk+3-devel libxml2-devel"
 short_desc="GNOME Scientific calculator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Gcalctool"
@@ -12,13 +14,4 @@ checksum=d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8
 long_desc="
  The package contains the GNOME scientific calculator."
 
-Add_dependency run dconf
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build itstool
-Add_dependency build flex
-Add_dependency build gtk+3-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/gcc/depends b/srcpkgs/gcc/depends
deleted file mode 100644
index e40ee2b41a..0000000000
--- a/srcpkgs/gcc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index 0889bde23e..aa68c3a4ea 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -1,14 +1,12 @@
 # Template file for 'gcc-c++'.
 #
+depends="libelf gcc>=4.7 libstdc++-devel>=4.7"
 short_desc="GCC C++ support"
 long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
 
-Add_dependency run libelf
-Add_dependency run gcc			">=${_majorver}"
-Add_dependency run libstdc++-devel	">=${_majorver}"
 
 do_install()
 {
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index 61b533c5ff..a841347281 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -1,13 +1,12 @@
 # Template file for 'gcc-fortran'.
 #
+depends="gcc>=4.7 libgfortran-devel>=4.7"
 short_desc="GCC Fortran compiler frontend"
 long_desc="${long_desc}
 
  This package contains the GCC Fortran frontend."
 
 
-Add_dependency run gcc			">=${_majorver}"
-Add_dependency run libgfortran-devel	">=${_majorver}"
 
 do_install() {
 	for f in gfortran ${_triplet}-gfortran; do
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
index cebb3e3642..ef8bf39469 100644
--- a/srcpkgs/gcc/gcc-go.template
+++ b/srcpkgs/gcc/gcc-go.template
@@ -1,13 +1,12 @@
 # Template file for 'gcc-go'.
 #
+depends="gcc>=4.7 libgo-devel>=4.7"
 short_desc="GCC Go compiler frontend"
 long_desc="${long_desc}
 
  This package contains the GCC Go frontend."
 
 
-Add_dependency run gcc		">=${_majorver}"
-Add_dependency run libgo-devel	">=${_majorver}"
 
 do_install()
 {
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 338d451829..43a0e00d37 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -1,14 +1,12 @@
 # Template file for 'gcc-objc++'.
 #
+depends="libelf gcc-c++>=4.7 gcc-objc>=4.7"
 short_desc="GCC Objective-C++ support"
 long_desc="${long_desc}
 
  This package contains GCC Objective-C++ support."
 
 
-Add_dependency run libelf
-Add_dependency run gcc-c++	">=${_majorver}"
-Add_dependency run gcc-objc	">=${_majorver}"
 
 do_install() {
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index b0abf18643..87c9471c6b 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -1,14 +1,12 @@
 # Template file for 'gcc-objc'.
 #
+depends="libelf gcc>=4.7 libobjc>=4.7"
 short_desc="GCC Objective-C support"
 long_desc="${long_desc}
 
  This package contains GCC Objective-C support."
 
 
-Add_dependency run libelf
-Add_dependency run gcc		">=${_majorver}"
-Add_dependency run libobjc	">=${_majorver}"
 
 do_install() {
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc \
diff --git a/srcpkgs/gcc/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template
index f75e1b1831..1d0749c5bb 100644
--- a/srcpkgs/gcc/libgfortran-devel.template
+++ b/srcpkgs/gcc/libgfortran-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libgfortran-devel'.
 #
+depends="libgfortran>=4.7"
 short_desc="GCC Fortran library ${version} - development files"
 long_desc="${long_desc}
 
  This package contains the GCC Fortran headers and static libraries."
 
 
-Add_dependency run libgfortran ">=${_majorver}"
 
 do_install() {
 	# create version -> major symlink
diff --git a/srcpkgs/gcc/libgo-devel.template b/srcpkgs/gcc/libgo-devel.template
index 498e455189..b6633af366 100644
--- a/srcpkgs/gcc/libgo-devel.template
+++ b/srcpkgs/gcc/libgo-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libgo-devel'.
 #
+depends="libgo>=4.7"
 short_desc="GCC Go library ${version} shared library support - development files"
 long_desc="${long_desc}
 
  This package contains the GCC Go headers and static libraries."
 
 
-Add_dependency run libgo ">=${_majorver}"
 
 do_install() {
 	vmove usr/lib/libgo.a usr/lib
diff --git a/srcpkgs/gcc/libgomp-devel.template b/srcpkgs/gcc/libgomp-devel.template
index fc8082fee2..fd9e23c42b 100644
--- a/srcpkgs/gcc/libgomp-devel.template
+++ b/srcpkgs/gcc/libgomp-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libgomp-devel'.
 #
+depends="libgomp>=4.7"
 short_desc="GCC OpenMP v3.0 shared support library - development files"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  for OpenMP v3.0 support."
 
 
-Add_dependency run libgomp	">=${_majorver}"
 
 do_install() {
 	vmove usr/lib/libgomp.a usr/lib
diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template
index 63f0f534c1..6575518f7e 100644
--- a/srcpkgs/gcc/libmudflap-devel.template
+++ b/srcpkgs/gcc/libmudflap-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'gcc-libmudflap-devel'.
 #
+depends="libmudflap>=4.7"
 short_desc="GCC mudflap shared support library (development files)"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  building mudflap-instrumented programs."
 
 
-Add_dependency run libmudflap	">=${_majorver}"
 
 do_install() {
 	vmove "usr/lib/libmudflap*.a" usr/lib
diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template
index dccf051ff6..76035cf354 100644
--- a/srcpkgs/gcc/libobjc-devel.template
+++ b/srcpkgs/gcc/libobjc-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libobjc-devel'.
 #
+depends="libobjc>=4.7"
 short_desc="GCC Objective-C shared library support (development files)"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  build Objective-C programs."
 
 
-Add_dependency run libobjc	">=${_majorver}"
 
 do_install() {
 	vmove "usr/lib/libobjc.*a" usr/lib
diff --git a/srcpkgs/gcc/libquadmath-devel.template b/srcpkgs/gcc/libquadmath-devel.template
index b70f225c4d..8dc43a2ac1 100644
--- a/srcpkgs/gcc/libquadmath-devel.template
+++ b/srcpkgs/gcc/libquadmath-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libquadmath-devel'.
 #
+depends="libquadmath>=4.7"
 short_desc="GCC quadmath shared support library (development files)"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  building mudflap-instrumented programs."
 
 
-Add_dependency run libquadmath	">=${_majorver}"
 
 do_install() {
 	vmove "usr/lib/libquadmath*.a" usr/lib
diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template
index e88f5c0449..fc08e932ae 100644
--- a/srcpkgs/gcc/libssp-devel.template
+++ b/srcpkgs/gcc/libssp-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libssp'.
 #
+depends="glibc-devel libssp>=4.7"
 short_desc="GCC SSP library support"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
  files provided by GCC."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libssp	">=${_majorver}"
 
 do_install() {
 	vmove "usr/lib/libssp*.a" usr/lib
diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template
index 0c03234045..9153284853 100644
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'gcc-libstdc++-devel'.
 #
+depends="libstdc++>=4.7"
 short_desc="GCC Standard C++ Library (development files)"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  C++ development."
 
 
-Add_dependency run libstdc++	">=${_majorver}"
 
 do_install() {
 	vmove "usr/lib/libstdc++.*a" usr/lib
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 212e71d5e0..741b56291d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -3,6 +3,8 @@ pkgname=gcc
 _majorver=4.7
 version=${_majorver}.0
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
+depends="binutils libelf libgomp>=4.7 libitm>=4.7 libssp-devel>=4.7"
+makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel cloog-ppl-devel libelf-devel"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -15,20 +17,7 @@ long_desc="
  for ObjectiveC++ install gcc-objc++, for Go install gcc-go,
  for Fortran install gcc-fortran."
 
-Add_dependency run binutils
-Add_dependency run libelf
-Add_dependency run libgomp 		">=${_majorver}"
-Add_dependency run libitm		">=${_majorver}"
-Add_dependency run libssp-devel 	">=${_majorver}"
 
-Add_dependency build perl
-Add_dependency build flex
-Add_dependency build zlib-devel
-Add_dependency build gmp-devel
-Add_dependency build mpfr-devel
-Add_dependency build mpc-devel
-Add_dependency build cloog-ppl-devel
-Add_dependency build libelf-devel
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	# Required stuff for multilib packages.
diff --git a/srcpkgs/gcr/depends b/srcpkgs/gcr/depends
deleted file mode 100644
index 88592da749..0000000000
--- a/srcpkgs/gcr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gcr/gcr-devel.template b/srcpkgs/gcr/gcr-devel.template
index 34327a107b..dcdaf6de15 100644
--- a/srcpkgs/gcr/gcr-devel.template
+++ b/srcpkgs/gcr/gcr-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'gcr-devel'.
 #
+depends="glib-devel p11-kit-devel gtk+3-devel gcr>=3.4.1"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
@@ -7,10 +8,6 @@ long_desc="${long_desc}
 
 replaces="gnome-keyring-devel<3.3.92"
 
-Add_dependency run glib-devel
-Add_dependency run p11-kit-devel
-Add_dependency run gtk+3-devel
-Add_dependency run gcr ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index 4bcf74f388..a64d5c439a 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -6,6 +6,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-debug --disable-update-mime
 --disable-update-icon-cache --disable-schemas-compile"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection gtk+3-devel p11-kit-devel libgcrypt-devel libtasn1-tools"
+fulldepends="gnupg"
 short_desc="GNOME crypto package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -22,16 +25,4 @@ replaces="gnome-keyring<3.3.92"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build p11-kit-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libtasn1-tools
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
-Add_dependency full gnupg
diff --git a/srcpkgs/gd/depends b/srcpkgs/gd/depends
deleted file mode 100644
index 58353b7c1b..0000000000
--- a/srcpkgs/gd/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.35"
-api_depends=">=2.0.35_4" # gdlib-config in -devel subpkg.
diff --git a/srcpkgs/gd/gd-devel.template b/srcpkgs/gd/gd-devel.template
index af212d2f19..f3fd6ca8e5 100644
--- a/srcpkgs/gd/gd-devel.template
+++ b/srcpkgs/gd/gd-devel.template
@@ -1,19 +1,12 @@
 # Template file for 'gd-devel'.
 #
+depends="libXpm-devel libX11-devel jpeg-devel fontconfig-devel freetype-devel libpng-devel zlib-devel gd"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libXpm-devel
-Add_dependency run libX11-devel
-Add_dependency run jpeg-devel
-Add_dependency run fontconfig-devel
-Add_dependency run freetype-devel
-Add_dependency run libpng-devel
-Add_dependency run zlib-devel
-Add_dependency run gd
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gd/gd-progs.template b/srcpkgs/gd/gd-progs.template
index b1fc7954ad..5fd9fc5a6a 100644
--- a/srcpkgs/gd/gd-progs.template
+++ b/srcpkgs/gd/gd-progs.template
@@ -1,5 +1,6 @@
 # Template file for 'gd-progs'.
 #
+depends="perl>=0"
 short_desc="Utility programs that use libgd"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  library."
 
 
-Add_dependency run perl		">=0"
 
 do_install() {
 	vmove usr/bin usr
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 7f0df88c56..73aa85cac6 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -5,6 +5,7 @@ revision=7
 distfiles="http://jaist.dl.sourceforge.net/project/buluoos/0.1/src/gd-$version.tar.bz2"
 #distfiles="http://www.libgd.org/releases/gd-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libXpm-devel libX11-devel jpeg-devel fontconfig-devel freetype-devel libpng-devel zlib-devel glibc-devel"
 short_desc="Graphics library for the dynamic creation of images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
@@ -26,12 +27,3 @@ long_desc="
  features for an 8-bit 2D package."
  
 subpackages="$pkgname-devel $pkgname-progs"
-Add_dependency build pkg-config
-Add_dependency build libXpm-devel
-Add_dependency build libX11-devel
-Add_dependency build jpeg-devel
-Add_dependency build fontconfig-devel
-Add_dependency build freetype-devel
-Add_dependency build libpng-devel
-Add_dependency build zlib-devel
-Add_dependency build glibc-devel
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 76dec42f3b..7435c8f948 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -5,6 +5,7 @@ distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-nls --with-system-readline
 --with-system-gdbinit=/etc/gdb/gdbinit"
+makedepends="ncurses-devel zlib-devel readline-devel python-devel"
 short_desc="The GNU Debugger"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gdb/"
@@ -29,10 +30,6 @@ long_desc="
 pycompile_dirs="usr/share/gdb/python/gdb"
 conf_files="/etc/gdb/gdbinit"
 
-Add_dependency build ncurses-devel
-Add_dependency build zlib-devel
-Add_dependency build readline-devel
-Add_dependency build python-devel
 
 post_install() {
 	# resolve conflicts with binutils
diff --git a/srcpkgs/gdbm/depends b/srcpkgs/gdbm/depends
deleted file mode 100644
index 7baa2d7080..0000000000
--- a/srcpkgs/gdbm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.10_1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gdbm/gdbm-devel.template b/srcpkgs/gdbm/gdbm-devel.template
index c780f2a455..95b4334af1 100644
--- a/srcpkgs/gdbm/gdbm-devel.template
+++ b/srcpkgs/gdbm/gdbm-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'gdbm-devel'.
 #
+depends="glibc-devel"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
 
 do_install()
 {
diff --git a/srcpkgs/gdk-pixbuf/depends b/srcpkgs/gdk-pixbuf/depends
deleted file mode 100644
index ca7b78c443..0000000000
--- a/srcpkgs/gdk-pixbuf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.22.0"
-api_depends=">=2.24.1_2" # x11 support
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
index 8e2d6cafbd..4eef4f5927 100644
--- a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'gdk-pixbuf-devel'.
 #
+depends="perl>=0 libpng-devel shared-mime-info"
 short_desc="${short_desc} - development files"
 long_desc="
  ${pkgname} is An image loading library for GTK+.
 
  This package contains development files: headers, static libs, etc."
 
-Add_dependency run perl		">=0"
-Add_dependency run libpng-devel
-Add_dependency run shared-mime-info
 
 do_install() {
 	install -d ${DESTDIR}/usr/{bin,include,lib}
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 2728fd2690..de20ff0633 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -4,6 +4,7 @@ version=2.26.1
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--without-libjasper --with-included-loaders=png --with-x11"
+makedepends="perl>=0 pkg-config glib-devel libpng-devel jpeg-devel tiff-devel libX11-devel gobject-introspection"
 short_desc="An Image loading library for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -15,11 +16,3 @@ long_desc="
 triggers="gtk-pixbuf-loaders"
 subpackages="$pkgname-devel"
 
-Add_dependency build perl	">=0"
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build tiff-devel
-Add_dependency build libX11-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/gdm/depends b/srcpkgs/gdm/depends
deleted file mode 100644
index c5b6d2ac54..0000000000
--- a/srcpkgs/gdm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.2.0"
-api_depends=">=3.4.0.1"
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 361c740710..a147941377 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
 --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
 --disable-static --without-systemd --with-console-kit"
+makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection pam-devel nss-devel accountsservice-devel gtk+3-devel upower-devel libcanberra-devel libXrandr-devel libxklavier-devel at-spi2-core-devel"
+fulldepends="xrdb dconf hicolor-icon-theme polkit-gnome xorg-server metacity gnome-session gnome-settings-daemon"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -50,29 +52,7 @@ system_accounts="gdm"
 gdm_homedir="/var/lib/gdm"
 systemd_services="gdm.service off"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build which
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build pam-devel
-Add_dependency build nss-devel
-Add_dependency build accountsservice-devel
-Add_dependency build gtk+3-devel
-Add_dependency build upower-devel
-Add_dependency build libcanberra-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libxklavier-devel
-Add_dependency build at-spi2-core-devel
 
-Add_dependency full xrdb
-Add_dependency full dconf
-Add_dependency full hicolor-icon-theme
-Add_dependency full polkit-gnome
-Add_dependency full xorg-server
-Add_dependency full metacity
-Add_dependency full gnome-session
-Add_dependency full gnome-settings-daemon
 
 post_install() {
 	# Use our own pam files.
diff --git a/srcpkgs/gedit/depends b/srcpkgs/gedit/depends
deleted file mode 100644
index 13ec5d9828..0000000000
--- a/srcpkgs/gedit/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gedit/gedit-devel.template b/srcpkgs/gedit/gedit-devel.template
index fe002fae79..af245a4038 100644
--- a/srcpkgs/gedit/gedit-devel.template
+++ b/srcpkgs/gedit/gedit-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gedit-devel'.
 #
+depends="gtksourceview-devel libpeas-devel"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtksourceview-devel
-Add_dependency run libpeas-devel
 
 noarch=yes
 
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 5907a8e62c..78d643268b 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -4,6 +4,9 @@ version=3.4.1
 distfiles="${GNOME_SITE}/gedit/3.4/gedit-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-updater --enable-python"
+depends="pygobject hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool itstool gnome-doc-utils gtksourceview-devel libpeas-devel enchant-devel pygobject-devel"
+fulldepends="gsettings-desktop-schemas iso-codes"
 short_desc="A text editor for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -17,18 +20,5 @@ pycompile_dirs="usr/lib/gedit/plugins"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="gedit-devel"
 
-Add_dependency run pygobject
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtksourceview-devel
-Add_dependency build libpeas-devel
-Add_dependency build enchant-devel
-Add_dependency build pygobject-devel
 
-Add_dependency full gsettings-desktop-schemas
-Add_dependency full iso-codes
diff --git a/srcpkgs/gegl/depends b/srcpkgs/gegl/depends
deleted file mode 100644
index 0a1169209a..0000000000
--- a/srcpkgs/gegl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gegl/gegl-devel.template b/srcpkgs/gegl/gegl-devel.template
index 9b86f9e69e..9808cf01c9 100644
--- a/srcpkgs/gegl/gegl-devel.template
+++ b/srcpkgs/gegl/gegl-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gegl-devel'.
 #
+depends="glib-devel gegl>=0.2.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gegl ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 7f74e885e0..fd7f51ac6d 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
 configure_args="--disable-docs --without-sdl --without-libopenraw
 --without-libavformat --without-graphviz --without-lua --without-libspiro
 --without-umfpack --with-exiv2 --without-libv4l --disable-introspection"
+makedepends="pkg-config intltool glib-devel cairo-devel libpng-devel jpeg-devel librsvg-devel pango-devel gtk+-devel babl-devel jasper-devel exiv2-devel"
 short_desc="Graph based image processing framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
@@ -22,15 +23,3 @@ long_desc="
 
 subpackages="gegl-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build cairo-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build librsvg-devel
-Add_dependency build pango-devel
-Add_dependency build gtk+-devel
-Add_dependency build babl-devel
-Add_dependency build jasper-devel
-Add_dependency build exiv2-devel
diff --git a/srcpkgs/geoclue/depends b/srcpkgs/geoclue/depends
deleted file mode 100644
index f90b51d01a..0000000000
--- a/srcpkgs/geoclue/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.12.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/geoclue/geoclue-devel.template b/srcpkgs/geoclue/geoclue-devel.template
index ffdc9a7edc..e57a50087f 100644
--- a/srcpkgs/geoclue/geoclue-devel.template
+++ b/srcpkgs/geoclue/geoclue-devel.template
@@ -1,17 +1,12 @@
 # Template file for 'geoclue-devel'.
 #
+depends="pkg-config intltool dbus-glib-devel libxml2-devel GConf-devel geoclue"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run dbus-glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run GConf-devel
-Add_dependency run ${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template
index d809c24630..19ce2a9f4f 100644
--- a/srcpkgs/geoclue/template
+++ b/srcpkgs/geoclue/template
@@ -5,6 +5,7 @@ revision=4
 distfiles="http://launchpad.net/geoclue/trunk/0.12/+download/geoclue-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-networkmanager=no --enable-conic=no"
+makedepends="automake gtk-doc pkg-config intltool dbus-glib-devel libxml2-devel GConf-devel libxslt gtk+-devel libsoup-gnome-devel"
 short_desc="The Geoinformation Service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0f533f177ae9aa35e807a01c754840f66df9579f5524552f14f2b5ba670a4696
@@ -15,16 +16,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build gtk-doc
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build GConf-devel
-Add_dependency build libxslt
-Add_dependency build gtk+-devel
-Add_dependency build libsoup-gnome-devel
 
 pre_configure() {
 	sed -i 's/libnm_glib/libnm-glib/g' configure.ac
diff --git a/srcpkgs/geoip/depends b/srcpkgs/geoip/depends
deleted file mode 100644
index f7bdbe85b1..0000000000
--- a/srcpkgs/geoip/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/geoip/geoip-devel.template b/srcpkgs/geoip/geoip-devel.template
index 11b3d14851..913f1640d6 100644
--- a/srcpkgs/geoip/geoip-devel.template
+++ b/srcpkgs/geoip/geoip-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'geoip-devel'.
 #
+depends="zlib-devel libgeoip"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run libgeoip
 
 do_install()
 {
diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template
index 2fade62754..324c747262 100644
--- a/srcpkgs/geoip/template
+++ b/srcpkgs/geoip/template
@@ -4,6 +4,7 @@ version=1.4.8
 distfiles="http://geolite.maxmind.com/download/${pkgname}/api/c/GeoIP-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
+makedepends="zlib-devel"
 short_desc="Non-DNS IP-to-country resolver C library and utilities"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.maxmind.com/app/c"
@@ -21,4 +22,3 @@ conf_files="/etc/geoip/GeoIP.conf"
 
 wrksrc="GeoIP-${version}"
 
-Add_dependency build zlib-devel
diff --git a/srcpkgs/gettext/depends b/srcpkgs/gettext/depends
deleted file mode 100644
index 552b83e8f5..0000000000
--- a/srcpkgs/gettext/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.17"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gettext/gettext-devel.template b/srcpkgs/gettext/gettext-devel.template
index 99bd18bcc4..34cdc61797 100644
--- a/srcpkgs/gettext/gettext-devel.template
+++ b/srcpkgs/gettext/gettext-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gettext-devel'.
 #
+depends="glibc-devel gettext-libs"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run gettext-libs
 
 do_install()
 {
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index f6822da24c..77e592a84a 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -8,6 +8,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp
 --disable-libasprintf --enable-threads=posix --disable-rpath
 --disable-acl --with-included-glib --with-included-libcroco
 --with-included-libxml --without-included-regex --without-emacs"
+makedepends="ncurses-devel libgomp-devel"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9
@@ -17,8 +18,6 @@ long_desc="
  internationalisation (or i18n) of a utility."
 
 subpackages="$pkgname-devel $pkgname-libs"
-Add_dependency build ncurses-devel
-Add_dependency build libgomp-devel
 
 post_configure() {
 	# Disable ACL.
diff --git a/srcpkgs/ghostscript/depends b/srcpkgs/ghostscript/depends
deleted file mode 100644
index daa819845a..0000000000
--- a/srcpkgs/ghostscript/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ghostscript/ghostscript-devel.template b/srcpkgs/ghostscript/ghostscript-devel.template
index 5a93e685c4..3346dfe440 100644
--- a/srcpkgs/ghostscript/ghostscript-devel.template
+++ b/srcpkgs/ghostscript/ghostscript-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'ghostscript-devel'.
 #
+depends="libijs>=9.05 libgs>=9.05"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libijs ">=${version}"
-Add_dependency run libgs ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index d8f059771b..a113e2737a 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -2,6 +2,7 @@
 pkgname=ghostscript
 version=9.05
 distfiles="http://downloads.ghostscript.com/public/$pkgname-$version.tar.bz2"
+makedepends="automake pkg-config libXext-devel libXt-devel cups-devel fontconfig-devel jasper-devel tiff-devel jpeg-devel libpng-devel lcms-devel lcms2-devel"
 short_desc="An interpreter for the PostScript language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.ghostscript.com/"
@@ -13,18 +14,6 @@ long_desc="
 disable_parallel_build=yes
 subpackages="libgs libijs $pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build libXext-devel
-Add_dependency build libXt-devel
-Add_dependency build cups-devel
-Add_dependency build fontconfig-devel
-Add_dependency build jasper-devel
-Add_dependency build tiff-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build lcms-devel
-Add_dependency build lcms2-devel
 
 pre_configure() {
 	# force it to use system libs.
diff --git a/srcpkgs/giblib/depends b/srcpkgs/giblib/depends
deleted file mode 100644
index 55813ed4c8..0000000000
--- a/srcpkgs/giblib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/giblib/giblib-devel.template b/srcpkgs/giblib/giblib-devel.template
index 88e3f089b7..fc163142c3 100644
--- a/srcpkgs/giblib/giblib-devel.template
+++ b/srcpkgs/giblib/giblib-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'giblib-devel'.
 #
+depends="imlib2-devel freetype-devel zlib-devel libX11-devel libXext-devel glibc-devel giblib"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-Add_dependency run imlib2-devel
-Add_dependency run freetype-devel
-Add_dependency run zlib-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run glibc-devel
-Add_dependency run giblib
 
 do_install()
 {
diff --git a/srcpkgs/giblib/template b/srcpkgs/giblib/template
index a265e0ff5f..2d03558bfe 100644
--- a/srcpkgs/giblib/template
+++ b/srcpkgs/giblib/template
@@ -5,6 +5,7 @@ distfiles="http://linuxbrit.co.uk/downloads/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/giblib"
 revision=2
+makedepends="pkg-config imlib2-devel freetype-devel zlib-devel libX11-devel libXext-devel glibc-devel"
 short_desc="Programming utility library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://linuxbrit.co.uk/giblib/"
@@ -20,10 +21,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build imlib2-devel
-Add_dependency build freetype-devel
-Add_dependency build zlib-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build glibc-devel
diff --git a/srcpkgs/giflib/depends b/srcpkgs/giflib/depends
deleted file mode 100644
index df57eced1c..0000000000
--- a/srcpkgs/giflib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.1.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/giflib/giflib-devel.template b/srcpkgs/giflib/giflib-devel.template
index 21d920473d..9dab2e2d31 100644
--- a/srcpkgs/giflib/giflib-devel.template
+++ b/srcpkgs/giflib/giflib-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'giflib-devel'.
 #
+depends="libSM-devel libICE-devel libX11-devel giflib"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run giflib
 
 do_install()
 {
diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template
index 2a2858d523..696cc4f4f9 100644
--- a/srcpkgs/giflib/template
+++ b/srcpkgs/giflib/template
@@ -4,6 +4,7 @@ version=4.1.6
 revision=4
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="libSM-devel libICE-devel libX11-devel"
 short_desc="library for GIF images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ceca77dcd29eb6f6d0336414dfecc9094413f71c3b589afcf96bb72fbfb08ce0
@@ -12,9 +13,6 @@ long_desc="
  with GIF images."
 
 subpackages="$pkgname-devel $pkgname-tools"
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
 
 post_install()
 {
diff --git a/srcpkgs/giggle/giggle-devel.template b/srcpkgs/giggle/giggle-devel.template
index c622c1574e..6358305aff 100644
--- a/srcpkgs/giggle/giggle-devel.template
+++ b/srcpkgs/giggle/giggle-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'giggle-devel'.
 #
+depends="libgiggle"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run lib${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index d0bc88bf45..a9e876c417 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -6,6 +6,8 @@ distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-evolution-data-server"
 revision=2
+makedepends="pkg-config itstool intltool gtksourceview-devel vte3-devel evolution-data-server-devel"
+fulldepends="git desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,13 +19,4 @@ long_desc="
 subpackages="lib${pkgname} ${pkgname}-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build itstool
-Add_dependency build intltool
-Add_dependency build gtksourceview-devel
-Add_dependency build vte3-devel
-Add_dependency build evolution-data-server-devel
 
-Add_dependency full git
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/gimp/depends b/srcpkgs/gimp/depends
deleted file mode 100644
index b7d8ad23d6..0000000000
--- a/srcpkgs/gimp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.6.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gimp/gimp-devel.template b/srcpkgs/gimp/gimp-devel.template
index 6a73213ebd..8f7be18c19 100644
--- a/srcpkgs/gimp/gimp-devel.template
+++ b/srcpkgs/gimp/gimp-devel.template
@@ -1,48 +1,11 @@
 # Template file for 'gimp-devel'.
 #
+depends="intltool pkg-config gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel glibc-devel lcms-devel alsa-lib-devel dbus-glib-devel dbus-devel jpeg-devel libexif-devel libcurl-devel libpng-devel libmng-devel zlib-devel libSM-devel libICE-devel libX11-devel libXpm-devel libXmu-devel libXt-devel libXext-devel libXfixes-devel poppler-glib-devel tiff-devel webkit-gtk-devel libsoup-devel libwmf-devel expat-devel librsvg-devel gegl-devel babl-devel gimp"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run intltool
-Add_dependency run pkg-config
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run glibc-devel
-Add_dependency run lcms-devel
-Add_dependency run alsa-lib-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run jpeg-devel
-Add_dependency run libexif-devel
-Add_dependency run libcurl-devel
-Add_dependency run libpng-devel
-Add_dependency run libmng-devel
-Add_dependency run zlib-devel
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run libXpm-devel
-Add_dependency run libXmu-devel
-Add_dependency run libXt-devel
-Add_dependency run libXext-devel
-Add_dependency run libXfixes-devel
-Add_dependency run poppler-glib-devel
-Add_dependency run tiff-devel
-Add_dependency run webkit-gtk-devel
-Add_dependency run libsoup-devel
-Add_dependency run libwmf-devel
-Add_dependency run expat-devel
-Add_dependency run librsvg-devel
-Add_dependency run gegl-devel
-Add_dependency run babl-devel
-Add_dependency run gimp
 
 do_install()
 {
diff --git a/srcpkgs/gimp/gimp-python.template b/srcpkgs/gimp/gimp-python.template
index bc7cf6e25b..381bc1798d 100644
--- a/srcpkgs/gimp/gimp-python.template
+++ b/srcpkgs/gimp/gimp-python.template
@@ -1,5 +1,6 @@
 # Template file for 'gimp-python'.
 #
+depends="pygtk"
 short_desc="${sourcepkg} Python bindings"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 pycompile_dirs="usr/lib/gimp/2.0/python"
 
-Add_dependency run pygtk
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index c073f9cd8b..b7987b04c6 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -6,6 +6,9 @@ distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-aa"
 license="GPL-3"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool gtk+-devel lcms-devel alsa-lib-devel dbus-glib-devel libXmu-devel libXext-devel libXcursor-devel libexif-devel webkit-gtk-devel libwmf-devel librsvg-devel poppler-glib-devel libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel libgudev-devel jasper-devel"
+fulldepends="iso-codes"
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=dd6cee080d18faefa010ba4823e60ee7c49a4d1574a78c6dfb590592a09f2dcc
@@ -29,30 +32,5 @@ conf_files="
 
 subpackages="gimp-devel gimp-python"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build lcms-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXext-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libexif-devel
-Add_dependency build webkit-gtk-devel
-Add_dependency build libwmf-devel
-Add_dependency build librsvg-devel
-Add_dependency build poppler-glib-devel
-Add_dependency build libmng-devel
-Add_dependency build libXpm-devel
-Add_dependency build libcurl-devel
-Add_dependency build babl-devel
-Add_dependency build gegl-devel
-Add_dependency build pygtk-devel
-Add_dependency build libgudev-devel
-Add_dependency build jasper-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
-Add_dependency full iso-codes
diff --git a/srcpkgs/git/git-perl.template b/srcpkgs/git/git-perl.template
index ecf14c7f24..ed402fcf97 100644
--- a/srcpkgs/git/git-perl.template
+++ b/srcpkgs/git/git-perl.template
@@ -1,13 +1,12 @@
 # Template file for 'git-perl'.
 #
+depends="git perl"
 short_desc="${sourcepkg} perl bindings"
 long_desc="${long_desc}
 
  This package contains the Perl bindings."
 
 noarch=yes
-Add_dependency run git
-Add_dependency run perl
 
 do_install()
 {
diff --git a/srcpkgs/git/git-python.template b/srcpkgs/git/git-python.template
index 8623dfb8b9..7fc6c8360c 100644
--- a/srcpkgs/git/git-python.template
+++ b/srcpkgs/git/git-python.template
@@ -1,5 +1,6 @@
 # Template file for 'git-python'.
 #
+depends="git python"
 short_desc="${sourcepkg} python bindings"
 long_desc="${long_desc}
 
@@ -8,8 +9,6 @@ long_desc="${long_desc}
 noarch=yes
 pycompile_module="git_remote_helpers"
 
-Add_dependency run git
-Add_dependency run python
 
 do_install()
 {
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 09080bdeb7..11ef6b249f 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -2,6 +2,7 @@
 pkgname=git
 version=1.7.10.2
 distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz"
+makedepends="asciidoc xmlto perl openssl-devel libcurl-devel expat-devel python-devel"
 short_desc="GIT Tree History Storage Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://git-scm.com/"
@@ -20,13 +21,6 @@ long_desc="
 
 subpackages="git-docs git-perl git-python"
 
-Add_dependency build asciidoc
-Add_dependency build xmlto
-Add_dependency build perl
-Add_dependency build openssl-devel
-Add_dependency build libcurl-devel
-Add_dependency build expat-devel
-Add_dependency build python-devel
 
 do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} --with-curl --with-expat \
diff --git a/srcpkgs/gjs/depends b/srcpkgs/gjs/depends
deleted file mode 100644
index 99c339b5d0..0000000000
--- a/srcpkgs/gjs/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7.11"
-api_depends=">=1.31.22"
diff --git a/srcpkgs/gjs/gjs-devel.template b/srcpkgs/gjs/gjs-devel.template
index de4daf0686..4571f1df32 100644
--- a/srcpkgs/gjs/gjs-devel.template
+++ b/srcpkgs/gjs/gjs-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'gjs-devel'.
 #
+depends="libffi-devel libgirepository-devel dbus-glib-devel cairo-devel readline-devel js-devel gjs>=1.32.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libffi-devel
-Add_dependency run libgirepository-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run cairo-devel
-Add_dependency run readline-devel
-Add_dependency run js-devel
-Add_dependency run gjs ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 2dd1c2e13d..dd1544b9d2 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -4,6 +4,7 @@ version=1.32.0
 homepage="http://live.gnome.org/Gjs"
 distfiles="${GNOME_SITE}/$pkgname/1.32/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool libffi-devel libgirepository-devel dbus-glib-devel cairo-devel readline-devel js-devel gobject-introspection"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MPL-1.1, LGPL-2.1, GPL-2"
@@ -15,12 +16,3 @@ long_desc="
 
 subpackages="gjs-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libffi-devel
-Add_dependency build libgirepository-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build cairo-devel
-Add_dependency build readline-devel
-Add_dependency build js-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index cfd87d3885..47ef6e387c 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -6,6 +6,7 @@ distfiles="http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version.t
 build_style=gnu-makefile
 make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version/usr
  MANDIR=$XBPS_DESTDIR/$pkgname-$version/usr/share/man/man1"
+makedepends="pkg-config atk-devel glib-devel pango-devel gdk-pixbuf-devel cairo-devel libpng-devel freetype-devel fontconfig-devel libSM-devel libICE-devel openssl-devel libX11-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
@@ -32,18 +33,3 @@ long_desc="
   * A different theme can be created with the GIMP.
   * And a lot more..."
 
-Add_dependency build pkg-config
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
-Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build openssl-devel
-Add_dependency build libX11-devel
-Add_dependency build gtk+-devel
-Add_dependency build libsensors-devel
diff --git a/srcpkgs/glade3/depends b/srcpkgs/glade3/depends
deleted file mode 100644
index 7f337a72a2..0000000000
--- a/srcpkgs/glade3/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.10.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/glade3/glade3-devel.template b/srcpkgs/glade3/glade3-devel.template
index cfdf00b535..7521ae6791 100644
--- a/srcpkgs/glade3/glade3-devel.template
+++ b/srcpkgs/glade3/glade3-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'glade3-devel'.
 #
+depends="gtk+3-devel libxml2-devel libgladeui3>=3.12.1"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run libxml2-devel
-Add_dependency run libgladeui3 ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/glade3/libgladeui3.template b/srcpkgs/glade3/libgladeui3.template
index 26bec891d6..707e304896 100644
--- a/srcpkgs/glade3/libgladeui3.template
+++ b/srcpkgs/glade3/libgladeui3.template
@@ -1,12 +1,12 @@
 # Template file for 'libgladeui'.
 #
+depends="pygobject"
 short_desc="GTK+ User Interface Build core library"
 long_desc="${long_desc}
 
  This library provides all the widgets and core code, like parsing and
  saving files."
 
-Add_dependency run pygobject
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 7fccd0d631..f4ff0eba93 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -5,6 +5,8 @@ wrksrc=glade-${version}
 distfiles="${GNOME_SITE}/glade/3.12/glade-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-static"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils gtk+3-devel libxml2-devel gobject-introspection python-devel pygobject-devel"
 short_desc="An User Interface Designer for GTK+"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=27e89fb743adb9996c418aa70cde8ce3c0769103f3691cc8011e6c6846600e76
@@ -22,15 +24,4 @@ long_desc="
 subpackages="libgladeui3 $pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build libxml2-devel
-Add_dependency build gobject-introspection
-Add_dependency build python-devel
-Add_dependency build pygobject-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/glew/depends b/srcpkgs/glew/depends
deleted file mode 100644
index 89acd330c2..0000000000
--- a/srcpkgs/glew/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.6.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/glew/glew-devel.template b/srcpkgs/glew/glew-devel.template
index 662e1027cb..0d2b6e7cff 100644
--- a/srcpkgs/glew/glew-devel.template
+++ b/srcpkgs/glew/glew-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'glew-devel'.
 #
+depends="glew"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glew
 
 do_install()
 {
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index e8d38badc8..b5d9cfe3d9 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -3,6 +3,7 @@ pkgname=glew
 version=1.6.0
 revision=3
 distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
+makedepends="pkg-config libXmu-devel libXi-devel MesaLib-devel libXext-devel libX11-devel"
 short_desc="The OpenGL Extension Wrangler Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://glew.sourceforge.net"
@@ -17,12 +18,6 @@ long_desc="
 subpackages="glew-devel"
 
 
-Add_dependency build pkg-config
-Add_dependency build libXmu-devel
-Add_dependency build libXi-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libXext-devel
-Add_dependency build libX11-devel
 
 do_build()
 {
diff --git a/srcpkgs/glib-networking/depends b/srcpkgs/glib-networking/depends
deleted file mode 100644
index a3fd0750ce..0000000000
--- a/srcpkgs/glib-networking/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.27.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 12c1720794..7128e36ccd 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -6,20 +6,12 @@ build_style=gnu-configure
 configure_args="--disable-static --with-libproxy --with-gnome-proxy
 --with-gnutls --with-pkcs11
 --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+makedepends="pkg-config intltool glib-devel libproxy-devel libgpg-error-devel libgcrypt-devel gnutls-devel p11-kit-devel"
+fulldepends="ca-certificates gsettings-desktop-schemas"
 short_desc="Network-related giomodules for glib"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf
 long_desc="
  This package contains GLib's GIO modules for networking."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libproxy-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build gnutls-devel
-Add_dependency build p11-kit-devel
 
-Add_dependency full ca-certificates
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/glib/depends b/srcpkgs/glib/depends
deleted file mode 100644
index 1809d31852..0000000000
--- a/srcpkgs/glib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.18.0"
-api_depends=">=2.31.22"
diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index ae02c74353..846ad5536f 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'glib-devel'.
 #
+depends="zlib-devel pcre-devel libffi-devel coreutils perl>=0"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
@@ -7,11 +8,6 @@ long_desc="${long_desc}
 
 pycompile_dirs="usr/lib/gdbus-2.0/codegen"
 
-Add_dependency run zlib-devel
-Add_dependency run pcre-devel
-Add_dependency run libffi-devel
-Add_dependency run coreutils  # required by glib-mkenums /usr/bin/env
-Add_dependency run perl ">=0" # required by glib-mkenums
 
 do_install() {
 	vmkdir usr/bin
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 613972188a..af55e8b8af 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -4,6 +4,7 @@ version=2.32.3
 distfiles="${GNOME_SITE}/glib/2.32/glib-$version.tar.xz"
 configure_args="--disable-fam --with-pcre=system --enable-static"
 build_style=gnu-configure
+makedepends="python>=0 pkg-config zlib-devel pcre-devel libffi-devel"
 short_desc="The GNU library of C routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -16,8 +17,3 @@ long_desc="
 
 subpackages="glib-devel"
 
-Add_dependency build python	">=0"
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build pcre-devel
-Add_dependency build libffi-devel
diff --git a/srcpkgs/glibc/depends b/srcpkgs/glibc/depends
deleted file mode 100644
index e12218f87a..0000000000
--- a/srcpkgs/glibc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index 295d5ad855..02e7e35792 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'glibc-devel'.
 #
+depends="kernel-libc-headers>=3.2.6<3.3 glibc>=2.14.1_5"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
 
-Add_dependency run kernel-libc-headers ">=3.2.6<3.3"
-Add_dependency run glibc ">=${version}_5"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 4991091ca1..3427e9590f 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -3,6 +3,8 @@ pkgname=glibc
 version=2.14.1
 revision=7
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
+depends="base-files libgcc glibc-locales"
+makedepends="bison perl"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
@@ -21,12 +23,7 @@ libthread_db-1.0.so"
 conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
 subpackages="glibc-devel glibc-locales nscd"
 
-Add_dependency run base-files
-Add_dependency run libgcc
-Add_dependency run glibc-locales
 
-Add_dependency build bison
-Add_dependency build perl
 
 do_configure() {
 	local cflags
diff --git a/srcpkgs/glibc32/glibc32-devel.template b/srcpkgs/glibc32/glibc32-devel.template
index a68eb0d79a..1402bc520c 100644
--- a/srcpkgs/glibc32/glibc32-devel.template
+++ b/srcpkgs/glibc32/glibc32-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'glibc32-devel'.
 #
+depends="glibc-devel glibc32"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run glibc32
 
 do_install()
 {
diff --git a/srcpkgs/glibc32/template b/srcpkgs/glibc32/template
index fc25d4497a..504e980a4f 100644
--- a/srcpkgs/glibc32/template
+++ b/srcpkgs/glibc32/template
@@ -6,6 +6,8 @@ _devrev=2
 distfiles="
 http://xbps.goodluckwith.us/binpkgs/i686/glibc-${version}_${revision}.i686.xbps
 http://xbps.goodluckwith.us/binpkgs/i686/glibc-devel-${version}_${_devrev}.i686.xbps"
+depends="glibc"
+makedepends="bsdtar"
 short_desc="The GNU C library (32 bits)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
@@ -26,8 +28,6 @@ noextract=yes
 noverifyrdeps=yes
 only_for_archs=x86_64
 
-Add_dependency run glibc
-Add_dependency build bsdtar
 
 do_install() {
 	for f in ${distfiles}; do
diff --git a/srcpkgs/glibmm/depends b/srcpkgs/glibmm/depends
deleted file mode 100644
index a0d98e3a7e..0000000000
--- a/srcpkgs/glibmm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.24.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/glibmm/glibmm-devel.template b/srcpkgs/glibmm/glibmm-devel.template
index 4058e0e7cb..56b3c09412 100644
--- a/srcpkgs/glibmm/glibmm-devel.template
+++ b/srcpkgs/glibmm/glibmm-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'glibmm-devel'.
 #
+depends="pkg-config glib-devel libsigc++-devel glibmm>=2.32.0"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run libsigc++-devel
-Add_dependency run glibmm ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 098fab4c1a..29abaf48a2 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -3,6 +3,7 @@ pkgname=glibmm
 version=2.32.0
 distfiles="${GNOME_SITE}/glibmm/2.32/glibmm-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel libsigc++-devel>=2.2.10"
 short_desc="C++ bindings for GLib"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gtkmm.sourceforge.net/"
@@ -16,7 +17,3 @@ long_desc="
 
 subpackages="glibmm-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libsigc++-devel	">=2.2.10"
diff --git a/srcpkgs/gmime/depends b/srcpkgs/gmime/depends
deleted file mode 100644
index 4b59a956db..0000000000
--- a/srcpkgs/gmime/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.6.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gmime/gmime-devel.template b/srcpkgs/gmime/gmime-devel.template
index e1b89f8305..056662fbb6 100644
--- a/srcpkgs/gmime/gmime-devel.template
+++ b/srcpkgs/gmime/gmime-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'gmime-devel'.
 #
+depends="pkg-config glib-devel zlib-devel gmime"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run zlib-devel
-Add_dependency run gmime
 
 do_install()
 {
diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 673501479b..6597a3b378 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -5,6 +5,7 @@ homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-mono --enable-smime"
+makedepends="pkg-config intltool glib-devel zlib-devel gpgme-devel"
 short_desc="GNOME Core mime parsing library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,8 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build zlib-devel
-Add_dependency build gpgme-devel
diff --git a/srcpkgs/gmp/depends b/srcpkgs/gmp/depends
deleted file mode 100644
index 3067d907e6..0000000000
--- a/srcpkgs/gmp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gmp/gmp-devel.template b/srcpkgs/gmp/gmp-devel.template
index 552df380e2..b12cdc0e2a 100644
--- a/srcpkgs/gmp/gmp-devel.template
+++ b/srcpkgs/gmp/gmp-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gmp-devel'.
 #
+depends="glibc-devel gmp"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run gmp
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template
index 42b43577bc..0b3b36732b 100644
--- a/srcpkgs/gnac/template
+++ b/srcpkgs/gnac/template
@@ -6,6 +6,8 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-compile"
 revision=1
+makedepends="pkg-config intltool gnome-doc-utils libnotify-devel libunique1-devel gst-plugins-base-devel"
+fulldepends="gst-plugins-good gst-plugins-bad gst-plugins-ugly desktop-file-utils hicolor-icon-theme"
 short_desc="Audio conversion program for the Gnome desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -16,15 +18,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build libnotify-devel
-Add_dependency build libunique1-devel
-Add_dependency build gst-plugins-base-devel
 
-Add_dependency full gst-plugins-good
-Add_dependency full gst-plugins-bad
-Add_dependency full gst-plugins-ugly
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/gnome-applets/template b/srcpkgs/gnome-applets/template
index 06be97be4e..89036ea272 100644
--- a/srcpkgs/gnome-applets/template
+++ b/srcpkgs/gnome-applets/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-install
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --without-hal"
+depends="hicolor-icon-theme desktop-file-utils pygtk"
+makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel GConf-devel gnome-panel-devel libgtop-devel libwnck-devel gnome-settings-daemon-devel polkit-devel gucharmap-devel pygtk-devel libxml2-devel dbus-glib-devel libgweather-devel NetworkManager-devel libcpufreq-devel libnotify-devel"
+fulldepends="gsettings-desktop-schemas gnome-icon-theme"
 short_desc="GNOME panel applets"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -16,33 +19,8 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 gconf_schemas="${pkgname}.schemas"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build GConf-devel
-Add_dependency build gnome-panel-devel
-Add_dependency build libgtop-devel
-Add_dependency build libwnck-devel
-Add_dependency build gnome-settings-daemon-devel
-Add_dependency build polkit-devel
-Add_dependency build gucharmap-devel
-Add_dependency build pygtk-devel
-Add_dependency build libxml2-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libgweather-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build libcpufreq-devel
-Add_dependency build libnotify-devel
 
-Add_dependency full gsettings-desktop-schemas
-Add_dependency full gnome-icon-theme
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
-Add_dependency run pygtk
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index f74380606b..44a6edd774 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -3,6 +3,7 @@ pkgname=gnome-backgrounds
 version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool"
 short_desc="Set of background images for the GNOME Desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -13,5 +14,3 @@ long_desc="
  GNOME Desktop."
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency build intltool
diff --git a/srcpkgs/gnome-bluetooth/depends b/srcpkgs/gnome-bluetooth/depends
deleted file mode 100644
index ced6b7492e..0000000000
--- a/srcpkgs/gnome-bluetooth/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends=">=3.3.92_1"
diff --git a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
index 2eb948f675..30cd73fc45 100644
--- a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
+++ b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'gnome-bluetooth-devel'.
 #
+depends="gtk+3-devel glib-devel gnome-bluetooth>=3.4.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
@@ -7,9 +8,6 @@ long_desc="${long_desc}
 
 noarch=yes
 
-Add_dependency run gtk+3-devel
-Add_dependency run glib-devel
-Add_dependency run gnome-bluetooth ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 472915a9da..3536a6b7a2 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-desktop-update --disable-schemas-compile
 --disable-icon-update"
+depends="dconf bluez gvfs obexd-client hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection libXi-devel gtk+3-devel libnotify-devel nautilus-sendto-devel"
 short_desc="The GNOME Bluetooth Subsystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GnomeBluetooth"
@@ -23,22 +25,7 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build libXi-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libnotify-devel
-Add_dependency build nautilus-sendto-devel
 
-Add_dependency run dconf
-Add_dependency run bluez
-Add_dependency run gvfs
-Add_dependency run obexd-client
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
 post_install() {
 	vinstall ${FILESDIR}/61-gnome-bluetooth-rfkill.rules \
diff --git a/srcpkgs/gnome-color-manager/template b/srcpkgs/gnome-color-manager/template
index bc40dae207..ffb6922266 100644
--- a/srcpkgs/gnome-color-manager/template
+++ b/srcpkgs/gnome-color-manager/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-compile
 --enable-clutter --enable-packagekit --enable-exiv"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool gnome-doc-utils libcanberra-devel vte3-devel exiv2-devel clutter-gtk-devel mash-devel gnome-desktop-devel libXrandr-devel lcms2-devel colord-devel libexif-devel"
+fulldepends="shared-color-profiles shared-color-targets"
 short_desc="Color profile manager for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/gnome-color-manager/"
@@ -33,21 +36,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build libcanberra-devel
-Add_dependency build vte3-devel
-Add_dependency build exiv2-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build mash-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build libXrandr-devel
-Add_dependency build lcms2-devel
-Add_dependency build colord-devel
-Add_dependency build libexif-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
-Add_dependency full shared-color-profiles
-Add_dependency full shared-color-targets
diff --git a/srcpkgs/gnome-common/template b/srcpkgs/gnome-common/template
index 6e63049405..4db6ba96ba 100644
--- a/srcpkgs/gnome-common/template
+++ b/srcpkgs/gnome-common/template
@@ -4,6 +4,7 @@ version=3.1.0
 revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.1/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+fulldepends="automake"
 short_desc="Common scripts and macros to develop with GNOME"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnome.org"
@@ -13,4 +14,3 @@ long_desc="
  This package contains common scripts and macros to develop with GNOME."
 
 noarch=yes
-Add_dependency full automake
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 2654e4920e..37b8f11a55 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -3,6 +3,8 @@ pkgname=gnome-contacts
 version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="desktop-file-utils"
+makedepends="pkg-config intltool vala-devel telepathy-glib-devel gnome-desktop-devel folks-devel libnotify-devel"
 short_desc="GNOME contacts manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -11,12 +13,4 @@ checksum=673614fe6cd5f986132819eeb21d67c40af336ffd2c4ca4c3e99365114f13523
 long_desc="
  This packages the contacts manager for the GNOME desktop."
 
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build vala-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build folks-devel
-Add_dependency build libnotify-devel
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index e13d5f335a..ef538e7023 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -6,6 +6,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-cups --with-libsocialweb --without-cheese
 --disable-update-mimedb --disable-static --enable-systemd"
+depends="gsettings-desktop-schemas pulseaudio desktop-file-utils hicolor-icon-theme sound-theme-freedesktop apg"
+makedepends="which pkg-config intltool gnome-doc-utils libXi-devel libnotify-devel gnome-desktop-devel libgnomekbd-devel gnome-menus-devel network-manager-applet-devel gnome-settings-daemon-devel gnome-online-accounts-devel libsocialweb-devel libcanberra-devel polkit-devel libgtop-devel upower-devel colord-devel pulseaudio-devel libwacom-devel gnome-bluetooth-devel tzdata systemd-devel cups-devel"
+fulldepends="iso-codes"
 short_desc="GNOME control center"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,36 +19,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build libXi-devel
-Add_dependency build libnotify-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build libgnomekbd-devel
-Add_dependency build gnome-menus-devel
-Add_dependency build network-manager-applet-devel
-Add_dependency build gnome-settings-daemon-devel
-Add_dependency build gnome-online-accounts-devel
-Add_dependency build libsocialweb-devel
-Add_dependency build libcanberra-devel
 #Add_dependency build cheese-devel
-Add_dependency build polkit-devel
-Add_dependency build libgtop-devel
-Add_dependency build upower-devel
-Add_dependency build colord-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build libwacom-devel
-Add_dependency build gnome-bluetooth-devel
-Add_dependency build tzdata
-Add_dependency build systemd-devel
-Add_dependency build cups-devel
 
-Add_dependency full iso-codes
-Add_dependency run gsettings-desktop-schemas
-Add_dependency run pulseaudio
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
-Add_dependency run sound-theme-freedesktop
-Add_dependency run apg # for random passwd generation
diff --git a/srcpkgs/gnome-desktop/depends b/srcpkgs/gnome-desktop/depends
deleted file mode 100644
index e7e77019f3..0000000000
--- a/srcpkgs/gnome-desktop/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.90"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/gnome-desktop/gnome-desktop-devel.template b/srcpkgs/gnome-desktop/gnome-desktop-devel.template
index 0edf932c64..c570743b4e 100644
--- a/srcpkgs/gnome-desktop/gnome-desktop-devel.template
+++ b/srcpkgs/gnome-desktop/gnome-desktop-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gnome-desktop-devel'.
 #
+depends="gsettings-desktop-schemas gtk+3-devel gnome-desktop>=3.4.2"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gsettings-desktop-schemas
-Add_dependency run gtk+3-devel
-Add_dependency run gnome-desktop ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index f89575a5ee..122c8f898b 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -5,6 +5,8 @@ homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-gnome-distributor=XBPS --disable-scrollkeeper"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection gtk+3-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="GNOME desktop management utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -20,11 +22,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
 
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 6095a18fd1..de49ca2353 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -4,6 +4,9 @@ version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="Look up words in dictionary sources"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -15,17 +18,8 @@ long_desc="
 replaces="gnome-utils>=3.0"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
 
-Add_dependency full gsettings-desktop-schemas
 
 post_install() {
 	# Remove -devel stuff.
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 7f9c8af892..9a54d16df1 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -4,6 +4,8 @@ version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel udisks2-devel"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -21,11 +23,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build udisks2-devel
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index 5e69ebfdb9..c78d13be20 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -4,6 +4,9 @@ version=0.20.10
 distfiles="${GNOME_SITE}/$pkgname/0.20/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
+depends="libxslt"
+makedepends="pkg-config intltool libxslt-devel gsettings-desktop-schemas"
+fulldepends="docbook-xml docbook-xsl rarian python libxml2-python"
 short_desc="Documentation utilities for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
@@ -16,14 +19,4 @@ long_desc="
 noarch=yes
 pycompile_module="xml2po"
 
-Add_dependency run libxslt
-Add_dependency full docbook-xml
-Add_dependency full docbook-xsl
-Add_dependency full rarian
-Add_dependency full python
-Add_dependency full libxml2-python
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt-devel
-Add_dependency build gsettings-desktop-schemas
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
index a0496e369e..b5ed74d2a0 100644
--- a/srcpkgs/gnome-documents/template
+++ b/srcpkgs/gnome-documents/template
@@ -3,6 +3,8 @@ pkgname=gnome-documents
 version=0.4.2
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool vala-devel gobject-introspection clutter-gtk-devel gnome-desktop-devel gnome-online-accounts-devel libgdata-devel tracker-devel evince-devel gjs-devel liboauth-devel"
 short_desc="Documents Manager for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -13,18 +15,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build vala-devel
-Add_dependency build gobject-introspection
-Add_dependency build clutter-gtk-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build gnome-online-accounts-devel
-Add_dependency build libgdata-devel
-Add_dependency build tracker-devel
-Add_dependency build evince-devel
-Add_dependency build gjs-devel
-Add_dependency build liboauth-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f3fb953112..87a270e8f9 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -4,6 +4,9 @@ version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper"
+depends="desktop-file-utils"
+makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="A font viewer for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -14,13 +17,5 @@ long_desc="
 
 replaces="gnome-utils>=3.0"
 
-Add_dependency run desktop-file-utils
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
 
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/gnome-icon-theme-extras/template b/srcpkgs/gnome-icon-theme-extras/template
index fbd0e05ffd..3e8553482b 100644
--- a/srcpkgs/gnome-icon-theme-extras/template
+++ b/srcpkgs/gnome-icon-theme-extras/template
@@ -3,6 +3,8 @@ pkgname=gnome-icon-theme-extras
 version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool icon-naming-utils"
+fulldepends="gnome-icon-theme"
 short_desc="GNOME Desktop icon theme (additional icons)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d54492c2fb685a983bce4dec24db5831a2828f6479c98fbcd93a1f8370b4c373
@@ -16,7 +18,3 @@ long_desc="
 noarch=yes
 gtk_iconcache_dirs="/usr/share/icons/gnome"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build icon-naming-utils
-Add_dependency full gnome-icon-theme
diff --git a/srcpkgs/gnome-icon-theme-symbolic/template b/srcpkgs/gnome-icon-theme-symbolic/template
index 1c5be9a91c..be5fcd7d3d 100644
--- a/srcpkgs/gnome-icon-theme-symbolic/template
+++ b/srcpkgs/gnome-icon-theme-symbolic/template
@@ -3,6 +3,8 @@ pkgname=gnome-icon-theme-symbolic
 version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool icon-naming-utils"
+fulldepends="gnome-icon-theme"
 short_desc="GNOME Desktop icon theme (symbolic icons)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8f2738b1e8992827427f007e0eafc8deed32039c2bcf8345b82243864292d021
@@ -16,7 +18,3 @@ long_desc="
 noarch=yes
 gtk_iconcache_dirs="/usr/share/icons/gnome"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build icon-naming-utils
-Add_dependency full gnome-icon-theme
diff --git a/srcpkgs/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template
index a01efea2f3..e30a7f2701 100644
--- a/srcpkgs/gnome-icon-theme/template
+++ b/srcpkgs/gnome-icon-theme/template
@@ -4,6 +4,8 @@ version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-icon-mapping"
+makedepends="pkg-config intltool icon-naming-utils"
+fulldepends="librsvg>=0"
 short_desc="Theme consisting of a set of icons for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0963524f488f48e8b982ca80c1b5207c4e0946ccb95c131b853c9ff448f8e159
@@ -14,10 +16,6 @@ long_desc="
 noarch=yes
 gtk_iconcache_dirs="/usr/share/icons/gnome"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build icon-naming-utils
-Add_dependency full librsvg ">=0"
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/icons/gnome/icon-theme.cache
diff --git a/srcpkgs/gnome-js-common/template b/srcpkgs/gnome-js-common/template
index 58d7954639..34fa4e2c8b 100644
--- a/srcpkgs/gnome-js-common/template
+++ b/srcpkgs/gnome-js-common/template
@@ -3,6 +3,7 @@ pkgname=gnome-js-common
 version=0.1.2
 distfiles="${GNOME_SITE}/$pkgname/0.1/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool"
 short_desc="GNOME JavaScript common modules"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1765be99f3d83cc57e1ec13a2bb963469b8e91b60239eeaab61d66d7744496e6
@@ -10,5 +11,3 @@ long_desc="
  This package includes some JavaScript common modules for GNOME."
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency build intltool
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index a80160c31b..25c7620c9e 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/lib/security --disable-debug
 --disable-schemas-compile --with-root-certs=/etc/ssl/certs"
+depends="libcap-progs dconf"
+makedepends="pkg-config intltool dbus-devel gcr-devel libcap-ng-devel pam-devel libcap-devel libtasn1-devel libgcrypt-devel libtasn1-tools"
 short_desc="GNOME password and secret manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -20,16 +22,4 @@ long_desc="
  disk, but forgotten when the session ends."
 
 # For setcap(8).
-Add_dependency run libcap-progs
-Add_dependency run dconf
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-devel
-Add_dependency build gcr-devel
-Add_dependency build libcap-ng-devel
-Add_dependency build pam-devel
-Add_dependency build libcap-devel
-Add_dependency build libtasn1-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libtasn1-tools
diff --git a/srcpkgs/gnome-media/template b/srcpkgs/gnome-media/template
index 462d9e363e..0b4059c5f8 100644
--- a/srcpkgs/gnome-media/template
+++ b/srcpkgs/gnome-media/template
@@ -6,6 +6,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils GConf-devel gtk+3-devel libgnome-media-profiles-devel gst-plugins-base-devel"
 short_desc="GNOME Media Tools"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnome.org"
@@ -17,17 +19,7 @@ long_desc="
 gconf_schemas="gnome-sound-recorder.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build GConf-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libgnome-media-profiles-devel
-Add_dependency build gst-plugins-base-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/gnome-menus/depends b/srcpkgs/gnome-menus/depends
deleted file mode 100644
index c365da46a7..0000000000
--- a/srcpkgs/gnome-menus/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.6"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/gnome-menus/gnome-menus-devel.template b/srcpkgs/gnome-menus/gnome-menus-devel.template
index 1482725fe2..1076815485 100644
--- a/srcpkgs/gnome-menus/gnome-menus-devel.template
+++ b/srcpkgs/gnome-menus/gnome-menus-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gnome-menus-devel'.
 #
+depends="pkg-config pygobject-devel gnome-menus>=3.4.2"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run pygobject-devel
-Add_dependency run gnome-menus ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index 5fae5befb6..3f978be604 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -4,6 +4,8 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="pygobject"
+makedepends="pkg-config intltool gobject-introspection pygobject-devel"
 short_desc="GNOME menu specifications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63
@@ -14,9 +16,4 @@ long_desc="
 subpackages="$pkgname-devel"
 pycompile_module="GMenuSimpleEditor"
 
-Add_dependency run pygobject
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build pygobject-devel
diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 2df84c523d..afc6064ad3 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -3,6 +3,8 @@ pkgname=gnome-mime-data
 version=2.18.0
 distfiles="${GNOME_SITE}/$pkgname/2.18/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="intltool"
+fulldepends="shared-mime-info"
 short_desc="Base MIME and Application database for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
@@ -13,8 +15,6 @@ long_desc="
 noarch=yes
 conf_files="/etc/gnome-vfs-mime-magic"
 
-Add_dependency full shared-mime-info
-Add_dependency build intltool
 
 post_install()
 {
diff --git a/srcpkgs/gnome-online-accounts/depends b/srcpkgs/gnome-online-accounts/depends
deleted file mode 100644
index 13d341d243..0000000000
--- a/srcpkgs/gnome-online-accounts/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.2.0"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/gnome-online-accounts/gnome-online-accounts-devel.template b/srcpkgs/gnome-online-accounts/gnome-online-accounts-devel.template
index c2014860ec..7f38ae5346 100644
--- a/srcpkgs/gnome-online-accounts/gnome-online-accounts-devel.template
+++ b/srcpkgs/gnome-online-accounts/gnome-online-accounts-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gnome-online-accounts-devel'.
 #
+depends="glib-devel gtk+3-devel gnome-online-accounts>=3.4.2"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gtk+3-devel
-Add_dependency run gnome-online-accounts ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 0001d0d551..49de23e202 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-google --enable-twitter
 --enable-yahoo --enable-facebook --disable-static"
+depends="hicolor-icon-theme webkit-gtk3>=1.6.3"
+makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection webkit-gtk3-devel json-glib-devel libnotify-devel rest-devel libsoup-gnome-devel libgnome-keyring-devel"
 short_desc="GNOME service to access online accounts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -14,20 +16,5 @@ long_desc="
  $pkgname provides interfaces so applications and
  libraries in GNOME can access the user's online accounts."
 
-shlib_depends="webkit-gtk3>=1.6.3"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
-
-Add_dependency run hicolor-icon-theme
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build gobject-introspection
-Add_dependency build webkit-gtk3-devel
-Add_dependency build json-glib-devel
-Add_dependency build libnotify-devel
-Add_dependency build rest-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build libgnome-keyring-devel
diff --git a/srcpkgs/gnome-panel/depends b/srcpkgs/gnome-panel/depends
deleted file mode 100644
index 46f353795b..0000000000
--- a/srcpkgs/gnome-panel/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.3.92"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/gnome-panel/gnome-panel-devel.template b/srcpkgs/gnome-panel/gnome-panel-devel.template
index 02be5becf3..296cdb25d6 100644
--- a/srcpkgs/gnome-panel/gnome-panel-devel.template
+++ b/srcpkgs/gnome-panel/gnome-panel-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'gnome-panel-devel'.
 #
+depends="glib-devel gtk+3-devel GConf-devel gnome-panel>=3.4.2.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gtk+3-devel
-Add_dependency run GConf-devel
-Add_dependency run gnome-panel ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 511d4fac87..42d7fb3d34 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-schemas-compile"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection gnome-desktop-devel gnome-menus-devel evolution-data-server-devel librsvg-devel libwnck-devel telepathy-glib-devel dconf-devel NetworkManager-devel polkit-devel libgweather-devel"
 short_desc="GNOME Panel"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -17,24 +19,7 @@ gconf_schemas="${pkgname}.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build which
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build gnome-desktop-devel
-Add_dependency build gnome-menus-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build librsvg-devel
-Add_dependency build libwnck-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build dconf-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build polkit-devel
-Add_dependency build libgweather-devel
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index b96c3d3a84..bcb4ac3e96 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -5,6 +5,8 @@ revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+depends="polkit-gnome hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel upower-devel"
 short_desc="GNOME power management tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/gnome-power-manager/"
@@ -23,12 +25,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run polkit-gnome
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build upower-devel
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 73f51ee38c..1ef32c09e2 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-mit-ext --disable-maintainer-mode --with-systemd
 --without-console-kit"
+makedepends="pkg-config intltool gnome-doc-utils pam-devel dbus-glib-devel libXScrnSaver-devel libXxf86misc-devel libgnomekbd-devel gnome-desktop-devel systemd-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="GNOME screen saver and locker"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GnomeScreensaver"
@@ -23,18 +25,7 @@ long_desc="
 # XXX: add xscreensaver hacks support.
 conf_files="/etc/pam.d/${pkgname}"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build pam-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libXScrnSaver-devel
-Add_dependency build libXxf86misc-devel
-Add_dependency build libgnomekbd-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build systemd-devel
 
-Add_dependency full gsettings-desktop-schemas
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 20d12d5011..534324e5b4 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -4,6 +4,9 @@ version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+depends="desktop-file-utils"
+makedepends="pkg-config intltool itstool gnome-doc-utils gtk+3-devel libcanberra-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="A screenshot capture utility for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -15,12 +18,4 @@ long_desc="
 
 replaces="gnome-utils>=3.0"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build libcanberra-devel
 
-Add_dependency full gsettings-desktop-schemas
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/gnome-search-tool/template b/srcpkgs/gnome-search-tool/template
index af4d6f1eec..6370292e1e 100644
--- a/srcpkgs/gnome-search-tool/template
+++ b/srcpkgs/gnome-search-tool/template
@@ -6,6 +6,9 @@ build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --disable-schemas-install"
+depends="desktop-file-utils"
+makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel GConf-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="Search utility for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -17,17 +20,8 @@ long_desc="
 gconf_schemas="${pkgname}.schemas"
 replaces="gnome-utils>=3.0"
 
-Add_dependency run desktop-file-utils
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build GConf-devel
 
-Add_dependency full gsettings-desktop-schemas
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 8d713196a7..1f62f68c65 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -4,6 +4,8 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-systemd"
+depends="gsettings-desktop-schemas dconf alsa-plugins hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool upower-devel GConf-devel json-glib-devel startup-notification-devel libXtst-devel gtk+3-devel systemd-devel"
 short_desc="GNOME session management utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -20,18 +22,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build upower-devel
-Add_dependency build GConf-devel
-Add_dependency build json-glib-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libXtst-devel
-Add_dependency build gtk+3-devel
-Add_dependency build systemd-devel
 
-Add_dependency run gsettings-desktop-schemas
-Add_dependency run dconf
-Add_dependency run alsa-plugins
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/gnome-settings-daemon/depends b/srcpkgs/gnome-settings-daemon/depends
deleted file mode 100644
index ab0d9627ad..0000000000
--- a/srcpkgs/gnome-settings-daemon/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
index f3201baca9..f936238296 100644
--- a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
+++ b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-settings-daemon-devel'.
 #
+depends="glib-devel"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 490a002b35..e38a94a47b 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -6,6 +6,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-cups
 --disable-schemas-compile --enable-systemd"
+depends="pulseaudio hicolor-icon-theme"
+makedepends="pkg-config intltool gtk+3-devel libxklavier-devel libnotify-devel libcanberra-devel pulseaudio-devel nss-devel startup-notification-devel GConf-devel gnome-desktop-devel libgnomekbd-devel colord-devel upower-devel xf86-input-wacom-devel libwacom-devel systemd-devel cups-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="GNOME settings daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -17,25 +20,4 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build libxklavier-devel
-Add_dependency build libnotify-devel
-Add_dependency build libcanberra-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build nss-devel
-Add_dependency build startup-notification-devel
-Add_dependency build GConf-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build libgnomekbd-devel
-Add_dependency build colord-devel
-Add_dependency build upower-devel
-Add_dependency build xf86-input-wacom-devel
-Add_dependency build libwacom-devel
-Add_dependency build systemd-devel
-Add_dependency build cups-devel
 
-Add_dependency full gsettings-desktop-schemas
-Add_dependency run pulseaudio
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/gnome-shell-extension-weather/template b/srcpkgs/gnome-shell-extension-weather/template
index 917ffee884..2483d672a0 100644
--- a/srcpkgs/gnome-shell-extension-weather/template
+++ b/srcpkgs/gnome-shell-extension-weather/template
@@ -2,6 +2,8 @@
 pkgname=gnome-shell-extension-weather
 version="$(date -u +%Y%m%d)"
 build_style=gnu-configure
+depends="gnome-shell-extensions>=3.2.0"
+makedepends="automake pkg-config intltool gettext-devel glib-devel gnome-common git"
 short_desc="Simple extension for displaying weather notifications in GNOME Shell."
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="https://github.com/simon04/gnome-shell-extension-weather"
@@ -17,14 +19,6 @@ noarch=yes
 nofetch=yes
 noextract=yes
 
-Add_dependency run gnome-shell-extensions ">=3.2.0"
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gettext-devel
-Add_dependency build glib-devel
-Add_dependency build gnome-common
-Add_dependency build git
 
 do_fetch()
 {
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternate-tab.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternate-tab.template
index 57d456ce08..a0a590a4dd 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternate-tab.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternate-tab.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-alternate-tab'.
 #
+depends="gnome-shell-extensions"
 short_desc="Alternate tab extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternative-status-menu.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternative-status-menu.template
index 966e3824a2..88e6a0e608 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternative-status-menu.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-alternative-status-menu.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-alternative-status-menu'.
 #
+depends="gnome-shell-extensions"
 short_desc="Alternative Status Menu extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-apps-menu.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-apps-menu.template
index 68d8e7be0b..fa047cc714 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-apps-menu.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-apps-menu.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-apps-menu'.
 #
+depends="gnome-shell-extensions"
 short_desc="Apps menu extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-automove-windows.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-automove-windows.template
index 774813fe12..33831e30c3 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-automove-windows.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-automove-windows.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-automove-windows'.
 #
+depends="gnome-shell-extensions"
 short_desc="Automove windows extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-dock.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-dock.template
index 520ec15d60..172afd2930 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-dock.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-dock.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-dock'.
 #
+depends="gnome-shell-extensions"
 short_desc="Dock extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-drive-menu.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-drive-menu.template
index 83b2a47c68..883e553aba 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-drive-menu.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-drive-menu.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-drive-menu'.
 #
+depends="gnome-shell-extensions"
 short_desc="Drive menu extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-native-window-placement.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-native-window-placement.template
index 928ca31112..00331a6b3a 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-native-window-placement.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-native-window-placement.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-native-window-placement'.
 #
+depends="gnome-shell-extensions"
 short_desc="Native window placement extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-places-menu.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-places-menu.template
index d8071b478f..e9ff9722cc 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-places-menu.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-places-menu.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-places-menu'.
 #
+depends="gnome-shell-extensions"
 short_desc="Places menu extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-system-monitor.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-system-monitor.template
index 2f0edc1ffd..34b0861f1f 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-system-monitor.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-system-monitor.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-system-monitor'.
 #
+depends="gnome-shell-extensions"
 short_desc="System monitor extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-user-theme.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-user-theme.template
index cb9d0f747b..2d1350d581 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-user-theme.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-user-theme.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-user-theme'.
 #
+depends="gnome-shell-extensions"
 short_desc="User theme extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-windows-navigator.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-windows-navigator.template
index 8ffc74ad91..c03982e613 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-windows-navigator.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-windows-navigator.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-windows-navigator'.
 #
+depends="gnome-shell-extensions"
 short_desc="Windows navigator extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-workspace-indicator.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-workspace-indicator.template
index ef814a539a..699eca5656 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-workspace-indicator.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-workspace-indicator.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-workspace-indicator'.
 #
+depends="gnome-shell-extensions"
 short_desc="Workspace indicator extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-xrandr-indicator.template b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-xrandr-indicator.template
index 2a09b2ea3a..04d884fe9f 100644
--- a/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-xrandr-indicator.template
+++ b/srcpkgs/gnome-shell-extensions/gnome-shell-extensions-xrandr-indicator.template
@@ -1,8 +1,8 @@
 # Template file for 'gnome-shell-extensions-xrandr-indicator'.
 #
+depends="gnome-shell-extensions"
 short_desc="XRandR indicator extension for GNOME Shell"
 
-Add_dependency run gnome-shell-extensions
 
 noarch=yes
 
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 21ee16dfb4..ddd40e1dfa 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -3,6 +3,8 @@ pkgname=gnome-shell-extensions
 version=3.2.0
 homepage="http://live.gnome.org/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+depends="gnome-shell>=3.2.0"
+makedepends="pkg-config intltool gnome-desktop-devel"
 short_desc="GNOME Shell extensions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,10 +21,6 @@ ${pkgname}-windows-navigator ${pkgname}-user-theme ${pkgname}-places-menu
 ${pkgname}-system-monitor ${pkgname}-apps-menu ${pkgname}-workspace-indicator
 ${pkgname}-xrandr-indicator ${pkgname}-drive-menu"
 
-Add_dependency run gnome-shell ">=${version}"
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-desktop-devel
 
 do_build()
 {
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d1507df3bd..72a1adea5c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --without-systemd
 --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+depends="caribou pulseaudio mesa-demos desktop-file-utils"
+makedepends="pkg-config intltool gnome-doc-utils gobject-introspection json-glib-devel>=0.14.0 startup-notification-devel network-manager-applet-devel folks-devel gnome-menus-devel gnome-desktop-devel gnome-bluetooth-devel libcroco-devel gjs-devel mutter-devel telepathy-logger-devel libcanberra-devel pulseaudio-devel polkit-devel libgnome-keyring-devel gcr-devel libgudev-devel"
+fulldepends="ca-certificates gir-freedesktop"
 short_desc="GNOME core user interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GnomeShell"
@@ -19,31 +22,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build json-glib-devel	">=0.14.0"
-Add_dependency build startup-notification-devel
-Add_dependency build network-manager-applet-devel
-Add_dependency build folks-devel
-Add_dependency build gnome-menus-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build gnome-bluetooth-devel
-Add_dependency build libcroco-devel
-Add_dependency build gjs-devel
-Add_dependency build mutter-devel
-Add_dependency build telepathy-logger-devel
-Add_dependency build libcanberra-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build polkit-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build gcr-devel
-Add_dependency build libgudev-devel
 
-Add_dependency run caribou
-Add_dependency run pulseaudio
-Add_dependency run mesa-demos
-Add_dependency run desktop-file-utils
-Add_dependency full ca-certificates
-Add_dependency full gir-freedesktop
diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 33bdc67661..ce5835cca1 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -4,6 +4,9 @@ version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="A system log viewer for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -15,14 +18,5 @@ long_desc="
 replaces="gnome-utils>=3.0"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
 
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 0c9398e94d..f4c6aca277 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
 --localstatedir=/var --enable-systemd"
+makedepends="which pkg-config intltool gnome-doc-utils libgtop-devel libwnck-devel gtkmm-devel librsvg-devel systemd-devel"
+fulldepends="gnome-icon-theme"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -15,14 +17,4 @@ long_desc="
  processes on your system. It also provides an overview of available
  resources such as CPU and memory."
  
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build libgtop-devel
-Add_dependency build libwnck-devel
-Add_dependency build gtkmm-devel
-Add_dependency build librsvg-devel
-Add_dependency build systemd-devel
 
-Add_dependency full gnome-icon-theme
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 1da1037993..5cbb52daf3 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+makedepends="which pkg-config intltool gnome-doc-utils dbus-glib-devel gtk+3-devel vte3-devel GConf-devel"
+fulldepends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="The GNOME terminal emulator application"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -23,17 +25,7 @@ long_desc="
 
 gconf_schemas="$pkgname.schemas"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build vte3-devel
-Add_dependency build GConf-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full gsettings-desktop-schemas
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template
index 107aec5ed8..ba6b966edb 100644
--- a/srcpkgs/gnome-themes-standard/template
+++ b/srcpkgs/gnome-themes-standard/template
@@ -3,6 +3,8 @@ pkgname=gnome-themes-standard
 version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+3-devel librsvg-devel"
+fulldepends="gtk-engines gtk2-engines"
 short_desc="Standard gnome themes"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aa29d23708e3357775fb7ea2de14b90551a2c732fce297f3372dae005374c3a8
@@ -14,13 +16,7 @@ gtk_iconcache_dirs="
 /usr/share/icons/HighContrast
 /usr/share/icons/HighContrastInverse"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build librsvg-devel
 
-Add_dependency full gtk-engines
-Add_dependency full gtk2-engines
 
 post_install() {
 	for f in ${gtk_iconcache_dirs}; do
diff --git a/srcpkgs/gnome-themes/template b/srcpkgs/gnome-themes/template
index af589b5a12..ddef26957b 100644
--- a/srcpkgs/gnome-themes/template
+++ b/srcpkgs/gnome-themes/template
@@ -3,6 +3,8 @@ pkgname=gnome-themes
 version=3.0.0
 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool icon-naming-utils gtk+3-devel"
+fulldepends="gtk-engines librsvg"
 short_desc="Default themes for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b277b605185651571b7225a92e10755cb8ceb0d4e3eef0e85135312f0981f1c9
@@ -20,12 +22,6 @@ gtk_iconcache_dirs="
 /usr/share/icons/Mist"
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build icon-naming-utils
-Add_dependency build gtk+3-devel
-Add_dependency full gtk-engines
-Add_dependency full librsvg
 
 post_install()
 {
diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template
index 09f94d8edf..82dc8521de 100644
--- a/srcpkgs/gnome-tweak-tool/template
+++ b/srcpkgs/gnome-tweak-tool/template
@@ -4,6 +4,9 @@ version=3.4.0.1
 homepage="http://live.gnome.org/GnomeTweakTool"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="pygobject desktop-file-utils"
+makedepends="pkg-config intltool pygobject-devel"
+fulldepends="GConf gsettings-desktop-schemas"
 short_desc="GNOME3 tool to customize advanced options"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,12 +18,5 @@ long_desc="
 noarch=yes
 pycompile_module="gtweak"
 
-Add_dependency run pygobject
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build pygobject-devel
 
-Add_dependency full GConf
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index c38b868c00..1c6b5bc503 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -3,6 +3,8 @@ pkgname=gnome-user-docs
 version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="yelp"
+makedepends="pkg-config intltool itstool gnome-doc-utils"
 short_desc="User documentation for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=dbbee5a13e0ef9b64366149fc68faeb7716c533a3b613306e9c077d92d38849a
@@ -13,8 +15,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency run yelp
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
diff --git a/srcpkgs/gnome-video-effects/template b/srcpkgs/gnome-video-effects/template
index 204e3aa395..2eef5cdf12 100644
--- a/srcpkgs/gnome-video-effects/template
+++ b/srcpkgs/gnome-video-effects/template
@@ -3,6 +3,7 @@ pkgname=gnome-video-effects
 version=0.4.0
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gstreamer-devel"
 short_desc="A collection of GStreamer effects for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -13,6 +14,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gstreamer-devel
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index eccd5f7e71..d4d9590b13 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -3,6 +3,7 @@ pkgname=gnome
 version=3.4.0
 revision=6
 build_style=meta-template
+depends="gnome-backgrounds>=3.4.0 gnome-themes-standard>=3.4.0 gnome-control-center>=3.4.0 gnome-desktop>=3.4.0 gnome-icon-theme>=3.4.0 gnome-icon-theme-extras>=3.4.0 gnome-icon-theme-symbolic>=3.4.0 gnome-panel>=3.4.0 gnome-session>=3.4.0 gnome-settings-daemon>=3.4.0 gnome-user-docs>=3.4.0 gnome-screensaver>=3.4.0 gnome-shell>=3.4.0 metacity>=2.34.3 nautilus>=3.4.0 notification-daemon>=0.7.4 yelp>=3.4.0 epiphany>=3.4.0 at-spi2-atk>=2.4.0 baobab>=3.4.0 gnome-disk-utility>=3.4.0 gnome-dictionary>=3.4.0 gnome-font-viewer>=3.4.0 gnome-search-tool>=3.4.0 gnome-system-log>=3.4.0 gnome-screenshot>=3.4.0 gnome-contacts>=3.4.0 gnome-terminal>=3.4.0 gnome-power-manager>=3.4.0 gnome-system-monitor>=3.4.0 gnome-bluetooth>=3.4.0 gnome-color-manager>=3.4.0 gnome-keyring>=3.4.0 gnome-media>=3.4.0 gnome-applets>=3.4.0 eog>=3.4.0 gedit>=3.4.0 gdm>=3.4.0 file-roller>=3.4.0 seahorse>=3.4.0 totem>=3.4.0 brasero>=3.4.0 empathy>=3.4.0 vino>=3.4.0 vinagre>=3.4.0 gcalctool>=6.4.0 network-manager-applet>=0.9.4.0 cantarell-fonts>=0.0.8 gucharmap>=3.4.0 cheese>=3.4.0 nautilus-sendto>=3.0.2 evince>=3.4.0 gnome-documents>=0.4.0 sushi>=0.4.0 evolution>=3.4.0 sound-juicer>=3.4.0 rygel>=0.14.0 tracker>=0.14.0 eog-plugins>=3.4.0 epiphany-extensions>=3.4.0 seahorse-nautilus>=3.4.0 seahorse-sharing>=3.4.0 xdg-user-dirs-gtk xdg-utils"
 short_desc="GNOME meta-package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -11,70 +12,6 @@ long_desc="
 
 noarch=yes
 
-Add_dependency run gnome-backgrounds		">=${version}"
-Add_dependency run gnome-themes-standard	">=${version}"
-Add_dependency run gnome-control-center		">=${version}"
-Add_dependency run gnome-desktop		">=${version}"
-Add_dependency run gnome-icon-theme		">=${version}"
-Add_dependency run gnome-icon-theme-extras	">=${version}"
-Add_dependency run gnome-icon-theme-symbolic	">=${version}"
-Add_dependency run gnome-panel			">=${version}"
-Add_dependency run gnome-session		">=${version}"
-Add_dependency run gnome-settings-daemon	">=${version}"
-Add_dependency run gnome-user-docs		">=${version}"
-Add_dependency run gnome-screensaver		">=${version}"
-Add_dependency run gnome-shell			">=${version}"
-Add_dependency run metacity			">=2.34.3"
-Add_dependency run nautilus			">=${version}"
-Add_dependency run notification-daemon		">=0.7.4"
-Add_dependency run yelp				">=${version}"
-Add_dependency run epiphany			">=${version}"
-Add_dependency run at-spi2-atk			">=2.4.0"
 
-Add_dependency run baobab			">=${version}"
-Add_dependency run gnome-disk-utility		">=${version}"
-Add_dependency run gnome-dictionary		">=${version}"
-Add_dependency run gnome-font-viewer		">=${version}"
-Add_dependency run gnome-search-tool		">=${version}"
-Add_dependency run gnome-system-log		">=${version}"
-Add_dependency run gnome-screenshot		">=${version}"
-Add_dependency run gnome-contacts		">=${version}"
-Add_dependency run gnome-terminal		">=${version}"
-Add_dependency run gnome-power-manager		">=${version}"
-Add_dependency run gnome-system-monitor		">=${version}"
-Add_dependency run gnome-bluetooth		">=${version}"
-Add_dependency run gnome-color-manager		">=${version}"
-Add_dependency run gnome-keyring		">=${version}"
-Add_dependency run gnome-media			">=${version}"
-Add_dependency run gnome-applets		">=${version}"
-Add_dependency run eog				">=${version}"
-Add_dependency run gedit			">=${version}"
-Add_dependency run gdm				">=${version}"
-Add_dependency run file-roller			">=${version}"
-Add_dependency run seahorse			">=${version}"
-Add_dependency run totem			">=${version}"
-Add_dependency run brasero			">=${version}"
-Add_dependency run empathy			">=${version}"
-Add_dependency run vino				">=${version}"
-Add_dependency run vinagre			">=${version}"
-Add_dependency run gcalctool			">=6.4.0"
-Add_dependency run network-manager-applet	">=0.9.4.0"
-Add_dependency run cantarell-fonts		">=0.0.8"
-Add_dependency run gucharmap			">=${version}"
-Add_dependency run cheese			">=${version}"
-Add_dependency run nautilus-sendto		">=3.0.2"
-Add_dependency run evince			">=${version}"
-Add_dependency run gnome-documents		">=0.4.0"
-Add_dependency run sushi			">=0.4.0"
-Add_dependency run evolution			">=${version}"
-Add_dependency run sound-juicer			">=${version}"
 
-Add_dependency run rygel			">=0.14.0"
-Add_dependency run tracker			">=0.14.0"
-Add_dependency run eog-plugins			">=${version}"
-Add_dependency run epiphany-extensions		">=${version}"
-Add_dependency run seahorse-nautilus		">=${version}"
-Add_dependency run seahorse-sharing		">=${version}"
 
-Add_dependency run xdg-user-dirs-gtk
-Add_dependency run xdg-utils
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index dc5799bbf5..a75dd84adc 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -5,6 +5,7 @@ homepage="http://www.gnupg.org/"
 distfiles="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-threads=posix --enable-noexecstack"
+makedepends="zlib-devel libldap-devel libcurl-devel readline-devel libusb-compat-devel"
 short_desc="The GNU Privacy Guard"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -17,8 +18,3 @@ long_desc="
  GPG, is a command line tool with features for easy integration with other
  applications. A wealth of frontend applications and libraries  are available."
 
-Add_dependency build zlib-devel
-Add_dependency build libldap-devel
-Add_dependency build libcurl-devel
-Add_dependency build readline-devel
-Add_dependency build libusb-compat-devel
diff --git a/srcpkgs/gnutls/depends b/srcpkgs/gnutls/depends
deleted file mode 100644
index 12ddcfbb10..0000000000
--- a/srcpkgs/gnutls/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.6.6"
-api_depends=">=2.12.18"
diff --git a/srcpkgs/gnutls/gnutls-devel.template b/srcpkgs/gnutls/gnutls-devel.template
index d75151f557..db42ac080f 100644
--- a/srcpkgs/gnutls/gnutls-devel.template
+++ b/srcpkgs/gnutls/gnutls-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libgrypt-devel'.
 #
+depends="zlib-devel p11-kit-devel libtasn1-devel libgcrypt-devel gnutls>=2.12.18"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run p11-kit-devel
-Add_dependency run libtasn1-devel
-Add_dependency run libgcrypt-devel
-Add_dependency run gnutls ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 388bb4c83e..48ea2c84e4 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -5,6 +5,7 @@ version=2.12.18
 distfiles="http://mirror.symnds.com/software/GNU/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-lzo --with-zlib --disable-guile --with-libgcrypt"
+makedepends="pkg-config zlib-devel lzo-devel readline-devel libgpg-error-devel libtasn1-devel libgcrypt-devel p11-kit-devel"
 short_desc="GNU Transport Layer Security library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gnutls/"
@@ -29,11 +30,3 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-tools"
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build lzo-devel
-Add_dependency build readline-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build libtasn1-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build p11-kit-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index b0cabcc90d..7de37d54e9 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,8 @@
 # Template file for 'go'
 pkgname=go
 version=r60.3
+depends="make"
+makedepends="mercurial ed bison glibc-devel"
 short_desc="The Go Programming Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://golang.org/"
@@ -19,12 +21,7 @@ nofetch=yes
 noextract=yes
 nostrip=yes
 
-Add_dependency run make
 
-Add_dependency build mercurial
-Add_dependency build ed
-Add_dependency build bison
-Add_dependency build glibc-devel
 
 do_fetch() {
 	local url="https://go.googlecode.com/hg"
diff --git a/srcpkgs/gobject-introspection/depends b/srcpkgs/gobject-introspection/depends
deleted file mode 100644
index 8d45e73d7a..0000000000
--- a/srcpkgs/gobject-introspection/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.30"
-api_depends=">=1.32.0"
diff --git a/srcpkgs/gobject-introspection/libgirepository-devel.template b/srcpkgs/gobject-introspection/libgirepository-devel.template
index f334b88bb2..8d722ae4e0 100644
--- a/srcpkgs/gobject-introspection/libgirepository-devel.template
+++ b/srcpkgs/gobject-introspection/libgirepository-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libgirepository-devel'.
 #
+depends="cairo-devel libffi-devel glib-devel libgirepository"
 short_desc="Library for handling GObject introspection data (development files)"
 long_desc="${long_desc}
 
  This package contains C libraries for handling the introspection data."
 
-Add_dependency run cairo-devel
-Add_dependency run libffi-devel
-Add_dependency run glib-devel
-Add_dependency run libgirepository
 
 do_install()
 {
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index ef81e5d850..2984a514c7 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -4,6 +4,9 @@ version=1.32.1
 distfiles="${GNOME_SITE}/$pkgname/1.32/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-tests"
+depends="python libgirepository-devel"
+makedepends="pkg-config flex libffi-devel glib-devel python-devel libxml2-devel cairo-devel"
+fulldepends="libtool"
 short_desc="Introspection system for GObject-based libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GObjectInstrospection"
@@ -16,15 +19,5 @@ long_desc="
 subpackages="gir-freedesktop libgirepository libgirepository-devel"
 pycompile_dirs="usr/lib/$pkgname/giscanner"
 
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build libffi-devel
-Add_dependency build glib-devel
-Add_dependency build python-devel
-Add_dependency build libxml2-devel
-Add_dependency build cairo-devel
 
-Add_dependency run python
-Add_dependency run libgirepository-devel
 
-Add_dependency full libtool
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 919c5b012d..f6f62ac8b2 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -4,6 +4,8 @@ version=0.12.0
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --enable-libparted-dmraid"
+depends="hicolor-icon-theme desktop-file-utils polkit"
+makedepends="pkg-config intltool libuuid-devel libparted-devel libsigc++-devel gnome-doc-utils glib-devel glibmm-devel atkmm-devel pangomm-devel gtk+-devel gtkmm2-devel"
 short_desc="Gnome Partition Editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gparted.sourceforge.net"
@@ -23,22 +25,7 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
-Add_dependency run polkit
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libuuid-devel
-Add_dependency build libparted-devel
-Add_dependency build libsigc++-devel
-Add_dependency build gnome-doc-utils
-Add_dependency build glib-devel
-Add_dependency build glibmm-devel
-Add_dependency build atkmm-devel
-Add_dependency build pangomm-devel
-Add_dependency build gtk+-devel
-Add_dependency build gtkmm2-devel
 
 post_install() {
 	vinstall ${FILESDIR}/org.void.pkexec.gparted.policy \
diff --git a/srcpkgs/gpgme/depends b/srcpkgs/gpgme/depends
deleted file mode 100644
index c2fc823f30..0000000000
--- a/srcpkgs/gpgme/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gpgme/gpgme-devel.template b/srcpkgs/gpgme/gpgme-devel.template
index 8d432f7721..248e2c473f 100644
--- a/srcpkgs/gpgme/gpgme-devel.template
+++ b/srcpkgs/gpgme/gpgme-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gpgme-devel'.
 #
+depends="libgpg-error-devel libassuan-devel gpgme"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgpg-error-devel
-Add_dependency run libassuan-devel
-Add_dependency run gpgme
 
 do_install() {
 	install -d ${DESTDIR}/usr
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 4d615c1360..e14b63fa7b 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -4,8 +4,11 @@ version=1.3.1
 homepage="http://www.gnupg.org/related_software/gpgme/"
 distfiles="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$version.tar.bz2"
 build_style=gnu-configure
-configure_args="--enable-fd-passing --disable-gpgsm-test --disable-gpgconf-test
---disable-g13-test"
+configure_args="--enable-fd-passing --disable-gpgsm-test --disable-gpgconf-test --disable-g13-test"
+subpackages="gpgme-devel"
+depends="libassuan>=2.0.3"
+makedepends="libgpg-error-devel libassuan-devel"
+fulldepends="gnupg"
 short_desc="GnuPG Made Easy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -21,11 +24,3 @@ long_desc="
  programming task, it is suggested that all software should try to use GPGME
  instead. This way bug fixes or improvements can be done at a central place
  and every application benefits from this."
-
-subpackages="gpgme-devel"
-
-shlib_depends="libassuan>=2.0.3"
-
-Add_dependency build libgpg-error-devel
-Add_dependency build libassuan-devel
-Add_dependency full gnupg
diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 8ae6556a55..d8f29846ee 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -5,6 +5,8 @@ distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 LDFLAGS="-lm"
 revision=2
+makedepends="pkg-config intltool jpeg-devel gtk+-devel"
+fulldepends="desktop-file-utils"
 short_desc="A Simple and Fast Image Viewer for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7c62e396804c2e97e3d6eea071dc1865eb207f2f499ca5ab35b2e768749d036c
@@ -17,9 +19,4 @@ long_desc="
     * Desktop independent: Doesn't require any specific desktop environment
     * Open source, licensed under GNU GPL"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build jpeg-devel
-Add_dependency build gtk+-devel
 
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index a47c91e067..7427cb8da3 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -2,6 +2,7 @@
 pkgname=gptfdisk
 version=0.8.2
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+makedepends="popt-devel icu-devel libuuid-devel"
 short_desc="GPT fdisk text-mode partitioning tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.rodsbooks.com/gdisk/"
@@ -13,9 +14,6 @@ long_desc="
  rather than on the more common (through 2009) Master Boot Record (MBR)
  partition tables."
 
-Add_dependency build popt-devel
-Add_dependency build icu-devel
-Add_dependency build libuuid-devel
 
 do_build() {
 	make ${makejobs}
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index 76ba9f3fff..2e8af4db12 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -4,6 +4,7 @@ version=2.28.0
 distfiles="http://www.graphviz.org/pub/graphviz/stable/SOURCES/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="flex pkg-config libpng-devel gd-devel expat-devel zlib-devel gd-devel gtk+-devel glib-devel pango-devel cairo-devel libX11-devel libXpm-devel jpeg-devel fontconfig-devel freetype-devel librsvg-devel atk-devel libXaw-devel libSM-devel libICE-devel libXt-devel libXmu-devel libXpm-devel libXext-devel libltdl-devel libXrender-devel qt-devel"
 short_desc="Graph Visualization Software"
 configure_args="--disable-rpath --enable-ltdl --disable-ltdl-install
 --disable-swig --disable-sharp --disable-guile --disable-io --disable-java
@@ -18,34 +19,6 @@ long_desc="
  many important applications in software engineering, database and web
  design, networking, and in visual interfaces for many other domains."
 
-Add_dependency build flex
-Add_dependency build pkg-config
-Add_dependency build libpng-devel
-Add_dependency build gd-devel
-Add_dependency build expat-devel
-Add_dependency build zlib-devel
-Add_dependency build gd-devel
-Add_dependency build gtk+-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build libX11-devel
-Add_dependency build libXpm-devel
-Add_dependency build jpeg-devel
-Add_dependency build fontconfig-devel
-Add_dependency build freetype-devel
-Add_dependency build librsvg-devel
-Add_dependency build atk-devel
-Add_dependency build libXaw-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libXt-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXpm-devel
-Add_dependency build libXext-devel
-Add_dependency build libltdl-devel
-Add_dependency build libXrender-devel
-Add_dependency build qt-devel
 
 post_install()
 {
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 671eb1df8f..2fca4be371 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -4,6 +4,7 @@ version=2.12
 homepage="http://www.gnu.org/software/grep/"
 distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pcre-devel"
 short_desc="The GNU grep utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -15,4 +16,3 @@ long_desc="
  full regexp matcher without necessarily having to look at every character.
  The result is typically many times faster than Unix grep or egrep."
 
-Add_dependency build pcre-devel
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 4bddd0bce7..5243643f54 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -6,6 +6,7 @@ homepage="http://live.gnome.org/Grilo"
 distfiles="${GNOME_SITE}/$pkgname/0.1/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-shoutcast"
+makedepends="pkg-config grilo-devel gupnp-av-devel libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel libgdata-devel tracker-devel"
 short_desc="Plugins for Grilo"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -21,16 +22,6 @@ long_desc="
     that are application agnostic.
   * A flexible API that allows plugin developers to write plugins of various kinds."
 
-Add_dependency build pkg-config
-Add_dependency build grilo-devel
-Add_dependency build gupnp-av-devel
-Add_dependency build libquvi-devel
-Add_dependency build rest-devel
-Add_dependency build sqlite-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build gmime-devel
-Add_dependency build libgdata-devel
-Add_dependency build tracker-devel
 
 pre_configure() {
 	sed -i -e "s|tracker-sparql-0.12|tracker-sparql-0.14|g" \
diff --git a/srcpkgs/grilo/depends b/srcpkgs/grilo/depends
deleted file mode 100644
index 29b65e6e86..0000000000
--- a/srcpkgs/grilo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.17"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/grilo/grilo-devel.template b/srcpkgs/grilo/grilo-devel.template
index 0ee687a8b6..143547fe94 100644
--- a/srcpkgs/grilo/grilo-devel.template
+++ b/srcpkgs/grilo/grilo-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'grilo-devel'.
 #
+depends="gtk+3-devel libxml2-devel libsoup-devel grilo"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run libxml2-devel
-Add_dependency run libsoup-devel
-Add_dependency run grilo
 
 do_install()
 {
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 6f29b50e67..e25b6c34d3 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,6 +4,7 @@ version=0.1.18
 homepage="http://live.gnome.org/Grilo"
 distfiles="${GNOME_SITE}/$pkgname/0.1/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config gobject-introspection vala-devel gtk+3-devel libxml2-devel libsoup-devel"
 short_desc="Framework focused on making media discovery and browsing easy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -21,12 +22,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build vala-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libxml2-devel
-Add_dependency build libsoup-devel
 
 post_install() {
 	mv ${DESTDIR}/usr/share/vala-0.14 ${DESTDIR}/usr/share/vala
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index c6ad31d9ef..8416611d03 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -6,6 +6,7 @@ distfiles="http://ftp.gnu.org/gnu/groff/groff-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--without-x"
 revision=3
+makedepends="bison zlib-devel"
 short_desc="The GNU troff text-formatting system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -21,8 +22,6 @@ long_desc="
 
 subpackages="groff-doc"
 
-Add_dependency build bison
-Add_dependency build zlib-devel
 
 post_install() {
 	# Remove unused stuff.
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 45710379d9..5512f9db28 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -6,6 +6,8 @@ homepage="http://www.gnu.org/software/grub/"
 distfiles="http://alpha.gnu.org/gnu/grub/grub-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-werror"
+makedepends="xz flex zlib-devel libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
+fulldepends="os-prober"
 short_desc="GRand Unified Bootloader 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -17,17 +19,6 @@ long_desc="
 
 conf_files="/etc/default/grub /etc/grub.d/40_custom"
 
-Add_dependency build xz
-Add_dependency build flex
-Add_dependency build zlib-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build ncurses-devel
-Add_dependency build freetype-devel
-Add_dependency build liblzma-devel
-Add_dependency build device-mapper-devel
-Add_dependency build font-unifont-bdf
-Add_dependency build fuse-devel
-Add_dependency full os-prober
 
 pre_configure() {
 	# fix unifont.bdf location so grub-mkfont can create *.pf2 files
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 9fcc3084b9..eba6432dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -4,6 +4,7 @@ version=3.4.2
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel gobject-introspection"
 short_desc="Collection of GSettings schemas"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,7 +13,3 @@ long_desc="
  ${pkgname} contains a collection of GSettings schemas for
  settings shared by various components of a desktop."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template
index fd6f794d03..be332c3c5a 100644
--- a/srcpkgs/gsfonts/template
+++ b/srcpkgs/gsfonts/template
@@ -4,6 +4,7 @@ version=8.11
 revision=1
 wrksrc=fonts
 distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-$version.tar.gz"
+fulldepends="font-util"
 short_desc="Ghostscript standard Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401
@@ -13,7 +14,6 @@ long_desc="
 font_dirs="/usr/share/fonts/Type1"
 noarch=yes
 
-Add_dependency full font-util
 
 do_install()
 {
diff --git a/srcpkgs/gsl/depends b/srcpkgs/gsl/depends
deleted file mode 100644
index 5b63e2f6a3..0000000000
--- a/srcpkgs/gsl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.15"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gsl/gsl-devel.template b/srcpkgs/gsl/gsl-devel.template
index a50be7d749..d96aae1379 100644
--- a/srcpkgs/gsl/gsl-devel.template
+++ b/srcpkgs/gsl/gsl-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'gsl-devel'.
 #
+depends="glibc-devel gsl"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run gsl
 
 do_install()
 {
diff --git a/srcpkgs/gssdp/depends b/srcpkgs/gssdp/depends
deleted file mode 100644
index bfc277e9ab..0000000000
--- a/srcpkgs/gssdp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.0"
-api_depends=">=0.12.0"
diff --git a/srcpkgs/gssdp/gssdp-devel.template b/srcpkgs/gssdp/gssdp-devel.template
index a9a569ace1..d4467024a2 100644
--- a/srcpkgs/gssdp/gssdp-devel.template
+++ b/srcpkgs/gssdp/gssdp-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gssdp-devel'.
 #
+depends="libsoup-devel gssdp"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libsoup-devel
-Add_dependency run gssdp
 
 do_install()
 {
diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template
index a6cf5124c2..3c76c5c93f 100644
--- a/srcpkgs/gssdp/template
+++ b/srcpkgs/gssdp/template
@@ -5,6 +5,7 @@ homepage="http://gupnp.org"
 distfiles="${GNOME_SITE}/gssdp/0.12/gssdp-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool gtk+-devel libsoup-devel gobject-introspection"
 short_desc="GObject-based library for SSDP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,8 +16,3 @@ long_desc="
 
 subpackages="gssdp-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libsoup-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/gst-ffmpeg/template b/srcpkgs/gst-ffmpeg/template
index acc2499005..f06c6ebead 100644
--- a/srcpkgs/gst-ffmpeg/template
+++ b/srcpkgs/gst-ffmpeg/template
@@ -4,6 +4,7 @@ version=0.10.13
 homepage="http://gstreamer.freedesktop.org"
 distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config yasm zlib-devel orc-devel glib-devel gstreamer-devel gst-plugins-base-devel libxml2-devel"
 short_desc="GStreamer FFmpeg plugins"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,11 +15,3 @@ long_desc="
  elements for decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF, ...),
  demuxing 30+ formats and colorspace conversion."
 
-Add_dependency build pkg-config
-Add_dependency build yasm
-Add_dependency build zlib-devel
-Add_dependency build orc-devel
-Add_dependency build glib-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/gst-plugins-bad/depends b/srcpkgs/gst-plugins-bad/depends
deleted file mode 100644
index c3c2bd47fe..0000000000
--- a/srcpkgs/gst-plugins-bad/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.20"
-api_depends=">=0.10.22_2"
diff --git a/srcpkgs/gst-plugins-bad/gst-plugins-bad-devel.template b/srcpkgs/gst-plugins-bad/gst-plugins-bad-devel.template
index 3150e22d02..3527ae31e0 100644
--- a/srcpkgs/gst-plugins-bad/gst-plugins-bad-devel.template
+++ b/srcpkgs/gst-plugins-bad/gst-plugins-bad-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gst-plugins-bad-devel'.
 #
+depends="gst-plugins-base-devel gst-plugins-bad"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gst-plugins-base-devel
-Add_dependency run gst-plugins-bad
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gst-plugins-bad/template b/srcpkgs/gst-plugins-bad/template
index 056f5bb5bc..03930f64c8 100644
--- a/srcpkgs/gst-plugins-bad/template
+++ b/srcpkgs/gst-plugins-bad/template
@@ -5,6 +5,10 @@ homepage="http://gstreamer.freedesktop.org"
 distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-experimental --disable-static"
+# Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36.
+subpackages="$pkgname-devel"
+depends="gst-plugins-base>=0.10.36"
+makedepends="pkg-config intltool alsa-lib-devel celt-devel openssl-devel gst-plugins-base-devel libdca-devel orc-devel libmms-devel exempi-devel libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel zlib-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel libvpx-devel libvdpau-devel libgsm-devel"
 short_desc="GStreamer plugins from the bad set"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -21,38 +25,3 @@ long_desc="
  compared to the rest. They might be close to being good quality, but
  they're missing something - be it a good code review, some documentation,
  a set of tests, a real live maintainer, or some actual wide use."
-
-subpackages="$pkgname-devel"
-
-# Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36.
-shlib_depends="gst-plugins-base>=0.10.36"
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build alsa-lib-devel
-Add_dependency build celt-devel
-Add_dependency build openssl-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build libdca-devel
-Add_dependency build orc-devel
-Add_dependency build libmms-devel
-Add_dependency build exempi-devel
-Add_dependency build libexif-devel
-Add_dependency build libmpcdec-devel
-Add_dependency build faac-devel
-Add_dependency build SDL-devel
-Add_dependency build libpng-devel
-Add_dependency build zlib-devel
-Add_dependency build faad2-devel
-Add_dependency build libdvdread-devel
-Add_dependency build libdvdnav-devel
-Add_dependency build librsvg-devel
-Add_dependency build libsndfile-devel
-Add_dependency build xvidcore-devel
-Add_dependency build jasper-devel
-Add_dependency build libmodplug-devel
-Add_dependency build neon-devel
-Add_dependency build libcurl-devel
-Add_dependency build libvpx-devel
-Add_dependency build libvdpau-devel
-Add_dependency build libgsm-devel
diff --git a/srcpkgs/gst-plugins-base/depends b/srcpkgs/gst-plugins-base/depends
deleted file mode 100644
index a1159ffe4c..0000000000
--- a/srcpkgs/gst-plugins-base/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.22"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template b/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template
index 8a169a0b6f..0954ee8f09 100644
--- a/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template
+++ b/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template
@@ -1,20 +1,11 @@
 # Template file for 'gst-plugins-base-devel'.
 #
+depends="libgudev-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel cdparanoia-devel libtheora-devel gstreamer-devel gst-plugins-base"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgudev-devel
-Add_dependency run liboil-devel
-Add_dependency run alsa-lib-devel
-Add_dependency run libXv-devel
-Add_dependency run libXext-devel
-Add_dependency run libvisual-devel
-Add_dependency run cdparanoia-devel
-Add_dependency run libtheora-devel
-Add_dependency run gstreamer-devel
-Add_dependency run gst-plugins-base
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index 532a513685..2f179edfc8 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -5,6 +5,7 @@ distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.x
 build_style=gnu-configure
 configure_args="--enable-experimental --disable-gnome_vfs
 --with-gudev --disable-static"
+makedepends="pkg-config gobject-introspection libgudev-devel gstreamer-devel glib-devel libxml2-devel pango-devel cairo-devel freetype-devel fontconfig-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel cdparanoia-devel libtheora-devel libvorbis-devel orc-devel"
 short_desc="GStreamer Base Plug-ins"
 maintainer="Juan RP <xtraeme@gmail.org>"
 homepage="http://gstreamer.freedesktop.org/"
@@ -22,22 +23,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build libgudev-devel
-Add_dependency build gstreamer-devel
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build liboil-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libXv-devel
-Add_dependency build libXext-devel
-Add_dependency build libvisual-devel
-Add_dependency build cdparanoia-devel
-Add_dependency build libtheora-devel
-Add_dependency build libvorbis-devel
-Add_dependency build orc-devel
diff --git a/srcpkgs/gst-plugins-good/depends b/srcpkgs/gst-plugins-good/depends
deleted file mode 100644
index de28b45c3b..0000000000
--- a/srcpkgs/gst-plugins-good/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.21"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template
index b0ef26c054..3ec626ca73 100644
--- a/srcpkgs/gst-plugins-good/template
+++ b/srcpkgs/gst-plugins-good/template
@@ -7,6 +7,7 @@ configure_args="--with-gudev --with-libv4l2 --enable-experimental
 --disable-schemas-install --disable-aalib --disable-esd --disable-hal
 --disable-libcaca --disable-libdv --disable-dv1394 --disable-shout2
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --enable-speex"
+makedepends="pkg-config intltool libxml2-devel libgudev-devel libflac-devel libXext-devel libXdamage-devel libXfixes-devel gtk+-devel taglib-devel libsoup-devel libsoup-gnome-devel gstreamer-devel gst-plugins-base-devel GConf-devel pulseaudio-devel orc-devel libXv-devel wavpack-devel v4l-utils-devel jack-devel speex-devel"
 short_desc="Core GStreamer libraries and elements"
 maintainer="Juan RP <xtraeme@gmail.org>"
 homepage="http://gstreamer.freedesktop.org/"
@@ -25,28 +26,6 @@ long_desc="
 gconf_schemas="gstreamer-0.10.schemas"
 
 # XXX: build libcaca, libdv, dv1394 and shout2 modules.
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxml2-devel
-Add_dependency build libgudev-devel
-Add_dependency build libflac-devel
-Add_dependency build libXext-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXfixes-devel
-Add_dependency build gtk+-devel
-Add_dependency build taglib-devel
-Add_dependency build libsoup-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build GConf-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build orc-devel
-Add_dependency build libXv-devel
-Add_dependency build wavpack-devel
-Add_dependency build v4l-utils-devel
-Add_dependency build jack-devel
-Add_dependency build speex-devel
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/gst-plugins-ugly/template b/srcpkgs/gst-plugins-ugly/template
index 589e5bfeaf..f17c0b8e8a 100644
--- a/srcpkgs/gst-plugins-ugly/template
+++ b/srcpkgs/gst-plugins-ugly/template
@@ -5,6 +5,7 @@ homepage="http://gstreamer.freedesktop.org"
 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-experimental"
+makedepends="pkg-config intltool glib-devel libxml2-devel gstreamer-devel gst-plugins-base-devel libcdio-devel libdvdread-devel x264-devel libmad-devel orc-devel liba52-devel libmpeg2-devel lame-devel"
 short_desc="GStreamer plugins from the ugly set"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -21,17 +22,3 @@ long_desc="
  good-quality plug-ins that might pose distribution problems."
 
 # XXX: add required pkgs for the amr, sid plugins.
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build libcdio-devel
-Add_dependency build libdvdread-devel
-Add_dependency build x264-devel
-Add_dependency build libmad-devel
-Add_dependency build orc-devel
-Add_dependency build liba52-devel
-Add_dependency build libmpeg2-devel
-Add_dependency build lame-devel
diff --git a/srcpkgs/gst-python/depends b/srcpkgs/gst-python/depends
deleted file mode 100644
index 6a84508f72..0000000000
--- a/srcpkgs/gst-python/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.21"
-api_depends=">=0.10.22" # -devel subpkg
diff --git a/srcpkgs/gst-python/gst-python-devel.template b/srcpkgs/gst-python/gst-python-devel.template
index 6995fc96d4..bd414fd928 100644
--- a/srcpkgs/gst-python/gst-python-devel.template
+++ b/srcpkgs/gst-python/gst-python-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'gst-python-devel'.
 #
+depends="gst-python"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gst-python
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gst-python/template b/srcpkgs/gst-python/template
index d413c22daf..e3fe739b5a 100644
--- a/srcpkgs/gst-python/template
+++ b/srcpkgs/gst-python/template
@@ -4,6 +4,8 @@ version=0.10.22
 homepage="http://gstreamer.freedesktop.org"
 distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="pygobject2 pygtk"
+makedepends="pkg-config glib-devel python-devel pygobject2-devel pygtk-devel libxml2-devel gstreamer-devel gst-plugins-base-devel"
 short_desc="Python bindings for GStreamer 0.10"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,14 +17,4 @@ long_desc="
 subpackages="${pkgname}-devel"
 pycompile_module="gst-0.10"
 
-Add_dependency run pygobject2
-Add_dependency run pygtk
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build python-devel
-Add_dependency build pygobject2-devel
-Add_dependency build pygtk-devel
-Add_dependency build libxml2-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template
index c2368a03c0..87e6cf7390 100644
--- a/srcpkgs/gst123/template
+++ b/srcpkgs/gst123/template
@@ -4,6 +4,8 @@ version=0.0.1
 distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config libstdc++-devel glib-devel libxml2-devel gstreamer-devel gst-plugins-base-devel"
+fulldepends="gst-plugins-good"
 short_desc="GStreamer based CLI player"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0a70f2a411056bb90a75e97f8320fc190c0a5b16de88e26ec8300b9c4c121cc1
@@ -14,11 +16,4 @@ long_desc="
  contains different file formats, like flac, ogg and mp3, you can use
  gst123 to play all your music files."
  
-Add_dependency build pkg-config
-Add_dependency build libstdc++-devel
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
 
-Add_dependency full gst-plugins-good
diff --git a/srcpkgs/gstreamer/depends b/srcpkgs/gstreamer/depends
deleted file mode 100644
index a1159ffe4c..0000000000
--- a/srcpkgs/gstreamer/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.22"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gstreamer/gstreamer-devel.template b/srcpkgs/gstreamer/gstreamer-devel.template
index fcf8bee06f..a0b03a0642 100644
--- a/srcpkgs/gstreamer/gstreamer-devel.template
+++ b/srcpkgs/gstreamer/gstreamer-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gstreamer-devel'.
 #
+depends="libxml2-devel glib-devel gstreamer"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxml2-devel
-Add_dependency run glib-devel
-Add_dependency run gstreamer
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template
index f740dc09ee..bbe8248534 100644
--- a/srcpkgs/gstreamer/template
+++ b/srcpkgs/gstreamer/template
@@ -5,6 +5,7 @@ distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.x
 build_style=gnu-configure
 configure_args="--disable-debug --disable-valgrind --enable-docbook
 --with-package-origin=http://code.google.com/p/xbps"
+makedepends="pkg-config flex python docbook-xsl libxml2-devel glib-devel gobject-introspection"
 short_desc="Core GStreamer libraries and elements"
 maintainer="Juan RP <xtraeme@gmail.org>"
 homepage="http://gstreamer.freedesktop.org/"
@@ -20,10 +21,3 @@ long_desc="
  plugin with a clean, generic interface."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build python
-Add_dependency build docbook-xsl
-Add_dependency build libxml2-devel
-Add_dependency build glib-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/gtk+/depends b/srcpkgs/gtk+/depends
deleted file mode 100644
index 95a32f1ef8..0000000000
--- a/srcpkgs/gtk+/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.16.0"
-api_depends=">=2.24.10_1" # fixed rundeps for -devel subpkg.
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 153e3d5bbb..debb2dfb3e 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'gtk+-devel'.
 #
+depends="glib-devel atk-devel cairo-devel gdk-pixbuf-devel pango-devel gtk+>=2.24.10"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run atk-devel
-Add_dependency run cairo-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run pango-devel
-Add_dependency run gtk+ ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index d46af411cb..72e8f9279b 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -5,6 +5,8 @@ revision=3
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-cups --with-xinput"
+depends="shared-mime-info gtk-update-icon-cache"
+makedepends="pkg-config perl>=0 glib-devel libXcursor-devel libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel libXdamage-devel freetype-devel fontconfig-devel libpng-devel gdk-pixbuf-devel cairo-devel pango-devel>=1.28.0 atk-devel>=1.32.0 gobject-introspection cups-devel"
 short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org"
@@ -25,26 +27,4 @@ conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
 subpackages="gtk+-devel gtk+-demo gtk-update-icon-cache"
 
-Add_dependency run shared-mime-info
-Add_dependency run gtk-update-icon-cache
 
-Add_dependency build pkg-config
-Add_dependency build perl ">=0"
-Add_dependency build glib-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXext-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXi-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXdamage-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libpng-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
-Add_dependency build pango-devel		">=1.28.0"
-Add_dependency build atk-devel			">=1.32.0"
-Add_dependency build gobject-introspection
-Add_dependency build cups-devel
diff --git a/srcpkgs/gtk+3/depends b/srcpkgs/gtk+3/depends
deleted file mode 100644
index c8b3d733c6..0000000000
--- a/srcpkgs/gtk+3/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends=">=3.3.18_1"
diff --git a/srcpkgs/gtk+3/gtk+3-devel.template b/srcpkgs/gtk+3/gtk+3-devel.template
index ef7e328180..2acb1a7bc6 100644
--- a/srcpkgs/gtk+3/gtk+3-devel.template
+++ b/srcpkgs/gtk+3/gtk+3-devel.template
@@ -1,21 +1,11 @@
 # Template file for 'gtk+3-devel'.
 #
+depends="glib-devel atk-devel cairo-devel gdk-pixbuf-devel pango-devel libXinerama-devel libXi-devel libXrandr-devel libXcursor-devel libXcomposite-devel gtk+3>=3.4.3"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run atk-devel
-Add_dependency run cairo-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run pango-devel
-Add_dependency run libXinerama-devel
-Add_dependency run libXi-devel
-Add_dependency run libXrandr-devel
-Add_dependency run libXcursor-devel
-Add_dependency run libXcomposite-devel
-Add_dependency run gtk+3 ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 9cd7b603a5..dcf5c42a2a 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -8,6 +8,8 @@ build_style=gnu-configure
 configure_args="--enable-cups --disable-schemas-compile
 --enable-gtk2-dependency --enable-colord --enable-x11-backend
 --enable-broadway-backend"
+depends="gtk-update-icon-cache shared-mime-info"
+makedepends="libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel glib-devel>=2.30.0 atk-devel>=2.2.0 libpng-devel fontconfig-devel cairo-devel pango-devel>=1.29.3 gdk-pixbuf-devel>=2.25.2 gtk+-devel colord-devel gobject-introspection cups-devel"
 short_desc="The GTK+ toolkit (v3)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -28,27 +30,7 @@ triggers="gtk3-immodules"
 conf_files="/etc/gtk-3.0/im-multipress.conf"
 subpackages="gtk+3-devel gtk+3-demo"
 
-Add_dependency build libXcursor-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXext-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXi-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build glib-devel		">=2.30.0"
-Add_dependency build atk-devel		">=2.2.0"
-Add_dependency build libpng-devel
-Add_dependency build fontconfig-devel
-Add_dependency build cairo-devel
-Add_dependency build pango-devel	">=1.29.3"
-Add_dependency build gdk-pixbuf-devel	">=2.25.2"
-Add_dependency build gtk+-devel
-Add_dependency build colord-devel
-Add_dependency build gobject-introspection
-Add_dependency build cups-devel
 
-Add_dependency run gtk-update-icon-cache
-Add_dependency run shared-mime-info
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template
index 0c666cf023..2d565f1c82 100644
--- a/srcpkgs/gtk-doc/template
+++ b/srcpkgs/gtk-doc/template
@@ -4,6 +4,8 @@ version=1.18
 homepage="http://www.gtk.org/gtk-doc/"
 distfiles="${GNOME_SITE}/$pkgname/1.18/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config openjade python>=0"
+fulldepends="docbook-xsl gnome-doc-utils perl>=0"
 short_desc="Documentation tool for public library API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, FDL-"
@@ -13,9 +15,3 @@ long_desc="
  pretty output via DocBook SGML."
 
 noarch=yes
-Add_dependency full docbook-xsl
-Add_dependency full gnome-doc-utils
-Add_dependency full perl ">=0"
-Add_dependency build pkg-config
-Add_dependency build openjade
-Add_dependency build python ">=0"
diff --git a/srcpkgs/gtk-engines/template b/srcpkgs/gtk-engines/template
index b064cbbbe1..070b02e866 100644
--- a/srcpkgs/gtk-engines/template
+++ b/srcpkgs/gtk-engines/template
@@ -5,18 +5,10 @@ distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-animation"
 revision=2
+makedepends="pkg-config intltool atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel gtk+3-devel"
 short_desc="GTK+ Theme engines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e0ed144cdd298bc69b53face0e907369fb6a51f1eb333b5d04331f12758b454c
 long_desc="
  This package contains theme engines for the GTK+ toolkit."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build gtk+3-devel
diff --git a/srcpkgs/gtk-vnc/depends b/srcpkgs/gtk-vnc/depends
deleted file mode 100644
index 6ea24dd545..0000000000
--- a/srcpkgs/gtk-vnc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gtk-vnc/gtk-vnc-devel.template b/srcpkgs/gtk-vnc/gtk-vnc-devel.template
index c94fbbd2c4..f9af3f65ef 100644
--- a/srcpkgs/gtk-vnc/gtk-vnc-devel.template
+++ b/srcpkgs/gtk-vnc/gtk-vnc-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gtk-vnc-devel'.
 #
+depends="glib-devel gtk+3-devel gtk-vnc"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gtk+3-devel
-Add_dependency run gtk-vnc
 
 do_install()
 {
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 802e07035c..40defca861 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -4,6 +4,7 @@ version=0.4.4
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-python --disable-static --with-gtk=3.0"
+makedepends="perl>=0 pkg-config intltool gobject-introspection gtk+3-devel gnutls-devel libsasl-devel vala-devel"
 short_desc="VNC viewer widget for GTK"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -19,11 +20,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build perl ">=0"
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build gnutls-devel
-Add_dependency build libsasl-devel
-Add_dependency build vala-devel
diff --git a/srcpkgs/gtk-xfce-engine/template b/srcpkgs/gtk-xfce-engine/template
index 23d5378830..12109c9747 100644
--- a/srcpkgs/gtk-xfce-engine/template
+++ b/srcpkgs/gtk-xfce-engine/template
@@ -5,6 +5,7 @@ homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/gtk-xfce-engine/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool gtk+-devel gtk+3-devel"
 short_desc="A GTK+ 2/3 theme engine for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,7 +15,3 @@ long_desc="
  various GTK2.0 themes with Xfce. It also contains some ready themes, but you
  are of course free to design your own."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build gtk+3-devel
diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index 07d7e4958f..1f67caf60d 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -6,18 +6,10 @@ distfiles="${GNOME_SITE}/gtk-engines/2.20/gtk-engines-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-animation"
 revision=2
+makedepends="pkg-config intltool atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5
 long_desc="
  This package contains theme engines for the GTK+2 toolkit."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build gtk+-devel
diff --git a/srcpkgs/gtkhtml/depends b/srcpkgs/gtkhtml/depends
deleted file mode 100644
index f2d31f8814..0000000000
--- a/srcpkgs/gtkhtml/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.2.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gtkhtml/gtkhtml-devel.template b/srcpkgs/gtkhtml/gtkhtml-devel.template
index c9777eacb9..04dcd86353 100644
--- a/srcpkgs/gtkhtml/gtkhtml-devel.template
+++ b/srcpkgs/gtkhtml/gtkhtml-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'gtkhtml-devel'.
 #
+depends="cairo-devel gtk+3-devel enchant-devel gsettings-desktop-schemas iso-codes libgtkhtml>=4.4.2"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run cairo-devel
-Add_dependency run gtk+3-devel
-Add_dependency run enchant-devel
-Add_dependency run gsettings-desktop-schemas
-Add_dependency run iso-codes
-Add_dependency run libgtkhtml ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gtkhtml/template b/srcpkgs/gtkhtml/template
index ded242a86e..273eef6b21 100644
--- a/srcpkgs/gtkhtml/template
+++ b/srcpkgs/gtkhtml/template
@@ -3,6 +3,8 @@ pkgname=gtkhtml
 version=4.4.2
 distfiles="${GNOME_SITE}/${pkgname}/4.4/${pkgname}-${version}.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+3-devel enchant-devel libsoup-gnome-devel"
+fulldepends="gnome-icon-theme gsettings-desktop-schemas iso-codes"
 short_desc="Layout engine written in C using the GTK+ widget toolkit"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnome.org"
@@ -15,12 +17,4 @@ long_desc="
 
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build enchant-devel
-Add_dependency build libsoup-gnome-devel
 
-Add_dependency full gnome-icon-theme
-Add_dependency full gsettings-desktop-schemas
-Add_dependency full iso-codes
diff --git a/srcpkgs/gtkmm/depends b/srcpkgs/gtkmm/depends
deleted file mode 100644
index a360f3fceb..0000000000
--- a/srcpkgs/gtkmm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.99.5"
-api_depends=">=3.3.20"
diff --git a/srcpkgs/gtkmm/gtkmm-devel.template b/srcpkgs/gtkmm/gtkmm-devel.template
index 90833d01fe..41806aafe1 100644
--- a/srcpkgs/gtkmm/gtkmm-devel.template
+++ b/srcpkgs/gtkmm/gtkmm-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'gtkmm-devel'.
 #
+depends="gtk+3-devel atkmm-devel pangomm-devel cairomm-devel gtkmm>=3.4.0"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run atkmm-devel
-Add_dependency run pangomm-devel
-Add_dependency run cairomm-devel
-Add_dependency run gtkmm ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index cac0345d68..c915a98557 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -3,6 +3,7 @@ pkgname=gtkmm
 version=3.4.0
 distfiles="${GNOME_SITE}/gtkmm/3.4/gtkmm-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config gtk+3-devel glibmm-devel>=2.32.0 atkmm-devel pangomm-devel cairomm-devel"
 short_desc="C++ bindings for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gtkmm.sourceforge.net/"
@@ -21,9 +22,3 @@ long_desc="
 
 subpackages="gtkmm-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gtk+3-devel
-Add_dependency build glibmm-devel	">=2.32.0"
-Add_dependency build atkmm-devel
-Add_dependency build pangomm-devel
-Add_dependency build cairomm-devel
diff --git a/srcpkgs/gtkmm2/depends b/srcpkgs/gtkmm2/depends
deleted file mode 100644
index a0d98e3a7e..0000000000
--- a/srcpkgs/gtkmm2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.24.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gtkmm2/gtkmm2-devel.template b/srcpkgs/gtkmm2/gtkmm2-devel.template
index 69448c50ef..f3d5e2b730 100644
--- a/srcpkgs/gtkmm2/gtkmm2-devel.template
+++ b/srcpkgs/gtkmm2/gtkmm2-devel.template
@@ -1,25 +1,12 @@
 # Template file for 'gtkmm2-devel'.
 #
+depends="pkg-config glib-devel atk-devel pango-devel cairo-devel freetype-devel fontconfig-devel gtk+-devel libsigc++-devel glibmm-devel atkmm-devel pangomm-devel cairomm-devel gtkmm2"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run atk-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run gtk+-devel
-Add_dependency run libsigc++-devel
-Add_dependency run glibmm-devel
-Add_dependency run atkmm-devel
-Add_dependency run pangomm-devel
-Add_dependency run cairomm-devel
-Add_dependency run gtkmm2
 
 do_install()
 {
diff --git a/srcpkgs/gtkmm2/template b/srcpkgs/gtkmm2/template
index 050065d7b7..361b1dd56f 100644
--- a/srcpkgs/gtkmm2/template
+++ b/srcpkgs/gtkmm2/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/gtkmm/2.24/gtkmm-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-documentation"
 revision=3
+makedepends="pkg-config glib-devel atk-devel pango-devel cairo-devel freetype-devel fontconfig-devel gtk+-devel libsigc++-devel glibmm-devel atkmm-devel pangomm-devel cairomm-devel libXcursor-devel"
 short_desc="C++ bindings for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 wrksrc=gtkmm-${version}
@@ -22,20 +23,6 @@ long_desc="
 
 subpackages="gtkmm2-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build gtk+-devel
-Add_dependency build libsigc++-devel
-Add_dependency build glibmm-devel
-Add_dependency build atkmm-devel
-Add_dependency build pangomm-devel
-Add_dependency build cairomm-devel
-Add_dependency build libXcursor-devel
 
 pre_install() {
 	sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
diff --git a/srcpkgs/gtksourceview/depends b/srcpkgs/gtksourceview/depends
deleted file mode 100644
index adf49ba812..0000000000
--- a/srcpkgs/gtksourceview/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/gtksourceview/gtksourceview-devel.template b/srcpkgs/gtksourceview/gtksourceview-devel.template
index 96a908c620..5126665345 100644
--- a/srcpkgs/gtksourceview/gtksourceview-devel.template
+++ b/srcpkgs/gtksourceview/gtksourceview-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'gtksourceview-devel'.
 #
+depends="gtk+3-devel libxml2-devel gtksourceview>=3.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run libxml2-devel
-Add_dependency run gtksourceview ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template
index 373b402138..887f11701a 100644
--- a/srcpkgs/gtksourceview/template
+++ b/srcpkgs/gtksourceview/template
@@ -4,6 +4,7 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool gobject-introspection gtk+3-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -16,8 +17,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/gtksourceviewmm/depends b/srcpkgs/gtksourceviewmm/depends
deleted file mode 100644
index d6ddca4b41..0000000000
--- a/srcpkgs/gtksourceviewmm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.2.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gtksourceviewmm/gtksourceviewmm-devel.template b/srcpkgs/gtksourceviewmm/gtksourceviewmm-devel.template
index a919453555..709c44893f 100644
--- a/srcpkgs/gtksourceviewmm/gtksourceviewmm-devel.template
+++ b/srcpkgs/gtksourceviewmm/gtksourceviewmm-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gtksourceviewmm-devel'.
 #
+depends="gtkmm-devel gtksourceviewmm"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtkmm-devel
-Add_dependency run gtksourceviewmm
 
 do_install()
 {
diff --git a/srcpkgs/gtksourceviewmm/template b/srcpkgs/gtksourceviewmm/template
index 036d6d822b..fe6435c68a 100644
--- a/srcpkgs/gtksourceviewmm/template
+++ b/srcpkgs/gtksourceviewmm/template
@@ -4,6 +4,7 @@ version=3.2.0
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-deprecated-api --disable-documentation"
+makedepends="pkg-config gtkmm-devel gtksourceview-devel"
 short_desc="GtkSourceview C++ bindings"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -18,6 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gtkmm-devel
-Add_dependency build gtksourceview-devel
diff --git a/srcpkgs/gucharmap/depends b/srcpkgs/gucharmap/depends
deleted file mode 100644
index ab0d9627ad..0000000000
--- a/srcpkgs/gucharmap/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gucharmap/gucharmap-devel.template b/srcpkgs/gucharmap/gucharmap-devel.template
index 2016b27d76..cd759fb7bc 100644
--- a/srcpkgs/gucharmap/gucharmap-devel.template
+++ b/srcpkgs/gucharmap/gucharmap-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gucharmap-devel'.
 #
+depends="gtk+3-devel gucharmap>=3.4.1.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run gucharmap ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index b1083b0cb8..25a65e29a1 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -4,6 +4,8 @@ version=3.4.1.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper --enable-introspection"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection gtk+3-devel"
 short_desc="GNOME Unicode Charmap"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -16,12 +18,4 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/gupnp-av/depends b/srcpkgs/gupnp-av/depends
deleted file mode 100644
index 31a1d27c33..0000000000
--- a/srcpkgs/gupnp-av/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gupnp-av/gupnp-av-devel.template b/srcpkgs/gupnp-av/gupnp-av-devel.template
index 7ea37bc73e..6616d68ca5 100644
--- a/srcpkgs/gupnp-av/gupnp-av-devel.template
+++ b/srcpkgs/gupnp-av/gupnp-av-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gupnp-av-devel'.
 #
+depends="gupnp-devel gupnp-av"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gupnp-devel
-Add_dependency run gupnp-av
 
 do_install()
 {
diff --git a/srcpkgs/gupnp-av/template b/srcpkgs/gupnp-av/template
index 1f959534af..13707dca55 100644
--- a/srcpkgs/gupnp-av/template
+++ b/srcpkgs/gupnp-av/template
@@ -5,6 +5,7 @@ homepage="http://gupnp.org/"
 distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config gobject-introspection gupnp-devel"
 short_desc="Library to ease handling and implementation of UPnP A/V profiles"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -14,6 +15,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build gupnp-devel
diff --git a/srcpkgs/gupnp-dlna/depends b/srcpkgs/gupnp-dlna/depends
deleted file mode 100644
index 017786f6fa..0000000000
--- a/srcpkgs/gupnp-dlna/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gupnp-dlna/gupnp-dlna-devel.template b/srcpkgs/gupnp-dlna/gupnp-dlna-devel.template
index 61730898e6..2b7ee95ac5 100644
--- a/srcpkgs/gupnp-dlna/gupnp-dlna-devel.template
+++ b/srcpkgs/gupnp-dlna/gupnp-dlna-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gupnp-dlna-devel'.
 #
+depends="gst-plugins-base-devel gupnp-dlna>=0.6.6"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gst-plugins-base-devel
-Add_dependency run gupnp-dlna ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index da84f7a52e..9fa9c6865d 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -5,6 +5,7 @@ homepage="http://gupnp.org/"
 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config gobject-introspection gst-plugins-base-devel"
 short_desc="GUPnP DLNA"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,6 +16,3 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build gst-plugins-base-devel
diff --git a/srcpkgs/gupnp-igd/depends b/srcpkgs/gupnp-igd/depends
deleted file mode 100644
index 66fe7f1eda..0000000000
--- a/srcpkgs/gupnp-igd/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gupnp-igd/gupnp-igd-devel.template b/srcpkgs/gupnp-igd/gupnp-igd-devel.template
index d77e073e23..75bd20e384 100644
--- a/srcpkgs/gupnp-igd/gupnp-igd-devel.template
+++ b/srcpkgs/gupnp-igd/gupnp-igd-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'gupnp--igd-devel'.
 #
+depends="glib-devel libsoup-devel gupnp-devel gupnp-igd"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libsoup-devel
-Add_dependency run gupnp-devel
-Add_dependency run gupnp-igd
 
 do_install()
 {
diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template
index edb513f8ba..1d933f010a 100644
--- a/srcpkgs/gupnp-igd/template
+++ b/srcpkgs/gupnp-igd/template
@@ -6,6 +6,7 @@ distfiles="${GNOME_SITE}/$pkgname/0.1/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-python --disable-static"
 revision=3
+makedepends="pkg-config glib-devel libxml2-devel libsoup-devel gssdp-devel gupnp-devel"
 short_desc="Library to handle UPnP IGD port mapping"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -16,9 +17,3 @@ long_desc="
 disable_parallel_build=yes
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build libsoup-devel
-Add_dependency build gssdp-devel
-Add_dependency build gupnp-devel
diff --git a/srcpkgs/gupnp/depends b/srcpkgs/gupnp/depends
deleted file mode 100644
index 20abab138f..0000000000
--- a/srcpkgs/gupnp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.18.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gupnp/gupnp-devel.template b/srcpkgs/gupnp/gupnp-devel.template
index f6979c3a28..51d629c669 100644
--- a/srcpkgs/gupnp/gupnp-devel.template
+++ b/srcpkgs/gupnp/gupnp-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'gupnp-devel'.
 #
+depends="python gssdp-devel glib-devel libxml2-devel libuuid-devel gupnp>=0.18.2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run python # for gupnp-binding-tool
-Add_dependency run gssdp-devel
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run libuuid-devel
-Add_dependency run gupnp ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index 4e8b139d35..18325550d4 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -5,6 +5,7 @@ homepage="http://gupnp.org/"
 distfiles="${GNOME_SITE}/gupnp/0.18/gupnp-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config glib-devel libxml2-devel libuuid-devel gssdp-devel gobject-introspection"
 short_desc="GObject-based library for UPnP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -14,9 +15,3 @@ long_desc="
 
 subpackages="gupnp-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build libuuid-devel
-Add_dependency build gssdp-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/gvfs/depends b/srcpkgs/gvfs/depends
deleted file mode 100644
index 59e51e8417..0000000000
--- a/srcpkgs/gvfs/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.7.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 40006add97..205c988db0 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/1.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-hal --disable-afc
 --with-bash-completion-dir=/etc/bash_completion.d"
+makedepends="pkg-config intltool libbluetooth-devel dbus-glib-devel libopenobex-devel libgudev-devel libexif-devel libusb-compat-devel fuse-devel libarchive-devel libcdio-devel libsoup-gnome-devel libgphoto2-devel libgnome-keyring-devel samba-devel avahi-glib-libs-devel udisks2-devel libgcrypt-devel"
+fulldepends="obex-data-server"
 short_desc="Userspace virtual filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -19,23 +21,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libbluetooth-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libopenobex-devel
-Add_dependency build libgudev-devel
-Add_dependency build libexif-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build fuse-devel
-Add_dependency build libarchive-devel
-Add_dependency build libcdio-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build libgphoto2-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build samba-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build udisks2-devel
-Add_dependency build libgcrypt-devel
 
-Add_dependency full obex-data-server
diff --git a/srcpkgs/gvim/template b/srcpkgs/gvim/template
index 6570d11b5f..8c13974ad8 100644
--- a/srcpkgs/gvim/template
+++ b/srcpkgs/gvim/template
@@ -11,6 +11,8 @@ configure_args="${configure_args} --enable-gui=gtk2 --with-x
 --with-vim-name=gvim"
 make_install_target="-C src
 DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} installvimbin install-icons"
+makedepends="pkg-config gtk+-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="${short_desc} (GTK+ GUI)"
 long_desc="${long_desc}
 
@@ -18,11 +20,7 @@ long_desc="${long_desc}
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
 
 pre_install() {
 	sed -i "s|/locolor|/hicolor|g" src/Makefile
diff --git a/srcpkgs/heimdal/heimdal-devel.template b/srcpkgs/heimdal/heimdal-devel.template
index 1e23887755..f32af7ddb3 100644
--- a/srcpkgs/heimdal/heimdal-devel.template
+++ b/srcpkgs/heimdal/heimdal-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'heimdal-devel'.
 #
+depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1 readline-devel ncurses-devel"
 short_desc="Heimdal Kerberos - development files"
 long_desc="${long_desc}
 
@@ -7,11 +8,6 @@ long_desc="${long_desc}
 
 noverifyrdeps=yes
 
-Add_dependency run db-devel
-Add_dependency run openssl-devel
-Add_dependency run e2fsprogs-devel    ">=1.4.10_1"
-Add_dependency run readline-devel
-Add_dependency run ncurses-devel
 
 do_install()
 {
diff --git a/srcpkgs/heimdal/heimdal-libs.template b/srcpkgs/heimdal/heimdal-libs.template
index 5f6679a300..c1a52e290d 100644
--- a/srcpkgs/heimdal/heimdal-libs.template
+++ b/srcpkgs/heimdal/heimdal-libs.template
@@ -1,16 +1,12 @@
 # Template file for 'heimdal-libs'.
 #
+depends="glibc libdb libssl e2fsprogs-libs>=1.4.10_1 readline"
 short_desc="Heimdal Kerberos - shared libraries"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
 
-Add_dependency run glibc
-Add_dependency run libdb
-Add_dependency run libssl
-Add_dependency run e2fsprogs-libs	">=1.4.10_1"
-Add_dependency run readline
 
 do_install()
 {
diff --git a/srcpkgs/heimdal/template b/srcpkgs/heimdal/template
index 13df260ba6..1a587f0a0b 100644
--- a/srcpkgs/heimdal/template
+++ b/srcpkgs/heimdal/template
@@ -7,6 +7,8 @@ build_style=gnu-configure
 configure_args="--enable-shared=yes --without-x --datadir=/var/lib/heimdal
 --localstatedir=/var/lib/heimdal --enable-pthread-support --with-openssl=/usr
 --enable-kcm --with-hdbdir=/var/lib/heimdal --with-readline=/usr"
+depends="glibc libdb libssl readline e2fsprogs-libs ncurses-libs heimdal-libs"
+makedepends="automake flex db-devel openssl-devel e2fsprogs-devel>=1.4.10_1 readline-devel ncurses-devel"
 short_desc="Heimdal Kerberos implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=64ebe73eea0bb4a9a80e038a953807416751451ade3e53f9103d3263b81ba925
@@ -18,21 +20,7 @@ long_desc="
 subpackages="heimdal-devel heimdal-libs"
 conf_files="/etc/krb5.conf"
 
-Add_dependency run glibc
-Add_dependency run libdb
-Add_dependency run libssl
-Add_dependency run readline
-Add_dependency run e2fsprogs-libs
-Add_dependency run ncurses-libs
-Add_dependency run heimdal-libs
 
-Add_dependency build automake
-Add_dependency build flex
-Add_dependency build db-devel
-Add_dependency build openssl-devel
-Add_dependency build e2fsprogs-devel	">=1.4.10_1"
-Add_dependency build readline-devel
-Add_dependency build ncurses-devel
 
 pre_configure()
 {
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index a7a03a398f..2085ebfb14 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -7,6 +7,8 @@ configure_args="--disable-gui-build --disable-hal"
 homepage="http://hplipopensource.com/"
 license="GPL-2"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
+makedepends="pkg-config automake libtool python-devel libxml2-python cups-devel sane-devel ghostscript-devel net-snmp-devel libusb-compat-devel jpeg-devel dbus-devel polkit-devel"
+fulldepends="python foomatic-db foomatic-db-engine desktop-file-utils"
 short_desc="HP Linux Imaging and Printing"
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
@@ -20,24 +22,7 @@ long_desc="
 conf_files="/etc/hp/hplip.conf"
 
 #XXX: pyqt pkgs for python gui
-Add_dependency build pkg-config
-Add_dependency build automake
-Add_dependency build libtool
-Add_dependency build python-devel
-Add_dependency build libxml2-python
-Add_dependency build cups-devel
-Add_dependency build sane-devel
-Add_dependency build ghostscript-devel
-Add_dependency build net-snmp-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build jpeg-devel
-Add_dependency build dbus-devel
-Add_dependency build polkit-devel
 
-Add_dependency full python
-Add_dependency full foomatic-db
-Add_dependency full foomatic-db-engine
-Add_dependency full desktop-file-utils
 
 post_install() {
 	rm -rf $DESTDIR/usr/share/hal
diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index 13d112e0d7..299ade1d2e 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -5,6 +5,7 @@ homepage="http://htop.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-unicode --enable-cgroup --enable-taskstats"
+makedepends="bison python>=0"
 short_desc="An interactive process viewer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,8 +14,6 @@ long_desc="
  htop is an interactive process viewer for Linux. It is a text-mode terminal
  application (for console or X terminals) and requires ncurses."
 
-Add_dependency build bison
-Add_dependency build python ">=0"
 
 pre_configure() {
 	sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure 
diff --git a/srcpkgs/hunspell/depends b/srcpkgs/hunspell/depends
deleted file mode 100644
index 28c1ca4514..0000000000
--- a/srcpkgs/hunspell/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/hunspell/hunspell-devel.template b/srcpkgs/hunspell/hunspell-devel.template
index 28d31ffcb1..fdb839e24d 100644
--- a/srcpkgs/hunspell/hunspell-devel.template
+++ b/srcpkgs/hunspell/hunspell-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'hunspelll-devel'.
 #
+depends="libstdc++-devel ncurses-devel hunspell"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libstdc++-devel
-Add_dependency run ncurses-devel
-Add_dependency run hunspell
 
 do_install()
 {
diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template
index 66779071b8..1455cde6cc 100644
--- a/srcpkgs/hunspell/template
+++ b/srcpkgs/hunspell/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-ui"
+makedepends="pkg-config bison libstdc++-devel ncurses-devel"
 short_desc="Improved spellchecker"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=af563e13646620e608052b46974e10d0fc3e4d48b1b996f9771cbfac6dfc3c38
@@ -24,7 +25,3 @@ long_desc="
   * GPL/LGPL/MPL tri-license."
 
 subpackages="$pkgname-devel" 
-Add_dependency build pkg-config
-Add_dependency build bison
-Add_dependency build libstdc++-devel
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index c13eecdf68..0ef6138908 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -4,6 +4,8 @@ version=0.9.5
 homepage="http://www.hydrogen-music.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 revision=3
+makedepends="scons libsndfile-devel alsa-lib-devel zlib-devel libtar-devel libarchive-devel jack-devel qt-devel"
+fulldepends="desktop-file-utils"
 short_desc="Advanced drum machine for GNU/Linux"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -14,16 +16,7 @@ long_desc="
  programming."
 
 # XXX LASH Support
-Add_dependency build scons
-Add_dependency build libsndfile-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build zlib-devel
-Add_dependency build libtar-devel
-Add_dependency build libarchive-devel
-Add_dependency build jack-devel
-Add_dependency build qt-devel
 
-Add_dependency full desktop-file-utils
 
 do_build() {
 	scons lrdf=0 jack=1 alsa=1 lash=0 portaudio=0 portmidi=0 \
diff --git a/srcpkgs/i3/i3-devel.template b/srcpkgs/i3/i3-devel.template
index ea792d326d..664de7405f 100644
--- a/srcpkgs/i3/i3-devel.template
+++ b/srcpkgs/i3/i3-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'i3-devel'.
 #
+depends="i3"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run i3
 
 do_install()
 {
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index a5f1883198..eea899db5c 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -4,6 +4,8 @@ version=4.1
 homepage="http://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
 revision=2
+depends="i3status"
+makedepends="pkg-config yajl-devel libxcb-devel xcb-proto xcb-util libev-devel flex asciidoc xmlto docbook-xml libXcursor-devel libX11-devel pcre-devel startup-notification-devel"
 short_desc="Improved tiling window manager."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -18,22 +20,7 @@ subpackages="${pkgname}-devel"
 
 conf_files="/etc/i3/config"
 
-Add_dependency run i3status
 
-Add_dependency build pkg-config
-Add_dependency build yajl-devel
-Add_dependency build libxcb-devel
-Add_dependency build xcb-proto
-Add_dependency build xcb-util
-Add_dependency build libev-devel
-Add_dependency build flex
-Add_dependency build asciidoc
-Add_dependency build xmlto
-Add_dependency build docbook-xml
-Add_dependency build libXcursor-devel
-Add_dependency build libX11-devel
-Add_dependency build pcre-devel
-Add_dependency build startup-notification-devel
 
 do_build() {
 	make ${makejobs}
diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template
index a2036488c1..eba866a35c 100644
--- a/srcpkgs/i3status/template
+++ b/srcpkgs/i3status/template
@@ -3,6 +3,8 @@ pkgname=i3status
 version=2.3
 homepage="http://i3wm.org/i3status"
 distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
+depends="libcap-progs"
+makedepends="asciidoc confuse-devel wireless_tools-devel alsa-lib-devel"
 short_desc="Generates status bar to use with dzen2 or xmobar."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -15,12 +17,7 @@ long_desc="
 
 conf_files="/etc/i3status.conf"
 
-Add_dependency run libcap-progs
 
-Add_dependency build asciidoc
-Add_dependency build confuse-devel
-Add_dependency build wireless_tools-devel
-Add_dependency build alsa-lib-devel
 
 do_build() {
 	make ${makejobs}
diff --git a/srcpkgs/iceauth/template b/srcpkgs/iceauth/template
index 84164254af..b8df9fb9b4 100644
--- a/srcpkgs/iceauth/template
+++ b/srcpkgs/iceauth/template
@@ -4,6 +4,7 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config xproto libICE-devel"
 short_desc="ICE protocol utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d
@@ -13,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
  
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build libICE-devel
diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 55d26adc3f..035a39945b 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://www.icecast.org/"
 distfiles="http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 revision=1
+makedepends="pkg-config openssl-devel libcurl-devel speex-devel libtheora-devel libvorbis-devel libogg-devel libxslt-devel libxml2-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -18,12 +19,3 @@ long_desc="
 
 conf_files="/etc/icecast.xml"
 
-Add_dependency build pkg-config
-Add_dependency build openssl-devel
-Add_dependency build libcurl-devel
-Add_dependency build speex-devel
-Add_dependency build libtheora-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libogg-devel
-Add_dependency build libxslt-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template
index 94e670423b..ceedbcf2f6 100644
--- a/srcpkgs/icon-naming-utils/template
+++ b/srcpkgs/icon-naming-utils/template
@@ -3,6 +3,7 @@ pkgname=icon-naming-utils
 version=0.8.90
 distfiles="http://tango.freedesktop.org/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+fulldepends="perl-XML-Simple"
 short_desc="Adapts GNOME and KDE icon names to the Icon Naming Specification"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b1378679df4485b4459f609a3304238b3e92d91e43744c47b70abbe690d883d5
@@ -13,7 +14,6 @@ long_desc="
  in the Icon Naming Specification."
 
 noarch=yes
-Add_dependency full perl-XML-Simple
 
 post_install()
 {
diff --git a/srcpkgs/icu/depends b/srcpkgs/icu/depends
deleted file mode 100644
index 86a5d572ca..0000000000
--- a/srcpkgs/icu/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.6.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/icu/icu-devel.template b/srcpkgs/icu/icu-devel.template
index d0a2215084..2ca8d30083 100644
--- a/srcpkgs/icu/icu-devel.template
+++ b/srcpkgs/icu/icu-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'icu-devel'.
 #
+depends="libstdc++-devel icu"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libstdc++-devel
-Add_dependency run icu
 
 do_install()
 {
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index 18fe5ec073..229acf3ae2 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -5,6 +5,9 @@ revision=2
 build_style=gnu-configure
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+depends="pygtk"
+makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel libflac-devel libsndfile-devel libmad-devel ffmpeg-devel speex-devel glib-devel pixman-devel pygtk-devel"
+fulldepends="mutagen desktop-file-utils shared-mime-info"
 short_desc="Internet DJ Console"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -17,21 +20,5 @@ long_desc="
 pycompile_module="idjc"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run pygtk
 
-Add_dependency build libvorbis-devel
-Add_dependency build libogg-devel
-Add_dependency build jack-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build libflac-devel
-Add_dependency build libsndfile-devel
-Add_dependency build libmad-devel
-Add_dependency build ffmpeg-devel
-Add_dependency build speex-devel
-Add_dependency build glib-devel
-Add_dependency build pixman-devel
-Add_dependency build pygtk-devel
 
-Add_dependency full mutagen
-Add_dependency full desktop-file-utils
-Add_dependency full shared-mime-info
diff --git a/srcpkgs/imlib2/depends b/srcpkgs/imlib2/depends
deleted file mode 100644
index d4db4c87cf..0000000000
--- a/srcpkgs/imlib2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/imlib2/imlib2-devel.template b/srcpkgs/imlib2/imlib2-devel.template
index 4a5a9ed271..c84d2968fb 100644
--- a/srcpkgs/imlib2/imlib2-devel.template
+++ b/srcpkgs/imlib2/imlib2-devel.template
@@ -1,22 +1,12 @@
 # Template file for 'imlib2-devel'.
 #
+depends="pkg-config zlib-devel bzip2-devel freetype-devel jpeg-devel libpng-devel tiff-devel libid3tag-devel giflib-devel libX11-devel libXext-devel"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run freetype-devel
-Add_dependency run jpeg-devel
-Add_dependency run libpng-devel
-Add_dependency run tiff-devel
-Add_dependency run libid3tag-devel
-Add_dependency run giflib-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
 
 
 do_install()
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 5c77e64384..b096a0d0b0 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/imlib2 --enable-visibility-hiding"
+makedepends="pkg-config zlib-devel freetype-devel jpeg-devel libpng-devel tiff-devel libid3tag-devel giflib-devel libX11-devel libXext-devel"
 short_desc="Image manipulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a
@@ -34,13 +35,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build freetype-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build tiff-devel
-Add_dependency build libid3tag-devel
-Add_dependency build giflib-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 31d15d9002..8328f0b2f1 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -3,6 +3,7 @@ pkgname=initramfs-tools
 _localver=1		# This is the XBPS version
 _distver=0.102		# This should match debian version
 version=${_distver}.${_localver}
+fulldepends="cpio util-linux gawk findutils sed grep gzip bzip2 xz udev busybox>=1.19.2 klibc-resume kbd>=1.15.3_5 kmod"
 short_desc="Tools for generating an initramfs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -39,20 +40,6 @@ make_dirs="
 /var/lib/$pkgname				0755	0	0
 "
 
-Add_dependency full cpio
-Add_dependency full util-linux
-Add_dependency full gawk
-Add_dependency full findutils
-Add_dependency full sed
-Add_dependency full grep
-Add_dependency full gzip
-Add_dependency full bzip2
-Add_dependency full xz
-Add_dependency full udev
-Add_dependency full busybox	">=1.19.2" # loadkmap
-Add_dependency full klibc-resume
-Add_dependency full kbd		">=1.15.3_5" # switch to /usr.
-Add_dependency full kmod
 
 do_install() {
 	# /etc config files
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 80e337ae51..586c9dd74c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -4,6 +4,8 @@ version=0.48.3.1
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-lcms"
+makedepends="pkg-config intltool gsl-devel gc-devel gtkmm2-devel libxml2-devel libxslt-devel boost-devel popt-devel lcms-devel libsigc++-devel libmagick-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="vector-based drawing program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://inkscape.org/"
@@ -17,18 +19,4 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 # XXX missing libwpg package to support wpg.
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gsl-devel
-Add_dependency build gc-devel
-Add_dependency build gtkmm2-devel
-Add_dependency build libxml2-devel
-Add_dependency build libxslt-devel
-Add_dependency build boost-devel
-Add_dependency build popt-devel
-Add_dependency build lcms-devel
-Add_dependency build libsigc++-devel
-Add_dependency build libmagick-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template
index eb41c4aa16..7c9e3bf299 100644
--- a/srcpkgs/intltool/template
+++ b/srcpkgs/intltool/template
@@ -4,6 +4,7 @@ version=0.50.2
 homepage="https://edge.launchpad.net/intltool"
 distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+fulldepends="perl-XML-Parser gettext"
 short_desc="Toolbox for internationalisation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -27,5 +28,3 @@ long_desc="
  (This is modeled on gettextize.)"
 
 noarch=yes
-Add_dependency full perl-XML-Parser
-Add_dependency full gettext
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index c152f740f2..1569bf85f5 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -3,6 +3,7 @@ pkgname=iproute2
 version=3.3.0
 patch_args="-Np1"
 distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
+makedepends="pkg-config perl>=0 db-devel bison flex libnl-devel iptables-devel"
 short_desc="IP Routing Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.linux-foundation.org/en/Net:Iproute2"
@@ -20,13 +21,6 @@ conf_files="
 /etc/iproute2/rt_scopes
 /etc/iproute2/rt_tables"
 
-Add_dependency build pkg-config
-Add_dependency build perl	">=0"
-Add_dependency build db-devel
-Add_dependency build bison
-Add_dependency build flex
-Add_dependency build libnl-devel
-Add_dependency build iptables-devel
 
 do_build() {
 	sed -i -e "s|\/usr\/local\/lib|\/usr\/libexec|g" configure
diff --git a/srcpkgs/iptables/depends b/srcpkgs/iptables/depends
deleted file mode 100644
index d82b99a617..0000000000
--- a/srcpkgs/iptables/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.7"
-api_depends=">=1.4.12.1_1"
diff --git a/srcpkgs/iptables/iptables-devel.template b/srcpkgs/iptables/iptables-devel.template
index 3e4ecb219e..e002ca63d9 100644
--- a/srcpkgs/iptables/iptables-devel.template
+++ b/srcpkgs/iptables/iptables-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'iptables-devel'.
 #
+depends="iptables>=1.4.13"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run iptables ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template
index df0038d8b7..f95daa355e 100644
--- a/srcpkgs/iptraf-ng/template
+++ b/srcpkgs/iptraf-ng/template
@@ -4,6 +4,7 @@ version=1.1.1
 homepage="https://fedorahosted.org/iptraf-ng/"
 distfiles="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="ncurses-devel"
 short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -28,4 +29,3 @@ long_desc="
  can be used on a wide variety of supported network cards."
 
 make_dirs="/var/lock/$pkgname 0750 root root"
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 8137a8e389..92e1bc52ea 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,6 +6,8 @@ patch_args="-Np1"
 wrksrc="${pkgname}-s${version}"
 homepage="http://www.skbuff.net/iputils"
 distfiles="http://www.skbuff.net/iputils/${pkgname}-s${version}.tar.bz2"
+makedepends="openssl-devel libcap-devel libidn-devel"
+fulldepends="libcap-progs"
 short_desc="IP Configuration Utilities (and ping)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -14,10 +16,6 @@ long_desc="
  The iputils package is set of small useful utilities for Linux networking.
  It was originally maintained by Alexey Kuznetsov."
 
-Add_dependency build openssl-devel
-Add_dependency build libcap-devel
-Add_dependency build libidn-devel
-Add_dependency full libcap-progs
 
 do_build() {
 	make ${makejobs} \
diff --git a/srcpkgs/irssi/irssi-devel.template b/srcpkgs/irssi/irssi-devel.template
index 17f05ce49a..70c323bf66 100644
--- a/srcpkgs/irssi/irssi-devel.template
+++ b/srcpkgs/irssi/irssi-devel.template
@@ -1,17 +1,12 @@
 # Template file for 'irssi-devel'.
 #
+depends="perl pkg-config glib-devel openssl-devel ncurses-devel irssi"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run perl
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run openssl-devel
-Add_dependency run ncurses-devel
-Add_dependency run irssi
 
 do_install()
 {
diff --git a/srcpkgs/irssi/irssi-perl.template b/srcpkgs/irssi/irssi-perl.template
index f7bf0947ec..0b688cd2db 100644
--- a/srcpkgs/irssi/irssi-perl.template
+++ b/srcpkgs/irssi/irssi-perl.template
@@ -1,5 +1,6 @@
 # Template file for 'irssi-perl'.
 #
+depends="irssi"
 short_desc="${sourcepkg} perl support"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  irssi package, and related perl scripts included."
 
 
-Add_dependency run irssi
 
 do_install()
 {
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 2fcccc68ac..1165df58e9 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -5,6 +5,8 @@ revision=4
 distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2"
 configure_args="--with-proxy --with-perl=module"
 build_style=gnu-configure
+depends="zlib"
+makedepends="perl pkg-config zlib-devel glib-devel openssl-devel ncurses-devel"
 short_desc="Secure and modular IRC client with text mode user interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
@@ -18,11 +20,4 @@ long_desc="
 conf_files="/etc/irssi.conf"
 subpackages="irssi-devel irssi-perl"
 
-Add_dependency run zlib
 
-Add_dependency build perl
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build glib-devel
-Add_dependency build openssl-devel
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template
index 6f3771c0ae..e30fbde6ed 100644
--- a/srcpkgs/itstool/template
+++ b/srcpkgs/itstool/template
@@ -4,6 +4,7 @@ version=1.1.2
 homepage="http://itstool.org/"
 distfiles="http://files.itstool.org/itstool/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="python>=0 libxml2-python>=0"
 short_desc="ITS Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -14,5 +15,3 @@ long_desc="
  translate and how to separate it into PO file messages."
 
 noarch=yes
-Add_dependency run python ">=0"
-Add_dependency run libxml2-python ">=0"
diff --git a/srcpkgs/jack/depends b/srcpkgs/jack/depends
deleted file mode 100644
index 9f3365cd35..0000000000
--- a/srcpkgs/jack/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.9.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/jack/jack-devel.template b/srcpkgs/jack/jack-devel.template
index 5e267d68d6..077efc785c 100644
--- a/srcpkgs/jack/jack-devel.template
+++ b/srcpkgs/jack/jack-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'jack-devel'.
 #
+depends="libsamplerate-devel alsa-lib-devel libsndfile-devel celt-devel libjack"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libsamplerate-devel
-Add_dependency run alsa-lib-devel
-Add_dependency run libsndfile-devel
-Add_dependency run celt-devel
-Add_dependency run libjack
 
 do_install()
 {
diff --git a/srcpkgs/jack/libjack.template b/srcpkgs/jack/libjack.template
index 7c451c52b6..d1a40bf874 100644
--- a/srcpkgs/jack/libjack.template
+++ b/srcpkgs/jack/libjack.template
@@ -1,11 +1,11 @@
 # Template file for 'libjack'.
 #
+depends="dbus-libs"
 short_desc="${short_desc} (Runtime library)"
 long_desc="${long_desc}
 
  This package contains the JACK runtime lib(s)."
 
-Add_dependency run dbus-libs
 
 do_install()
 {
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 81f68e8632..f6c796e436 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -6,6 +6,7 @@ build_style=waf
 configure_args="--alsa --classic --dbus"
 homepage="http://jackaudio.org/"
 distfiles="http://www.grame.fr/~letz/${pkgname}-${version}.tgz"
+makedepends="python pkg-config libstdc++-devel glibc-devel libsamplerate-devel readline-devel ncurses-devel alsa-lib-devel dbus-devel expat-devel libsndfile-devel celt-devel"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, LGPL-2.1"
@@ -28,18 +29,6 @@ subpackages="lib$pkgname $pkgname-devel"
 
 # XXX libffado (firewire)
 
-Add_dependency build python
-Add_dependency build pkg-config
-Add_dependency build libstdc++-devel
-Add_dependency build glibc-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build readline-devel
-Add_dependency build ncurses-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build dbus-devel
-Add_dependency build expat-devel
-Add_dependency build libsndfile-devel
-Add_dependency build celt-devel
 
 post_install()
 {
diff --git a/srcpkgs/jasper/depends b/srcpkgs/jasper/depends
deleted file mode 100644
index 54a71bf9cb..0000000000
--- a/srcpkgs/jasper/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.900.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/jasper/jasper-devel.template b/srcpkgs/jasper/jasper-devel.template
index deeff22095..b7a8727f94 100644
--- a/srcpkgs/jasper/jasper-devel.template
+++ b/srcpkgs/jasper/jasper-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'jasper-devel'.
 #
+depends="jpeg-devel libjasper"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run jpeg-devel
-Add_dependency run libjasper
 
 do_install()
 {
diff --git a/srcpkgs/jasper/template b/srcpkgs/jasper/template
index 41d24c5b25..56772711db 100644
--- a/srcpkgs/jasper/template
+++ b/srcpkgs/jasper/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="http://www.ece.uvic.ca/~mdadams/jasper/software/$pkgname-$version.zip"
 build_style=gnu-configure
 configure_args="--enable-shared --without-x --disable-opengl"
+makedepends="unzip jpeg-devel"
 short_desc="Software-based reference implementation of the JPEG-2000 codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
@@ -17,5 +18,3 @@ long_desc="
  Part-5 standard (as an official reference implementation)."
 
 subpackages="libjasper $pkgname-devel"
-Add_dependency build unzip
-Add_dependency build jpeg-devel
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index b11be22ae6..a8b8f9c734 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -5,6 +5,7 @@ _jumbover=5
 wrksrc=${pkgname}-${version}-jumbo-${_jumbover}
 homepage="http://www.openwall.com/john/"
 distfiles="$homepage/g/$pkgname-${version}-jumbo-${_jumbover}.tar.bz2"
+makedepends="openssl-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,7 +23,6 @@ long_desc="
 
 conf_files="/etc/john/john.conf"
 
-Add_dependency build openssl-devel
 
 do_build() {
 	sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS += -c -Wall -DJOHN_SYSTEMWIDE=1|' src/Makefile
diff --git a/srcpkgs/jpeg/depends b/srcpkgs/jpeg/depends
deleted file mode 100644
index c3243b1352..0000000000
--- a/srcpkgs/jpeg/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/jpeg/jpeg-devel.template b/srcpkgs/jpeg/jpeg-devel.template
index 05d93a5ba1..0279635f34 100644
--- a/srcpkgs/jpeg/jpeg-devel.template
+++ b/srcpkgs/jpeg/jpeg-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'jpeg-devel'.
 #
+depends="glibc-devel jpeg>=8d"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
 
 replaces="jpeg-devel>=0"
 
-Add_dependency run glibc-devel
-Add_dependency run jpeg ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template
index 5f94090edf..7d45849cb1 100644
--- a/srcpkgs/jre/template
+++ b/srcpkgs/jre/template
@@ -14,6 +14,8 @@ else
 	checksum=814bbbdb4c73b11c213de9543c821854b1ff18d2d8d45ae8d8cbeacab9b03c70
 fi
 
+makedepends="libXrender-devel libXtst-devel alsa-lib-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info"
 short_desc="Oracle's Java Runtime Environment (JRE) - Version 7, Update 3"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
@@ -32,14 +34,7 @@ gtk_iconcache_dirs="
 /usr/share/icons/HighContrast
 /usr/share/icons/LowContrast"
 
-Add_dependency build libXrender-devel
-Add_dependency build libXtst-devel
-Add_dependency build alsa-lib-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
-Add_dependency full xdg-utils
-Add_dependency full shared-mime-info
 
 wrksrc=jre${_extraversion}
 
diff --git a/srcpkgs/js/depends b/srcpkgs/js/depends
deleted file mode 100644
index 85965620db..0000000000
--- a/srcpkgs/js/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.8.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/js/js-devel.template b/srcpkgs/js/js-devel.template
index 8695f110f1..d24482e95d 100644
--- a/srcpkgs/js/js-devel.template
+++ b/srcpkgs/js/js-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gjs-devel'.
 #
+depends="nspr-devel js"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run nspr-devel
-Add_dependency run js
 
 do_install()
 {
diff --git a/srcpkgs/js/template b/srcpkgs/js/template
index 53f85e0f65..02a15debc9 100644
--- a/srcpkgs/js/template
+++ b/srcpkgs/js/template
@@ -6,6 +6,7 @@ distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz"
 build_style=gnu-configure
 configure_args="--with-system-nspr --enable-threadsafe"
 revision=3
+makedepends="zip python perl>=0 nspr-devel"
 short_desc="Spidermonkey JavaScript interpreter and library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
@@ -16,7 +17,3 @@ long_desc="
 
 subpackages="js-devel"
 
-Add_dependency build zip
-Add_dependency build python
-Add_dependency build perl ">=0"
-Add_dependency build nspr-devel
diff --git a/srcpkgs/json-c/depends b/srcpkgs/json-c/depends
deleted file mode 100644
index 1e7ac30399..0000000000
--- a/srcpkgs/json-c/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/json-c/json-c-devel.template b/srcpkgs/json-c/json-c-devel.template
index b2a4d7b403..b23d978327 100644
--- a/srcpkgs/json-c/json-c-devel.template
+++ b/srcpkgs/json-c/json-c-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'json-c-devel'.
 #
+depends="json-c"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run json-c
 
 do_install()
 {
diff --git a/srcpkgs/json-glib/depends b/srcpkgs/json-glib/depends
deleted file mode 100644
index f67f5dc955..0000000000
--- a/srcpkgs/json-glib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.12.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/json-glib/json-glib-devel.template b/srcpkgs/json-glib/json-glib-devel.template
index 0b977adc09..8bbaaf65ae 100644
--- a/srcpkgs/json-glib/json-glib-devel.template
+++ b/srcpkgs/json-glib/json-glib-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'json-glib-devel'.
 #
+depends="glib-devel json-glib"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run json-glib
 
 do_install()
 {
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index eb7d326f3b..8d62e6993a 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -5,6 +5,7 @@ revision=4
 distfiles="${GNOME_SITE}/${pkgname}/0.14/${pkgname}-${version}.tar.xz"
 configure_args="--enable-static --with-pic=yes"
 build_style=gnu-configure
+makedepends="pkg-config glib-devel gobject-introspection"
 short_desc="A JSON parser for GLib-based libraries and applications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/JsonGlib"
@@ -19,6 +20,3 @@ long_desc="
  GObject instances to and from JSON data types."
 
 subpackages="${pkgname}-devel"
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index 635b4df9fb..1b63939b58 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -7,6 +7,7 @@ distfiles="${KERNEL_SITE}/utils/kbd/kbd-$version.tar.bz2"
 build_style=configure
 configure_args="--prefix=/usr --datadir=/usr/share/kbd
 --localedir=/usr/share/kbd/locale --mandir=/usr/share/man"
+makedepends="flex"
 short_desc="Linux keyboard utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,7 +16,6 @@ long_desc="
  This package allows you to set up the Linux console, change the font,
  resize text mode virtual consoles and remap the keyboard."
 
-Add_dependency build flex
 
 post_install() {
 	# Remove olpc keymaps, they conflict with qwerty ones!
diff --git a/srcpkgs/kernel-manpages/template b/srcpkgs/kernel-manpages/template
index 333cabbf7b..265b0a1d06 100644
--- a/srcpkgs/kernel-manpages/template
+++ b/srcpkgs/kernel-manpages/template
@@ -6,14 +6,13 @@ wrksrc=linux-${version}
 homepage="http://www.kernel.org"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
 checksum=9db97d45638017e6dfaed768cfa9f47533c9c9fb3538bce0e594d9feff5489b4
+makedepends="perl>=0 xmlto"
 short_desc="${pkgname} development manual pages"
 long_desc="
  This package contains manual pages for developping for the Linux kernel."
 
 noarch=yes
 
-Add_dependency build perl ">=0"
-Add_dependency build xmlto
 
 do_build() {
 	make ${makejobs} mandocs
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 4119da76dd..50f4d3b1b5 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -11,6 +11,8 @@ distfiles="http://www.kernel.org/pub/linux//kernel/v3.0/testing/linux-${_kmajor}
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
+depends="glibc initramfs-tools linux-firmware module-init-tools"
+makedepends="perl>=0 kmod"
 short_desc="The Linux kernel and modules (testing snapshot)"
 long_desc="
  This package provides the linux kernel image and associated modules
@@ -40,12 +42,6 @@ mutable_files="
 /lib/modules/${_kernver}/modules.alias
 /lib/modules/${_kernver}/modules.alias.bin"
 
-Add_dependency run glibc
-Add_dependency run initramfs-tools
-Add_dependency run linux-firmware
-Add_dependency run module-init-tools
-Add_dependency build perl	">=0"
-Add_dependency build kmod
 
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
diff --git a/srcpkgs/kernel-uml/template b/srcpkgs/kernel-uml/template
index 836a202f12..247b711c71 100644
--- a/srcpkgs/kernel-uml/template
+++ b/srcpkgs/kernel-uml/template
@@ -6,6 +6,8 @@ wrksrc=linux-${version}
 homepage="http://www.kernel.org"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
 checksum=9db97d45638017e6dfaed768cfa9f47533c9c9fb3538bce0e594d9feff5489b4
+makedepends="perl>=0 libpcap-devel"
+fulldepends="uml-utilities"
 short_desc="Kernel ${version} for User Mode Linux"
 long_desc="
  User-mode Linux (UML) is a port of the Linux kernel to its own system call
@@ -16,9 +18,6 @@ long_desc="
  This package contains the kernel itself, as an executable program, and the
  associated kernel modules."
 
-Add_dependency build perl ">=0"
-Add_dependency build libpcap-devel
-Add_dependency full uml-utilities
 
 do_build() {
 	make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs}
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index f3669e70d7..f359f3dd1d 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -9,6 +9,8 @@ checksum=7a93d6c032826b1cad40fdf339596f1d86abd1d5d30b78c9eed5e5136a1f82ab
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
+depends="initramfs-tools linux-firmware module-init-tools"
+makedepends="perl kmod"
 short_desc="The Linux kernel and modules"
 long_desc="
  This package provides the linux kernel image and associated modules."
@@ -37,11 +39,6 @@ mutable_files="
 /lib/modules/${_kernver}/modules.alias
 /lib/modules/${_kernver}/modules.alias.bin"
 
-Add_dependency run initramfs-tools
-Add_dependency run linux-firmware
-Add_dependency run module-init-tools
-Add_dependency build perl
-Add_dependency build kmod
 
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
diff --git a/srcpkgs/keychain/template b/srcpkgs/keychain/template
index 0083ae0332..bfd5e13689 100644
--- a/srcpkgs/keychain/template
+++ b/srcpkgs/keychain/template
@@ -2,6 +2,8 @@
 pkgname=keychain
 version=2.7.1
 distfiles="http://www.funtoo.org/archive/$pkgname/$pkgname-$version.tar.bz2"
+depends="dash"
+makedepends="perl"
 short_desc="keychain manager for ssh-agent and gpg-agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.funtoo.org/wiki/Keychain"
@@ -13,8 +15,6 @@ long_desc="
  one long running ssh-agent process per system, rather than the norm of one 
  ssh-agent per login session."
 
-Add_dependency run dash
-Add_dependency build perl
 
 do_build()
 {
diff --git a/srcpkgs/keyutils/depends b/srcpkgs/keyutils/depends
deleted file mode 100644
index bd0fc44696..0000000000
--- a/srcpkgs/keyutils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.5.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/keyutils/keyutils-devel.template b/srcpkgs/keyutils/keyutils-devel.template
index 92ba967b08..222666f0fe 100644
--- a/srcpkgs/keyutils/keyutils-devel.template
+++ b/srcpkgs/keyutils/keyutils-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'keyutils-devel'.
 #
+depends="libkeyutils>=1.5.5"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libkeyutils ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/kmod/depends b/srcpkgs/kmod/depends
deleted file mode 100644
index af8c93d16e..0000000000
--- a/srcpkgs/kmod/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/kmod/libkmod-devel.template b/srcpkgs/kmod/libkmod-devel.template
index cebd782c25..c8dfaf0b0d 100644
--- a/srcpkgs/kmod/libkmod-devel.template
+++ b/srcpkgs/kmod/libkmod-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libkmod-devel'.
 #
+depends="zlib-devel libkmod"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains the files needed for developing applications
  that use libkmod."
 
-Add_dependency run zlib-devel
-Add_dependency run libkmod
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index ecf9c6d6bd..ed720f19a3 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -5,6 +5,7 @@ homepage="http://git.profusion.mobi/cgit.cgi/kmod.git"
 distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
 build_style=gnu-configure
 configure_args="--with-rootprefix= --with-zlib --with-xz"
+makedepends="pkg-config zlib-devel liblzma-devel"
 short_desc="Linux kernel module handling"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -25,9 +26,6 @@ make_dirs="
 /lib/depmod.d 0755 root root
 /lib/modprobe.d 0755 root root"
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build liblzma-devel
 
 post_install() {
 	vinstall ${FILESDIR}/depmod-search.conf 644 lib/depmod.d search.conf
diff --git a/srcpkgs/kyua/template b/srcpkgs/kyua/template
index 712c22aba3..4fb6ad9dbe 100644
--- a/srcpkgs/kyua/template
+++ b/srcpkgs/kyua/template
@@ -6,6 +6,7 @@ wrksrc="kyua-cli-${version}"
 homepage="http://code.google.com/p/kyua"
 distfiles="https://kyua.googlecode.com/files/kyua-cli-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config doxygen atf-devel lutok-devel sqlite-devel"
 short_desc="Automated Testing Framework (a replacement for ATF)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -17,8 +18,3 @@ long_desc="
  run the tests themselves, and Kyua ensures that they can do so in the most
  convenient way."
 
-Add_dependency build pkg-config
-Add_dependency build doxygen
-Add_dependency build atf-devel
-Add_dependency build lutok-devel
-Add_dependency build sqlite-devel
diff --git a/srcpkgs/ladspa-sdk/ladspa-sdk-docs.template b/srcpkgs/ladspa-sdk/ladspa-sdk-docs.template
index d2df4fd57b..3cc085902f 100644
--- a/srcpkgs/ladspa-sdk/ladspa-sdk-docs.template
+++ b/srcpkgs/ladspa-sdk/ladspa-sdk-docs.template
@@ -1,5 +1,6 @@
 # Template file for 'ladspa-sdk-docs'.
 #
+depends="ladspa-sdk"
 short_desc="${short_desc} (Documentation)"
 long_desc="${long_desc}
 
@@ -9,7 +10,6 @@ long_desc="${long_desc}
 
 noarch=yes
 
-Add_dependency run ladspa-sdk
 
 do_install()
 {
diff --git a/srcpkgs/ladspa-sdk/template b/srcpkgs/ladspa-sdk/template
index bae47a4a05..46b46e5973 100644
--- a/srcpkgs/ladspa-sdk/template
+++ b/srcpkgs/ladspa-sdk/template
@@ -3,6 +3,7 @@ pkgname=ladspa-sdk
 version=1.13
 revision=2
 distfiles="http://www.ladspa.org/download/ladspa_sdk.tgz"
+makedepends="libsndfile-progs libstdc++"
 short_desc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.ladspa.org/"
@@ -24,8 +25,6 @@ noarch=yes
 
 wrksrc=ladspa_sdk
 
-Add_dependency build libsndfile-progs
-Add_dependency build libstdc++
 
 do_build()
 {
diff --git a/srcpkgs/lame/depends b/srcpkgs/lame/depends
deleted file mode 100644
index 3e37215ff5..0000000000
--- a/srcpkgs/lame/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.98.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lame/lame-devel.template b/srcpkgs/lame/lame-devel.template
index 12f09d95a2..83f9511366 100644
--- a/srcpkgs/lame/lame-devel.template
+++ b/srcpkgs/lame/lame-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'lame-devel'.
 #
+depends="lame"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run lame
 
 do_install()
 {
diff --git a/srcpkgs/lame/template b/srcpkgs/lame/template
index baff716b5f..c0820a9861 100644
--- a/srcpkgs/lame/template
+++ b/srcpkgs/lame/template
@@ -5,6 +5,7 @@ homepage="http://lame.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/lame/lame-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-nasm --enable-shared"
+makedepends="nasm ncurses-devel"
 short_desc="Fast, high quality MP3 encoder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -26,5 +27,3 @@ long_desc="
  project."
 
 subpackages="$pkgname-devel"
-Add_dependency build nasm
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/latencytop/template b/srcpkgs/latencytop/template
index 441c4fe5fb..eff73f6473 100644
--- a/srcpkgs/latencytop/template
+++ b/srcpkgs/latencytop/template
@@ -4,6 +4,7 @@ version=0.5
 homepage="http://www.latencytop.org"
 distfiles="http://www.latencytop.org/download/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
+makedepends="pkg-config gtk+-devel ncurses-devel"
 short_desc="Measuring and fixing Linux latency"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,9 +19,6 @@ long_desc="
  operation/action is causing the latency to happen so that the code can be changed
  to avoid the worst latency hiccups."
 
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build ncurses-devel
 
 pre_install() {
 	vmkdir usr/sbin
diff --git a/srcpkgs/lbreakout2/template b/srcpkgs/lbreakout2/template
index 709392413a..7fb5af6515 100644
--- a/srcpkgs/lbreakout2/template
+++ b/srcpkgs/lbreakout2/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--disable-rpath --enable-sdl-net
 /games/$pkgname"
 make_install_args="doc_dir=/usr/share/doc"
+depends="glibc zlib libpng SDL SDL_mixer SDL_net"
+makedepends="zlib-devel libpng-devel SDL-devel SDL_mixer-devel SDL_net-devel"
 short_desc="Breakout-style arcade game"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3f58eb2dc657572a22103c836277e653d47bf22453355ee1e3b531a72579d616
@@ -19,17 +21,6 @@ long_desc="
  And if you're through with all the levels you can create complete new
  levelsets with the integrated easy-to-use level editor!"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libpng
-Add_dependency run SDL
-Add_dependency run SDL_mixer
-Add_dependency run SDL_net
-Add_dependency build zlib-devel
-Add_dependency build libpng-devel
-Add_dependency build SDL-devel
-Add_dependency build SDL_mixer-devel
-Add_dependency build SDL_net-devel
 
 post_install()
 {
diff --git a/srcpkgs/lcms/depends b/srcpkgs/lcms/depends
deleted file mode 100644
index 27bbe1afc5..0000000000
--- a/srcpkgs/lcms/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.18"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lcms/lcms-devel.template b/srcpkgs/lcms/lcms-devel.template
index 8dbc96849f..2f93f783fe 100644
--- a/srcpkgs/lcms/lcms-devel.template
+++ b/srcpkgs/lcms/lcms-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'lcms-devel'.
 #
+depends="glibc-devel jpeg-devel tiff-devel lcms"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run jpeg-devel
-Add_dependency run tiff-devel
-Add_dependency run lcms
 
 do_install()
 {
diff --git a/srcpkgs/lcms/template b/srcpkgs/lcms/template
index 30934c786a..83d185dfd4 100644
--- a/srcpkgs/lcms/template
+++ b/srcpkgs/lcms/template
@@ -5,6 +5,7 @@ revision=6
 wrksrc=${pkgname}-${version%[a-z]*}
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
+makedepends="glibc-devel jpeg-devel tiff-devel"
 short_desc="Light Color Management System -- a color management library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
@@ -19,6 +20,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build glibc-devel
-Add_dependency build jpeg-devel
-Add_dependency build tiff-devel
diff --git a/srcpkgs/lcms2/depends b/srcpkgs/lcms2/depends
deleted file mode 100644
index 8a68c701ce..0000000000
--- a/srcpkgs/lcms2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lcms2/lcms2-devel.template b/srcpkgs/lcms2/lcms2-devel.template
index dc0fbd83f0..f7eb0df14d 100644
--- a/srcpkgs/lcms2/lcms2-devel.template
+++ b/srcpkgs/lcms2/lcms2-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'lcms-devel'.
 #
+depends="tiff-devel lcms2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run tiff-devel
-Add_dependency run lcms2
 
 do_install()
 {
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 0c6d33dba3..8761d807c4 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -4,6 +4,7 @@ version=2.2
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="tiff-devel"
 short_desc="Small-footprint color management engine, version 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.littlecms.com"
@@ -18,4 +19,3 @@ long_desc="
  printers."
 
 subpackages="$pkgname-devel"
-Add_dependency build tiff-devel
diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 512856d2be..325cfca562 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -6,6 +6,7 @@ distfiles="$homepage/less-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-regex=pcre"
 revision=1
+makedepends="ncurses-devel pcre-devel"
 short_desc="Pager program similar to more(1)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -18,5 +19,3 @@ long_desc="
  termcap (or terminfo on some systems), so it can run on a variety of
  terminals.  There is even limited support for hardcopy terminals."
 
-Add_dependency build ncurses-devel
-Add_dependency build pcre-devel
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index ba0451842d..206d01105a 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -5,6 +5,7 @@ distfiles="http://ftp.yars.free.net/pub/source/lftp/lftp-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
 --with-openssl"
+makedepends="ncurses-devel readline-devel openssl-devel expat-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://lftp.yar.ru/"
@@ -18,7 +19,3 @@ long_desc="
 
 conf_files="/etc/lftp.conf"
 
-Add_dependency build ncurses-devel
-Add_dependency build readline-devel
-Add_dependency build openssl-devel
-Add_dependency build expat-devel
diff --git a/srcpkgs/lftpfs/template b/srcpkgs/lftpfs/template
index 1c1acb27a7..11f8b0ea30 100644
--- a/srcpkgs/lftpfs/template
+++ b/srcpkgs/lftpfs/template
@@ -3,6 +3,7 @@ pkgname=lftpfs
 version=0.4.3
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-Fuse perl-IPC-Run lftp"
 short_desc="Filesystem with caching based on FUSE and LFTP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://lftpfs.sourceforge.net/"
@@ -22,9 +23,6 @@ long_desc="
 "
 
 noarch=yes
-Add_dependency full perl-Fuse
-Add_dependency full perl-IPC-Run
-Add_dependency full lftp
 
 post_install()
 {
diff --git a/srcpkgs/libICE/depends b/srcpkgs/libICE/depends
deleted file mode 100644
index 66a8f8ac96..0000000000
--- a/srcpkgs/libICE/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libICE/libICE-devel.template b/srcpkgs/libICE/libICE-devel.template
index 4bd5aa4a8d..09911d576c 100644
--- a/srcpkgs/libICE/libICE-devel.template
+++ b/srcpkgs/libICE/libICE-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libICE-devel'.
 #
+depends="xtrans xproto libICE"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xtrans
-Add_dependency run xproto
-Add_dependency run libICE
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template
index e5cd5ae3e4..88b9d88470 100644
--- a/srcpkgs/libICE/template
+++ b/srcpkgs/libICE/template
@@ -4,6 +4,7 @@ version=1.0.8
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xtrans xproto"
 short_desc="Inter Client Exchange (ICE) library for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -15,6 +16,3 @@ long_desc="
  This is part of modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xtrans
-Add_dependency build xproto
diff --git a/srcpkgs/libIDL/depends b/srcpkgs/libIDL/depends
deleted file mode 100644
index eacf465f5b..0000000000
--- a/srcpkgs/libIDL/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.13"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libIDL/libIDL-devel.template b/srcpkgs/libIDL/libIDL-devel.template
index 5a772cb870..a9b8b446d0 100644
--- a/srcpkgs/libIDL/libIDL-devel.template
+++ b/srcpkgs/libIDL/libIDL-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libIDL-devel'.
 #
+depends="libIDL"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libIDL
 
 do_install()
 {
diff --git a/srcpkgs/libIDL/template b/srcpkgs/libIDL/template
index b00e772b3e..5ec1ac9d40 100644
--- a/srcpkgs/libIDL/template
+++ b/srcpkgs/libIDL/template
@@ -4,6 +4,7 @@ version=0.8.13
 revision=3
 distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config flex glib-devel"
 short_desc="CORBA Interface Definition Language parser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71
@@ -31,6 +32,3 @@ long_desc="
  generate meaningful errors and warnings for invalid or deprecated IDL."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build glib-devel
diff --git a/srcpkgs/libSM/depends b/srcpkgs/libSM/depends
deleted file mode 100644
index 7d08e28214..0000000000
--- a/srcpkgs/libSM/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libSM/libSM-devel.template b/srcpkgs/libSM/libSM-devel.template
index 16670bfdbb..95359bfd65 100644
--- a/srcpkgs/libSM/libSM-devel.template
+++ b/srcpkgs/libSM/libSM-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libSM-devel'.
 #
+depends="xproto libICE-devel libSM"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libICE-devel
-Add_dependency run libSM
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index 6ab6969683..8d9e9d3205 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -4,6 +4,7 @@ version=1.2.1
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xtrans libuuid-devel libICE-devel"
 short_desc="X Session Management Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -13,7 +14,3 @@ long_desc="
  Management Library. This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xtrans
-Add_dependency build libuuid-devel
-Add_dependency build libICE-devel
diff --git a/srcpkgs/libX11/depends b/srcpkgs/libX11/depends
deleted file mode 100644
index d53122dc9d..0000000000
--- a/srcpkgs/libX11/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2"
-api_depends=">=1.4.99.1" # required by xinput 2.2
diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index 0573773cc3..44716d8c1e 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libX11-devel'.
 #
+depends="xproto kbproto libxcb-devel libX11"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run kbproto
-Add_dependency run libxcb-devel
-Add_dependency run libX11
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 67c216b0d5..92568ac3ef 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -5,6 +5,7 @@ distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
 --disable-secure-rpc --enable-loadable-i18n"
+makedepends="pkg-config xproto>=7.0.23 xextproto xtrans xcmiscproto kbproto bigreqsproto inputproto>=2.2 xf86bigfontproto libxcb-devel"
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -17,16 +18,6 @@ long_desc="
  This is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto	">=7.0.23"
-Add_dependency build xextproto
-Add_dependency build xtrans
-Add_dependency build xcmiscproto
-Add_dependency build kbproto
-Add_dependency build bigreqsproto
-Add_dependency build inputproto	">=2.2"
-Add_dependency build xf86bigfontproto
-Add_dependency build libxcb-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/libXScrnSaver/depends b/srcpkgs/libXScrnSaver/depends
deleted file mode 100644
index c4deeecfc6..0000000000
--- a/srcpkgs/libXScrnSaver/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXScrnSaver/libXScrnSaver-devel.template b/srcpkgs/libXScrnSaver/libXScrnSaver-devel.template
index 5b882d98d3..d284d6abbc 100644
--- a/srcpkgs/libXScrnSaver/libXScrnSaver-devel.template
+++ b/srcpkgs/libXScrnSaver/libXScrnSaver-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libXScrnSaver-devel'.
 #
+depends="scrnsaverproto libX11-devel libXext-devel libXScrnSaver"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run scrnsaverproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXScrnSaver
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXScrnSaver/template b/srcpkgs/libXScrnSaver/template
index 8c3b8ad51c..2648e2773f 100644
--- a/srcpkgs/libXScrnSaver/template
+++ b/srcpkgs/libXScrnSaver/template
@@ -4,6 +4,7 @@ version=1.2.2
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xextproto scrnsaverproto libX11-devel libXext-devel"
 short_desc="X11 Screen Saver Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -13,8 +14,3 @@ long_desc="
  This is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xextproto
-Add_dependency build scrnsaverproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXau/depends b/srcpkgs/libXau/depends
deleted file mode 100644
index dc58176dfd..0000000000
--- a/srcpkgs/libXau/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXau/libXau-devel.template b/srcpkgs/libXau/libXau-devel.template
index c0262509da..0aab0306c9 100644
--- a/srcpkgs/libXau/libXau-devel.template
+++ b/srcpkgs/libXau/libXau-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libXau-devel'.
 #
+depends="xproto libXau"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run xproto
-Add_dependency run libXau
 
 do_install()
 {
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 51ca8aacd9..6d473ff9da 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -4,6 +4,7 @@ version=1.0.5
 revision=3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto"
 short_desc="Authorization Protocol for X from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
@@ -12,5 +13,3 @@ long_desc="
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
diff --git a/srcpkgs/libXaw/depends b/srcpkgs/libXaw/depends
deleted file mode 100644
index 66a8f8ac96..0000000000
--- a/srcpkgs/libXaw/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXaw/libXaw-devel.template b/srcpkgs/libXaw/libXaw-devel.template
index ff71522d86..593dd31c4b 100644
--- a/srcpkgs/libXaw/libXaw-devel.template
+++ b/srcpkgs/libXaw/libXaw-devel.template
@@ -1,21 +1,11 @@
 # Template file for 'libXaw-devel'.
 #
+depends="pkg-config xproto xextproto libICE-devel libSM-devel libX11-devel libXext-devel libXt-devel libXmu-devel libXpm-devel libXaw"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run xextproto
-Add_dependency run libICE-devel
-Add_dependency run libSM-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXt-devel
-Add_dependency run libXmu-devel
-Add_dependency run libXpm-devel
-Add_dependency run libXaw
 
 do_install()
 {
diff --git a/srcpkgs/libXaw/template b/srcpkgs/libXaw/template
index b466edd0d8..8b5dcf50f3 100644
--- a/srcpkgs/libXaw/template
+++ b/srcpkgs/libXaw/template
@@ -5,6 +5,7 @@ distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-xmlto"
 revision=3
+makedepends="pkg-config xproto xextproto libICE-devel libSM-devel libX11-devel libXext-devel libXt-devel libXmu-devel libXpm-devel"
 short_desc="X Athena Widgets Library from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
@@ -15,13 +16,3 @@ long_desc="
  This libXaw is from the modular Xorg X11."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build libICE-devel
-Add_dependency build libSM-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXt-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXpm-devel
diff --git a/srcpkgs/libXcomposite/depends b/srcpkgs/libXcomposite/depends
deleted file mode 100644
index 7855591013..0000000000
--- a/srcpkgs/libXcomposite/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXcomposite/libXcomposite-devel.template b/srcpkgs/libXcomposite/libXcomposite-devel.template
index 77631e86f3..7a29d41dfe 100644
--- a/srcpkgs/libXcomposite/libXcomposite-devel.template
+++ b/srcpkgs/libXcomposite/libXcomposite-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'libXcomposite-devel'.
 #
+depends="pkg-config xproto fixesproto compositeproto libX11-devel libXfixes-devel libXcomposite"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run fixesproto
-Add_dependency run compositeproto
-Add_dependency run libX11-devel
-Add_dependency run libXfixes-devel
-Add_dependency run libXcomposite
 
 do_install()
 {
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 11bc5e4d7b..3e3eb4ce6a 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -4,6 +4,7 @@ version=0.4.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config xproto fixesproto compositeproto libX11-devel libXfixes-devel"
 short_desc="X Composite Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
@@ -13,9 +14,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build fixesproto
-Add_dependency build compositeproto
-Add_dependency build libX11-devel
-Add_dependency build libXfixes-devel
diff --git a/srcpkgs/libXcursor/depends b/srcpkgs/libXcursor/depends
deleted file mode 100644
index 68ae22f7f6..0000000000
--- a/srcpkgs/libXcursor/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXcursor/libXcursor-devel.template b/srcpkgs/libXcursor/libXcursor-devel.template
index 004e1e01b5..daef5074ff 100644
--- a/srcpkgs/libXcursor/libXcursor-devel.template
+++ b/srcpkgs/libXcursor/libXcursor-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libXcursor-devel'.
 #
+depends="xproto libXcursor"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libXcursor
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index 7862497da7..ed64884b1c 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -4,6 +4,7 @@ version=1.1.13
 revision=2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config fixesproto>=5.0_1 libXfixes-devel libX11-devel libXrender-devel"
 short_desc="Client-side cursor loading library for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
@@ -17,8 +18,3 @@ long_desc="
  This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build fixesproto ">=5.0_1"
-Add_dependency build libXfixes-devel
-Add_dependency build libX11-devel
-Add_dependency build libXrender-devel
diff --git a/srcpkgs/libXdamage/depends b/srcpkgs/libXdamage/depends
deleted file mode 100644
index 328eed9225..0000000000
--- a/srcpkgs/libXdamage/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXdamage/libXdamage-devel.template b/srcpkgs/libXdamage/libXdamage-devel.template
index 470ae7a2a1..4ff3306a0d 100644
--- a/srcpkgs/libXdamage/libXdamage-devel.template
+++ b/srcpkgs/libXdamage/libXdamage-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'libXdamage-devel'.
 #
+depends="pkg-config xproto damageproto libX11-devel libXfixes-devel libXdamage"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run damageproto
-Add_dependency run libX11-devel
-Add_dependency run libXfixes-devel
-Add_dependency run libXdamage
 
 do_install()
 {
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index 544823d662..fa5794df98 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -4,6 +4,7 @@ version=1.1.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config xproto damageproto libX11-devel libXfixes-devel"
 short_desc="Xdamage extension (Library)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
@@ -11,8 +12,3 @@ long_desc="
  This package contains the Xdamage extension."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build damageproto
-Add_dependency build libX11-devel
-Add_dependency build libXfixes-devel
diff --git a/srcpkgs/libXdmcp/depends b/srcpkgs/libXdmcp/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libXdmcp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXdmcp/libXdmcp-devel.template b/srcpkgs/libXdmcp/libXdmcp-devel.template
index a272bcf957..c00cc80c1c 100644
--- a/srcpkgs/libXdmcp/libXdmcp-devel.template
+++ b/srcpkgs/libXdmcp/libXdmcp-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libXdmcp-devel'.
 #
+depends="xproto libXdmcp"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libXdmcp
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template
index b7fdca79cd..a853b7163c 100644
--- a/srcpkgs/libXdmcp/template
+++ b/srcpkgs/libXdmcp/template
@@ -4,6 +4,7 @@ version=1.1.1
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto"
 short_desc="X Display Manager Control Protocol library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -13,5 +14,3 @@ long_desc="
  from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
diff --git a/srcpkgs/libXevie/depends b/srcpkgs/libXevie/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libXevie/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXevie/libXevie-devel.template b/srcpkgs/libXevie/libXevie-devel.template
index db6cd56a31..6a17e67122 100644
--- a/srcpkgs/libXevie/libXevie-devel.template
+++ b/srcpkgs/libXevie/libXevie-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'libXevie-devel'.
 #
+depends="pkg-config xproto xextproto evieext libX11-devel libXext-devel libXevie"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run xextproto
-Add_dependency run evieext
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXevie
 
 do_install()
 {
diff --git a/srcpkgs/libXevie/template b/srcpkgs/libXevie/template
index 38144ee366..ba299170cd 100644
--- a/srcpkgs/libXevie/template
+++ b/srcpkgs/libXevie/template
@@ -4,6 +4,7 @@ version=1.0.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config xproto xextproto evieext libX11-devel libXext-devel"
 short_desc="X Event Interceptor Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73
@@ -12,9 +13,3 @@ long_desc="
  Interceptor Library. This is from the modular X.org project."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build evieext
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXext/depends b/srcpkgs/libXext/depends
deleted file mode 100644
index a372a53dbf..0000000000
--- a/srcpkgs/libXext/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.5"
-api_depends=">=1.3.0_1"
diff --git a/srcpkgs/libXext/libXext-devel.template b/srcpkgs/libXext/libXext-devel.template
index 4965df4607..54fd9003bc 100644
--- a/srcpkgs/libXext/libXext-devel.template
+++ b/srcpkgs/libXext/libXext-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libXext-devel'.
 #
+depends="xextproto libX11-devel libXext"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xextproto
-Add_dependency run libX11-devel
-Add_dependency run libXext
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template
index 74fd950a27..e7ba67dff0 100644
--- a/srcpkgs/libXext/template
+++ b/srcpkgs/libXext/template
@@ -4,6 +4,7 @@ version=1.3.1
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xextproto libX11-devel"
 short_desc="X Extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -13,6 +14,3 @@ long_desc="
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xextproto
-Add_dependency build libX11-devel
diff --git a/srcpkgs/libXfixes/depends b/srcpkgs/libXfixes/depends
deleted file mode 100644
index 3fa9b8a8d6..0000000000
--- a/srcpkgs/libXfixes/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXfixes/libXfixes-devel.template b/srcpkgs/libXfixes/libXfixes-devel.template
index 7588207a10..fe64154754 100644
--- a/srcpkgs/libXfixes/libXfixes-devel.template
+++ b/srcpkgs/libXfixes/libXfixes-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libXfixes-devel'.
 #
+depends="pkg-config xproto fixesproto libX11-devel libXfixes"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run fixesproto
-Add_dependency run libX11-devel
-Add_dependency run libXfixes
 
 do_install()
 {
diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index e3be8fd6fd..0f1e32752e 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -4,6 +4,7 @@ version=5.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config xproto xextproto fixesproto libX11-devel"
 short_desc="Xfixes library and extension of X RandR from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3
@@ -17,8 +18,3 @@ long_desc="
  X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build fixesproto
-Add_dependency build libX11-devel
diff --git a/srcpkgs/libXfont/depends b/srcpkgs/libXfont/depends
deleted file mode 100644
index fd55a5e347..0000000000
--- a/srcpkgs/libXfont/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXfont/libXfont-devel.template b/srcpkgs/libXfont/libXfont-devel.template
index 229e9dcf0d..77b1fdcf2d 100644
--- a/srcpkgs/libXfont/libXfont-devel.template
+++ b/srcpkgs/libXfont/libXfont-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'libXfont-devel'.
 #
+depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel libXfont"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run fontsproto
-Add_dependency run zlib-devel
-Add_dependency run libfontenc-devel
-Add_dependency run freetype-devel
-Add_dependency run libXfont
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template
index 4517d828eb..7d7efec4e7 100644
--- a/srcpkgs/libXfont/template
+++ b/srcpkgs/libXfont/template
@@ -4,6 +4,7 @@ version=1.4.5
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-devel-docs"
+makedepends="pkg-config xproto xtrans fontcacheproto fontsproto zlib-devel freetype-devel libfontenc-devel"
 short_desc="X font Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -15,14 +16,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xtrans
-Add_dependency build fontcacheproto
-Add_dependency build fontsproto
-Add_dependency build zlib-devel
-Add_dependency build freetype-devel
-Add_dependency build libfontenc-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/libXfontcache/depends b/srcpkgs/libXfontcache/depends
deleted file mode 100644
index 53edd8d9ba..0000000000
--- a/srcpkgs/libXfontcache/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends=">=1.0.4_2" # fontcacheproto rundep added to -devel pkg.
diff --git a/srcpkgs/libXfontcache/libXfontcache-devel.template b/srcpkgs/libXfontcache/libXfontcache-devel.template
index ab0cc16bd4..5c0a88b04b 100644
--- a/srcpkgs/libXfontcache/libXfontcache-devel.template
+++ b/srcpkgs/libXfontcache/libXfontcache-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libXfontcache-devel'.
 #
+depends="fontcacheproto libXfontcache"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run fontcacheproto
-Add_dependency run libXfontcache
 
 do_install()
 {
diff --git a/srcpkgs/libXfontcache/template b/srcpkgs/libXfontcache/template
index 863924d3c0..6ca2f5c106 100644
--- a/srcpkgs/libXfontcache/template
+++ b/srcpkgs/libXfontcache/template
@@ -4,6 +4,7 @@ version=1.0.4
 revision=3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto fontcacheproto libX11-devel libXext-devel"
 short_desc="X-TrueType font cache extension client library "
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
@@ -13,8 +14,3 @@ long_desc="
  This is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build fontcacheproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXft/depends b/srcpkgs/libXft/depends
deleted file mode 100644
index 8bf8955c7e..0000000000
--- a/srcpkgs/libXft/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1.13"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXft/libXft-devel.template b/srcpkgs/libXft/libXft-devel.template
index f24f933a00..8b69106138 100644
--- a/srcpkgs/libXft/libXft-devel.template
+++ b/srcpkgs/libXft/libXft-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libXft-devel'.
 #
+depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libXrender-devel
-Add_dependency run fontconfig-devel
-Add_dependency run freetype-devel
-Add_dependency run libXft
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index af0f44562b..12c5b39950 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -4,6 +4,7 @@ version=2.3.0
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto libX11-devel libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -22,9 +23,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build libX11-devel
-Add_dependency build libXrender-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
diff --git a/srcpkgs/libXi/depends b/srcpkgs/libXi/depends
deleted file mode 100644
index 72cb315a95..0000000000
--- a/srcpkgs/libXi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.1"
-api_depends=">=1.5.99.3" # xinput-2.2
diff --git a/srcpkgs/libXi/libXi-devel.template b/srcpkgs/libXi/libXi-devel.template
index 1466d4d42c..f505bb6b5b 100644
--- a/srcpkgs/libXi/libXi-devel.template
+++ b/srcpkgs/libXi/libXi-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libXi-devel'.
 #
+depends="pkg-config inputproto libX11-devel libXext-devel libXi"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run inputproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXi
 
 do_install()
 {
diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index 5597efaa5c..163212d85b 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -4,6 +4,7 @@ version=1.6.1
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config inputproto>=2.2 libX11-devel libXext-devel xmlto"
 short_desc="X Input extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,8 +17,3 @@ long_desc="
  freedesktop.org."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build inputproto	">=2.2"
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build xmlto
diff --git a/srcpkgs/libXinerama/depends b/srcpkgs/libXinerama/depends
deleted file mode 100644
index 8a3f27e0b7..0000000000
--- a/srcpkgs/libXinerama/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXinerama/libXinerama-devel.template b/srcpkgs/libXinerama/libXinerama-devel.template
index ba17b64a4e..d0513d56df 100644
--- a/srcpkgs/libXinerama/libXinerama-devel.template
+++ b/srcpkgs/libXinerama/libXinerama-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libXinerama-devel'.
 #
+depends="xineramaproto libXext-devel libXinerama"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xineramaproto
-Add_dependency run libXext-devel
-Add_dependency run libXinerama
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template
index fb80ebc0a1..21d8ce9818 100644
--- a/srcpkgs/libXinerama/template
+++ b/srcpkgs/libXinerama/template
@@ -4,6 +4,7 @@ version=1.1.2
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xineramaproto libX11-devel libXext-devel"
 short_desc="X PanoramiX extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,7 +13,3 @@ long_desc="
  libXinerama provides X PanoramiX extension library."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xineramaproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXmu/depends b/srcpkgs/libXmu/depends
deleted file mode 100644
index dc58176dfd..0000000000
--- a/srcpkgs/libXmu/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXmu/libXmu-devel.template b/srcpkgs/libXmu/libXmu-devel.template
index 2397553109..ab3d87afbd 100644
--- a/srcpkgs/libXmu/libXmu-devel.template
+++ b/srcpkgs/libXmu/libXmu-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libXmu-devel'.
 #
+depends="xproto libX11-devel libXext-devel libXt-devel libXmu"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXt-devel
-Add_dependency run libXmu
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXmu/template b/srcpkgs/libXmu/template
index 72c99129e3..d75bd0fa32 100644
--- a/srcpkgs/libXmu/template
+++ b/srcpkgs/libXmu/template
@@ -4,6 +4,7 @@ version=1.1.1
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libX11-devel libXext-devel libXt-devel"
 short_desc="X Miscellaneous Utilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -17,7 +18,3 @@ long_desc="
  This also includes the Mini Xmu library that does not use Xt and Xaw."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXt-devel
diff --git a/srcpkgs/libXp/depends b/srcpkgs/libXp/depends
deleted file mode 100644
index a66f7dfdeb..0000000000
--- a/srcpkgs/libXp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXp/libXp-devel.template b/srcpkgs/libXp/libXp-devel.template
index 30d2875719..b29c9a5563 100644
--- a/srcpkgs/libXp/libXp-devel.template
+++ b/srcpkgs/libXp/libXp-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libXp-devel'.
 #
+depends="libXp"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libXp
 
 do_install()
 {
diff --git a/srcpkgs/libXp/template b/srcpkgs/libXp/template
index cfc9a8ef2e..ff77a08560 100644
--- a/srcpkgs/libXp/template
+++ b/srcpkgs/libXp/template
@@ -4,6 +4,7 @@ version=1.0.0
 revision=3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto xextproto printproto libX11-devel libXext-devel libXau-devel"
 short_desc="X Print Service Extension Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
@@ -15,10 +16,3 @@ long_desc="
  This is from the modular X.org."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build printproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXau-devel
diff --git a/srcpkgs/libXpm/depends b/srcpkgs/libXpm/depends
deleted file mode 100644
index 6b77038e3f..0000000000
--- a/srcpkgs/libXpm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.5.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXpm/libXpm-devel.template b/srcpkgs/libXpm/libXpm-devel.template
index 2f919ebba8..2f0354f62e 100644
--- a/srcpkgs/libXpm/libXpm-devel.template
+++ b/srcpkgs/libXpm/libXpm-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libXpm-devel'.
 #
+depends="libX11-devel libXpm"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libX11-devel
-Add_dependency run libXpm
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXpm/template b/srcpkgs/libXpm/template
index 33baaba8a0..033d2d2587 100644
--- a/srcpkgs/libXpm/template
+++ b/srcpkgs/libXpm/template
@@ -4,6 +4,7 @@ version=3.5.10
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto libICE-devel libSM-devel libX11-devel libXext-devel libXt-devel"
 short_desc="X PixMap Library from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,10 +17,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build libICE-devel
-Add_dependency build libSM-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXt-devel
diff --git a/srcpkgs/libXrandr/depends b/srcpkgs/libXrandr/depends
deleted file mode 100644
index c2fc823f30..0000000000
--- a/srcpkgs/libXrandr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXrandr/libXrandr-devel.template b/srcpkgs/libXrandr/libXrandr-devel.template
index 6db2e8642b..45c8abd6b6 100644
--- a/srcpkgs/libXrandr/libXrandr-devel.template
+++ b/srcpkgs/libXrandr/libXrandr-devel.template
@@ -1,20 +1,12 @@
 # Template file for 'libXrandr-devel'.
 #
+depends="pkg-config xproto xextproto renderproto randrproto libX11-devel libXext-devel libXrender-devel libXrandr"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run xextproto
-Add_dependency run renderproto
-Add_dependency run randrproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXrender-devel
-Add_dependency run libXrandr
 
 do_install()
 {
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index 025d2f217e..b85483da46 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -4,6 +4,7 @@ version=1.3.1
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config xproto xextproto renderproto randrproto libX11-devel libXext-devel libXrender-devel"
 short_desc="X RandR Library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=62bba708649c04cbbc2f5de910942a01cc727b27225bc06169af8a89b957c661
@@ -18,11 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build renderproto
-Add_dependency build randrproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXrender-devel
diff --git a/srcpkgs/libXrender/depends b/srcpkgs/libXrender/depends
deleted file mode 100644
index 82f41d9434..0000000000
--- a/srcpkgs/libXrender/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXrender/libXrender-devel.template b/srcpkgs/libXrender/libXrender-devel.template
index 48aa6c24ad..0a74dae153 100644
--- a/srcpkgs/libXrender/libXrender-devel.template
+++ b/srcpkgs/libXrender/libXrender-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libXrender-devel'.
 #
+depends="xproto renderproto libX11-devel libXrender"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run renderproto
-Add_dependency run libX11-devel
-Add_dependency run libXrender
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template
index b74c12f56d..e219ce0a1d 100644
--- a/srcpkgs/libXrender/template
+++ b/srcpkgs/libXrender/template
@@ -4,6 +4,7 @@ version=0.9.7
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config renderproto libX11-devel"
 short_desc="X Render Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -21,6 +22,3 @@ long_desc="
  This is the modular X.org X11 project version."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build renderproto
-Add_dependency build libX11-devel
diff --git a/srcpkgs/libXres/depends b/srcpkgs/libXres/depends
deleted file mode 100644
index 8a3f27e0b7..0000000000
--- a/srcpkgs/libXres/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXres/libXres-devel.template b/srcpkgs/libXres/libXres-devel.template
index 24646c0562..b1e2e9d874 100644
--- a/srcpkgs/libXres/libXres-devel.template
+++ b/srcpkgs/libXres/libXres-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libXres-devel'.
 #
+depends="xproto libX11-devel libXext-devel libXres"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXres
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template
index f8ce469d9f..e2c8478877 100644
--- a/srcpkgs/libXres/template
+++ b/srcpkgs/libXres/template
@@ -4,6 +4,7 @@ version=1.0.6
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config resourceproto libX11-devel libXext-devel"
 short_desc="X Resource Information Extension Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,7 +17,3 @@ long_desc="
  server about its usage of various resources."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build resourceproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXt/depends b/srcpkgs/libXt/depends
deleted file mode 100644
index 66a8f8ac96..0000000000
--- a/srcpkgs/libXt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXt/libXt-devel.template b/srcpkgs/libXt/libXt-devel.template
index 6d7bd1c503..a745be46ad 100644
--- a/srcpkgs/libXt/libXt-devel.template
+++ b/srcpkgs/libXt/libXt-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libXt-devel'.
 #
+depends="xproto libSM-devel libICE-devel libX11-devel libXt"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run libXt
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index f3f0d6a75d..c2d8253991 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -4,6 +4,7 @@ version=1.1.3
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto kbproto libSM-devel libICE-devel libX11-devel"
 short_desc="X Toolkit Intrinsics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -18,9 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build kbproto
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
diff --git a/srcpkgs/libXtst/depends b/srcpkgs/libXtst/depends
deleted file mode 100644
index 8a3f27e0b7..0000000000
--- a/srcpkgs/libXtst/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXtst/libXtst-devel.template b/srcpkgs/libXtst/libXtst-devel.template
index 455223964b..a214744295 100644
--- a/srcpkgs/libXtst/libXtst-devel.template
+++ b/srcpkgs/libXtst/libXtst-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libXtst-devel'.
 #
+depends="recordproto libX11-devel libXext-devel libXtst"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run recordproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXtst
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXtst/template b/srcpkgs/libXtst/template
index 7f881c8c47..4a321e463c 100644
--- a/srcpkgs/libXtst/template
+++ b/srcpkgs/libXtst/template
@@ -4,6 +4,7 @@ version=1.2.1
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config recordproto inputproto libX11-devel libXext-devel libXi-devel"
 short_desc="X Tst Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,9 +13,3 @@ long_desc="
  This package provides the X Tst Library from the modular X.org X11 project."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build recordproto
-Add_dependency build inputproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXi-devel
diff --git a/srcpkgs/libXv/depends b/srcpkgs/libXv/depends
deleted file mode 100644
index dc58176dfd..0000000000
--- a/srcpkgs/libXv/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXv/libXv-devel.template b/srcpkgs/libXv/libXv-devel.template
index b3a047fe85..a3c8e4b6b6 100644
--- a/srcpkgs/libXv/libXv-devel.template
+++ b/srcpkgs/libXv/libXv-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'libXv-devel'.
 #
+depends="pkg-config xproto videoproto libX11-devel libXext-devel libXv"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run videoproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXv
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXv/template b/srcpkgs/libXv/template
index c2c56de172..8986df3cff 100644
--- a/srcpkgs/libXv/template
+++ b/srcpkgs/libXv/template
@@ -4,6 +4,7 @@ version=1.0.7
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config videoproto libX11-devel libXext-devel"
 short_desc="Xv Extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -13,7 +14,3 @@ long_desc="
  the modular X.org project"
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build videoproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXvMC/depends b/srcpkgs/libXvMC/depends
deleted file mode 100644
index dc58176dfd..0000000000
--- a/srcpkgs/libXvMC/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXvMC/libXvMC-devel.template b/srcpkgs/libXvMC/libXvMC-devel.template
index 2d208b0b73..3b19bdcc08 100644
--- a/srcpkgs/libXvMC/libXvMC-devel.template
+++ b/srcpkgs/libXvMC/libXvMC-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libXvMC-devel'.
 #
+depends="libX11-devel libXext-devel libXv-devel libXvMC"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXv-devel
-Add_dependency run libXvMC
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index f888eca70b..9603127deb 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -4,6 +4,7 @@ version=1.0.7
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config videoproto libX11-devel libXext-devel libXv-devel"
 short_desc="XVideo Motion Compensation Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -14,8 +15,3 @@ long_desc="
  extension of the X video extension for the X Window System."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build videoproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXv-devel
diff --git a/srcpkgs/libXxf86dga/depends b/srcpkgs/libXxf86dga/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libXxf86dga/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXxf86dga/libXxf86dga-devel.template b/srcpkgs/libXxf86dga/libXxf86dga-devel.template
index c6a67d8ad1..e7e4c29576 100644
--- a/srcpkgs/libXxf86dga/libXxf86dga-devel.template
+++ b/srcpkgs/libXxf86dga/libXxf86dga-devel.template
@@ -1,19 +1,12 @@
 # Template file for 'libXxf86dga-devel'.
 #
+depends="pkg-config xproto xextproto xf86dgaproto libX11-devel libXext-devel glibc-devel libXxf86dga"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run xextproto
-Add_dependency run xf86dgaproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run glibc-devel
-Add_dependency run libXxf86dga
 
 do_install()
 {
diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template
index 3154ec9a46..240a384c96 100644
--- a/srcpkgs/libXxf86dga/template
+++ b/srcpkgs/libXxf86dga/template
@@ -4,6 +4,7 @@ version=1.1.1
 revision=4
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto xextproto xf86dgaproto libX11-devel libXext-devel glibc-devel"
 short_desc="Library for the XFree86-DGA X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
@@ -15,10 +16,3 @@ long_desc="
  This library is from the modular X.org project."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build xf86dgaproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build glibc-devel
diff --git a/srcpkgs/libXxf86misc/depends b/srcpkgs/libXxf86misc/depends
deleted file mode 100644
index 0dcb50045f..0000000000
--- a/srcpkgs/libXxf86misc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXxf86misc/libXxf86misc-devel.template b/srcpkgs/libXxf86misc/libXxf86misc-devel.template
index 0978031e98..fa9a88c980 100644
--- a/srcpkgs/libXxf86misc/libXxf86misc-devel.template
+++ b/srcpkgs/libXxf86misc/libXxf86misc-devel.template
@@ -1,17 +1,12 @@
 # Template file for 'libXxf86misc-devel'.
 #
+depends="pkg-config xproto xextproto xf86miscproto libX11-devel libXxf86misc"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run xproto
-Add_dependency run xextproto
-Add_dependency run xf86miscproto
-Add_dependency run libX11-devel
-Add_dependency run libXxf86misc
 
 do_install()
 {
diff --git a/srcpkgs/libXxf86misc/template b/srcpkgs/libXxf86misc/template
index 008b1bdf0f..6bb927be86 100644
--- a/srcpkgs/libXxf86misc/template
+++ b/srcpkgs/libXxf86misc/template
@@ -4,6 +4,7 @@ version=1.0.1
 revision=3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto xextproto xf86miscproto libX11-devel libXext-devel"
 short_desc="Library for the XFree86-Misc X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
@@ -13,9 +14,3 @@ long_desc="
  to be queried and changed dynamically."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build xf86miscproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libXxf86vm/depends b/srcpkgs/libXxf86vm/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libXxf86vm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libXxf86vm/libXxf86vm-devel.template b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
index 76a1a5c2d6..c3baa508ff 100644
--- a/srcpkgs/libXxf86vm/libXxf86vm-devel.template
+++ b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libXxf86vm-devel'.
 #
+depends="xf86vidmodeproto libX11-devel libXext-devel libXxf86vm"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xf86vidmodeproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXxf86vm
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index 8d5896e8c7..55e9661e31 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -4,6 +4,7 @@ version=1.1.2
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xf86vidmodeproto libX11-devel libXext-devel"
 short_desc="Library for the XFree86-VidMode X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,7 +17,3 @@ long_desc="
  This library is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xf86vidmodeproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/liba52/depends b/srcpkgs/liba52/depends
deleted file mode 100644
index 270f89c96f..0000000000
--- a/srcpkgs/liba52/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/liba52/liba52-devel.template b/srcpkgs/liba52/liba52-devel.template
index fa8c915e0c..da2371400c 100644
--- a/srcpkgs/liba52/liba52-devel.template
+++ b/srcpkgs/liba52/liba52-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'liba52-devel'.
 #
+depends="glibc-devel liba52"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run liba52
 
 do_install()
 {
diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template
index ff12be02a6..5fbba37bcc 100644
--- a/srcpkgs/liba52/template
+++ b/srcpkgs/liba52/template
@@ -6,6 +6,7 @@ wrksrc="a52dec-${version}"
 distfiles="http://liba52.sourceforge.net/files/a52dec-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-shared"
+makedepends="automake"
 short_desc="Free ATSC A/52 stream decoder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33
@@ -16,7 +17,6 @@ long_desc="
  as AC-3."
 
 subpackages="$pkgname-devel a52dec"
-Add_dependency build automake
 
 pre_configure()
 {
diff --git a/srcpkgs/libarchive/depends b/srcpkgs/libarchive/depends
deleted file mode 100644
index 146f550394..0000000000
--- a/srcpkgs/libarchive/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libarchive/libarchive-devel.template b/srcpkgs/libarchive/libarchive-devel.template
index ae44e8c38b..c859feb506 100644
--- a/srcpkgs/libarchive/libarchive-devel.template
+++ b/srcpkgs/libarchive/libarchive-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'libarchive-devel'.
 #
+depends="acl-devel zlib-devel bzip2-devel liblzma-devel openssl-devel expat-devel libarchive"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run acl-devel
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run liblzma-devel
-Add_dependency run openssl-devel
-Add_dependency run expat-devel
-Add_dependency run libarchive
 
 do_install()
 {
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 75462f5a47..4f16f59a8e 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -4,6 +4,7 @@ version=3.0.4
 distfiles="https://github.com/downloads/libarchive/libarchive/libarchive-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--without-xml2 --without-nettle"
+makedepends="zlib-devel acl-devel openssl-devel liblzma-devel expat-devel"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libarchive.github.com/"
@@ -17,8 +18,3 @@ long_desc="
 
 subpackages="bsdtar bsdcpio $pkgname-devel"
 
-Add_dependency build zlib-devel
-Add_dependency build acl-devel
-Add_dependency build openssl-devel
-Add_dependency build liblzma-devel
-Add_dependency build expat-devel
diff --git a/srcpkgs/libart/depends b/srcpkgs/libart/depends
deleted file mode 100644
index 1f4d7e012e..0000000000
--- a/srcpkgs/libart/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.3.20"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libart/libart-devel.template b/srcpkgs/libart/libart-devel.template
index 031208e342..d6f4a3a2af 100644
--- a/srcpkgs/libart/libart-devel.template
+++ b/srcpkgs/libart/libart-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libart-devel'.
 #
+depends="libart"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libart
 
 do_install()
 {
diff --git a/srcpkgs/libart/template b/srcpkgs/libart/template
index 33f22728b7..c88ee9078e 100644
--- a/srcpkgs/libart/template
+++ b/srcpkgs/libart/template
@@ -5,6 +5,7 @@ revision=3
 wrksrc="libart_lgpl-$version"
 distfiles="${GNOME_SITE}/libart_lgpl/2.3/libart_lgpl-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config"
 short_desc="High-performance 2D graphics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa
@@ -23,4 +24,3 @@ long_desc="
  optimized for interactive display."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/libass/depends b/srcpkgs/libass/depends
deleted file mode 100644
index 31a1d27c33..0000000000
--- a/srcpkgs/libass/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libass/libass-devel.template b/srcpkgs/libass/libass-devel.template
index bfe8066a91..a5da777f4c 100644
--- a/srcpkgs/libass/libass-devel.template
+++ b/srcpkgs/libass/libass-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libass-devel'.
 #
+depends="fontconfig-devel enca-devel fribidi-devel libass>=0.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run fontconfig-devel
-Add_dependency run enca-devel
-Add_dependency run fribidi-devel
-Add_dependency run libass ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template
index 17ca0a86fa..4167881501 100644
--- a/srcpkgs/libass/template
+++ b/srcpkgs/libass/template
@@ -4,6 +4,7 @@ version=0.10.0
 distfiles="http://libass.googlecode.com/files/${pkgname}-${version}.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config enca-devel fontconfig-devel fribidi-devel"
 short_desc="A portable library for SSA/ASS subtitles rendering"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -13,10 +14,6 @@ long_desc="
  The $pkgname package contains $short_desc."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build enca-devel
-Add_dependency build fontconfig-devel
-Add_dependency build fribidi-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/libassuan/depends b/srcpkgs/libassuan/depends
deleted file mode 100644
index d64a741825..0000000000
--- a/srcpkgs/libassuan/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.1"
-api_depends=">=2.0.3"
diff --git a/srcpkgs/libassuan/libassuan-devel.template b/srcpkgs/libassuan/libassuan-devel.template
index 8e8208d1a5..6f5eae056f 100644
--- a/srcpkgs/libassuan/libassuan-devel.template
+++ b/srcpkgs/libassuan/libassuan-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libassuan-devel'.
 #
+depends="libgpg-error-devel libassuan"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgpg-error-devel
-Add_dependency run libassuan
 
 do_install()
 {
diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index 84efdf236a..118c889cbd 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -4,6 +4,7 @@ version=2.0.3
 homepage="http://www.gnupg.org/related_software/libassuan"
 distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="libgpg-error-devel"
 short_desc="IPC library used by some GnuPG related software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,4 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build libgpg-error-devel
diff --git a/srcpkgs/libasyncns/depends b/srcpkgs/libasyncns/depends
deleted file mode 100644
index daa819845a..0000000000
--- a/srcpkgs/libasyncns/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libasyncns/libasyncns-devel.template b/srcpkgs/libasyncns/libasyncns-devel.template
index 89d07e1717..3a5b6bc1c9 100644
--- a/srcpkgs/libasyncns/libasyncns-devel.template
+++ b/srcpkgs/libasyncns/libasyncns-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libasyncns-devel'.
 #
+depends="glibc-devel libasyncns"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libasyncns
 
 do_install()
 {
diff --git a/srcpkgs/libatasmart/depends b/srcpkgs/libatasmart/depends
deleted file mode 100644
index 552b83e8f5..0000000000
--- a/srcpkgs/libatasmart/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.17"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libatasmart/libatasmart-devel.template b/srcpkgs/libatasmart/libatasmart-devel.template
index d92ee7918e..84769d5e10 100644
--- a/srcpkgs/libatasmart/libatasmart-devel.template
+++ b/srcpkgs/libatasmart/libatasmart-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libatasmart-devel'.
 #
+depends="libudev-devel libatasmart"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libudev-devel
-Add_dependency run libatasmart
 
 do_install()
 {
diff --git a/srcpkgs/libatasmart/template b/srcpkgs/libatasmart/template
index 99a7790fbc..21a1e118e4 100644
--- a/srcpkgs/libatasmart/template
+++ b/srcpkgs/libatasmart/template
@@ -4,6 +4,7 @@ version=0.17
 revision=3
 distfiles="http://0pointer.de/public/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libudev-devel"
 short_desc="ATA S.M.A.R.T. Reading and Parsing Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2d62a11274f32cde2f074adef9ceb662bf205618dfc8f8e74b9be6a8b1ed5ffd
@@ -11,5 +12,3 @@ long_desc="
  ${short_desc}"
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libudev-devel
diff --git a/srcpkgs/libburn/depends b/srcpkgs/libburn/depends
deleted file mode 100644
index 42234881a3..0000000000
--- a/srcpkgs/libburn/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7.2"
-api_depends=">=1.2.2"
diff --git a/srcpkgs/libburn/libburn-devel.template b/srcpkgs/libburn/libburn-devel.template
index 42ab9bef3d..37d0ef75d9 100644
--- a/srcpkgs/libburn/libburn-devel.template
+++ b/srcpkgs/libburn/libburn-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libburn-devel'.
 #
+depends="glibc-devel libburn>=1.2.2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libburn ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libcanberra/depends b/srcpkgs/libcanberra/depends
deleted file mode 100644
index f034ee889b..0000000000
--- a/srcpkgs/libcanberra/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.23"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcanberra/libcanberra-devel.template b/srcpkgs/libcanberra/libcanberra-devel.template
index 0248897c6f..d140235ebd 100644
--- a/srcpkgs/libcanberra/libcanberra-devel.template
+++ b/srcpkgs/libcanberra/libcanberra-devel.template
@@ -1,19 +1,12 @@
 # Template file for 'libcanberra-devel'.
 #
+depends="pkg-config gtk+-devel libvorbis-devel libltdl-devel gstreamer-devel libxml2-devel alsa-lib-devel libcanberra"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run gtk+-devel
-Add_dependency run libvorbis-devel
-Add_dependency run libltdl-devel
-Add_dependency run gstreamer-devel
-Add_dependency run libxml2-devel
-Add_dependency run alsa-lib-devel
-Add_dependency run libcanberra
 
 do_install()
 {
diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template
index 5a26dce44c..fbd7a512cb 100644
--- a/srcpkgs/libcanberra/template
+++ b/srcpkgs/libcanberra/template
@@ -8,6 +8,7 @@ configure_args="--enable-alsa --enable-null
 --enable-gstreamer --disable-oss --with-builtin=dso --disable-lynx
 --disable-schemas-install --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --with-systemdsystemunitdir=/lib/systemd/system"
+makedepends="pkg-config gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel gstreamer-devel alsa-lib-devel tdb-devel pulseaudio-devel libudev-devel vala-devel GConf-devel"
 short_desc="XDG Sound Theme and Name Specification library implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
@@ -26,15 +27,3 @@ long_desc="
 gconf_schemas="libcanberra.schemas"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libltdl-devel
-Add_dependency build gstreamer-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build tdb-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build libudev-devel
-Add_dependency build vala-devel
-Add_dependency build GConf-devel
diff --git a/srcpkgs/libcap-ng/depends b/srcpkgs/libcap-ng/depends
deleted file mode 100644
index bc8055c04c..0000000000
--- a/srcpkgs/libcap-ng/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcap-ng/libcap-ng-devel.template b/srcpkgs/libcap-ng/libcap-ng-devel.template
index 49da08b16b..afa12bb1ed 100644
--- a/srcpkgs/libcap-ng/libcap-ng-devel.template
+++ b/srcpkgs/libcap-ng/libcap-ng-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libcap-ng-devel'.
 #
+depends="glibc-devel libcap-ng"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libcap-ng
 
 do_install()
 {
diff --git a/srcpkgs/libcap-ng/libcap-ng-python.template b/srcpkgs/libcap-ng/libcap-ng-python.template
index d59e155a88..67bc285c25 100644
--- a/srcpkgs/libcap-ng/libcap-ng-python.template
+++ b/srcpkgs/libcap-ng/libcap-ng-python.template
@@ -1,5 +1,6 @@
 # Template file for 'libcap-ng-python'.
 #
+depends="python"
 short_desc="${sourcepkg} python bindings"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 pycompile_module="capng"
 
-Add_dependency run python
 
 do_install()
 {
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index 68b7daec41..f012b2c42f 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -4,6 +4,7 @@ version=0.6.6
 distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="python-devel swig"
 short_desc="An alternate POSIX capabilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://people.redhat.com/sgrubb/libcap-ng/"
@@ -19,5 +20,3 @@ long_desc="
  much easier than the traditional libcap library."
 
 subpackages="$pkgname-devel $pkgname-progs $pkgname-python"
-Add_dependency build python-devel
-Add_dependency build swig
diff --git a/srcpkgs/libcap/depends b/srcpkgs/libcap/depends
deleted file mode 100644
index 9c30304b06..0000000000
--- a/srcpkgs/libcap/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.16"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcap/libcap-devel.template b/srcpkgs/libcap/libcap-devel.template
index 27abf76ba5..41d2b3d060 100644
--- a/srcpkgs/libcap/libcap-devel.template
+++ b/srcpkgs/libcap/libcap-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libcap-devel'.
 #
+depends="glibc-devel libcap"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libcap
 
 do_install()
 {
diff --git a/srcpkgs/libcap/libcap-pam.template b/srcpkgs/libcap/libcap-pam.template
index 98b002806a..99eac33c41 100644
--- a/srcpkgs/libcap/libcap-pam.template
+++ b/srcpkgs/libcap/libcap-pam.template
@@ -1,5 +1,6 @@
 # Template file for 'libcap-pam'.
 #
+depends="attr pam"
 short_desc="${short_desc} (PAM module)"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
 
 conf_files="/etc/security/capability.conf"
 
-Add_dependency run attr
-Add_dependency run pam
 
 do_install()
 {
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index d1eeab7a08..48084fe72b 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -4,6 +4,7 @@ version=2.22
 revision=4
 distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
 #distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
+makedepends="perl pam-devel attr-devel"
 short_desc="POSIX.1e capabilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sites.google.com/site/fullycapable/"
@@ -14,9 +15,6 @@ long_desc="
  draft 15 capabilities."
 
 subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
-Add_dependency build perl
-Add_dependency build pam-devel
-Add_dependency build attr-devel
 
 do_build() {
 	sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)\/lib|LIBDIR=\$(FAKEROOT)/\$(lib)|g" \
diff --git a/srcpkgs/libcddb/depends b/srcpkgs/libcddb/depends
deleted file mode 100644
index 27ebe44099..0000000000
--- a/srcpkgs/libcddb/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcddb/libcddb-devel.template b/srcpkgs/libcddb/libcddb-devel.template
index be560ac822..3e7b606142 100644
--- a/srcpkgs/libcddb/libcddb-devel.template
+++ b/srcpkgs/libcddb/libcddb-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libcddb-devel'.
 #
+depends="glibc-devel libcddb"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libcddb
 
 do_install()
 {
diff --git a/srcpkgs/libcddb/template b/srcpkgs/libcddb/template
index 19402bce89..8e7bd15bdd 100644
--- a/srcpkgs/libcddb/template
+++ b/srcpkgs/libcddb/template
@@ -4,6 +4,7 @@ version=1.3.2
 revision=3
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config"
 short_desc="Library to access data on a CDDB server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=68e9b53918b9bea727fb2db78936526671c039dcd7396cb82ecd6854e866048c
@@ -14,4 +15,3 @@ long_desc="
  have a C API."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/libcdio/depends b/srcpkgs/libcdio/depends
deleted file mode 100644
index 03777cf6c4..0000000000
--- a/srcpkgs/libcdio/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.83"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcdio/libcdio-devel.template b/srcpkgs/libcdio/libcdio-devel.template
index 353cc55536..d8c7b76261 100644
--- a/srcpkgs/libcdio/libcdio-devel.template
+++ b/srcpkgs/libcdio/libcdio-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libcdio-devel'.
 #
+depends="ncurses-devel libcddb-devel libcdio"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run ncurses-devel
-Add_dependency run libcddb-devel
-Add_dependency run libcdio
 
 do_install()
 {
diff --git a/srcpkgs/libcdio/template b/srcpkgs/libcdio/template
index 81c274c36e..872c4ef7ab 100644
--- a/srcpkgs/libcdio/template
+++ b/srcpkgs/libcdio/template
@@ -5,6 +5,7 @@ homepage="http://www.gnu.org/software/libcdio/"
 distfiles="http://ftp.gnu.org/gnu/libcdio/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config ncurses-devel libcddb-devel"
 short_desc="CD-ROM access library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -19,6 +20,3 @@ long_desc="
  disc images as though they were CDs."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build ncurses-devel
-Add_dependency build libcddb-devel
diff --git a/srcpkgs/libcgroup/depends b/srcpkgs/libcgroup/depends
deleted file mode 100644
index a438b6d105..0000000000
--- a/srcpkgs/libcgroup/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.37.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcgroup/libcgroup-devel.template b/srcpkgs/libcgroup/libcgroup-devel.template
index 6bcc113676..457503ba5d 100644
--- a/srcpkgs/libcgroup/libcgroup-devel.template
+++ b/srcpkgs/libcgroup/libcgroup-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libcgroup-devel'.
 #
+depends="glibc-devel libcgroup"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libcgroup
 
 do_install()
 {
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 824231492c..26345d015a 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -5,6 +5,7 @@ homepage="http://libcg.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/libcg/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="flex pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,5 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build flex
-Add_dependency build pam-devel
diff --git a/srcpkgs/libchamplain/depends b/srcpkgs/libchamplain/depends
deleted file mode 100644
index 8698f59978..0000000000
--- a/srcpkgs/libchamplain/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.12.2_1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libchamplain/libchamplain-devel.template b/srcpkgs/libchamplain/libchamplain-devel.template
index af3c642d57..f5283d0a9c 100644
--- a/srcpkgs/libchamplain/libchamplain-devel.template
+++ b/srcpkgs/libchamplain/libchamplain-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'libchamplain-devel'.
 #
+depends="libsoup-gnome-devel gtk+3-devel clutter-gtk-devel json-glib-devel sqlite-devel libchamplain>=0.12.2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libsoup-gnome-devel
-Add_dependency run gtk+3-devel
-Add_dependency run clutter-gtk-devel
-Add_dependency run json-glib-devel
-Add_dependency run sqlite-devel
-Add_dependency run ${sourcepkg} ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template
index 6421f1dcf9..fc122c6a01 100644
--- a/srcpkgs/libchamplain/template
+++ b/srcpkgs/libchamplain/template
@@ -5,6 +5,7 @@ revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-debug --disable-static"
+makedepends="pkg-config intltool gobject-introspection libsoup-devel libsoup-gnome-devel gtk+3-devel clutter-gtk-devel json-glib-devel sqlite-devel"
 short_desc="Library aimed to provide a Clutter widget to display rasterized maps"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e
@@ -14,12 +15,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build libsoup-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build gtk+3-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build json-glib-devel
-Add_dependency build sqlite-devel
diff --git a/srcpkgs/libcroco/depends b/srcpkgs/libcroco/depends
deleted file mode 100644
index bc8055c04c..0000000000
--- a/srcpkgs/libcroco/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcroco/libcroco-devel.template b/srcpkgs/libcroco/libcroco-devel.template
index 5a245680f1..70d73e7ceb 100644
--- a/srcpkgs/libcroco/libcroco-devel.template
+++ b/srcpkgs/libcroco/libcroco-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libcroco-devel'.
 #
+depends="glib-devel libxml2-devel libcroco>=0.6.5"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run libcroco ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libcroco/template b/srcpkgs/libcroco/template
index 35004732d6..1a50d01f0d 100644
--- a/srcpkgs/libcroco/template
+++ b/srcpkgs/libcroco/template
@@ -5,6 +5,7 @@ homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config glib-devel libxml2-devel"
 short_desc="Toolkit to parse and manipulate CSS (Cascading Style Sheets)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -16,6 +17,3 @@ long_desc="
  engine, and an XML/CSS layout/rendering engine."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/libcryptui/depends b/srcpkgs/libcryptui/depends
deleted file mode 100644
index 0d19939794..0000000000
--- a/srcpkgs/libcryptui/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcryptui/libcryptui-devel.template b/srcpkgs/libcryptui/libcryptui-devel.template
index 57e4040eb7..415e0fb80b 100644
--- a/srcpkgs/libcryptui/libcryptui-devel.template
+++ b/srcpkgs/libcryptui/libcryptui-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libcryptui-devel'.
 #
+depends="GConf-devel libcryptui>=3.4.1"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run GConf-devel
-Add_dependency run libcryptui ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 05a42f4fba..f0e8650c21 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --disable-update-mime-database
 --disable-schemas-compile"
+depends="hicolor-icon-theme"
+makedepends="pkg-config intltool dbus-glib-devel gtk+3-devel gpgme-devel libnotify-devel libgnome-keyring-devel gobject-introspection"
+fulldepends="gnupg"
 short_desc="GNOME Interface components for OpenPGP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -17,14 +20,4 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build gpgme-devel
-Add_dependency build libnotify-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build gobject-introspection
 
-Add_dependency run hicolor-icon-theme
-Add_dependency full gnupg
diff --git a/srcpkgs/libcss/depends b/srcpkgs/libcss/depends
deleted file mode 100644
index 56fb9e056a..0000000000
--- a/srcpkgs/libcss/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libcss/libcss-devel.template b/srcpkgs/libcss/libcss-devel.template
index f5188494c9..cfbad75607 100644
--- a/srcpkgs/libcss/libcss-devel.template
+++ b/srcpkgs/libcss/libcss-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libcss-devel'.
 #
+depends="libcss>=0.1.2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libcss ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
index f68a796203..eb04ba29c8 100644
--- a/srcpkgs/libcss/template
+++ b/srcpkgs/libcss/template
@@ -3,6 +3,7 @@ pkgname=libcss
 version=0.1.2
 homepage="http://www.netsurf-browser.org"
 distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+makedepends="pkg-config perl libparserutils-devel libwapcaplet-devel"
 short_desc="CSS parser and selection engine, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e
@@ -23,10 +24,6 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build perl
-Add_dependency build libparserutils-devel 
-Add_dependency build libwapcaplet-devel
 
 do_build() {
 	make ${makejobs} COMPONENT_TYPE=lib-shared
diff --git a/srcpkgs/libdaemon/depends b/srcpkgs/libdaemon/depends
deleted file mode 100644
index 6b57f08164..0000000000
--- a/srcpkgs/libdaemon/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.14"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdaemon/libdaemon-devel.template b/srcpkgs/libdaemon/libdaemon-devel.template
index 91d5ac6ac0..dad36d326f 100644
--- a/srcpkgs/libdaemon/libdaemon-devel.template
+++ b/srcpkgs/libdaemon/libdaemon-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libdaemon-devel'.
 #
+depends="glibc-devel libdaemon"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libdaemon
 
 do_install()
 {
diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template
index 7b9a179526..1db07e993c 100644
--- a/srcpkgs/libdaemon/template
+++ b/srcpkgs/libdaemon/template
@@ -5,6 +5,7 @@ revision=3
 distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-lynx"
+makedepends="glibc-devel"
 short_desc="Lightweight C library that eases the writing of UNIX daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834
@@ -24,4 +25,3 @@ long_desc="
  simple to get it done right and code duplication is not a goal."
 
 subpackages="$pkgname-devel"
-Add_dependency build glibc-devel
diff --git a/srcpkgs/libdca/depends b/srcpkgs/libdca/depends
deleted file mode 100644
index 2c7c93e28f..0000000000
--- a/srcpkgs/libdca/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.0.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdca/libdca-devel.template b/srcpkgs/libdca/libdca-devel.template
index 4fd523b1ee..e8d6f00151 100644
--- a/srcpkgs/libdca/libdca-devel.template
+++ b/srcpkgs/libdca/libdca-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libdca-devel'.
 #
+depends="glibc-devel libdca"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libdca
 
 do_install()
 {
diff --git a/srcpkgs/libdiscid/depends b/srcpkgs/libdiscid/depends
deleted file mode 100644
index b84ba41c81..0000000000
--- a/srcpkgs/libdiscid/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdiscid/libdiscid-devel.template b/srcpkgs/libdiscid/libdiscid-devel.template
index 2c19dc6473..6c4dafc26c 100644
--- a/srcpkgs/libdiscid/libdiscid-devel.template
+++ b/srcpkgs/libdiscid/libdiscid-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libasyncns-devel'.
 #
+depends="glibc-devel libdiscid"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libdiscid
 
 do_install()
 {
diff --git a/srcpkgs/libdmapsharing/depends b/srcpkgs/libdmapsharing/depends
deleted file mode 100644
index 2e6bf568b5..0000000000
--- a/srcpkgs/libdmapsharing/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.9.12"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdmapsharing/libdmapsharing-devel.template b/srcpkgs/libdmapsharing/libdmapsharing-devel.template
index 1105a7f366..17d1b5a917 100644
--- a/srcpkgs/libdmapsharing/libdmapsharing-devel.template
+++ b/srcpkgs/libdmapsharing/libdmapsharing-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'lidmapsharing-devel'.
 #
+depends="libsoup-devel libgee-devel libdmapsharing>=2.9.15"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libsoup-devel
-Add_dependency run libgee-devel
-Add_dependency run libdmapsharing ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libdmapsharing/template b/srcpkgs/libdmapsharing/template
index c961b9e222..30f5f13269 100644
--- a/srcpkgs/libdmapsharing/template
+++ b/srcpkgs/libdmapsharing/template
@@ -5,6 +5,7 @@ homepage="http://www.flyn.org/projects/libdmapsharing/index.html"
 distfiles="http://www.flyn.org/projects/libdmapsharing/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-mdns=avahi"
+makedepends="pkg-config gtk+-devel avahi-glib-libs-devel libsoup-devel gst-plugins-base-devel libgee-devel"
 short_desc="A library that implements the DMAP family of protocols"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -17,9 +18,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build libsoup-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build libgee-devel
diff --git a/srcpkgs/libdmx/depends b/srcpkgs/libdmx/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libdmx/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdmx/libdmx-devel.template b/srcpkgs/libdmx/libdmx-devel.template
index 500d365bf2..3d6babbc10 100644
--- a/srcpkgs/libdmx/libdmx-devel.template
+++ b/srcpkgs/libdmx/libdmx-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libdmx-devel'.
 #
+depends="dmxproto libX11-devel libXext-devel libdmx"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dmxproto
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libdmx
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libdmx/template b/srcpkgs/libdmx/template
index 6be3c47fdb..db3af4e4b6 100644
--- a/srcpkgs/libdmx/template
+++ b/srcpkgs/libdmx/template
@@ -4,6 +4,7 @@ version=1.1.2
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config dmxproto libX11-devel libXext-devel"
 short_desc="DMX Extension for Xorg"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -14,7 +15,3 @@ long_desc="
  This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build dmxproto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template
index 1ce61d6937..dfc327f5b8 100644
--- a/srcpkgs/libdom/libdom-devel.template
+++ b/srcpkgs/libdom/libdom-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libdom-devel'.
 #
+depends="libdom"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libdom
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index 925c9cf73a..f251454231 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -2,6 +2,7 @@
 pkgname=libdom
 version="$(date -u +%Y%m%d)"
 homepage="http://www.netsurf-browser.org"
+makedepends="pkg-config perl subversion libxml2-devel libparserutils-devel libwapcaplet-devel libhubbub-devel"
 short_desc="Implementation of the W3C DOM, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="MIT"
@@ -16,13 +17,6 @@ subpackages="${pkgname}-devel"
 nofetch=yes
 noextract=yes
 
-Add_dependency build pkg-config
-Add_dependency build perl
-Add_dependency build subversion
-Add_dependency build libxml2-devel
-Add_dependency build libparserutils-devel
-Add_dependency build libwapcaplet-devel
-Add_dependency build libhubbub-devel
 
 do_fetch() {
 	local url="svn://svn.netsurf-browser.org/trunk/libdom"
diff --git a/srcpkgs/libdrm/depends b/srcpkgs/libdrm/depends
deleted file mode 100644
index 1c37093bdf..0000000000
--- a/srcpkgs/libdrm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.4.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdrm/libdrm-devel.template b/srcpkgs/libdrm/libdrm-devel.template
index 58f40d032c..019678ce45 100644
--- a/srcpkgs/libdrm/libdrm-devel.template
+++ b/srcpkgs/libdrm/libdrm-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libdrm-devel'.
 #
+depends="libudev-devel libdrm>=2.4.34"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libudev-devel
-Add_dependency run libdrm ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 94b67dec98..65047b8e71 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -4,6 +4,7 @@ version=2.4.34
 distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-udev --enable-vmwgfx-experimental-api"
+makedepends="automake pkg-config glibc-devel libudev-devel libpciaccess-devel"
 short_desc="Userspace interface to kernel DRM services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dri.freedesktop.org/"
@@ -16,11 +17,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build glibc-devel
-Add_dependency build libudev-devel
-Add_dependency build libpciaccess-devel
 
 pre_configure() {
 	sed -i "/.*PTHREADSTUBS.*/d" configure.ac
diff --git a/srcpkgs/libdvbpsi/depends b/srcpkgs/libdvbpsi/depends
deleted file mode 100644
index cfed651e1d..0000000000
--- a/srcpkgs/libdvbpsi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdvbpsi/libdvbpsi-devel.template b/srcpkgs/libdvbpsi/libdvbpsi-devel.template
index 22a0915980..20298ace92 100644
--- a/srcpkgs/libdvbpsi/libdvbpsi-devel.template
+++ b/srcpkgs/libdvbpsi/libdvbpsi-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libdvbpsi-devel'.
 #
+depends="glibc-devel libdvbpsi"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libdvbpsi
 
 do_install()
 {
diff --git a/srcpkgs/libdvdcss/depends b/srcpkgs/libdvdcss/depends
deleted file mode 100644
index a24e33ec00..0000000000
--- a/srcpkgs/libdvdcss/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdvdcss/libdvdcss-devel.template b/srcpkgs/libdvdcss/libdvdcss-devel.template
index 97cebdbcf6..da83c64b8d 100644
--- a/srcpkgs/libdvdcss/libdvdcss-devel.template
+++ b/srcpkgs/libdvdcss/libdvdcss-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libdvdcss-devel'.
 #
+depends="glibc-devel libdvdcss"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libdvdcss
 
 do_install()
 {
diff --git a/srcpkgs/libdvdnav/depends b/srcpkgs/libdvdnav/depends
deleted file mode 100644
index 81d23b88df..0000000000
--- a/srcpkgs/libdvdnav/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.1.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdvdnav/libdvdnav-devel.template b/srcpkgs/libdvdnav/libdvdnav-devel.template
index 5f7490ad06..4e4d23a8b2 100644
--- a/srcpkgs/libdvdnav/libdvdnav-devel.template
+++ b/srcpkgs/libdvdnav/libdvdnav-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libdvdread-devel'.
 #
+depends="libdvdread-devel libdvdnav"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libdvdread-devel
-Add_dependency run libdvdnav
 
 do_install()
 {
diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template
index d494a271f0..2ab14ec33e 100644
--- a/srcpkgs/libdvdnav/template
+++ b/srcpkgs/libdvdnav/template
@@ -4,6 +4,7 @@ version=4.2.0
 homepage="http://dvdnav.mplayerhq.hu/"
 distfiles="http://dvdnav.mplayerhq.hu/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="automake libdvdread-devel"
 short_desc="Library to navigate DVDs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,8 +21,6 @@ long_desc="
  encapsulated."
 
 subpackages="$pkgname-devel"
-Add_dependency build automake
-Add_dependency build libdvdread-devel
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libdvdread/depends b/srcpkgs/libdvdread/depends
deleted file mode 100644
index 81d23b88df..0000000000
--- a/srcpkgs/libdvdread/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.1.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libdvdread/libdvdread-devel.template b/srcpkgs/libdvdread/libdvdread-devel.template
index 34b744f780..65aad8ed02 100644
--- a/srcpkgs/libdvdread/libdvdread-devel.template
+++ b/srcpkgs/libdvdread/libdvdread-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libdvdread-devel'.
 #
+depends="glibc-devel libdvdread"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libdvdread
 
 do_install()
 {
diff --git a/srcpkgs/libdvdread/template b/srcpkgs/libdvdread/template
index 6f76fea5a4..3526a5701c 100644
--- a/srcpkgs/libdvdread/template
+++ b/srcpkgs/libdvdread/template
@@ -4,6 +4,7 @@ version=4.2.0
 homepage="http://dvdnav.mplayerhq.hu"
 distfiles="http://dvdnav.mplayerhq.hu/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="automake"
 short_desc="DVD access library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,7 +14,6 @@ long_desc="
  for programs that access DVDs a little easier."
 
 subpackages="$pkgname-devel"
-Add_dependency build automake
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libebml/depends b/srcpkgs/libebml/depends
deleted file mode 100644
index 638e6380c1..0000000000
--- a/srcpkgs/libebml/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libebml/libebml-devel.template b/srcpkgs/libebml/libebml-devel.template
index 4603bbe51e..1e3b2034c1 100644
--- a/srcpkgs/libebml/libebml-devel.template
+++ b/srcpkgs/libebml/libebml-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libebml-devel'.
 #
+depends="glibc-devel libebml"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libebml
 
 do_install()
 {
diff --git a/srcpkgs/libee/depends b/srcpkgs/libee/depends
deleted file mode 100644
index d0f82907b9..0000000000
--- a/srcpkgs/libee/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.3.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libee/libee-devel.template b/srcpkgs/libee/libee-devel.template
index 892e915d7b..aa0d4d2097 100644
--- a/srcpkgs/libee/libee-devel.template
+++ b/srcpkgs/libee/libee-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libee-devel'.
 #
+depends="libestr-devel libee"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libestr-devel
-Add_dependency run libee
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libee/template b/srcpkgs/libee/template
index a55b61df6b..9b48798a48 100644
--- a/srcpkgs/libee/template
+++ b/srcpkgs/libee/template
@@ -4,6 +4,7 @@ version=0.3.2
 homepage="http://www.libee.org"
 distfiles="$homepage/files/download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libestr-devel"
 short_desc="Event expression library inspired by CEE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,5 +16,3 @@ long_desc="
 subpackages="$pkgname-devel"
 disable_parallel_build=yes
 
-Add_dependency build pkg-config
-Add_dependency build libestr-devel
diff --git a/srcpkgs/libelf/depends b/srcpkgs/libelf/depends
deleted file mode 100644
index eacf465f5b..0000000000
--- a/srcpkgs/libelf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.13"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libelf/libelf-devel.template b/srcpkgs/libelf/libelf-devel.template
index c573825079..0cb1e4791d 100644
--- a/srcpkgs/libelf/libelf-devel.template
+++ b/srcpkgs/libelf/libelf-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libelf-devel'.
 #
+depends="glibc-devel libelf"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libelf
 
 do_install()
 {
diff --git a/srcpkgs/libepc/depends b/srcpkgs/libepc/depends
deleted file mode 100644
index fed1cb2e2e..0000000000
--- a/srcpkgs/libepc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libepc/libepc-devel.template b/srcpkgs/libepc/libepc-devel.template
index 0505083b3f..b249b78302 100644
--- a/srcpkgs/libepc/libepc-devel.template
+++ b/srcpkgs/libepc/libepc-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libepc-devel'.
 #
+depends="gtk+3-devel avahi-glib-libs-devel libsoup-devel libepc"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run avahi-glib-libs-devel
-Add_dependency run libsoup-devel
-Add_dependency run libepc
 
 do_install()
 {
diff --git a/srcpkgs/libepc/template b/srcpkgs/libepc/template
index 866702d82f..5eea5bf3c0 100644
--- a/srcpkgs/libepc/template
+++ b/srcpkgs/libepc/template
@@ -4,6 +4,7 @@ version=0.4.4
 homepage="http://live.gnome.org/libepc"
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+3-devel libsoup-devel avahi-glib-libs-devel avahi-ui-libs-devel"
 short_desc="Easy Publish and Consume Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -21,9 +22,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build libsoup-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build avahi-ui-libs-devel
diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template
index c59496d582..be93cc0d60 100644
--- a/srcpkgs/liberation-fonts-ttf/template
+++ b/srcpkgs/liberation-fonts-ttf/template
@@ -3,6 +3,7 @@ pkgname=liberation-fonts-ttf
 version=1.07.1
 homepage="http://www.redhat.com/promo/fonts/"
 distfiles="https://fedorahosted.org/releases/l/i/${pkgname%-ttf}/$pkgname-$version.tar.gz"
+fulldepends="font-util"
 short_desc="TrueType fonts from RedHat"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, ${pkgname}"
@@ -16,7 +17,6 @@ long_desc="
  substitute for Courier New, Cumberland, Courier, Nimbus Mono L,
  and Bitstream Vera Sans Mono)."
 
-Add_dependency full font-util
 
 noarch=yes
 font_dirs="/usr/share/fonts/TTF"
diff --git a/srcpkgs/libestr/depends b/srcpkgs/libestr/depends
deleted file mode 100644
index 02d581ed9c..0000000000
--- a/srcpkgs/libestr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libestr/libestr-devel.template b/srcpkgs/libestr/libestr-devel.template
index 7ae5f50f6d..3736a11946 100644
--- a/srcpkgs/libestr/libestr-devel.template
+++ b/srcpkgs/libestr/libestr-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libestr-devel'.
 #
+depends="glibc-devel libestr"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libestr
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libev/depends b/srcpkgs/libev/depends
deleted file mode 100644
index c2df550793..0000000000
--- a/srcpkgs/libev/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.04"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libev/libev-devel.template b/srcpkgs/libev/libev-devel.template
index 32b2838163..cc7b97004a 100644
--- a/srcpkgs/libev/libev-devel.template
+++ b/srcpkgs/libev/libev-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libdev-devel'.
 #
+depends="libev>=4.11"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libev ">=$version"
 
 do_install() {
         vmove usr/include usr
diff --git a/srcpkgs/libevent/depends b/srcpkgs/libevent/depends
deleted file mode 100644
index 7dd8488f67..0000000000
--- a/srcpkgs/libevent/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libevent/libevent-devel.template b/srcpkgs/libevent/libevent-devel.template
index 0859091e41..8edd2093f4 100644
--- a/srcpkgs/libevent/libevent-devel.template
+++ b/srcpkgs/libevent/libevent-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libevent-devel'.
 #
+depends="openssl-devel libevent"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run openssl-devel
-Add_dependency run libevent
 
 do_install()
 {
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index a0baa1c76d..e30947386c 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -4,6 +4,7 @@ version=2.0.19
 wrksrc="$pkgname-$version-stable"
 distfiles="https://github.com/downloads/$pkgname/$pkgname/$pkgname-$version-stable.tar.gz"
 build_style=gnu-configure
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.monkey.org/~provos/libevent/"
@@ -18,4 +19,3 @@ long_desc="
  without having to change the event loop."
 
 subpackages="$pkgname-devel"
-Add_dependency build openssl-devel
diff --git a/srcpkgs/libexif/depends b/srcpkgs/libexif/depends
deleted file mode 100644
index 1a5211fe01..0000000000
--- a/srcpkgs/libexif/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.17"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libexif/libexif-devel.template b/srcpkgs/libexif/libexif-devel.template
index efde3b42c7..20e6714b96 100644
--- a/srcpkgs/libexif/libexif-devel.template
+++ b/srcpkgs/libexif/libexif-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libexif-devel'.
 #
+depends="glibc-devel libexif"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libexif
 
 do_install()
 {
diff --git a/srcpkgs/libfetch/depends b/srcpkgs/libfetch/depends
deleted file mode 100644
index 1bce2af358..0000000000
--- a/srcpkgs/libfetch/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.33"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libfetch/libfetch-devel.template b/srcpkgs/libfetch/libfetch-devel.template
index c07c23400b..a6dc175cff 100644
--- a/srcpkgs/libfetch/libfetch-devel.template
+++ b/srcpkgs/libfetch/libfetch-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libfetch-devel'.
 #
+depends="openssl-devel libfetch"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run openssl-devel
-Add_dependency run libfetch
 
 do_install()
 {
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index 2e26783ebc..153025e5ba 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -4,6 +4,7 @@ version=2.33
 distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
 revision=2
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3226f53d5ad29cc27510db968ef0d37bf4554b8aaaeadcd56e23067213b08943
@@ -12,7 +13,6 @@ long_desc="
  files using Uniform Resource Locators (URLs)."
 
 subpackages="$pkgname-devel"
-Add_dependency build openssl-devel
 
 pre_build()
 {
diff --git a/srcpkgs/libffi/depends b/srcpkgs/libffi/depends
deleted file mode 100644
index bd50f167de..0000000000
--- a/srcpkgs/libffi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libffi/libffi-devel.template b/srcpkgs/libffi/libffi-devel.template
index 1cf3886346..143c067b64 100644
--- a/srcpkgs/libffi/libffi-devel.template
+++ b/srcpkgs/libffi/libffi-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libffi-devel'.
 #
+depends="glibc-devel libffi"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libffi
 
 do_install()
 {
diff --git a/srcpkgs/libfm/depends b/srcpkgs/libfm/depends
deleted file mode 100644
index 000d53d92b..0000000000
--- a/srcpkgs/libfm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.16"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libfm/libfm-devel.template b/srcpkgs/libfm/libfm-devel.template
index c7b61370cb..e44123333f 100644
--- a/srcpkgs/libfm/libfm-devel.template
+++ b/srcpkgs/libfm/libfm-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libfm-devel'.
 #
+depends="gtk+-devel menu-cache-devel libfm"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run menu-cache-devel
-Add_dependency run libfm
 
 do_install()
 {
diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template
index b1642c40c6..c133696c6f 100644
--- a/srcpkgs/libfm/template
+++ b/srcpkgs/libfm/template
@@ -4,6 +4,8 @@ version=0.1.17
 distfiles="${SOURCEFORGE_SITE}/pcmanfm/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-udisks"
+makedepends="pkg-config intltool dbus-glib-devel gtk+-devel menu-cache-devel"
+fulldepends="desktop-file-utils udisks"
 short_desc="LXDE GLib/GIO based library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b
@@ -17,11 +19,4 @@ conf_files="
 /etc/xdg/libfm/libfm.conf
 /etc/xdg/libfm/pref-apps.conf"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+-devel
-Add_dependency build menu-cache-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full udisks
diff --git a/srcpkgs/libfontenc/depends b/srcpkgs/libfontenc/depends
deleted file mode 100644
index dc58176dfd..0000000000
--- a/srcpkgs/libfontenc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libfontenc/libfontenc-devel.template b/srcpkgs/libfontenc/libfontenc-devel.template
index 7b02600c5b..7ebf0c4cd6 100644
--- a/srcpkgs/libfontenc/libfontenc-devel.template
+++ b/srcpkgs/libfontenc/libfontenc-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libfontenc-devel'.
 #
+depends="xproto zlib-devel libfontenc"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xproto
-Add_dependency run zlib-devel
-Add_dependency run libfontenc
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libfontenc/template b/srcpkgs/libfontenc/template
index 91e5ee3a08..8fe6c45540 100644
--- a/srcpkgs/libfontenc/template
+++ b/srcpkgs/libfontenc/template
@@ -4,6 +4,7 @@ version=1.1.1
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto zlib-devel"
 short_desc="The fontenc Library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,6 +13,3 @@ long_desc="
  This provides the fontenc Library from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build zlib-devel
diff --git a/srcpkgs/libgcrypt/depends b/srcpkgs/libgcrypt/depends
deleted file mode 100644
index db6180d368..0000000000
--- a/srcpkgs/libgcrypt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgcrypt/libgcrypt-devel.template b/srcpkgs/libgcrypt/libgcrypt-devel.template
index e8680c4e4c..aa72f2386a 100644
--- a/srcpkgs/libgcrypt/libgcrypt-devel.template
+++ b/srcpkgs/libgcrypt/libgcrypt-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgrypt-devel'.
 #
+depends="libgpg-error-devel libgcrypt"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgpg-error-devel
-Add_dependency run libgcrypt
 
 do_install()
 {
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 7aa481d5e6..76217a233f 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -4,6 +4,7 @@ version=1.5.0
 distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="libgpg-error-devel"
 short_desc="GNU cryptographic library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa
@@ -16,4 +17,3 @@ long_desc="
  lot of supporting functions."
 
 subpackages="$pkgname-devel"
-Add_dependency build libgpg-error-devel
diff --git a/srcpkgs/libgdata/depends b/srcpkgs/libgdata/depends
deleted file mode 100644
index 699dd4000b..0000000000
--- a/srcpkgs/libgdata/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.0"
-api_depends=">=0.12.0"
diff --git a/srcpkgs/libgdata/libgdata-devel.template b/srcpkgs/libgdata/libgdata-devel.template
index 4651450c90..3495dae237 100644
--- a/srcpkgs/libgdata/libgdata-devel.template
+++ b/srcpkgs/libgdata/libgdata-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libgdata-devel'.
 #
+depends="libxml2-devel libsoup-devel libgdata>=0.12.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains development files: headers, static libs, etc."
 
-Add_dependency run libxml2-devel
-Add_dependency run libsoup-devel
-Add_dependency run libgdata ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 4923093a33..39f961b58c 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -4,6 +4,7 @@ version=0.12.0
 homepage="http://live.gnome.org/libgdata"
 distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config flex intltool gobject-introspection glib-devel gtk+3-devel libsoup-gnome-devel liboauth-devel libgnome-keyring-devel"
 short_desc="Library for accessing GData webservices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,12 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build liboauth-devel
-Add_dependency build libgnome-keyring-devel
diff --git a/srcpkgs/libgee/depends b/srcpkgs/libgee/depends
deleted file mode 100644
index 017786f6fa..0000000000
--- a/srcpkgs/libgee/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgee/libgee-devel.template b/srcpkgs/libgee/libgee-devel.template
index 4e086a3b79..fa9c32093e 100644
--- a/srcpkgs/libgee/libgee-devel.template
+++ b/srcpkgs/libgee/libgee-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgee-devel'.
 #
+depends="glib-devel libgee"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libgee
 
 do_install()
 {
diff --git a/srcpkgs/libgee/template b/srcpkgs/libgee/template
index 487e86485f..ad56072757 100644
--- a/srcpkgs/libgee/template
+++ b/srcpkgs/libgee/template
@@ -6,6 +6,7 @@ homepage="http://live.gnome.org/Libgee"
 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 configure_args="--enable-static --with-pic=yes"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel vala-devel gobject-introspection"
 short_desc="GObject collection library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,8 +16,3 @@ long_desc="
  for commonly used data structures."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build vala-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libgexiv2/depends b/srcpkgs/libgexiv2/depends
deleted file mode 100644
index fed1cb2e2e..0000000000
--- a/srcpkgs/libgexiv2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgexiv2/libgexiv2-devel.template b/srcpkgs/libgexiv2/libgexiv2-devel.template
index 8844abc396..89375460e6 100644
--- a/srcpkgs/libgexiv2/libgexiv2-devel.template
+++ b/srcpkgs/libgexiv2/libgexiv2-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libgexiv2-devel'.
 #
+depends="glib-devel exiv2-devel libgexiv2>=0.4.1"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run exiv2-devel
-Add_dependency run libgexiv2 ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template
index 3037c3cc95..02d81e15c1 100644
--- a/srcpkgs/libgexiv2/template
+++ b/srcpkgs/libgexiv2/template
@@ -5,6 +5,7 @@ homepage="http://www.exiv2.org"
 distfiles="http://yorba.org/download/gexiv2/0.4/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="libtool pkg-config glib-devel exiv2-devel"
 short_desc="GObject-based wrapper around the Exiv2 library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,7 +16,3 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build libtool
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build exiv2-devel
diff --git a/srcpkgs/libglade/depends b/srcpkgs/libglade/depends
deleted file mode 100644
index 4b59a956db..0000000000
--- a/srcpkgs/libglade/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.6.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libglade/libglade-devel.template b/srcpkgs/libglade/libglade-devel.template
index 3f7bc5066e..20b9b2fac0 100644
--- a/srcpkgs/libglade/libglade-devel.template
+++ b/srcpkgs/libglade/libglade-devel.template
@@ -1,22 +1,12 @@
 # Template file for 'libglade-devel'.
 #
+depends="pkg-config python libxml2-devel gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel libglade"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run python
-Add_dependency run libxml2-devel
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libglade
 
 do_install()
 {
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index 885aab9ec5..902b01482e 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -5,6 +5,8 @@ revision=6
 distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-xml-catalog"
+makedepends="pkg-config python libxml2-devel gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel"
+fulldepends="xmlcatmgr"
 short_desc="Runtime interpreter for GLADE GUI files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
@@ -25,17 +27,6 @@ export xml_entries="system http://glade.gnome.org/glade-2.0.dtd
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build libxml2-devel
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency full xmlcatmgr
 
 post_install()
 {
diff --git a/srcpkgs/libgnome-keyring/depends b/srcpkgs/libgnome-keyring/depends
deleted file mode 100644
index ab0d9627ad..0000000000
--- a/srcpkgs/libgnome-keyring/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnome-keyring/libgnome-keyring-devel.template b/srcpkgs/libgnome-keyring/libgnome-keyring-devel.template
index 312000d3e3..16decf2009 100644
--- a/srcpkgs/libgnome-keyring/libgnome-keyring-devel.template
+++ b/srcpkgs/libgnome-keyring/libgnome-keyring-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgnome-keyring-devel'.
 #
+depends="glib-devel libgnome-keyring>=3.4.1"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libgnome-keyring ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index fe09739276..93b869cf26 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -4,6 +4,7 @@ version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-debug"
+makedepends="pkg-config intltool dbus-devel glib-devel libgcrypt-devel libgpg-error-devel gobject-introspection"
 short_desc="GNOME keyring client library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -20,10 +21,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libgnome-media-profiles/depends b/srcpkgs/libgnome-media-profiles/depends
deleted file mode 100644
index ab0d9627ad..0000000000
--- a/srcpkgs/libgnome-media-profiles/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnome-media-profiles/libgnome-media-profiles-devel.template b/srcpkgs/libgnome-media-profiles/libgnome-media-profiles-devel.template
index 8053c41bf9..cea6ac24fb 100644
--- a/srcpkgs/libgnome-media-profiles/libgnome-media-profiles-devel.template
+++ b/srcpkgs/libgnome-media-profiles/libgnome-media-profiles-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'libgnome-media-profiles-devel'.
 #
+depends="pkg-config intltool gnome-doc-utils libgnome-media-profiles"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run gnome-doc-utils
-Add_dependency run libgnome-media-profiles
 
 do_install()
 {
diff --git a/srcpkgs/libgnome-media-profiles/template b/srcpkgs/libgnome-media-profiles/template
index 90d7c80543..9c3c1d4f2e 100644
--- a/srcpkgs/libgnome-media-profiles/template
+++ b/srcpkgs/libgnome-media-profiles/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-schemas-install
 --disable-scrollkeeper --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+makedepends="which pkg-config intltool gnome-doc-utils gtk+3-devel libxml2-devel GConf-devel gst-plugins-base-devel"
 short_desc="GNOME Media Profiles"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061
@@ -15,14 +16,6 @@ revision=4
 gconf_schemas="gnome-media-profiles.schemas"
 subpackages="$pkgname-devel"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build libxml2-devel
-Add_dependency build GConf-devel
-Add_dependency build gst-plugins-base-devel
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/libgnomecanvas/depends b/srcpkgs/libgnomecanvas/depends
deleted file mode 100644
index e709dcbad4..0000000000
--- a/srcpkgs/libgnomecanvas/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.30.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template b/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template
index 80103c407d..51fd9e500b 100644
--- a/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template
+++ b/srcpkgs/libgnomecanvas/libgnomecanvas-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libgnomecanvas-devel'.
 #
+depends="gtk+-devel libart-devel libgnomecanvas"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run gtk+-devel
-Add_dependency run libart-devel
-Add_dependency run libgnomecanvas
 
 do_install()
 {
diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index ac57ac676b..865b12c86e 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -4,6 +4,7 @@ version=2.30.3
 distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=3
+makedepends="pkg-config intltool gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
@@ -22,7 +23,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libart-devel
diff --git a/srcpkgs/libgnomekbd/depends b/srcpkgs/libgnomekbd/depends
deleted file mode 100644
index ef68c2ebf0..0000000000
--- a/srcpkgs/libgnomekbd/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.90"
-api_depends=">=3.4.0.2"
diff --git a/srcpkgs/libgnomekbd/libgnomekbd-devel.template b/srcpkgs/libgnomekbd/libgnomekbd-devel.template
index 95fc2e4e74..fcd15bb4bb 100644
--- a/srcpkgs/libgnomekbd/libgnomekbd-devel.template
+++ b/srcpkgs/libgnomekbd/libgnomekbd-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libgnomekbd-devel'.
 #
+depends="libxml2-devel gtk+3-devel libxklavier-devel libgnomekbd>=3.4.0.2"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxml2-devel
-Add_dependency run gtk+3-devel
-Add_dependency run libxklavier-devel
-Add_dependency run libgnomekbd ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libgnomekbd/template b/srcpkgs/libgnomekbd/template
index 8995f944ac..d220e84246 100644
--- a/srcpkgs/libgnomekbd/template
+++ b/srcpkgs/libgnomekbd/template
@@ -5,6 +5,8 @@ revision=3
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="desktop-file-utils"
+makedepends="pkg-config intltool libxml2-devel gtk+3-devel libxklavier-devel>=5.2.1_1 gobject-introspection"
 short_desc="Gnome keyboard configuration library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39
@@ -13,11 +15,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxml2-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libxklavier-devel ">=5.2.1_1"
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libgpg-error/depends b/srcpkgs/libgpg-error/depends
deleted file mode 100644
index 58213312e1..0000000000
--- a/srcpkgs/libgpg-error/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgpg-error/libgpg-error-devel.template b/srcpkgs/libgpg-error/libgpg-error-devel.template
index ee89948b8b..5ad00950cc 100644
--- a/srcpkgs/libgpg-error/libgpg-error-devel.template
+++ b/srcpkgs/libgpg-error/libgpg-error-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgpg-error-devel'.
 #
+depends="glibc-devel libgpg-error"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libgpg-error
 
 do_install()
 {
diff --git a/srcpkgs/libgphoto2/depends b/srcpkgs/libgphoto2/depends
deleted file mode 100644
index 6aecdb53df..0000000000
--- a/srcpkgs/libgphoto2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.4.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgphoto2/libgphoto2-devel.template b/srcpkgs/libgphoto2/libgphoto2-devel.template
index 99622ba315..a184403f4e 100644
--- a/srcpkgs/libgphoto2/libgphoto2-devel.template
+++ b/srcpkgs/libgphoto2/libgphoto2-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libgphoto2-devel'.
 #
+depends="libexif-devel libusb-compat-devel libgphoto2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libexif-devel
-Add_dependency run libusb-compat-devel
-Add_dependency run libgphoto2
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template
index 0124673bc1..3b7d30a3ac 100644
--- a/srcpkgs/libgphoto2/template
+++ b/srcpkgs/libgphoto2/template
@@ -5,6 +5,7 @@ homepage="http://www.gphoto.org"
 distfiles="${SOURCEFORGE_SITE}/gphoto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-rpath udevscriptdir=/lib/udev"
+makedepends="pkg-config libltdl-devel libusb-compat-devel jpeg-devel gd-devel libexif-devel"
 short_desc="Digital camera access library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -23,12 +24,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libltdl-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build jpeg-devel
-Add_dependency build gd-devel
-Add_dependency build libexif-devel
 
 post_install() {
 	# Remove unused udev helper
diff --git a/srcpkgs/libgsf/depends b/srcpkgs/libgsf/depends
deleted file mode 100644
index 41ff1f607d..0000000000
--- a/srcpkgs/libgsf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.14.11"
-api_depends=">=1.14.22"
diff --git a/srcpkgs/libgsf/libgsf-devel.template b/srcpkgs/libgsf/libgsf-devel.template
index 86443cbe6d..a7472fabd6 100644
--- a/srcpkgs/libgsf/libgsf-devel.template
+++ b/srcpkgs/libgsf/libgsf-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libgsf-devel'.
 #
+depends="glib-devel libxml2-devel libgsf>=1.14.23"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run libgsf ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index 8f1d50a754..5293b5d8d3 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -5,6 +5,7 @@ homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool glib-devel libxml2-devel gdk-pixbuf-devel gobject-introspection"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -16,9 +17,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libgsm/libgsm-devel.template b/srcpkgs/libgsm/libgsm-devel.template
index 28828bf35c..2c1fea91c0 100644
--- a/srcpkgs/libgsm/libgsm-devel.template
+++ b/srcpkgs/libgsm/libgsm-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgsm-devel'.
 #
+depends="glibc-devel libgsm"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libgsm
 
 
 do_install()
diff --git a/srcpkgs/libgssglue/depends b/srcpkgs/libgssglue/depends
deleted file mode 100644
index 91173a9649..0000000000
--- a/srcpkgs/libgssglue/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgssglue/libgssglue-devel.template b/srcpkgs/libgssglue/libgssglue-devel.template
index 3ddccafcfe..88fd52b435 100644
--- a/srcpkgs/libgssglue/libgssglue-devel.template
+++ b/srcpkgs/libgssglue/libgssglue-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgssglue-devel'.
 #
+depends="glibc-devel libgssglue"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libgssglue
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libgtop/depends b/srcpkgs/libgtop/depends
deleted file mode 100644
index a292caca77..0000000000
--- a/srcpkgs/libgtop/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.28.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgtop/libgtop-devel.template b/srcpkgs/libgtop/libgtop-devel.template
index 14833958f7..8cb9d42e09 100644
--- a/srcpkgs/libgtop/libgtop-devel.template
+++ b/srcpkgs/libgtop/libgtop-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libgtop-devel'.
 #
+depends="pkg-config intltool glib-devel libXau-devel libgtop"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run glib-devel
-Add_dependency run libXau-devel
-Add_dependency run libgtop
 
 do_install()
 {
diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template
index dff78d0d93..a33fbbf204 100644
--- a/srcpkgs/libgtop/template
+++ b/srcpkgs/libgtop/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="-with-libgtop-smp"
 revision=2
+makedepends="pkg-config intltool glib-devel libXau-devel gobject-introspection"
 short_desc="Library to retrieve system information, used in GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/"
@@ -18,8 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libXau-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libgudev/depends b/srcpkgs/libgudev/depends
deleted file mode 120000
index a53336e027..0000000000
--- a/srcpkgs/libgudev/depends
+++ /dev/null
@@ -1 +0,0 @@
-../udev/depends
\ No newline at end of file
diff --git a/srcpkgs/libgudev/libgudev-devel.template b/srcpkgs/libgudev/libgudev-devel.template
index bd69a8933c..3462017f4f 100644
--- a/srcpkgs/libgudev/libgudev-devel.template
+++ b/srcpkgs/libgudev/libgudev-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libgudev-devel'.
 #
+depends="libudev-devel glib-devel libgudev"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains the libgudev development files (static libs, headers,
  etc), a library to interact with udev through the GLib bindings."
 
-Add_dependency run libudev-devel
-Add_dependency run glib-devel
-Add_dependency run libgudev
 
 do_install()
 {
diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index fe616bc33e..ddec712c05 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
 configure_args="--without-selinux --disable-rule-generator
 --enable-introspection --enable-gudev --disable-static
 --disable-keymap --disable-mtd_probe"
+makedepends="pkg-config gperf glib-devel gobject-introspection libblkid-devel libkmod-devel usbutils pciutils"
 short_desc="GObject-based wrapper library for libudev"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -20,14 +21,6 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gperf
-Add_dependency build glib-devel
-Add_dependency build gobject-introspection
-Add_dependency build libblkid-devel
-Add_dependency build libkmod-devel
-Add_dependency build usbutils
-Add_dependency build pciutils
 
 post_install() {
 	# remove stuff in udev pkg.
diff --git a/srcpkgs/libgusb/depends b/srcpkgs/libgusb/depends
deleted file mode 100644
index 6f02f45679..0000000000
--- a/srcpkgs/libgusb/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgusb/libgusb-devel.template b/srcpkgs/libgusb/libgusb-devel.template
index 6f9b4c9478..6596a6b2b6 100644
--- a/srcpkgs/libgusb/libgusb-devel.template
+++ b/srcpkgs/libgusb/libgusb-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libgusb-devel'.
 #
+depends="libudev-devel libgusb"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains the libgudev development files (static libs, headers,
  etc), a library to interact with udev through the GLib bindings."
 
-Add_dependency run libudev-devel
-Add_dependency run libgusb
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 2227f53a56..9e8c2b47fb 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -4,6 +4,7 @@ version=0.1.3
 distfiles="http://people.freedesktop.org/~hughsient/releases/$pkgname-${version}.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config libusb-devel libgudev-devel"
 short_desc="GLib wrapper around libusb1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://gitorious.org/gusb/"
@@ -17,6 +18,3 @@ long_desc="
  high-level application or system daemon."
 
 subpackages="${pkgname}-devel"
-Add_dependency build pkg-config
-Add_dependency build libusb-devel
-Add_dependency build libgudev-devel
diff --git a/srcpkgs/libgweather/depends b/srcpkgs/libgweather/depends
deleted file mode 100644
index 360a254cba..0000000000
--- a/srcpkgs/libgweather/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.6"
-api_depends=">=3.4.1_1"
diff --git a/srcpkgs/libgweather/libgweather-devel.template b/srcpkgs/libgweather/libgweather-devel.template
index 4467996c75..9d4658d207 100644
--- a/srcpkgs/libgweather/libgweather-devel.template
+++ b/srcpkgs/libgweather/libgweather-devel.template
@@ -1,18 +1,12 @@
 # Template file for 'libgweather-devel'.
 #
+depends="glib-devel gdk-pixbuf-devel gtk+3-devel GConf-devel libxml2-devel libsoup-devel libgweather>=3.4.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glib-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run gtk+3-devel
-Add_dependency run GConf-devel
-Add_dependency run libxml2-devel
-Add_dependency run libsoup-devel
-Add_dependency run libgweather ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index ce06bb6aad..dccca8d97a 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -8,6 +8,8 @@ build_style=gnu-configure
 configure_args="--disable-schemas-install
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo"
+makedepends="pkg-config intltool libxml2-devel gtk+3-devel libsoup-devel libsoup-gnome-devel GConf-devel gobject-introspection"
+fulldepends="gnome-icon-theme"
 short_desc="Weather information access library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -20,16 +22,7 @@ gconf_schemas="gweather.schemas"
 gtk_iconcache_dirs="/usr/share/icons/gnome"
 subpackages="$pkgname-devel"
 
-Add_dependency full gnome-icon-theme
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxml2-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libsoup-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build GConf-devel
-Add_dependency build gobject-introspection
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/libgxps/depends b/srcpkgs/libgxps/depends
deleted file mode 100644
index 0a1169209a..0000000000
--- a/srcpkgs/libgxps/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgxps/libgxps-devel.template b/srcpkgs/libgxps/libgxps-devel.template
index 235a74a272..4efe178c4b 100644
--- a/srcpkgs/libgxps/libgxps-devel.template
+++ b/srcpkgs/libgxps/libgxps-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libgxps-devel'.
 #
+depends="glib-devel libarchive-devel cairo-devel libgxps"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libarchive-devel
-Add_dependency run cairo-devel
-Add_dependency run libgxps
 
 do_install()
 {
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 0ee05250e3..6dc109e7dd 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -5,6 +5,7 @@ homepage="http://live.gnome.org/libgxps"
 distfiles="${GNOME_SITE}/$pkgname/0.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config glib-devel jpeg-devel tiff-devel lcms2-devel libarchive-devel freetype-devel gobject-introspection"
 short_desc="GObject base library for XPS documents"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -14,11 +15,3 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build jpeg-devel
-Add_dependency build tiff-devel
-Add_dependency build lcms2-devel
-Add_dependency build libarchive-devel
-Add_dependency build freetype-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libhubbub/depends b/srcpkgs/libhubbub/depends
deleted file mode 100644
index 56fb9e056a..0000000000
--- a/srcpkgs/libhubbub/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libhubbub/libhubbub-devel.template b/srcpkgs/libhubbub/libhubbub-devel.template
index de591d65ba..b93a71de31 100644
--- a/srcpkgs/libhubbub/libhubbub-devel.template
+++ b/srcpkgs/libhubbub/libhubbub-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libhubbub-devel'.
 #
+depends="libhubbub>=0.1.2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libhubbub ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
index bc8b4f0315..ed16f3c397 100644
--- a/srcpkgs/libhubbub/template
+++ b/srcpkgs/libhubbub/template
@@ -3,6 +3,7 @@ pkgname=libhubbub
 version=0.1.2
 homepage="http://www.netsurf-browser.org"
 distfiles="${homepage}/projects/releases/hubbub-${version}-src.tar.gz"
+makedepends="perl pkg-config libxslt-devel json-c-devel libparserutils-devel"
 short_desc="HTML5 compliant parsing library, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52
@@ -28,11 +29,6 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build perl
-Add_dependency build pkg-config
-Add_dependency build libxslt-devel
-Add_dependency build json-c-devel
-Add_dependency build libparserutils-devel
 
 wrksrc=hubbub-${version}
 
diff --git a/srcpkgs/libical/depends b/srcpkgs/libical/depends
deleted file mode 100644
index c3eeac1e0f..0000000000
--- a/srcpkgs/libical/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.44"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libical/libical-devel.template b/srcpkgs/libical/libical-devel.template
index 1b7276b7d7..f4c848e392 100644
--- a/srcpkgs/libical/libical-devel.template
+++ b/srcpkgs/libical/libical-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libical-devel'.
 #
+depends="glibc-devel libical"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libical
 
 do_install()
 {
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index e2b6e20cde..0f98f5c802 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -5,6 +5,7 @@ distfiles="${SOURCEFORGE_SITE}/freeassociation/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-shared"
 revision=2
+makedepends="flex automake"
 short_desc="Reference implementation of the iCalendar data type and format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=000762efb81501421d94ec56343648a62b3bd2884e7cdf6f638e2c207dd8f6a1
@@ -12,8 +13,6 @@ long_desc="
  LIBICAL -- an implementation of iCalendar protocols and data formats."
 
 subpackages="$pkgname-devel"
-Add_dependency build flex
-Add_dependency build automake
 
 pre_configure()
 {
diff --git a/srcpkgs/libid3tag/depends b/srcpkgs/libid3tag/depends
deleted file mode 100644
index 59c3dbc364..0000000000
--- a/srcpkgs/libid3tag/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.15.1b"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libid3tag/libid3tag-devel.template b/srcpkgs/libid3tag/libid3tag-devel.template
index 432093d1f9..dbb41abc88 100644
--- a/srcpkgs/libid3tag/libid3tag-devel.template
+++ b/srcpkgs/libid3tag/libid3tag-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libid3tag-devel'.
 #
+depends="zlib-devel libid3tag"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run zlib-devel
-Add_dependency run libid3tag
 
 do_install()
 {
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index acabe78f9e..a87c7d6739 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -4,6 +4,7 @@ version=0.15.1b
 revision=3
 distfiles="ftp://ftp.mars.org/pub/mpeg/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
@@ -12,8 +13,6 @@ long_desc="
  tags, both ID3v1 and the various versions of ID3v2."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
 
 post_install()
 {
diff --git a/srcpkgs/libidn/depends b/srcpkgs/libidn/depends
deleted file mode 100644
index 4edb2fea97..0000000000
--- a/srcpkgs/libidn/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libidn/libidn-devel.template b/srcpkgs/libidn/libidn-devel.template
index bea534c2c4..3be6acfb47 100644
--- a/srcpkgs/libidn/libidn-devel.template
+++ b/srcpkgs/libidn/libidn-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libidn-devel'.
 #
+depends="glibc-devel libidn"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libidn
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template
index 92deb8e619..9810f218b7 100644
--- a/srcpkgs/libidn/template
+++ b/srcpkgs/libidn/template
@@ -4,6 +4,7 @@ version=1.24
 distfiles="http://ftp.gnu.org/gnu/libidn/libidn-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-csharp --disable-java --enable-threads=posix"
+makedepends="perl pkg-config"
 short_desc="Internationalized Domain Names command line tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libidn/"
@@ -24,5 +25,3 @@ long_desc="
  IDNA are supported."
 
 subpackages="$pkgname-devel"
-Add_dependency build perl
-Add_dependency build pkg-config
diff --git a/srcpkgs/libieee1284/depends b/srcpkgs/libieee1284/depends
deleted file mode 100644
index 08597f150e..0000000000
--- a/srcpkgs/libieee1284/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libieee1284/libieee1284-devel.template b/srcpkgs/libieee1284/libieee1284-devel.template
index c56be98abf..9c1002e7f2 100644
--- a/srcpkgs/libieee1284/libieee1284-devel.template
+++ b/srcpkgs/libieee1284/libieee1284-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libieee1284-devel'.
 #
+depends="libieee1284>=0.2.10"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libieee1284 ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/libiptcdata/depends b/srcpkgs/libiptcdata/depends
deleted file mode 100644
index dc58176dfd..0000000000
--- a/srcpkgs/libiptcdata/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libiptcdata/libiptcdata-devel.template b/srcpkgs/libiptcdata/libiptcdata-devel.template
index eedd10a6b8..ef2a687e56 100644
--- a/srcpkgs/libiptcdata/libiptcdata-devel.template
+++ b/srcpkgs/libiptcdata/libiptcdata-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libiptcdata-devel'.
 #
+depends="libiptcdata>=1.0.4"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ${sourcepkg} ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libisofs/depends b/srcpkgs/libisofs/depends
deleted file mode 100644
index 6d00d3a62b..0000000000
--- a/srcpkgs/libisofs/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.24"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libisofs/libisofs-devel.template b/srcpkgs/libisofs/libisofs-devel.template
index bce2bfd0b2..422de02b6d 100644
--- a/srcpkgs/libisofs/libisofs-devel.template
+++ b/srcpkgs/libisofs/libisofs-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'libisofs-devel'.
 #
+depends="glibc-devel zlib-devel acl-devel attr-devel libisofs"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run zlib-devel
-Add_dependency run acl-devel
-Add_dependency run attr-devel
-Add_dependency run libisofs
 
 do_install()
 {
diff --git a/srcpkgs/libisofs/template b/srcpkgs/libisofs/template
index e12549e5aa..5843fa56a4 100644
--- a/srcpkgs/libisofs/template
+++ b/srcpkgs/libisofs/template
@@ -5,6 +5,7 @@ revision=3
 distfiles="http://files.libburnia-project.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-libacl --enable-xattr"
+makedepends="acl-devel zlib-devel"
 short_desc="Library to create ISO9660 images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=60aea7f9b6e07d44fb3d24e8bc33cb512058ca6c28f26fdf100e95b0443b25d1
@@ -13,5 +14,3 @@ long_desc="
  other software."
 
 subpackages="$pkgname-devel"
-Add_dependency build acl-devel
-Add_dependency build zlib-devel
diff --git a/srcpkgs/libjpeg-turbo/depends b/srcpkgs/libjpeg-turbo/depends
deleted file mode 100644
index 328eed9225..0000000000
--- a/srcpkgs/libjpeg-turbo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
index 957fcccf51..c2c0753f16 100644
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
+++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libjpeg-turbo-devel'.
 #
+depends="glibc-devel libjpeg-turbo"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libjpeg-turbo
 
 provides="jpeg-devel-8"
 replaces="jpeg-devel>=0"
diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
index cae9809043..fe3cf7eb9b 100644
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
+++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
@@ -1,11 +1,11 @@
 # Template file for 'libjpeg-turbo-tools'.
 #
+depends="libjpeg-turbo>=1.2.0"
 short_desc="${sourcepkg} - bundled tools"
 long_desc="${long_desc}
 
  This package contains tools to manipulate JPG files."
 
-Add_dependency run libjpeg-turbo ">=${version}"
 
 provides="jpeg-tools-8"
 replaces="jpeg-tools>=0"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index fd3af60161..204fea2203 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -5,6 +5,7 @@ homepage="http://libjpeg-turbo.virtualgl.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--with-jpeg8"
+makedepends="nasm"
 short_desc="Derivative of libjpeg which uses SIMD instructions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -21,7 +22,6 @@ provides="jpeg-8"
 replaces="jpeg>=0"
 subpackages="${pkgname}-devel ${pkgname}-tools"
 
-Add_dependency build nasm
 
 post_install() {
 	vinstall jpegint.h 644 usr/include
diff --git a/srcpkgs/libldap/depends b/srcpkgs/libldap/depends
deleted file mode 100644
index ef54246b6b..0000000000
--- a/srcpkgs/libldap/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.4.21"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libldap/libldap-devel.template b/srcpkgs/libldap/libldap-devel.template
index c2c8e0a12f..db33413726 100644
--- a/srcpkgs/libldap/libldap-devel.template
+++ b/srcpkgs/libldap/libldap-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libldap-devel'.
 #
+depends="openssl-devel libsasl-devel libldap>=2.4.31"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run openssl-devel
-Add_dependency run libsasl-devel
-Add_dependency run libldap ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template
index 17c124653e..dd332910fd 100644
--- a/srcpkgs/libldap/template
+++ b/srcpkgs/libldap/template
@@ -8,6 +8,7 @@ build_style=gnu-configure
 configure_args="--enable-dynamic --enable-proctitle --with-tls
 --enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
 --enable-syslog --disable-slapd"
+makedepends="pkg-config libsasl-devel openssl-devel groff"
 short_desc="OpenLDAP libraries"
 license="OpenLDAP License v2.8 -- BSD alike"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,10 +20,6 @@ long_desc="
 conf_files="/etc/openldap/ldap.conf" 
 subpackages="libldap-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libsasl-devel
-Add_dependency build openssl-devel
-Add_dependency build groff
 
 post_install() {
 	# Remove unused stuff.
diff --git a/srcpkgs/liblo/depends b/srcpkgs/liblo/depends
deleted file mode 100644
index 95ffe5f1fc..0000000000
--- a/srcpkgs/liblo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.26"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/liblo/liblo-devel.template b/srcpkgs/liblo/liblo-devel.template
index da3fda182b..6ddd547c69 100644
--- a/srcpkgs/liblo/liblo-devel.template
+++ b/srcpkgs/liblo/liblo-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'liblo-devel'.
 #
+depends="glibc-devel liblo"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run liblo
 
 do_install()
 {
diff --git a/srcpkgs/liblrdf/depends b/srcpkgs/liblrdf/depends
deleted file mode 100644
index 7855591013..0000000000
--- a/srcpkgs/liblrdf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/liblrdf/liblrdf-devel.template b/srcpkgs/liblrdf/liblrdf-devel.template
index f0d3e13ef3..b3d0db458f 100644
--- a/srcpkgs/liblrdf/liblrdf-devel.template
+++ b/srcpkgs/liblrdf/liblrdf-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'liblrdf-devel'.
 #
+depends="raptor-devel liblrdf"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run raptor-devel
-Add_dependency run liblrdf
 
 do_install()
 {
diff --git a/srcpkgs/liblrdf/template b/srcpkgs/liblrdf/template
index 11ba801fc3..2df79c6006 100644
--- a/srcpkgs/liblrdf/template
+++ b/srcpkgs/liblrdf/template
@@ -5,6 +5,7 @@ homepage="http://sourceforge.net/projects/lrdf"
 distfiles="${SOURCEFORGE_SITE}/lrdf/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="automake pkg-config ladspa-sdk raptor-devel"
 short_desc="A lightweight RDF library with special support for LADSPA plugins"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -14,10 +15,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build ladspa-sdk
-Add_dependency build raptor-devel
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libmad/depends b/srcpkgs/libmad/depends
deleted file mode 100644
index 59c3dbc364..0000000000
--- a/srcpkgs/libmad/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.15.1b"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmad/libmad-devel.template b/srcpkgs/libmad/libmad-devel.template
index 66ecae27ca..3cb5cdbf69 100644
--- a/srcpkgs/libmad/libmad-devel.template
+++ b/srcpkgs/libmad/libmad-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libmad-devel'.
 #
+depends="glibc-devel libmad"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libmad
 
 do_install()
 {
diff --git a/srcpkgs/libmad/template b/srcpkgs/libmad/template
index 7f8529182e..111845544e 100644
--- a/srcpkgs/libmad/template
+++ b/srcpkgs/libmad/template
@@ -4,6 +4,7 @@ version=0.15.1b
 revision=3
 distfiles="${SOURCEFORGE_SITE}/mad/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="automake"
 short_desc="High-quality MPEG audio decoder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
@@ -31,7 +32,6 @@ long_desc="
  of dithering or noise shaping."
 
 subpackages="$pkgname-devel"
-Add_dependency build automake
 
 pre_configure()
 {
diff --git a/srcpkgs/libmatroska/depends b/srcpkgs/libmatroska/depends
deleted file mode 100644
index c2fc823f30..0000000000
--- a/srcpkgs/libmatroska/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmatroska/libmatroska-devel.template b/srcpkgs/libmatroska/libmatroska-devel.template
index 1fb2bf3d52..203e5ffbe7 100644
--- a/srcpkgs/libmatroska/libmatroska-devel.template
+++ b/srcpkgs/libmatroska/libmatroska-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libmatroska-devel'.
 #
+depends="libebml-devel libmatroska"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libebml-devel
-Add_dependency run libmatroska
 
 do_install()
 {
diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index 6ad4c78a3e..182ad64243 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -6,6 +6,7 @@ build_style=gnu-makefile
 build_wrksrc="make/linux"
 make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr install"
 revision=2
+makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dl.matroska.org/downloads/libmatroska/"
@@ -30,4 +31,3 @@ long_desc="
   - Modularly extendable"
 
 subpackages="$pkgname-devel"
-Add_dependency build libebml-devel
diff --git a/srcpkgs/libmikmod/depends b/srcpkgs/libmikmod/depends
deleted file mode 100644
index b7c1818cda..0000000000
--- a/srcpkgs/libmikmod/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.1.12"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmikmod/libmikmod-devel.template b/srcpkgs/libmikmod/libmikmod-devel.template
index ab26d8c2a9..9a37fb64d2 100644
--- a/srcpkgs/libmikmod/libmikmod-devel.template
+++ b/srcpkgs/libmikmod/libmikmod-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libmikmod-devel'.
 #
+depends="glibc-devel libmikmod"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libmikmod
 
 do_install()
 {
diff --git a/srcpkgs/libmms/depends b/srcpkgs/libmms/depends
deleted file mode 100644
index b127b172a5..0000000000
--- a/srcpkgs/libmms/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmms/libmms-devel.template b/srcpkgs/libmms/libmms-devel.template
index 42f0832e81..ac11fe896c 100644
--- a/srcpkgs/libmms/libmms-devel.template
+++ b/srcpkgs/libmms/libmms-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libmms-devel'.
 #
+depends="pkg-config glib-devel libmms"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run libmms
 
 do_install()
 {
diff --git a/srcpkgs/libmms/template b/srcpkgs/libmms/template
index e7b0a30f46..96164312c1 100644
--- a/srcpkgs/libmms/template
+++ b/srcpkgs/libmms/template
@@ -3,6 +3,7 @@ pkgname=libmms
 version=0.6
 revision=4
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+makedepends="pkg-config glib-devel"
 short_desc="MMS stream protocol library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1f894f33b5e0334bd7c75343480bdf3a9cf79232aa92085c03f1a67e7d4ceb9d
@@ -11,8 +12,6 @@ long_desc="
  and mmsh protocols."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build glib-devel
 
 do_build()
 {
diff --git a/srcpkgs/libmng/depends b/srcpkgs/libmng/depends
deleted file mode 100644
index 03d7b541e7..0000000000
--- a/srcpkgs/libmng/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmng/libmng-devel.template b/srcpkgs/libmng/libmng-devel.template
index a4b8ec9d82..2c051a09f2 100644
--- a/srcpkgs/libmng/libmng-devel.template
+++ b/srcpkgs/libmng/libmng-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'libmng-devel'.
 #
+depends="jpeg-devel zlib-devel lcms-devel libmng"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run jpeg-devel
-Add_dependency run zlib-devel
-Add_dependency run lcms-devel
-Add_dependency run libmng
 
 do_install()
 {
diff --git a/srcpkgs/libmng/template b/srcpkgs/libmng/template
index 8c28e9eb97..49fbb7cec2 100644
--- a/srcpkgs/libmng/template
+++ b/srcpkgs/libmng/template
@@ -4,6 +4,7 @@ version=1.0.10
 revision=4
 distfiles="http://www.libmng.com/download/libmng-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="automake jpeg-devel zlib-devel lcms-devel"
 short_desc="Multiple-image Network Graphics (MNG) reference library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7b1477816c54b4d8ee0690c583982637910a1801ece0b0831e03fd07882e8118
@@ -15,10 +16,6 @@ long_desc="
  library by Marti Maria Saguar."
 
 subpackages="$pkgname-devel"
-Add_dependency build automake
-Add_dependency build jpeg-devel
-Add_dependency build zlib-devel
-Add_dependency build lcms-devel
 
 pre_configure() {
 	ln -s makefiles/configure.in .
diff --git a/srcpkgs/libmodplug/depends b/srcpkgs/libmodplug/depends
deleted file mode 100644
index f6edb4300c..0000000000
--- a/srcpkgs/libmodplug/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmodplug/libmodplug-devel.template b/srcpkgs/libmodplug/libmodplug-devel.template
index c9dd8d402f..279f808753 100644
--- a/srcpkgs/libmodplug/libmodplug-devel.template
+++ b/srcpkgs/libmodplug/libmodplug-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libmodplug-devel'.
 #
+depends="glibc-devel libmodplug"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libmodplug
 
 do_install()
 {
diff --git a/srcpkgs/libmp4v2/depends b/srcpkgs/libmp4v2/depends
deleted file mode 100644
index ede626b552..0000000000
--- a/srcpkgs/libmp4v2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.9.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmp4v2/libmp4v2-devel.template b/srcpkgs/libmp4v2/libmp4v2-devel.template
index 246f6f5c07..4a164e81ad 100644
--- a/srcpkgs/libmp4v2/libmp4v2-devel.template
+++ b/srcpkgs/libmp4v2/libmp4v2-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libmp4v2-devel'.
 #
+depends="glibc-devel libmp4v2"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libmp4v2
 
 do_install()
 {
diff --git a/srcpkgs/libmpcdec/depends b/srcpkgs/libmpcdec/depends
deleted file mode 100644
index 4bfed7c0bf..0000000000
--- a/srcpkgs/libmpcdec/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmpcdec/libmpcdec-devel.template b/srcpkgs/libmpcdec/libmpcdec-devel.template
index 51d22d990d..68ea9ef680 100644
--- a/srcpkgs/libmpcdec/libmpcdec-devel.template
+++ b/srcpkgs/libmpcdec/libmpcdec-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libmpcdec-devel'.
 #
+depends="glibc-devel libmpcdec"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libmpcdec
 
 do_install()
 {
diff --git a/srcpkgs/libmpeg2/depends b/srcpkgs/libmpeg2/depends
deleted file mode 100644
index c483c1e92d..0000000000
--- a/srcpkgs/libmpeg2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.5.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmpeg2/libmpeg2-devel.template b/srcpkgs/libmpeg2/libmpeg2-devel.template
index 825ceda862..c827f1f60f 100644
--- a/srcpkgs/libmpeg2/libmpeg2-devel.template
+++ b/srcpkgs/libmpeg2/libmpeg2-devel.template
@@ -1,19 +1,12 @@
 # Template file for 'libmpeg2-devel'.
 #
+depends="pkg-config libICE-devel libSM-devel libX11-devel libXext-devel libXv-devel SDL-devel libmpeg2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run libICE-devel
-Add_dependency run libSM-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run libXv-devel
-Add_dependency run SDL-devel
-Add_dependency run libmpeg2
 
 do_install()
 {
diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template
index 20ab0f4e69..4b54a6ca6f 100644
--- a/srcpkgs/libmpeg2/template
+++ b/srcpkgs/libmpeg2/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="http://libmpeg2.sourceforge.net/files/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-shared"
+makedepends="pkg-config libX11-devel libXext-devel libXv-devel SDL-devel"
 short_desc="Library for decoding MPEG-2 and MPEG-1 video streams"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4
@@ -13,8 +14,3 @@ long_desc="
  streams acclaimed to be the fastest around."
 
 subpackages="$pkgname-devel mpeg2dec"
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXv-devel
-Add_dependency build SDL-devel
diff --git a/srcpkgs/libmtp/depends b/srcpkgs/libmtp/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libmtp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmtp/libmtp-devel.template b/srcpkgs/libmtp/libmtp-devel.template
index 11b0f6c612..21c8d316b1 100644
--- a/srcpkgs/libmtp/libmtp-devel.template
+++ b/srcpkgs/libmtp/libmtp-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libmtp-devel'.
 #
+depends="libusb-compat-devel libmtp"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libusb-compat-devel
-Add_dependency run libmtp
 
 do_install()
 {
diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 42521553ba..a3e424cfcd 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -4,6 +4,7 @@ version=1.0.2
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="doxygen libusb-compat-devel"
 short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=23adc4d18b5d9e0932a542104b871163cdadc09e697184199ecaaa33eaffa7af
@@ -13,8 +14,6 @@ long_desc="
  systems."
 
 subpackages="$pkgname-devel"
-Add_dependency build doxygen
-Add_dependency build libusb-compat-devel
 
 post_install()
 {
diff --git a/srcpkgs/libmusicbrainz/depends b/srcpkgs/libmusicbrainz/depends
deleted file mode 100644
index 4bf0509c63..0000000000
--- a/srcpkgs/libmusicbrainz/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libmusicbrainz/libmusicbrainz-devel.template b/srcpkgs/libmusicbrainz/libmusicbrainz-devel.template
index 6b9bb62f85..e4f7739af2 100644
--- a/srcpkgs/libmusicbrainz/libmusicbrainz-devel.template
+++ b/srcpkgs/libmusicbrainz/libmusicbrainz-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libmusicbrainz-devel'.
 #
+depends="neon-devel libdiscid-devel libmusicbrainz"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run neon-devel
-Add_dependency run libdiscid-devel
-Add_dependency run libmusicbrainz
 
 do_install()
 {
diff --git a/srcpkgs/libmusicbrainz/template b/srcpkgs/libmusicbrainz/template
index 98338a7453..c069e8eb78 100644
--- a/srcpkgs/libmusicbrainz/template
+++ b/srcpkgs/libmusicbrainz/template
@@ -5,6 +5,7 @@ homepage="http://musicbrainz.org/"
 distfiles="ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname-$version.tar.gz"
 build_style=cmake
 revision=2
+makedepends="cmake neon-devel libdiscid-devel"
 short_desc="Library That Provides Access to the MusicBrainz Server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,6 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build cmake
-Add_dependency build neon-devel
-Add_dependency build libdiscid-devel
diff --git a/srcpkgs/libnfsidmap/depends b/srcpkgs/libnfsidmap/depends
deleted file mode 100644
index 66d2420605..0000000000
--- a/srcpkgs/libnfsidmap/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.24"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnfsidmap/libnfsidmap-devel.template b/srcpkgs/libnfsidmap/libnfsidmap-devel.template
index d7a4e2d663..f295775246 100644
--- a/srcpkgs/libnfsidmap/libnfsidmap-devel.template
+++ b/srcpkgs/libnfsidmap/libnfsidmap-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libnfsidmap-devel'.
 #
+depends="libldap-devel libnfsidmap"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libldap-devel
-Add_dependency run ${sourcepkg}
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libnfsidmap/template b/srcpkgs/libnfsidmap/template
index f97ad6013b..67344741f4 100644
--- a/srcpkgs/libnfsidmap/template
+++ b/srcpkgs/libnfsidmap/template
@@ -5,6 +5,7 @@ homepage="http://www.citi.umich.edu/projects/nfsv4/linux/"
 distfiles="$homepage/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="libldap-devel"
 short_desc="Library to help mapping IDs, mainly for NFSv4"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -16,4 +17,3 @@ long_desc="
  NFSv4 server mapping functions MUST use secure communications."
 
 subpackages="$pkgname-devel"
-Add_dependency build libldap-devel
diff --git a/srcpkgs/libnice/depends b/srcpkgs/libnice/depends
deleted file mode 100644
index 140f5aa7a9..0000000000
--- a/srcpkgs/libnice/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnice/libnice-devel.template b/srcpkgs/libnice/libnice-devel.template
index d0dd4cf1c0..23c002ce55 100644
--- a/srcpkgs/libnice/libnice-devel.template
+++ b/srcpkgs/libnice/libnice-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libnice-devel'.
 #
+depends="gstreamer-devel libsoup-devel gupnp-igd-devel libnice"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gstreamer-devel
-Add_dependency run libsoup-devel
-Add_dependency run gupnp-igd-devel
-Add_dependency run libnice
 
 do_install()
 {
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 1187b7ae94..b65f23fbbb 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -5,6 +5,7 @@ homepage="http://nice.freedesktop.org"
 distfiles="$homepage/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool gstreamer-devel libsoup-devel gupnp-igd-devel"
 short_desc="An implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -23,8 +24,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gstreamer-devel
-Add_dependency build libsoup-devel
-Add_dependency build gupnp-igd-devel
diff --git a/srcpkgs/libnl/depends b/srcpkgs/libnl/depends
deleted file mode 100644
index 19862a1b53..0000000000
--- a/srcpkgs/libnl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnl/libnl-devel.template b/srcpkgs/libnl/libnl-devel.template
index af09505c8c..5d1b1078a1 100644
--- a/srcpkgs/libnl/libnl-devel.template
+++ b/srcpkgs/libnl/libnl-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libnl-devel'.
 #
+depends="libnl"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libnl
 
 do_install()
 {
diff --git a/srcpkgs/libnl3/depends b/srcpkgs/libnl3/depends
deleted file mode 100644
index 214cb4e13b..0000000000
--- a/srcpkgs/libnl3/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.2.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnl3/libnl3-devel.template b/srcpkgs/libnl3/libnl3-devel.template
index 1a5d3bb58b..3958831d8f 100644
--- a/srcpkgs/libnl3/libnl3-devel.template
+++ b/srcpkgs/libnl3/libnl3-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libnl-devel'.
 #
+depends="glibc-devel libnl3"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libnl3
 
 do_install()
 {
diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template
index 5e8384b913..fc8656f3e5 100644
--- a/srcpkgs/libnl3/template
+++ b/srcpkgs/libnl3/template
@@ -6,6 +6,7 @@ homepage="http://www.infradead.org/~tgr/libnl"
 distfiles="${homepage}/files/libnl-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="flex"
 short_desc="Netlink Protocol Library Suite"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -22,4 +23,3 @@ long_desc="
 subpackages="${pkgname}-progs ${pkgname}-devel"
 conf_files="/etc/libnl/pktloc /etc/libnl/classid"
 
-Add_dependency build flex
diff --git a/srcpkgs/libnotify/depends b/srcpkgs/libnotify/depends
deleted file mode 100644
index 4c0b4c554c..0000000000
--- a/srcpkgs/libnotify/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnotify/libnotify-devel.template b/srcpkgs/libnotify/libnotify-devel.template
index a1dc1c2fbc..d05e5799a5 100644
--- a/srcpkgs/libnotify/libnotify-devel.template
+++ b/srcpkgs/libnotify/libnotify-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libnotify-devel'.
 #
+depends="gdk-pixbuf-devel glib-devel libnotify>=0.7.5"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run glib-devel
-Add_dependency run libnotify ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index a377cfb225..ea18d31266 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -4,6 +4,7 @@ version=0.7.5
 distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config glib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel gobject-introspection"
 short_desc="Desktop notification library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://library.gnome.org/devel/notification-spec/"
@@ -15,9 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libpng-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+3-devel # required to build the tests
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libnsbmp/depends b/srcpkgs/libnsbmp/depends
deleted file mode 100644
index 12f980f59d..0000000000
--- a/srcpkgs/libnsbmp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template
index 48a5aa9ce0..5222c0e5cc 100644
--- a/srcpkgs/libnsbmp/libnsbmp-devel.template
+++ b/srcpkgs/libnsbmp/libnsbmp-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libnsbmp-devel'.
 #
+depends="libnsbmp"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libnsbmp
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libnsgif/depends b/srcpkgs/libnsgif/depends
deleted file mode 100644
index 12f980f59d..0000000000
--- a/srcpkgs/libnsgif/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template
index c922ae2afc..72ecb65535 100644
--- a/srcpkgs/libnsgif/libnsgif-devel.template
+++ b/srcpkgs/libnsgif/libnsgif-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libnsgif-devel'.
 #
+depends="libnsgif"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libnsgif
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/liboauth/depends b/srcpkgs/liboauth/depends
deleted file mode 100644
index 82f41d9434..0000000000
--- a/srcpkgs/liboauth/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/liboauth/liboauth-devel.template b/srcpkgs/liboauth/liboauth-devel.template
index 8ab73753b9..0f384db31e 100644
--- a/srcpkgs/liboauth/liboauth-devel.template
+++ b/srcpkgs/liboauth/liboauth-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libasyncns-devel'.
 #
+depends="libcurl-devel nss-devel liboauth"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libcurl-devel
-Add_dependency run nss-devel
-Add_dependency run liboauth
 
 do_install()
 {
diff --git a/srcpkgs/liboauth/template b/srcpkgs/liboauth/template
index e663632376..64b911d1d4 100644
--- a/srcpkgs/liboauth/template
+++ b/srcpkgs/liboauth/template
@@ -7,6 +7,7 @@ configure_args="--enable-nss"
 homepage="http://liboauth.sourceforge.net"
 license="MIT"
 revision=2
+makedepends="pkg-config libcurl-devel nss-devel"
 short_desc="C library implementing OAuth Core RFC 5849"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549
@@ -18,6 +19,3 @@ long_desc="
  perform HTTP requests."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libcurl-devel
-Add_dependency build nss-devel
diff --git a/srcpkgs/libogg/depends b/srcpkgs/libogg/depends
deleted file mode 100644
index c2fc823f30..0000000000
--- a/srcpkgs/libogg/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libogg/libogg-devel.template b/srcpkgs/libogg/libogg-devel.template
index cfc3085d86..10b15111f1 100644
--- a/srcpkgs/libogg/libogg-devel.template
+++ b/srcpkgs/libogg/libogg-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libogg-devel'.
 #
+depends="glibc-devel libogg"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libogg
 
 do_install()
 {
diff --git a/srcpkgs/liboil/depends b/srcpkgs/liboil/depends
deleted file mode 100644
index bffe43bcce..0000000000
--- a/srcpkgs/liboil/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.3.16"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/liboil/liboil-devel.template b/srcpkgs/liboil/liboil-devel.template
index ea8d351f13..aedc658857 100644
--- a/srcpkgs/liboil/liboil-devel.template
+++ b/srcpkgs/liboil/liboil-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'liboil-devel'.
 #
+depends="glibc-devel liboil"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run liboil
 
 do_install()
 {
diff --git a/srcpkgs/liboil/template b/srcpkgs/liboil/template
index 7e2166460c..a5cd52605c 100644
--- a/srcpkgs/liboil/template
+++ b/srcpkgs/liboil/template
@@ -4,6 +4,7 @@ version=0.3.17
 distfiles="http://liboil.freedesktop.org/download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config"
 short_desc="Library of Optimized Inner Loops, CPU optimized functions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69
@@ -18,4 +19,3 @@ long_desc="
  extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.)."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/libopenal/depends b/srcpkgs/libopenal/depends
deleted file mode 100644
index e5a81ba3c7..0000000000
--- a/srcpkgs/libopenal/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.13"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libopenal/libopenal-devel.template b/srcpkgs/libopenal/libopenal-devel.template
index 559eb14406..6b894d54d6 100644
--- a/srcpkgs/libopenal/libopenal-devel.template
+++ b/srcpkgs/libopenal/libopenal-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libopenal-devel'.
 #
+depends="glibc-devel libopenal"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libopenal
 
 do_install()
 {
diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template
index 5d4d14cbad..a15c6dd83f 100644
--- a/srcpkgs/libopenal/template
+++ b/srcpkgs/libopenal/template
@@ -5,6 +5,7 @@ build_style=cmake
 homepage="http://connect.creativelabs.com/openal/default.aspx"
 distfiles="http://kcat.strangesoft.net/openal-releases/openal-soft-$version.tar.bz2"
 revision=2
+makedepends="pkg-config cmake alsa-lib-devel pulseaudio-devel SDL-devel"
 short_desc="A cross-platform 3D audio library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -27,8 +28,3 @@ subpackages="$pkgname-devel"
 wrksrc=openal-soft-$version
 
 
-Add_dependency build pkg-config
-Add_dependency build cmake
-Add_dependency build alsa-lib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build SDL-devel
diff --git a/srcpkgs/libparserutils/depends b/srcpkgs/libparserutils/depends
deleted file mode 100644
index 56fb9e056a..0000000000
--- a/srcpkgs/libparserutils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template
index 9b12717c56..3b23fd51e2 100644
--- a/srcpkgs/libparserutils/libparserutils-devel.template
+++ b/srcpkgs/libparserutils/libparserutils-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libparserutils-devel'.
 #
+depends="libparserutils"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libparserutils
 
 do_install() {
 
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index 5c218c2c8e..b63ef0fdac 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -4,6 +4,7 @@ version=0.1.1
 revision=3
 homepage="http://www.netsurf-browser.org"
 distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
+makedepends="perl"
 short_desc="Library for building efficient parsers, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=2d3f1887d3027b7df1fcacd5f74aba16d3c22a86c169816cd712857a1be0aaf3
@@ -27,7 +28,6 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build perl
 
 do_build() {
 	make ${makejobs} COMPONENT_TYPE=lib-shared
diff --git a/srcpkgs/libpcap/depends b/srcpkgs/libpcap/depends
deleted file mode 100644
index 328eed9225..0000000000
--- a/srcpkgs/libpcap/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libpcap/libpcap-devel.template b/srcpkgs/libpcap/libpcap-devel.template
index 205605d10f..ca3c504c7c 100644
--- a/srcpkgs/libpcap/libpcap-devel.template
+++ b/srcpkgs/libpcap/libpcap-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libpcap-devel'.
 #
+depends="libnl-devel libpcap"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libnl-devel
-Add_dependency run libpcap
 
 do_install()
 {
diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index 9a46b5280b..9cd68a6e85 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -5,6 +5,7 @@ revision=3
 distfiles="http://www.tcpdump.org/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
+makedepends="flex libnl-devel"
 short_desc="System-independent interface for user-level packet capture"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85
@@ -20,5 +21,3 @@ long_desc="
  in each application."
 
 subpackages="$pkgname-devel"
-Add_dependency build flex
-Add_dependency build libnl-devel
diff --git a/srcpkgs/libpciaccess/depends b/srcpkgs/libpciaccess/depends
deleted file mode 100644
index fc0b110871..0000000000
--- a/srcpkgs/libpciaccess/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libpciaccess/libpciaccess-devel.template b/srcpkgs/libpciaccess/libpciaccess-devel.template
index 58d450e403..8e0133ab85 100644
--- a/srcpkgs/libpciaccess/libpciaccess-devel.template
+++ b/srcpkgs/libpciaccess/libpciaccess-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libpciaccess-devel'.
 #
+depends="glibc-devel libpciaccess>=0.13.1"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libpciaccess ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libpeas/depends b/srcpkgs/libpeas/depends
deleted file mode 100644
index 535a13f126..0000000000
--- a/srcpkgs/libpeas/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.0"
-api_depends=">=1.4.0"
diff --git a/srcpkgs/libpeas/libpeas-devel.template b/srcpkgs/libpeas/libpeas-devel.template
index 74f53d9878..411bac57c0 100644
--- a/srcpkgs/libpeas/libpeas-devel.template
+++ b/srcpkgs/libpeas/libpeas-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libpeas-devel'.
 #
+depends="pkg-config intltool gtk+3-devel gjs-devel pygobject-devel libseed-devel"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
@@ -7,12 +8,6 @@ long_desc="${long_desc}
 
 pycompile_dirs="usr/lib/peas-demo/plugins/pythonhello"
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run gtk+3-devel
-Add_dependency run gjs-devel
-Add_dependency run pygobject-devel
-Add_dependency run libseed-devel
 
 do_install()
 {
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index 58ff614747..ab62e50ca4 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -4,6 +4,8 @@ version=1.4.0
 distfiles="${GNOME_SITE}/$pkgname/1.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-vala"
+depends="pygobject hicolor-icon-theme"
+makedepends="pkg-config intltool vala-devel libgirepository-devel gtk+3-devel python-devel pygobject-devel gjs-devel libseed-devel"
 short_desc="Gobject-based plugins engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6
@@ -19,15 +21,4 @@ long_desc="
 subpackages="$pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run pygobject
-Add_dependency run hicolor-icon-theme
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build vala-devel
-Add_dependency build libgirepository-devel
-Add_dependency build gtk+3-devel
-Add_dependency build python-devel
-Add_dependency build pygobject-devel
-Add_dependency build gjs-devel
-Add_dependency build libseed-devel
diff --git a/srcpkgs/libpipeline/depends b/srcpkgs/libpipeline/depends
deleted file mode 100644
index 638e6380c1..0000000000
--- a/srcpkgs/libpipeline/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libpipeline/libpipeline-devel.template b/srcpkgs/libpipeline/libpipeline-devel.template
index edf6adb6a5..eca833c49e 100644
--- a/srcpkgs/libpipeline/libpipeline-devel.template
+++ b/srcpkgs/libpipeline/libpipeline-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libpipeline-devel'.
 #
+depends="glibc-devel libpipeline"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libpipeline
 
 do_install()
 {
diff --git a/srcpkgs/libplist/depends b/srcpkgs/libplist/depends
deleted file mode 100644
index fce4d9e162..0000000000
--- a/srcpkgs/libplist/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libplist/libplist-devel.template b/srcpkgs/libplist/libplist-devel.template
index 33ff127e0d..d093895812 100644
--- a/srcpkgs/libplist/libplist-devel.template
+++ b/srcpkgs/libplist/libplist-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libplist-devel'.
 #
+depends="libplist++ libplist"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libplist++
-Add_dependency run libplist
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index f4c7a01916..af01224b1b 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -5,6 +5,7 @@ homepage="http://libimobiledevice.org/"
 distfiles="http://www.libimobiledevice.org/downloads/$pkgname-$version.tar.bz2"
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=ON"
+makedepends="cmake swig python-devel glib-devel libxml2-devel"
 short_desc="Apple Property List library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -14,8 +15,3 @@ long_desc="
 
 subpackages="${pkgname}++ ${pkgname}-python ${pkgname}-devel"
 
-Add_dependency build cmake
-Add_dependency build swig
-Add_dependency build python-devel
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/libpng/depends b/srcpkgs/libpng/depends
deleted file mode 100644
index d4db4c87cf..0000000000
--- a/srcpkgs/libpng/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libpng/libpng-devel.template b/srcpkgs/libpng/libpng-devel.template
index edf4d08bc4..07cb78007c 100644
--- a/srcpkgs/libpng/libpng-devel.template
+++ b/srcpkgs/libpng/libpng-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libpng-devel'.
 #
+depends="zlib-devel libpng>=1.4.9"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run libpng ">=${version}"
 
 
 do_install() {
diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index 4172e8ff3c..75b59089b7 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -5,6 +5,7 @@ revision=2
 patch_args="-Np1"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="zlib-devel"
 short_desc="Library for manipulating PNG images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libpng.org/pub/png/libpng.html"
@@ -21,7 +22,6 @@ long_desc="
  only supports C. Support for other languages is being considered."
 
 subpackages="$pkgname-devel"
-Add_dependency build zlib-devel
 
 post_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/libproxy/depends b/srcpkgs/libproxy/depends
deleted file mode 100644
index 03ffdecfb5..0000000000
--- a/srcpkgs/libproxy/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libproxy/libproxy-devel.template b/srcpkgs/libproxy/libproxy-devel.template
index f1576f30ec..6eacf7323f 100644
--- a/srcpkgs/libproxy/libproxy-devel.template
+++ b/srcpkgs/libproxy/libproxy-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libproxy-devel'.
 #
+depends="pkg-config libproxy>=0.4.7"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run libproxy ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/libproxy/libproxy-python.template b/srcpkgs/libproxy/libproxy-python.template
index dea4b6a31c..1c63f1cd06 100644
--- a/srcpkgs/libproxy/libproxy-python.template
+++ b/srcpkgs/libproxy/libproxy-python.template
@@ -1,12 +1,11 @@
 # Template file for 'libproxy-python'.
 #
+depends="libproxy>=0.4.7 python"
 short_desc="${sourcepkg} python bindings"
 long_desc="${long_desc}
 
  This package contains the python bindings."
 
-Add_dependency run libproxy ">=$version"
-Add_dependency run python
 
 do_install() {
 	vmove "usr/lib/python*" usr/lib
diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template
index 5943a2a9d8..877cb13673 100644
--- a/srcpkgs/libproxy/template
+++ b/srcpkgs/libproxy/template
@@ -4,6 +4,7 @@ version=0.4.7
 homepage="http://libproxy.googlecode.com"
 license="LGPL-2.1"
 distfiles="http://libproxy.googlecode.com/files/$pkgname-$version.tar.gz"
+makedepends="pkg-config python cmake"
 short_desc="A library handling all the details of proxy configuration"
 maintainer="Juan RP <xtraeme@gmail.com>"
 build_style=cmake
@@ -25,6 +26,3 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-python"
 
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build cmake
diff --git a/srcpkgs/libquvi-scripts/template b/srcpkgs/libquvi-scripts/template
index b78797a106..e9912907e7 100644
--- a/srcpkgs/libquvi-scripts/template
+++ b/srcpkgs/libquvi-scripts/template
@@ -4,6 +4,8 @@ version=0.4.4
 homepage="http://quvi.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/quvi/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config"
+fulldepends="lua"
 short_desc="Set of (lua) scripts for libquvi"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -22,5 +24,3 @@ long_desc="
  This package contains a set of plugins for use with libquvi and/or quvi."
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency full lua
diff --git a/srcpkgs/libquvi/depends b/srcpkgs/libquvi/depends
deleted file mode 100644
index 7855591013..0000000000
--- a/srcpkgs/libquvi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libquvi/libquvi-devel.template b/srcpkgs/libquvi/libquvi-devel.template
index 2d2969260c..04f0213ff1 100644
--- a/srcpkgs/libquvi/libquvi-devel.template
+++ b/srcpkgs/libquvi/libquvi-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libquvi-devel'.
 #
+depends="libcurl-devel lua-devel libquvi"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 replaces="quvi-devel<0.4.0"
-Add_dependency run libcurl-devel
-Add_dependency run lua-devel
-Add_dependency run libquvi
 
 do_install()
 {
diff --git a/srcpkgs/libquvi/template b/srcpkgs/libquvi/template
index 4c316dbb74..f90a6d2e57 100644
--- a/srcpkgs/libquvi/template
+++ b/srcpkgs/libquvi/template
@@ -4,6 +4,8 @@ version=0.4.1
 homepage="http://quvi.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/quvi/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config lua-devel libcurl-devel"
+fulldepends="libquvi-scripts>=0.4.1"
 short_desc="C library that can be used to parse flash media stream URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -22,8 +24,4 @@ long_desc="
 replaces="quvi<0.4.0"
 subpackages="${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build lua-devel
-Add_dependency build libcurl-devel
 
-Add_dependency full libquvi-scripts ">=${version}"
diff --git a/srcpkgs/libraw/depends b/srcpkgs/libraw/depends
deleted file mode 100644
index dff35ca78f..0000000000
--- a/srcpkgs/libraw/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.14.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libraw/libraw-devel.template b/srcpkgs/libraw/libraw-devel.template
index cefb4de716..7e3fc1cc34 100644
--- a/srcpkgs/libraw/libraw-devel.template
+++ b/srcpkgs/libraw/libraw-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libraw-devel'.
 #
+depends="lcms2-devel jasper-devel libraw"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run lcms2-devel
-Add_dependency run jasper-devel
-Add_dependency run libraw
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index 2a59bb2db6..03fc7ae7da 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -5,6 +5,7 @@ wrksrc=LibRaw-${version}
 homepage="http://www.libraw.org"
 distfiles="${homepage}/data/LibRaw-${version}.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config lcms2-devel jasper-devel libgomp-devel"
 short_desc="Raw image decoder library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, CDDL, ${pkgname}"
@@ -15,10 +16,6 @@ long_desc="
 
 subpackages="${pkgname}-devel ${pkgname}-progs"
 
-Add_dependency build pkg-config
-Add_dependency build lcms2-devel
-Add_dependency build jasper-devel
-Add_dependency build libgomp-devel
 
 post_install() {
 	vmkdir usr/share/licenses
diff --git a/srcpkgs/librpcsecgss/depends b/srcpkgs/librpcsecgss/depends
deleted file mode 100644
index a66443b077..0000000000
--- a/srcpkgs/librpcsecgss/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.19"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/librpcsecgss/librpcsecgss-devel.template b/srcpkgs/librpcsecgss/librpcsecgss-devel.template
index 8bcebb0675..fdb3d8c3af 100644
--- a/srcpkgs/librpcsecgss/librpcsecgss-devel.template
+++ b/srcpkgs/librpcsecgss/librpcsecgss-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'librpcsecgss-devel'.
 #
+depends="libgssglue-devel librpcsecgss"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgssglue-devel
-Add_dependency run ${sourcepkg}
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/librpcsecgss/template b/srcpkgs/librpcsecgss/template
index e61da5d791..22f8a4de23 100644
--- a/srcpkgs/librpcsecgss/template
+++ b/srcpkgs/librpcsecgss/template
@@ -4,6 +4,7 @@ version=0.19
 homepage="http://www.citi.umich.edu/projects/nfsv4/linux/"
 distfiles="$homepage/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libgssglue-devel"
 short_desc="Library for RPCSECGSS support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -14,5 +15,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libgssglue-devel
diff --git a/srcpkgs/librsvg/depends b/srcpkgs/librsvg/depends
deleted file mode 100644
index 747196740a..0000000000
--- a/srcpkgs/librsvg/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.26.0"
-api_depends=">=2.36.0"
diff --git a/srcpkgs/librsvg/librsvg-devel.template b/srcpkgs/librsvg/librsvg-devel.template
index 6b38d098f8..14d0f3952c 100644
--- a/srcpkgs/librsvg/librsvg-devel.template
+++ b/srcpkgs/librsvg/librsvg-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'librsvg-devel'.
 #
+depends="gdk-pixbuf-devel cairo-devel libcroco-devel librsvg>=2.36.1"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run cairo-devel
-Add_dependency run libcroco-devel
-Add_dependency run librsvg ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 3c3e53df9e..19ef7971bd 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -4,6 +4,7 @@ version=2.36.1
 distfiles="${GNOME_SITE}/$pkgname/2.36/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-introspection"
+makedepends="pkg-config intltool python>=0 libcroco-devel gtk+-devel gtk+3-devel gobject-introspection"
 short_desc="SVG library for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5
@@ -17,10 +18,3 @@ long_desc="
 triggers="gtk-pixbuf-loaders"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build python	">=0"
-Add_dependency build libcroco-devel
-Add_dependency build gtk+-devel
-Add_dependency build gtk+3-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libsamplerate/depends b/srcpkgs/libsamplerate/depends
deleted file mode 100644
index 66fe7f1eda..0000000000
--- a/srcpkgs/libsamplerate/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsamplerate/libsamplerate-devel.template b/srcpkgs/libsamplerate/libsamplerate-devel.template
index caa7d611ec..87d66950db 100644
--- a/srcpkgs/libsamplerate/libsamplerate-devel.template
+++ b/srcpkgs/libsamplerate/libsamplerate-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libsamplerate-devel'.
 #
+depends="glibc-devel libsndfile-devel libsamplerate"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libsndfile-devel
-Add_dependency run libsamplerate
 
 do_install()
 {
diff --git a/srcpkgs/libsamplerate/template b/srcpkgs/libsamplerate/template
index 151bfcad96..54235386e2 100644
--- a/srcpkgs/libsamplerate/template
+++ b/srcpkgs/libsamplerate/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="http://www.mega-nerd.com/SRC/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="CFLAGS=-fPIC"
+makedepends="pkg-config libsndfile-devel fftw-devel"
 short_desc="Sample Rate Converter for audio"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=78ed5d9ff1bf162c4a078f6a3e7432a537dd2f22dc58872b081fb01156027fcc
@@ -19,6 +20,3 @@ long_desc="
  slowing down effects."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libsndfile-devel
-Add_dependency build fftw-devel
diff --git a/srcpkgs/libsasl/depends b/srcpkgs/libsasl/depends
deleted file mode 100644
index 84c0595156..0000000000
--- a/srcpkgs/libsasl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1.23"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsasl/libsasl-devel.template b/srcpkgs/libsasl/libsasl-devel.template
index 102f092197..38c352cac2 100644
--- a/srcpkgs/libsasl/libsasl-devel.template
+++ b/srcpkgs/libsasl/libsasl-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libsasl-devel'.
 #
+depends="openssl-devel db-devel libsasl"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run openssl-devel
-Add_dependency run db-devel
-Add_dependency run libsasl
 
 do_install()
 {
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index e04a246a7f..8042625c06 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -8,6 +8,7 @@ build_style=gnu-configure
 configure_args="--disable-anon --disable-cram
 --disable-digest --disable-gssapi --disable-otp --disable-login
 --disable-plain"
+makedepends="db-devel openssl-devel"
 short_desc="Cyrus SASL - authentication abstraction library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136
@@ -26,8 +27,6 @@ long_desc="
 
 subpackages="libsasl-devel"
 
-Add_dependency build db-devel
-Add_dependency build openssl-devel
 
 post_install()
 {
diff --git a/srcpkgs/libsexy/depends b/srcpkgs/libsexy/depends
deleted file mode 100644
index f1d070ed33..0000000000
--- a/srcpkgs/libsexy/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.11"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsexy/libsexy-devel.template b/srcpkgs/libsexy/libsexy-devel.template
index 9d346b9c2a..d7d0870197 100644
--- a/srcpkgs/libsexy/libsexy-devel.template
+++ b/srcpkgs/libsexy/libsexy-devel.template
@@ -1,22 +1,12 @@
 # Template file for 'libsexy-devel'.
 #
+depends="pkg-config iso-codes gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel libxml2-devel libsexy"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run iso-codes
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libxml2-devel
-Add_dependency run libsexy
 
 do_install()
 {
diff --git a/srcpkgs/libsexy/template b/srcpkgs/libsexy/template
index 407d99afdc..db03265b87 100644
--- a/srcpkgs/libsexy/template
+++ b/srcpkgs/libsexy/template
@@ -4,6 +4,7 @@ version=0.1.11
 revision=6
 distfiles="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config iso-codes gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel libxml2-devel"
 short_desc="Collection of additional GTK+ widgets"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e
@@ -14,13 +15,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build iso-codes
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/libsigc++/depends b/srcpkgs/libsigc++/depends
deleted file mode 100644
index 19862a1b53..0000000000
--- a/srcpkgs/libsigc++/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsigc++/libsigc++-devel.template b/srcpkgs/libsigc++/libsigc++-devel.template
index 2a8b74440a..2c79ff4631 100644
--- a/srcpkgs/libsigc++/libsigc++-devel.template
+++ b/srcpkgs/libsigc++/libsigc++-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libsigc++-devel'.
 #
+depends="glibc-devel libsigc++"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libsigc++
 
 do_install()
 {
diff --git a/srcpkgs/libsigc++/template b/srcpkgs/libsigc++/template
index 45149f70b2..6a9075b046 100644
--- a/srcpkgs/libsigc++/template
+++ b/srcpkgs/libsigc++/template
@@ -4,6 +4,7 @@ version=2.2.10
 distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-documentation"
+makedepends="libstdc++-devel"
 short_desc="Type-safe callback system for C++ programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c
@@ -19,4 +20,3 @@ long_desc="
  Library General Public License, LGPL."
 
 subpackages="$pkgname-devel"
-Add_dependency build libstdc++-devel
diff --git a/srcpkgs/libsmbios/depends b/srcpkgs/libsmbios/depends
deleted file mode 100644
index ebf58db9fb..0000000000
--- a/srcpkgs/libsmbios/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.2.14"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsmbios/libsmbios-devel.template b/srcpkgs/libsmbios/libsmbios-devel.template
index 250dea2652..2a9627d2c8 100644
--- a/srcpkgs/libsmbios/libsmbios-devel.template
+++ b/srcpkgs/libsmbios/libsmbios-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libsmbios-devel'.
 #
+depends="libsmbios"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libsmbios
 
 do_install()
 {
diff --git a/srcpkgs/libsmbios/libsmbios-utils.template b/srcpkgs/libsmbios/libsmbios-utils.template
index 84f9bb0ff5..814b97d4fe 100644
--- a/srcpkgs/libsmbios/libsmbios-utils.template
+++ b/srcpkgs/libsmbios/libsmbios-utils.template
@@ -1,11 +1,11 @@
 # Template file for 'libsmbios-utils'.
 #
+depends="libsmbios"
 short_desc="${sourcepkg} utilities"
 long_desc="${long_desc}
 
 This package contains some sample binaries that use libsmbios."
 
-Add_dependency run libsmbios
 
 do_install()
 {
diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index d6c803cd1f..2a35455452 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -5,6 +5,8 @@ revision=2
 distfiles="http://linux.dell.com/$pkgname/download/$pkgname/$pkgname-$version/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static --disable-python"
+depends="glibc"
+makedepends="pkg-config libxml2-devel"
 short_desc="Library for SMBIOS access"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=90c87d0f246c2f224b93aa3980b7b186a78fb4ce64d56ceda61c2a23347baa1b
@@ -13,9 +15,6 @@ long_desc="
  to get information from standard BIOS tables, such as the SMBIOS table."
 
 subpackages="$pkgname-devel $pkgname-utils"
-Add_dependency run glibc
-Add_dependency build pkg-config
-Add_dependency build libxml2-devel
 
 post_install()
 {
diff --git a/srcpkgs/libsndfile/depends b/srcpkgs/libsndfile/depends
deleted file mode 100644
index 1572c0e89f..0000000000
--- a/srcpkgs/libsndfile/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.20"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsndfile/libsndfile-devel.template b/srcpkgs/libsndfile/libsndfile-devel.template
index 7f6e00ba49..d647c58f62 100644
--- a/srcpkgs/libsndfile/libsndfile-devel.template
+++ b/srcpkgs/libsndfile/libsndfile-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libsndfile-devel'.
 #
+depends="alsa-lib-devel libvorbis-devel libflac-devel libsndfile>=1.0.25"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run alsa-lib-devel
-Add_dependency run libvorbis-devel
-Add_dependency run libflac-devel
-Add_dependency run libsndfile ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index dde3fb22c7..e40e36c21f 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -5,6 +5,7 @@ homepage="http://www.mega-nerd.com/libsndfile"
 license="LGPL-2.1"
 distfiles="http://www.mega-nerd.com/$pkgname/files/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config python alsa-lib-devel libvorbis-devel>=1.2.3 libflac-devel sqlite-devel"
 short_desc="C library for reading and writing files containing sampled sound"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882
@@ -14,9 +15,3 @@ long_desc="
  through one standard library interface."
 
 subpackages="$pkgname-progs $pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build alsa-lib-devel
-Add_dependency build libvorbis-devel	">=1.2.3"
-Add_dependency build libflac-devel
-Add_dependency build sqlite-devel
diff --git a/srcpkgs/libsocialweb/depends b/srcpkgs/libsocialweb/depends
deleted file mode 100644
index 2b774c3814..0000000000
--- a/srcpkgs/libsocialweb/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.25.19"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libsocialweb/libsocialweb-devel.template b/srcpkgs/libsocialweb/libsocialweb-devel.template
index 1d2d11c950..ee26ddbc5d 100644
--- a/srcpkgs/libsocialweb/libsocialweb-devel.template
+++ b/srcpkgs/libsocialweb/libsocialweb-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'folks-devel'.
 #
+depends="dbus-glib-devel rest-devel libsoup-gnome-devel libsocialweb"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dbus-glib-devel
-Add_dependency run rest-devel
-Add_dependency run libsoup-gnome-devel
-Add_dependency run libsocialweb
 
 do_install()
 {
diff --git a/srcpkgs/libsocialweb/template b/srcpkgs/libsocialweb/template
index cbef0f03b0..004595b495 100644
--- a/srcpkgs/libsocialweb/template
+++ b/srcpkgs/libsocialweb/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-all-services=yes --with-online=always
 --enable-vala-bindings"
 homepage="http://www.gnome.org"
+makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection vala-devel rest-devel dbus-glib-devel libgnome-keyring-devel GConf-devel json-glib-devel libsoup-gnome-devel"
 short_desc="A personal social data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5
@@ -18,15 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build gobject-introspection
-Add_dependency build vala-devel
-Add_dependency build rest-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build GConf-devel
-Add_dependency build json-glib-devel
-Add_dependency build libsoup-gnome-devel
diff --git a/srcpkgs/libsoup/depends b/srcpkgs/libsoup/depends
deleted file mode 100644
index 8a1872fe32..0000000000
--- a/srcpkgs/libsoup/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.34.0"
-api_depends=">=2.38.0"
diff --git a/srcpkgs/libsoup/libsoup-devel.template b/srcpkgs/libsoup/libsoup-devel.template
index 134255ae97..c669092bb8 100644
--- a/srcpkgs/libsoup/libsoup-devel.template
+++ b/srcpkgs/libsoup/libsoup-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libsoup-devel'.
 #
+depends="glib-devel libxml2-devel libsoup>=2.38.1"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run libsoup ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libsoup/libsoup-gnome-devel.template b/srcpkgs/libsoup/libsoup-gnome-devel.template
index 90b601a0a8..c3686bae5c 100644
--- a/srcpkgs/libsoup/libsoup-gnome-devel.template
+++ b/srcpkgs/libsoup/libsoup-gnome-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libsoup-gnome-devel'.
 #
+depends="libsoup-devel>=2.38.1 libsoup-gnome>=2.38.1"
 short_desc="${sourcepkg} - GNOME development files"
 long_desc="${long_desc}
 
  This package contains the GNOME support files for development:
  headers, static libs, etc."
 
-Add_dependency run libsoup-devel ">=${version}"
-Add_dependency run libsoup-gnome ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/libsoup/libsoup-gnome.template b/srcpkgs/libsoup/libsoup-gnome.template
index 5f59253147..8db078b989 100644
--- a/srcpkgs/libsoup/libsoup-gnome.template
+++ b/srcpkgs/libsoup/libsoup-gnome.template
@@ -1,13 +1,11 @@
 # Template file for 'libsoup-gnome'.
 #
+depends="gnutls libgcrypt libgpg-error"
 short_desc="${sourcepkg} - GNOME libraries"
 long_desc="${long_desc}
 
  This package contains the GNOME support libraries."
 
-Add_dependency run gnutls
-Add_dependency run libgcrypt
-Add_dependency run libgpg-error
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib/girepository-1.0
diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index 11dc53e61d..3eee7796ce 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -3,6 +3,8 @@ pkgname=libsoup
 version=2.38.1
 distfiles="${GNOME_SITE}/$pkgname/2.38/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gobject-introspection glib-devel libgcrypt-devel libgpg-error-devel libxml2-devel gnutls-devel sqlite-devel libgnome-keyring-devel"
+fulldepends="glib-networking"
 short_desc="HTTP library implementation in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -31,15 +33,4 @@ long_desc="
 
 subpackages="$pkgname-gnome $pkgname-gnome-devel $pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build glib-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build libxml2-devel
-Add_dependency build gnutls-devel
-Add_dependency build sqlite-devel
-Add_dependency build libgnome-keyring-devel
 
-Add_dependency full glib-networking
diff --git a/srcpkgs/libspectre/depends b/srcpkgs/libspectre/depends
deleted file mode 100644
index 5943d4eaa0..0000000000
--- a/srcpkgs/libspectre/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libspectre/libspectre-devel.template b/srcpkgs/libspectre/libspectre-devel.template
index db56cdebc6..b825dd4778 100644
--- a/srcpkgs/libspectre/libspectre-devel.template
+++ b/srcpkgs/libspectre/libspectre-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libspectre-devel'.
 #
+depends="libspectre>=0.2.6"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libspectre ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template
index 2bb7a36b8e..5e542e7238 100644
--- a/srcpkgs/libspectre/template
+++ b/srcpkgs/libspectre/template
@@ -4,6 +4,7 @@ version=0.2.6
 homepage="http://libspectre.freedesktop.org/wiki/"
 distfiles="http://libspectre.freedesktop.org/releases/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
+makedepends="ghostscript-devel"
 short_desc="Small library for rendering Postscript documents"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,4 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build ghostscript-devel
diff --git a/srcpkgs/libssh2/depends b/srcpkgs/libssh2/depends
deleted file mode 100644
index eaf929f4dc..0000000000
--- a/srcpkgs/libssh2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libssh2/libssh2-devel.template b/srcpkgs/libssh2/libssh2-devel.template
index b0ef5ef80e..9e53519052 100644
--- a/srcpkgs/libssh2/libssh2-devel.template
+++ b/srcpkgs/libssh2/libssh2-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libssh2-devel'.
 #
+depends="libssh2>=1.4.2"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libssh2 ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index c0eb6b2d03..c42eff015d 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -4,6 +4,7 @@ version=1.4.2
 homepage="http://www.libssh2.org/"
 distfiles="http://www.libssh2.org/download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="openssl-devel"
 short_desc="library implementing the SSH2 protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -14,4 +15,3 @@ long_desc="
  and keyboard-interactive authentication."
 
 subpackages="$pkgname-devel"
-Add_dependency build openssl-devel
diff --git a/srcpkgs/libtar/depends b/srcpkgs/libtar/depends
deleted file mode 100644
index bd2919ddf1..0000000000
--- a/srcpkgs/libtar/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.11"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libtar/libtar-devel.template b/srcpkgs/libtar/libtar-devel.template
index a586e4b605..9201a06a84 100644
--- a/srcpkgs/libtar/libtar-devel.template
+++ b/srcpkgs/libtar/libtar-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libtar-devel'.
 #
+depends="zlib-devel libtar"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run libtar
 
 do_install()
 {
diff --git a/srcpkgs/libtar/template b/srcpkgs/libtar/template
index f64cdfa2f1..b78201643f 100644
--- a/srcpkgs/libtar/template
+++ b/srcpkgs/libtar/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://www.feep.net/libtar/"
 distfiles="ftp://ftp.feep.net/pub/software/${pkgname}/${pkgname}-${version}.tar.gz"
 revision=2
+makedepends="zlib-devel"
 short_desc="tar file manipulation API"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -15,4 +16,3 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency build zlib-devel
diff --git a/srcpkgs/libtasn1/depends b/srcpkgs/libtasn1/depends
deleted file mode 100644
index 012b7194ee..0000000000
--- a/srcpkgs/libtasn1/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libtasn1/libtasn1-devel.template b/srcpkgs/libtasn1/libtasn1-devel.template
index f71a646091..f03c0277c0 100644
--- a/srcpkgs/libtasn1/libtasn1-devel.template
+++ b/srcpkgs/libtasn1/libtasn1-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libtasn1-devel'.
 #
+depends="glibc-devel libtasn1"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libtasn1
 
 do_install()
 {
diff --git a/srcpkgs/libtheora/depends b/srcpkgs/libtheora/depends
deleted file mode 100644
index bb0044e6e3..0000000000
--- a/srcpkgs/libtheora/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libtheora/libtheora-devel.template b/srcpkgs/libtheora/libtheora-devel.template
index 46445e09de..aed954353a 100644
--- a/srcpkgs/libtheora/libtheora-devel.template
+++ b/srcpkgs/libtheora/libtheora-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libtheora-devel'.
 #
+depends="libogg-devel libtheora"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libogg-devel
-Add_dependency run libtheora
 
 do_install()
 {
diff --git a/srcpkgs/libtheora/template b/srcpkgs/libtheora/template
index 7630cbc534..5551edf1cf 100644
--- a/srcpkgs/libtheora/template
+++ b/srcpkgs/libtheora/template
@@ -5,6 +5,7 @@ revision=3
 distfiles="http://downloads.xiph.org/releases/theora/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-examples --disable-vorbistest --disable-sdltest"
+makedepends="pkg-config libogg-devel"
 short_desc="Theora Video Compression Codec"
 maintainer="pancake <pancake@nopcode.org>"
 checksum=f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61
@@ -17,5 +18,3 @@ long_desc="
  in the future to improve over what is possible with VP3."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libogg-devel
diff --git a/srcpkgs/libtirpc/depends b/srcpkgs/libtirpc/depends
deleted file mode 100644
index b84ba41c81..0000000000
--- a/srcpkgs/libtirpc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libtirpc/libtirpc-devel.template b/srcpkgs/libtirpc/libtirpc-devel.template
index bf1a7b73d4..47af2631c6 100644
--- a/srcpkgs/libtirpc/libtirpc-devel.template
+++ b/srcpkgs/libtirpc/libtirpc-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libtirpc-devel'.
 #
+depends="libgssglue-devel libtirpc"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgssglue-devel
-Add_dependency run ${sourcepkg}
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template
index 1482a58e6c..e7c44793e9 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -6,6 +6,7 @@ homepage="http://libtirpc.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-gss"
+makedepends="automake pkg-config libgssglue-devel"
 short_desc="Transport Independent RPC library (SunRPC replacement)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -24,9 +25,6 @@ long_desc="
 conf_files="/etc/netconfig"
 subpackages="$pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build libgssglue-devel
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libtool/depends b/srcpkgs/libtool/depends
deleted file mode 100644
index dcf92fe6ff..0000000000
--- a/srcpkgs/libtool/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.2.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libtool/libltdl-devel.template b/srcpkgs/libtool/libltdl-devel.template
index 8a635b448d..c7fcb566c7 100644
--- a/srcpkgs/libtool/libltdl-devel.template
+++ b/srcpkgs/libtool/libltdl-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libltdl-devel'.
 #
+depends="libltdl"
 short_desc="GNU Libtool Dynamic Module Loader development files"
 long_desc="
  The libltdl package contains the GNU Libtool Dynamic Module Loader, a
@@ -12,7 +13,6 @@ long_desc="
 
  This package contains development files required by libltdl."
 
-Add_dependency run libltdl
  
 do_install()
 {
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 41ac6eb6c4..eef086dc80 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -5,6 +5,7 @@ revision=4
 homepage="http://www.gnu.org/software/libtool"
 distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="tar sed"
 short_desc="Generic library support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,5 +18,3 @@ long_desc="
 build_requires=21
 noarch=yes
 subpackages="libltdl libltdl-devel"
-Add_dependency run tar
-Add_dependency run sed
diff --git a/srcpkgs/libtorrent/depends b/srcpkgs/libtorrent/depends
deleted file mode 100644
index 736a9374eb..0000000000
--- a/srcpkgs/libtorrent/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.12.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libtorrent/libtorrent-devel.template b/srcpkgs/libtorrent/libtorrent-devel.template
index 55c44d8e1d..932ee06e8e 100644
--- a/srcpkgs/libtorrent/libtorrent-devel.template
+++ b/srcpkgs/libtorrent/libtorrent-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'librtorrent-devel'.
 #
+depends="openssl-devel libsigc++-devel libstdc++-devel glibc-devel libtorrent"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-Add_dependency run openssl-devel
-Add_dependency run libsigc++-devel
-Add_dependency run libstdc++-devel
-Add_dependency run glibc-devel
-Add_dependency run libtorrent
 
 do_install()
 {
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index 604a7f6b94..50ff9335f1 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -5,6 +5,7 @@ distfiles="http://libtorrent.rakshasa.no/downloads/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-debug"
 revision=2
+makedepends="pkg-config openssl-devel libsigc++-devel libstdc++-devel glibc-devel"
 short_desc="BitTorrent library written in C++"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libtorrent.rakshasa.no"
@@ -19,8 +20,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build openssl-devel
-Add_dependency build libsigc++-devel
-Add_dependency build libstdc++-devel
-Add_dependency build glibc-devel
diff --git a/srcpkgs/libunique/depends b/srcpkgs/libunique/depends
deleted file mode 100644
index f068513a83..0000000000
--- a/srcpkgs/libunique/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libunique/libunique-devel.template b/srcpkgs/libunique/libunique-devel.template
index dd87be66da..59168404d7 100644
--- a/srcpkgs/libunique/libunique-devel.template
+++ b/srcpkgs/libunique/libunique-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libunique-devel'.
 #
+depends="dbus-glib-devel libunique"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run dbus-glib-devel
-Add_dependency run libunique
 
 do_install()
 {
diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template
index b0db38bfe1..c238b583fc 100644
--- a/srcpkgs/libunique/template
+++ b/srcpkgs/libunique/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-bacon=yes --enable-dbus=yes"
 revision=3
+makedepends="pkg-config libX11-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel dbus-devel dbus-glib-devel gtk+3-devel gobject-introspection"
 short_desc="Library for writing single instance applications"
 maintainer="xtraeme <xtraeme@gmail.org>"
 homepage="http://live.gnome.org/LibUnique"
@@ -24,15 +25,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/libunique1/depends b/srcpkgs/libunique1/depends
deleted file mode 100644
index 607d410287..0000000000
--- a/srcpkgs/libunique1/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libunique1/libunique1-devel.template b/srcpkgs/libunique1/libunique1-devel.template
index fc3a3a717a..f83b3980c5 100644
--- a/srcpkgs/libunique1/libunique1-devel.template
+++ b/srcpkgs/libunique1/libunique1-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libunique1-devel'.
 #
+depends="gtk+-devel libunique1"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run libunique1
 
 do_install()
 {
diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template
index 4ed9572180..a870b12aac 100644
--- a/srcpkgs/libunique1/template
+++ b/srcpkgs/libunique1/template
@@ -7,6 +7,7 @@ distfiles="${GNOME_SITE}/libunique/1.1/libunique-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static --disable-dbus"
 revision=3
+makedepends="automake pkg-config gobject-introspection gtk+-devel"
 short_desc="Library for writing single instance applications (GTK+2)"
 maintainer="xtraeme <xtraeme@gmail.org>"
 homepage="http://live.gnome.org/LibUnique"
@@ -29,10 +30,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build gtk+-devel
 
 pre_configure() {
 	# Fix build with glib 2.30.
diff --git a/srcpkgs/libusb-compat/depends b/srcpkgs/libusb-compat/depends
deleted file mode 100644
index 140f5aa7a9..0000000000
--- a/srcpkgs/libusb-compat/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libusb-compat/libusb-compat-devel.template b/srcpkgs/libusb-compat/libusb-compat-devel.template
index fa12599cae..baccaa5039 100644
--- a/srcpkgs/libusb-compat/libusb-compat-devel.template
+++ b/srcpkgs/libusb-compat/libusb-compat-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libusb-compat-devel'.
 #
+depends="libusb-compat>=0.1.4"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libusb-compat ">=${version}"
 
 do_install() {
 	vmove usr/bin usr
diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template
index 897daae5ed..1cbee8fb8e 100644
--- a/srcpkgs/libusb-compat/template
+++ b/srcpkgs/libusb-compat/template
@@ -4,6 +4,7 @@ version=0.1.4
 homepage="http://libusb.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/libusb/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libusb-devel"
 short_desc="A libusb-0.1 compatibility library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -14,5 +15,3 @@ long_desc="
  just converts libusb-0.1 calls into their libusb-1.0 equivalents."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libusb-devel
diff --git a/srcpkgs/libusb/depends b/srcpkgs/libusb/depends
deleted file mode 100644
index a66f7dfdeb..0000000000
--- a/srcpkgs/libusb/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libusb/libusb-devel.template b/srcpkgs/libusb/libusb-devel.template
index 9746c9cc10..bfb7e8ee51 100644
--- a/srcpkgs/libusb/libusb-devel.template
+++ b/srcpkgs/libusb/libusb-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libusb-devel'.
 #
+depends="glibc-devel libusb>=1.0.9"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libusb ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libutempter/depends b/srcpkgs/libutempter/depends
deleted file mode 100644
index 0fabab2982..0000000000
--- a/srcpkgs/libutempter/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libutempter/libutempter-devel.template b/srcpkgs/libutempter/libutempter-devel.template
index 89b0e19cf2..8a848dbdcf 100644
--- a/srcpkgs/libutempter/libutempter-devel.template
+++ b/srcpkgs/libutempter/libutempter-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libutempter-devel'.
 #
+depends="glibc-devel libutempter>=1.1.5"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libutempter ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template
index c26bd6a2c7..ba6076aa23 100644
--- a/srcpkgs/libva-intel-driver/template
+++ b/srcpkgs/libva-intel-driver/template
@@ -5,6 +5,7 @@ version=1.0.17
 wrksrc=${_distname}-${version}
 distfiles="http://cgit.freedesktop.org/vaapi/${_distname}/snapshot/${_distname}-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="automake pkg-config libva-devel libdrm-devel libX11-devel"
 short_desc="Video Acceleration (VA) API - Intel Graphics backend"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freedesktop.org/wiki/Software/vaapi"
@@ -19,11 +20,6 @@ long_desc="
  This package includes the VA-API backend for Intel G45 chipsets and Intel
  HD Graphics."
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build libva-devel
-Add_dependency build libdrm-devel
-Add_dependency build libX11-devel
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libva/depends b/srcpkgs/libva/depends
deleted file mode 100644
index 495cf8ab48..0000000000
--- a/srcpkgs/libva/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.14"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libva/libva-devel.template b/srcpkgs/libva/libva-devel.template
index 9794be233f..96c3a7afc9 100644
--- a/srcpkgs/libva/libva-devel.template
+++ b/srcpkgs/libva/libva-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libva-devel'.
 #
+depends="glibc-devel libva"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libva
 
 do_install()
 {
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index b22502f519..889cab7205 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -4,6 +4,7 @@ version=1.0.15
 revision=4
 distfiles="http://cgit.freedesktop.org/libva/snapshot/libva-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config automake libXfixes-devel MesaLib-devel"
 short_desc="Video Acceleration (VA) API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freedesktop.org/wiki/Software/vaapi"
@@ -17,10 +18,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build automake
-Add_dependency build libXfixes-devel
-Add_dependency build MesaLib-devel
 
 pre_configure() {
 	autoreconf -fiv
diff --git a/srcpkgs/libvdpau/depends b/srcpkgs/libvdpau/depends
deleted file mode 100644
index fed1cb2e2e..0000000000
--- a/srcpkgs/libvdpau/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libvdpau/libvdpau-devel.template b/srcpkgs/libvdpau/libvdpau-devel.template
index 7fcec960c3..08c57fee4f 100644
--- a/srcpkgs/libvdpau/libvdpau-devel.template
+++ b/srcpkgs/libvdpau/libvdpau-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libvdpau-devel'.
 #
+depends="libX11-devel jack-devel libvdpau"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libX11-devel
-Add_dependency run jack-devel
-Add_dependency run libvdpau
 
 do_install()
 {
diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template
index 962a8997e4..9931f6c3c5 100644
--- a/srcpkgs/libvdpau/template
+++ b/srcpkgs/libvdpau/template
@@ -4,6 +4,7 @@ version=0.4.1
 revision=4
 distfiles="http://people.freedesktop.org/~aplattner/vdpau/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config dri2proto libX11-devel libXext-devel"
 short_desc="The Video Decode and Presentation API for UNIX"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cgit.freedesktop.org/~aplattner/libvdpau"
@@ -18,10 +19,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build dri2proto
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/libvirt-glib/depends b/srcpkgs/libvirt-glib/depends
deleted file mode 100644
index 14a6cf6595..0000000000
--- a/srcpkgs/libvirt-glib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.0.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libvirt-glib/libvirt-glib-devel.template b/srcpkgs/libvirt-glib/libvirt-glib-devel.template
index f3c8ec6b0f..6a90d27628 100644
--- a/srcpkgs/libvirt-glib/libvirt-glib-devel.template
+++ b/srcpkgs/libvirt-glib/libvirt-glib-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libvirt-devel'.
 #
+depends="glib-devel libxml2-devel libvirt-devel libvirt-glib>=0.0.8"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run libvirt-devel
-Add_dependency run libvirt-glib ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/libvirt-glib/libvirt-glib-python.template b/srcpkgs/libvirt-glib/libvirt-glib-python.template
index ac4fd45407..d42f15fb7c 100644
--- a/srcpkgs/libvirt-glib/libvirt-glib-python.template
+++ b/srcpkgs/libvirt-glib/libvirt-glib-python.template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-glib-python'.
 #
+depends="python"
 short_desc="${short_desc} - python bindings"
 long_desc="${long_desc}
 
  This package contains the Python language bindings."
 
-Add_dependency run python
 
 do_install() {
 	vmove "usr/lib/python*" usr/lib
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 743d154923..21c14bdd66 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -4,6 +4,7 @@ version=0.0.8
 distfiles="http://libvirt.org/sources/glib/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config glib-devel libvirt-devel libxml2-devel python-devel gobject-introspection vala-devel"
 short_desc="libvirt glib integration"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libvirt.org"
@@ -19,10 +20,3 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-python"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libvirt-devel
-Add_dependency build libxml2-devel
-Add_dependency build python-devel
-Add_dependency build gobject-introspection
-Add_dependency build vala-devel
diff --git a/srcpkgs/libvirt/depends b/srcpkgs/libvirt/depends
deleted file mode 100644
index 82d4f82b1c..0000000000
--- a/srcpkgs/libvirt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libvirt/libvirt-devel.template b/srcpkgs/libvirt/libvirt-devel.template
index 9f31494fa7..9680cb245d 100644
--- a/srcpkgs/libvirt/libvirt-devel.template
+++ b/srcpkgs/libvirt/libvirt-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-devel'.
 #
+depends="libvirt>=0.9.12"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libvirt ">=$version"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libvirt/libvirt-python.template b/srcpkgs/libvirt/libvirt-python.template
index 737a7e0ee1..9c9e3e39a6 100644
--- a/srcpkgs/libvirt/libvirt-python.template
+++ b/srcpkgs/libvirt/libvirt-python.template
@@ -1,11 +1,11 @@
 # Template file for 'libvirt-python'.
 #
+depends="python"
 short_desc="${short_desc} - python bindings"
 long_desc="${long_desc}
 
  This package contains the Python language bindings."
 
-Add_dependency run python
 
 do_install() {
 	vmove "usr/lib/python*" usr/lib
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cc5a73be8b..44a60ff4d9 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--without-hal
 ac_cv_path_MOUNT=/bin/mount ac_cv_path_UMOUNT=/bin/umount
 ac_cv_path_MKFS=/sbin/mkfs ac_cv_path_SHOWMOUNT=/usr/sbin/showmount"
+makedepends="readline-devel libcap-ng-devel libnl-devel libgcrypt-devel gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel device-mapper-devel dbus-devel libudev-devel libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel python-devel libssh2-devel"
+fulldepends="lvm2 parted"
 short_desc="The virtualization API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7
@@ -28,25 +30,4 @@ conf_files="
 /etc/libvirt/libvirt.conf
 /etc/sasl2/libvirt.conf"
 
-Add_dependency build readline-devel
-Add_dependency build libcap-ng-devel
-Add_dependency build libnl-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build gnutls-devel
-Add_dependency build libsasl-devel
-Add_dependency build libcurl-devel
-Add_dependency build libpcap-devel
-Add_dependency build libxml2-devel
-Add_dependency build libparted-devel
-Add_dependency build device-mapper-devel
-Add_dependency build dbus-devel
-Add_dependency build libudev-devel
-Add_dependency build libpciaccess-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build polkit-devel
-Add_dependency build yajl-devel
-Add_dependency build python-devel
-Add_dependency build libssh2-devel
 
-Add_dependency full lvm2
-Add_dependency full parted
diff --git a/srcpkgs/libvisual/depends b/srcpkgs/libvisual/depends
deleted file mode 100644
index 7855591013..0000000000
--- a/srcpkgs/libvisual/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libvisual/libvisual-devel.template b/srcpkgs/libvisual/libvisual-devel.template
index 488674a0a8..19b3e9dda2 100644
--- a/srcpkgs/libvisual/libvisual-devel.template
+++ b/srcpkgs/libvisual/libvisual-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libvisual-devel'.
 #
+depends="libvisual"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libvisual
 
 do_install()
 {
diff --git a/srcpkgs/libvisual/template b/srcpkgs/libvisual/template
index ac9a94fa6e..a834641d25 100644
--- a/srcpkgs/libvisual/template
+++ b/srcpkgs/libvisual/template
@@ -4,6 +4,7 @@ version=0.4.0
 revision=3
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config"
 short_desc="Abstraction library for audio visualisation plugins"
 maintainer="pancake <pancake@nopcode.org>"
 checksum=0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7
@@ -21,4 +22,3 @@ long_desc="
  anywhere he wants."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/libvorbis/depends b/srcpkgs/libvorbis/depends
deleted file mode 100644
index d56e13c7b3..0000000000
--- a/srcpkgs/libvorbis/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.1rc1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libvorbis/libvorbis-devel.template b/srcpkgs/libvorbis/libvorbis-devel.template
index f72cffd97f..155b2bb5d3 100644
--- a/srcpkgs/libvorbis/libvorbis-devel.template
+++ b/srcpkgs/libvorbis/libvorbis-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libvorbis-devel'.
 #
+depends="libogg-devel libvorbis"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libogg-devel
-Add_dependency run libvorbis
 
 do_install()
 {
diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template
index 62d109a28f..530b6a66ae 100644
--- a/srcpkgs/libvorbis/template
+++ b/srcpkgs/libvorbis/template
@@ -4,6 +4,7 @@ version=1.3.3
 homepage="http://www.xiph.org/vorbis/"
 distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libogg-devel"
 short_desc="The Vorbis General Audio Compression Codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -17,5 +18,3 @@ long_desc="
  that support Ogg Vorbis."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libogg-devel
diff --git a/srcpkgs/libvpx/depends b/srcpkgs/libvpx/depends
deleted file mode 100644
index a66f7dfdeb..0000000000
--- a/srcpkgs/libvpx/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libvpx/libvpx-devel.template b/srcpkgs/libvpx/libvpx-devel.template
index 58a5971690..9344039729 100644
--- a/srcpkgs/libvpx/libvpx-devel.template
+++ b/srcpkgs/libvpx/libvpx-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libvpx-devel'.
 #
+depends="yasm glibc-devel libvpx"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run yasm
-Add_dependency run glibc-devel
-Add_dependency run libvpx
 
 do_install()
 {
diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template
index 08b8fcc210..d50cb241f4 100644
--- a/srcpkgs/libvpx/template
+++ b/srcpkgs/libvpx/template
@@ -8,6 +8,7 @@ configure_args="--enable-vp8 --enable-runtime-cpu-detect --enable-shared
 --enable-postproc --enable-pic --disable-install-docs --disable-install-srcs"
 make_install_target="DIST_DIR=${XBPS_DESTDIR}/${pkgname}-${version}/usr install"
 revision=2
+makedepends="which perl>=0 yasm"
 short_desc="The VP8 Codec SDK"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.webmproject.org"
@@ -22,9 +23,6 @@ long_desc="
  based on the Matroska container."
 
 subpackages="$pkgname-devel"
-Add_dependency build which
-Add_dependency build perl ">=0"
-Add_dependency build yasm
 
 post_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/libwacom/depends b/srcpkgs/libwacom/depends
deleted file mode 100644
index 91173a9649..0000000000
--- a/srcpkgs/libwacom/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libwacom/libwacom-devel.template b/srcpkgs/libwacom/libwacom-devel.template
index b068042596..86ff3c74e0 100644
--- a/srcpkgs/libwacom/libwacom-devel.template
+++ b/srcpkgs/libwacom/libwacom-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libwacom-devel'.
 #
+depends="glib-devel libwacom"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libwacom
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 6443d10381..f21b13be46 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,6 +4,7 @@ version=0.4
 homepage="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Main_Page"
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config libgudev-devel"
 short_desc="Library to identify wacom tablets"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -14,5 +15,3 @@ long_desc="
  on-screen tablet, what is the size of this model, etc."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libgudev-devel
diff --git a/srcpkgs/libwapcaplet/depends b/srcpkgs/libwapcaplet/depends
deleted file mode 100644
index 140f5aa7a9..0000000000
--- a/srcpkgs/libwapcaplet/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libwapcaplet/libwapcaplet-devel.template b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
index bb549e7633..ee1125495b 100644
--- a/srcpkgs/libwapcaplet/libwapcaplet-devel.template
+++ b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libwapcaplet-devel'.
 #
+depends="libwapcaplet"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libwapcaplet
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libwebp/depends b/srcpkgs/libwebp/depends
deleted file mode 100644
index 6f02f45679..0000000000
--- a/srcpkgs/libwebp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libwebp/libwebp-devel.template b/srcpkgs/libwebp/libwebp-devel.template
index 74cb69f8b3..7392789110 100644
--- a/srcpkgs/libwebp/libwebp-devel.template
+++ b/srcpkgs/libwebp/libwebp-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libwebp-devel'.
 #
+depends="jpeg-devel libpng-devel libwebp"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run jpeg-devel
-Add_dependency run libpng-devel
-Add_dependency run libwebp
 
 do_install()
 {
diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template
index 39093328ae..467073f234 100644
--- a/srcpkgs/libwebp/template
+++ b/srcpkgs/libwebp/template
@@ -4,6 +4,7 @@ version=0.1.3
 distfiles="http://webp.googlecode.com/files/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="automake jpeg-devel libpng-devel"
 short_desc="WebP image format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/speed/webp/"
@@ -16,9 +17,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build automake
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libwmf/depends b/srcpkgs/libwmf/depends
deleted file mode 100644
index 5a165a753e..0000000000
--- a/srcpkgs/libwmf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.8.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libwmf/libwmf-devel.template b/srcpkgs/libwmf/libwmf-devel.template
index 27cd7c43e7..0953c19084 100644
--- a/srcpkgs/libwmf/libwmf-devel.template
+++ b/srcpkgs/libwmf/libwmf-devel.template
@@ -1,22 +1,12 @@
 # Template file for 'libwmf-devel'.
 #
+depends="pkg-config freetype-devel jpeg-devel libpng-devel expat-devel glib-devel gtk+-devel gd-devel libX11-devel zlib-devel libwmf"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run freetype-devel
-Add_dependency run jpeg-devel
-Add_dependency run libpng-devel
-Add_dependency run expat-devel
-Add_dependency run glib-devel
-Add_dependency run gtk+-devel
-Add_dependency run gd-devel
-Add_dependency run libX11-devel
-Add_dependency run zlib-devel
-Add_dependency run libwmf
 
 do_install()
 {
diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template
index acfa781392..471378eb19 100644
--- a/srcpkgs/libwmf/template
+++ b/srcpkgs/libwmf/template
@@ -7,6 +7,9 @@ build_style=gnu-configure
 configure_args="--with-gsfontdir=/usr/share/fonts/Type1
  --with-fontdir=/usr/share/fonts/Type1
  --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS"
+depends="gd"
+makedepends="pkg-config freetype-devel jpeg-devel libpng-devel expat-devel glib-devel gtk+-devel gd-devel libX11-devel zlib-devel"
+fulldepends="gsfonts"
 short_desc="Library for reading and converting WMF (Windows Meta Files)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
@@ -23,18 +26,6 @@ long_desc="
 triggers="gtk-pixbuf-loaders"
 subpackages="$pkgname-devel"
 
-Add_dependency run gd
-Add_dependency build pkg-config
-Add_dependency build freetype-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build expat-devel
-Add_dependency build glib-devel
-Add_dependency build gtk+-devel
-Add_dependency build gd-devel
-Add_dependency build libX11-devel
-Add_dependency build zlib-devel
-Add_dependency full gsfonts
 
 post_install()
 {
diff --git a/srcpkgs/libwnck/depends b/srcpkgs/libwnck/depends
deleted file mode 100644
index e7e77019f3..0000000000
--- a/srcpkgs/libwnck/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.90"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/libwnck/libwnck-devel.template b/srcpkgs/libwnck/libwnck-devel.template
index 0883531905..1ab8498f5f 100644
--- a/srcpkgs/libwnck/libwnck-devel.template
+++ b/srcpkgs/libwnck/libwnck-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libwnck-devel'.
 #
+depends="gtk+3-devel startup-notification-devel libXres-devel libwnck>=3.4.2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run startup-notification-devel
-Add_dependency run libXres-devel
-Add_dependency run libwnck ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 9d8ba69cf5..379fe7f0ce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -3,6 +3,7 @@ pkgname=libwnck
 version=3.4.2
 distfiles="${GNOME_SITE}/libwnck/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gobject-introspection startup-notification-devel gtk+3-devel libXres-devel"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/"
@@ -14,9 +15,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build startup-notification-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libXres-devel
diff --git a/srcpkgs/libwnck2/depends b/srcpkgs/libwnck2/depends
deleted file mode 100644
index 6b74a71981..0000000000
--- a/srcpkgs/libwnck2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.30"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libwnck2/libwnck2-devel.template b/srcpkgs/libwnck2/libwnck2-devel.template
index b6a06fca40..b1402f884c 100644
--- a/srcpkgs/libwnck2/libwnck2-devel.template
+++ b/srcpkgs/libwnck2/libwnck2-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libwnck-devel'.
 #
+depends="gtk+-devel startup-notification-devel libXres-devel libwnck2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run startup-notification-devel
-Add_dependency run libXres-devel
-Add_dependency run libwnck2
 
 do_install()
 {
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 9464915c73..422afcae4d 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -5,6 +5,7 @@ wrksrc=libwnck-${version}
 distfiles="${GNOME_SITE}/libwnck/2.30/libwnck-$version.tar.bz2"
 build_style=gnu-configure
 revision=3
+makedepends="pkg-config intltool gobject-introspection startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/"
@@ -18,12 +19,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build startup-notification-devel
-Add_dependency build libXres-devel
-Add_dependency build gtk+-devel
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
diff --git a/srcpkgs/libx86/depends b/srcpkgs/libx86/depends
deleted file mode 100644
index 19862a1b53..0000000000
--- a/srcpkgs/libx86/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libx86/libx86-devel.template b/srcpkgs/libx86/libx86-devel.template
index 782d8dab7c..7b40630ab8 100644
--- a/srcpkgs/libx86/libx86-devel.template
+++ b/srcpkgs/libx86/libx86-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libx86-devel'.
 #
+depends="glibc-devel libx86"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libx86
 
 do_install()
 {
diff --git a/srcpkgs/libxcb/depends b/srcpkgs/libxcb/depends
deleted file mode 100644
index a8f65f428e..0000000000
--- a/srcpkgs/libxcb/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2"
-api_depends=">=1.8_1"
diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template
index bc2526120c..f7d85a073d 100644
--- a/srcpkgs/libxcb/libxcb-devel.template
+++ b/srcpkgs/libxcb/libxcb-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libxcb-devel'.
 #
+depends="libXdmcp-devel libXau-devel libxcb"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libXdmcp-devel
-Add_dependency run libXau-devel
-Add_dependency run libxcb
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index 52a15c8205..463c2898f6 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -5,6 +5,7 @@ homepage="http://xcb.freedesktop.org"
 distfiles="$homepage/dist/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-build-docs"
+makedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.7 libXdmcp-devel libXau-devel"
 short_desc="X protocol C-language Binding"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,10 +23,3 @@ long_desc="
  requests and receive responses with both, which eases porting to XCB."
  
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build xcb-proto ">=1.7"
-Add_dependency build libXdmcp-devel
-Add_dependency build libXau-devel
diff --git a/srcpkgs/libxdg-basedir/depends b/srcpkgs/libxdg-basedir/depends
deleted file mode 100644
index 328eed9225..0000000000
--- a/srcpkgs/libxdg-basedir/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxdg-basedir/libxdg-basedir-devel.template b/srcpkgs/libxdg-basedir/libxdg-basedir-devel.template
index a8aeb5d1e9..1bebc7fd1e 100644
--- a/srcpkgs/libxdg-basedir/libxdg-basedir-devel.template
+++ b/srcpkgs/libxdg-basedir/libxdg-basedir-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libxdg-basedir-devel'.
 #
+depends="libxdg-basedir"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/libxfce4menu/depends b/srcpkgs/libxfce4menu/depends
deleted file mode 100644
index 86a5d572ca..0000000000
--- a/srcpkgs/libxfce4menu/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.6.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxfce4menu/libxfce4menu-devel.template b/srcpkgs/libxfce4menu/libxfce4menu-devel.template
index b88621c27a..8a30a6b02c 100644
--- a/srcpkgs/libxfce4menu/libxfce4menu-devel.template
+++ b/srcpkgs/libxfce4menu/libxfce4menu-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'libxfce4menu-devel'.
 #
+depends="pkg-config glib-devel libxfce4util-devel libxfce4menu"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run libxfce4util-devel
-Add_dependency run libxfce4menu
 
 do_install()
 {
diff --git a/srcpkgs/libxfce4menu/template b/srcpkgs/libxfce4menu/template
index fd94c8c5ae..ca74d6e12e 100644
--- a/srcpkgs/libxfce4menu/template
+++ b/srcpkgs/libxfce4menu/template
@@ -4,6 +4,8 @@ version=4.6.1
 revision=3
 distfiles="http://mocha.xfce.org/archive/xfce-4.6.1/src/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc glib libxfce4util"
+makedepends="pkg-config intltool glib-devel libxfce4util-devel"
 short_desc="freedesktop.org compliant menu implementation for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
@@ -12,10 +14,3 @@ long_desc="
  for XFCE."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run libxfce4util
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libxfce4util-devel
diff --git a/srcpkgs/libxfce4ui/depends b/srcpkgs/libxfce4ui/depends
deleted file mode 100644
index 171cfd569d..0000000000
--- a/srcpkgs/libxfce4ui/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.9.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxfce4ui/libxfce4ui-devel.template b/srcpkgs/libxfce4ui/libxfce4ui-devel.template
index 559752531f..12fa22f3b4 100644
--- a/srcpkgs/libxfce4ui/libxfce4ui-devel.template
+++ b/srcpkgs/libxfce4ui/libxfce4ui-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'libxfce4ui-devel'.
 #
+depends="gtk+-devel libxfce4util-devel xfconf-devel libxfce4ui>=4.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run libxfce4util-devel
-Add_dependency run xfconf-devel
-Add_dependency run libxfce4ui ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 236a6e37a2..ebf9d231d9 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -5,6 +5,7 @@ homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/xfce/4.10/src/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool gtk+-devel libxfce4util-devel xfconf-devel dbus-glib-devel libxml2-devel startup-notification-devel"
 short_desc="Replacement of the old libxfcegui4 library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -16,11 +17,3 @@ long_desc="
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build xfconf-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build startup-notification-devel
diff --git a/srcpkgs/libxfce4util/depends b/srcpkgs/libxfce4util/depends
deleted file mode 100644
index 79732def7d..0000000000
--- a/srcpkgs/libxfce4util/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.9.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxfce4util/libxfce4util-devel.template b/srcpkgs/libxfce4util/libxfce4util-devel.template
index d4884a5988..bc882e154a 100644
--- a/srcpkgs/libxfce4util/libxfce4util-devel.template
+++ b/srcpkgs/libxfce4util/libxfce4util-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libxfce4util-devel'.
 #
+depends="glib-devel libxfce4util>=4.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxfce4util ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index fbed702f52..a9aa7743ed 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -4,6 +4,7 @@ version=4.10.0
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/libxfce4util/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -13,6 +14,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
diff --git a/srcpkgs/libxfcegui4/depends b/srcpkgs/libxfcegui4/depends
deleted file mode 100644
index 2b9120baf8..0000000000
--- a/srcpkgs/libxfcegui4/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.7.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxfcegui4/libxfcegui4-devel.template b/srcpkgs/libxfcegui4/libxfcegui4-devel.template
index f317919f53..31a99ca98c 100644
--- a/srcpkgs/libxfcegui4/libxfcegui4-devel.template
+++ b/srcpkgs/libxfcegui4/libxfcegui4-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libxfcegui4-devel'.
 #
+depends="libxfcegui4>=4.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxfcegui4 ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/libxfcegui4/template b/srcpkgs/libxfcegui4/template
index ebc9a2d28a..fb3ba60603 100644
--- a/srcpkgs/libxfcegui4/template
+++ b/srcpkgs/libxfcegui4/template
@@ -6,6 +6,8 @@ license="GPL-2"
 distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static --disable-gladeui --enable-startup-notification --disable-debug"
+depends="hicolor-icon-theme"
+makedepends="pkg-config intltool gtk+-devel libxml2-devel libxfce4util-devel startup-notification-devel libglade-devel libxklavier-devel"
 short_desc="GTK widgets for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533
@@ -16,13 +18,4 @@ conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.x
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libxml2-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libglade-devel
-Add_dependency build libxklavier-devel
 
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/libxkbfile/depends b/srcpkgs/libxkbfile/depends
deleted file mode 100644
index 66a8f8ac96..0000000000
--- a/srcpkgs/libxkbfile/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxkbfile/libxkbfile-devel.template b/srcpkgs/libxkbfile/libxkbfile-devel.template
index 095b01169c..9d3744f215 100644
--- a/srcpkgs/libxkbfile/libxkbfile-devel.template
+++ b/srcpkgs/libxkbfile/libxkbfile-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libxkbfile-devel'.
 #
+depends="kbproto libX11-devel libxkbfile"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run kbproto
-Add_dependency run libX11-devel
-Add_dependency run libxkbfile
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libxkbfile/template b/srcpkgs/libxkbfile/template
index eef6c3c357..2fba306123 100644
--- a/srcpkgs/libxkbfile/template
+++ b/srcpkgs/libxkbfile/template
@@ -4,6 +4,7 @@ version=1.0.8
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto xextproto libX11-devel"
 short_desc="The xkbfile Library from modular X.org"
 license="MIT"
 checksum=8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
@@ -12,7 +13,3 @@ The xkbfile library is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build libX11-devel
diff --git a/srcpkgs/libxkbui/depends b/srcpkgs/libxkbui/depends
deleted file mode 100644
index b51be5b034..0000000000
--- a/srcpkgs/libxkbui/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxkbui/libxkbui-devel.template b/srcpkgs/libxkbui/libxkbui-devel.template
index fb0d341306..1d238bf7bc 100644
--- a/srcpkgs/libxkbui/libxkbui-devel.template
+++ b/srcpkgs/libxkbui/libxkbui-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libxkbui-devel'.
 #
+depends="libxkbui"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libxkbui
 
 do_install()
 {
diff --git a/srcpkgs/libxkbui/template b/srcpkgs/libxkbui/template
index d12a251ce4..b97750ad17 100644
--- a/srcpkgs/libxkbui/template
+++ b/srcpkgs/libxkbui/template
@@ -4,6 +4,7 @@ version=1.0.2
 revision=4
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xproto xextproto libX11-devel libXt-devel libxkbfile-devel"
 short_desc="xkbui library from modular x.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214
@@ -11,9 +12,3 @@ long_desc="
  This is the xkbui library from modular X.org."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency build xextproto
-Add_dependency build libX11-devel
-Add_dependency build libXt-devel
-Add_dependency build libxkbfile-devel
diff --git a/srcpkgs/libxklavier/depends b/srcpkgs/libxklavier/depends
deleted file mode 100644
index f57871a1d2..0000000000
--- a/srcpkgs/libxklavier/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.0"
-api_depends=">=5.2"
diff --git a/srcpkgs/libxklavier/libxklavier-devel.template b/srcpkgs/libxklavier/libxklavier-devel.template
index 2785fecaf5..6376d1cea4 100644
--- a/srcpkgs/libxklavier/libxklavier-devel.template
+++ b/srcpkgs/libxklavier/libxklavier-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'libxklavier-devel'.
 #
+depends="glib-devel libxml2-devel>=2.7.8 libxklavier>=5.2.1"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel	">=2.7.8"
-Add_dependency run libxklavier		">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index d70966d97b..3138e5f5e3 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -4,6 +4,8 @@ version=5.2.1
 revision=2
 distfiles="${GNOME_SITE}/$pkgname/5.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config glib-devel libxkbfile-devel libxml2-devel>=2.7.8 libXi-devel gobject-introspection"
+fulldepends="xkeyboard-config iso-codes"
 short_desc="Library providing high-level API for X Keyboard Extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e
@@ -15,11 +17,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build libxkbfile-devel
-Add_dependency build libxml2-devel	">=2.7.8"
-Add_dependency build libXi-devel
-Add_dependency build gobject-introspection
-Add_dependency full xkeyboard-config
-Add_dependency full iso-codes
diff --git a/srcpkgs/libxml++/depends b/srcpkgs/libxml++/depends
deleted file mode 100644
index 6a11fcf61d..0000000000
--- a/srcpkgs/libxml++/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.32.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxml++/libxml++-devel.template b/srcpkgs/libxml++/libxml++-devel.template
index e17ee99dfd..cec1fb52d9 100644
--- a/srcpkgs/libxml++/libxml++-devel.template
+++ b/srcpkgs/libxml++/libxml++-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libxml++-devel'.
 #
+depends="libxml++"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxml++
 
 do_install()
 {
diff --git a/srcpkgs/libxml++/template b/srcpkgs/libxml++/template
index a4676806c5..a5a1c45520 100644
--- a/srcpkgs/libxml++/template
+++ b/srcpkgs/libxml++/template
@@ -4,6 +4,7 @@ version=2.34.1
 distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config libsigc++-devel libxml2-devel glib-devel glibmm-devel"
 short_desc="C++ bindings for libxml2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=664f3636c425554bf5e7d1b60253244e2d723899be8a971fc54332148bfce040
@@ -20,11 +21,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libsigc++-devel
-Add_dependency build libxml2-devel
-Add_dependency build glib-devel
-Add_dependency build glibmm-devel
 
 pre_install()
 {
diff --git a/srcpkgs/libxml2/depends b/srcpkgs/libxml2/depends
deleted file mode 100644
index 6a7e4eb14d..0000000000
--- a/srcpkgs/libxml2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.7.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxml2/libxml2-devel.template b/srcpkgs/libxml2/libxml2-devel.template
index 8e11cc1ea3..ea78f097c0 100644
--- a/srcpkgs/libxml2/libxml2-devel.template
+++ b/srcpkgs/libxml2/libxml2-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libxml2-devel'.
 #
+depends="zlib-devel libxml2"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run libxml2
 
 do_install()
 {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 286865b1d9..9620ad07a1 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,6 +4,7 @@ version=2.7.8
 revision=3
 distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="zlib-devel python-devel"
 short_desc="Library providing XML and HTML support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec
@@ -19,5 +20,3 @@ long_desc="
  URI library."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency build zlib-devel
-Add_dependency build python-devel
diff --git a/srcpkgs/libxslt/depends b/srcpkgs/libxslt/depends
deleted file mode 100644
index 987f14b5f2..0000000000
--- a/srcpkgs/libxslt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.24"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libxslt/libxslt-devel.template b/srcpkgs/libxslt/libxslt-devel.template
index 6f97683e17..ee85d70383 100644
--- a/srcpkgs/libxslt/libxslt-devel.template
+++ b/srcpkgs/libxslt/libxslt-devel.template
@@ -1,17 +1,12 @@
 # Template file for 'libxslt-devel'.
 #
+depends="python-devel libxml2-devel libgcrypt-devel libgpg-error-devel zlib-devel libxslt"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run python-devel
-Add_dependency run libxml2-devel
-Add_dependency run libgcrypt-devel
-Add_dependency run libgpg-error-devel
-Add_dependency run zlib-devel
-Add_dependency run libxslt
 
 do_install()
 {
diff --git a/srcpkgs/libxslt/libxslt-python.template b/srcpkgs/libxslt/libxslt-python.template
index 668864cbe4..c7fb629e21 100644
--- a/srcpkgs/libxslt/libxslt-python.template
+++ b/srcpkgs/libxslt/libxslt-python.template
@@ -1,12 +1,12 @@
 # Template file for 'libxslt-python'.
 #
+depends="python"
 short_desc="${short_desc} (python extension)"
 long_desc="${long_desc}
 
  This package contains ${sourcepkg} python related files."
 
 
-Add_dependency run python
 
 do_install()
 {
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index 76dd5cbecb..718bda6bb1 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -4,6 +4,7 @@ version=1.1.26
 revision=4
 distfiles="ftp://xmlsoft.org/libxslt/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="python-devel libxml2-devel libgcrypt-devel libgpg-error-devel zlib-devel"
 short_desc="XSLT parser library from the GNOME project"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1
@@ -15,8 +16,3 @@ long_desc="
  expressions extensions."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency build python-devel
-Add_dependency build libxml2-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build zlib-devel
diff --git a/srcpkgs/libyaml/depends b/srcpkgs/libyaml/depends
deleted file mode 100644
index 42a0b0f16d..0000000000
--- a/srcpkgs/libyaml/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libyaml/libyaml-devel.template b/srcpkgs/libyaml/libyaml-devel.template
index 93b1f5ed2e..f0087e31b9 100644
--- a/srcpkgs/libyaml/libyaml-devel.template
+++ b/srcpkgs/libyaml/libyaml-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libyaml-devel'.
 #
+depends="glibc-devel libyaml"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libyaml
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 3b4f1b9785..ffb880c47c 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -6,6 +6,8 @@ homepage="https://launchpad.net/lightdm-gtk-greeter"
 distfiles="https://launchpad.net/lightdm-gtk-greeter/trunk/$version/+download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="lightdm"
+makedepends="pkg-config intltool glib-devel gtk+3-devel lightdm-devel libxklavier-devel"
 short_desc="Light Display Manager GTK+ Greeter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
@@ -22,14 +24,7 @@ long_desc="
 
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build lightdm-devel
-Add_dependency build libxklavier-devel
 
-Add_dependency run lightdm
 
 post_install() {
 	cd ${DESTDIR}//usr/share/xgreeters && \
diff --git a/srcpkgs/lightdm/depends b/srcpkgs/lightdm/depends
deleted file mode 100644
index c3ff5923bc..0000000000
--- a/srcpkgs/lightdm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.2_1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lightdm/lightdm-devel.template b/srcpkgs/lightdm/lightdm-devel.template
index 02fb5b167b..6b4fe316d2 100644
--- a/srcpkgs/lightdm/lightdm-devel.template
+++ b/srcpkgs/lightdm/lightdm-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'lightdm-devel.
 #
+depends="glib-devel liblightdm-gobject>=1.2.2 liblightdm-qt>=1.2.2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains headers, static libs, etc for LightDM."
 
-Add_dependency run glib-devel
-Add_dependency run liblightdm-gobject ">=${version}"
-Add_dependency run liblightdm-qt ">=${version}"
 
 
 do_install() {
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 21b08e4921..e73900d627 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -7,6 +7,9 @@ distfiles="https://launchpad.net/lightdm/1.2/$version/+download/$pkgname-$versio
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
 --with-greeter-user=lightdm --disable-static --disable-tests"
+depends="accountsservice"
+makedepends="pkg-config intltool dbus-glib-devel libxklavier-devel libxml2-devel qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel gobject-introspection"
+fulldepends="gnome-icon-theme dbus"
 short_desc="Light Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
@@ -35,23 +38,8 @@ make_dirs="/var/cache/lightdm 0755 lightdm lightdm"
 
 subpackages="liblightdm-gobject liblightdm-qt lightdm-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-glib-devel
-Add_dependency build libxklavier-devel
-Add_dependency build libxml2-devel
-Add_dependency build qt-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libxcb-devel
-Add_dependency build libXdmcp-devel
-Add_dependency build pam-devel
-Add_dependency build vala-devel
-Add_dependency build gobject-introspection
 
-Add_dependency full gnome-icon-theme
-Add_dependency full dbus
 
-Add_dependency run accountsservice
 
 post_install() {
 	# Remove provided init file and use our own.
diff --git a/srcpkgs/lightspark/template b/srcpkgs/lightspark/template
index 8ba320ede4..a382929583 100644
--- a/srcpkgs/lightspark/template
+++ b/srcpkgs/lightspark/template
@@ -5,6 +5,9 @@ revision=2
 build_style=cmake
 configure_args="-DAUDIO_BACKEND=pulse -DENABLE_CURL=1 -DCOMPILE_PLUGIN=1"
 distfiles="http://launchpad.net/lightspark/trunk/$pkgname-$version/+download/$pkgname-$version.tar.gz"
+depends="libgcc glibc zlib libffi libpcre glib glibmm libcurl boost fontconfig libX11 libGL SDL ftgl glew ffmpeg cairo libpulseaudio"
+makedepends="pkg-config cmake nasm libffi-devel libX11-devel fontconfig-devel zlib-devel boost-devel SDL-devel ffmpeg-devel libcurl-devel gtk+-devel glib-devel MesaLib-devel ftgl-devel glew-devel pcre-devel libxml++-devel glibmm-devel libstdc++-devel cairo-devel pulseaudio-devel llvm-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils"
 short_desc="Modern, free, open-source flash player implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b6d9dbd57d61f7ca5b645e290c1ec4b21c739ab8f6601ff75400b89a65226404
@@ -20,48 +23,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libffi
-Add_dependency run libpcre
-Add_dependency run glib
-Add_dependency run glibmm
-Add_dependency run libcurl
-Add_dependency run boost
-Add_dependency run fontconfig
-Add_dependency run libX11
-Add_dependency run libGL
-Add_dependency run SDL
-Add_dependency run ftgl
-Add_dependency run glew
-Add_dependency run ffmpeg
-Add_dependency run cairo
-Add_dependency run libpulseaudio
 
-Add_dependency build pkg-config
-Add_dependency build cmake
-Add_dependency build nasm
-Add_dependency build libffi-devel
-Add_dependency build libX11-devel
-Add_dependency build fontconfig-devel
-Add_dependency build zlib-devel
-Add_dependency build boost-devel
-Add_dependency build SDL-devel
-Add_dependency build ffmpeg-devel
-Add_dependency build libcurl-devel
-Add_dependency build gtk+-devel
-Add_dependency build glib-devel
-Add_dependency build MesaLib-devel
-Add_dependency build ftgl-devel
-Add_dependency build glew-devel
-Add_dependency build pcre-devel
-Add_dependency build libxml++-devel
-Add_dependency build glibmm-devel
-Add_dependency build libstdc++-devel
-Add_dependency build cairo-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build llvm-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/lilv/depends b/srcpkgs/lilv/depends
deleted file mode 100644
index 766067bc22..0000000000
--- a/srcpkgs/lilv/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.5.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lilv/lilv-bash-completion.template b/srcpkgs/lilv/lilv-bash-completion.template
index b83ef169e8..155fd846e5 100644
--- a/srcpkgs/lilv/lilv-bash-completion.template
+++ b/srcpkgs/lilv/lilv-bash-completion.template
@@ -1,12 +1,11 @@
 # Template file for 'lilv-bash-completion'.
 #
+depends="bash-completion lilv"
 short_desc="${short_desc} - Bash completion for Lilv"
 long_desc="${long_desc}
 
  This package contains a bash completion file for the Lilv programs."
 
-Add_dependency run bash-completion
-Add_dependency run lilv
 
 do_install()
 {
diff --git a/srcpkgs/lilv/lilv-devel.template b/srcpkgs/lilv/lilv-devel.template
index c27179f675..0f4e36e1c6 100644
--- a/srcpkgs/lilv/lilv-devel.template
+++ b/srcpkgs/lilv/lilv-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'lilv-devel'.
 #
+depends="glibc-devel sord-devel liblilv"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run sord-devel
-Add_dependency run liblilv
 
 do_install()
 {
diff --git a/srcpkgs/lilv/template b/srcpkgs/lilv/template
index da8dd29c5f..ceeb12a2bf 100644
--- a/srcpkgs/lilv/template
+++ b/srcpkgs/lilv/template
@@ -5,6 +5,7 @@ build_style=waf
 homepage="http://drobilla.net/software/lilv/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 revision=2
+makedepends="pkg-config python sord-devel lv2core"
 short_desc="Lilv is a simple yet powerful C API for using LV2 plugins."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="ISC"
@@ -16,7 +17,3 @@ long_desc="
 
 subpackages="$pkgname-devel lib$pkgname $pkgname-bash-completion"
 
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build sord-devel
-Add_dependency build lv2core
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 73f61e7674..771c55c60e 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,8 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version="$(date -u +%Y%m%d)"
+depends="linux-firmware-network>=20120523"
+makedepends="wget git"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/"
@@ -21,10 +23,7 @@ ar9170-firmware>=0"
 
 subpackages="${pkgname}-network"
 
-Add_dependency run ${pkgname}-network ">=${version}"
 
-Add_dependency build wget
-Add_dependency build git
 
 do_fetch() {
 	url="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git"
diff --git a/srcpkgs/llvm/clang-analyzer.template b/srcpkgs/llvm/clang-analyzer.template
index 2a27f4507c..01386a75c1 100644
--- a/srcpkgs/llvm/clang-analyzer.template
+++ b/srcpkgs/llvm/clang-analyzer.template
@@ -1,5 +1,6 @@
 # Template file for 'clang-analyzer'.
 #
+depends="clang python perl"
 short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
 long_desc="
  The Clang Static Analyzer is source code analysis tool that find bugs in
@@ -16,9 +17,6 @@ long_desc="
 noarch=yes
 pycompile_dirs="usr/lib/clang-analyzer"
 
-Add_dependency run clang
-Add_dependency run python
-Add_dependency run perl
 
 do_install()
 {
diff --git a/srcpkgs/llvm/clang-devel.template b/srcpkgs/llvm/clang-devel.template
index 8ef99fabb1..0c06444b28 100644
--- a/srcpkgs/llvm/clang-devel.template
+++ b/srcpkgs/llvm/clang-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'clang-devel'.
 #
+depends="clang"
 short_desc="LLVM C language family frontend - development files"
 long_desc="
  Clang project is a new C, C++, Objective C and Objective C++ front-end for
@@ -28,7 +29,6 @@ long_desc="
 
   This package includes development files for the LLVM clang."
 
-Add_dependency run clang
 
 do_install()
 {
diff --git a/srcpkgs/llvm/clang.template b/srcpkgs/llvm/clang.template
index 497975bd39..4233fa32f1 100644
--- a/srcpkgs/llvm/clang.template
+++ b/srcpkgs/llvm/clang.template
@@ -1,5 +1,6 @@
 # Template file for 'clang'.
 #
+depends="libffi gcc>=4.5"
 short_desc="Low-Level Virtual Machine (LLVM), C language family frontend"
 long_desc="
  Clang project is a new C, C++, Objective C and Objective C++ front-end for
@@ -26,8 +27,6 @@ long_desc="
    * A single unified parser for C, Objective C, C++, and Objective C++
    * Conformance with C/C++/ObjC and their variants"
 
-Add_dependency run libffi
-Add_dependency run gcc ">=4.5"
 
 do_install()
 {
diff --git a/srcpkgs/llvm/depends b/srcpkgs/llvm/depends
deleted file mode 100644
index 75e34751eb..0000000000
--- a/srcpkgs/llvm/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-# Only accept the same ABI version.
-abi_depends=">=3.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/llvm/libclang.template b/srcpkgs/llvm/libclang.template
index 898db4d0aa..a820e0ace1 100644
--- a/srcpkgs/llvm/libclang.template
+++ b/srcpkgs/llvm/libclang.template
@@ -1,5 +1,6 @@
 # Template file for 'libclang'.
 #
+depends="libffi"
 short_desc="Low-Level Virtual Machine (LLVM), C language family frontend library"
 long_desc="
  Clang project is a new C, C++, Objective C and Objective C++ front-end for
@@ -28,7 +29,6 @@ long_desc="
 
  This package includes the shared library used by the Clang frontend."
 
-Add_dependency run libffi
 
 do_install()
 {
diff --git a/srcpkgs/llvm/llvm-devel.template b/srcpkgs/llvm/llvm-devel.template
index d56232ab3d..da47d88386 100644
--- a/srcpkgs/llvm/llvm-devel.template
+++ b/srcpkgs/llvm/llvm-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'llvm-devel'.
 #
+depends="libffi-devel libllvm llvm"
 short_desc="Low Level Virtual Machine - development files"
 long_desc="
   ${long_desc}
 
   This package includes development files for the LLVM clang."
 
-Add_dependency run libffi-devel
-Add_dependency run libllvm
-Add_dependency run llvm
 
 do_install()
 {
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 2ab23e17c6..844b97e98a 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -9,6 +9,7 @@ build_style=gnu-configure
 configure_args="--disable-expensive-checks --disable-debug-runtime
 --enable-targets=all --enable-bindings=none --enable-optimize
 --enable-shared --enable-libffi --enable-llvmc-dynamic"
+makedepends="groff perl python libffi-devel"
 short_desc="Low Level Virtual Machine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.llvm.org"
@@ -53,10 +54,6 @@ subpackages="libclang clang-analyzer clang clang-devel libllvm"
 subpackages="${subpackages} llvm-devel llvm-docs"
 
 # XXX: Investigate bindings support.
-Add_dependency build groff
-Add_dependency build perl
-Add_dependency build python
-Add_dependency build libffi-devel
 
 post_extract() {
 	# Move clang files into the llvm source.
diff --git a/srcpkgs/lm-sensors/depends b/srcpkgs/lm-sensors/depends
deleted file mode 100644
index cf0780b65c..0000000000
--- a/srcpkgs/lm-sensors/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lm-sensors/libsensors-devel.template b/srcpkgs/lm-sensors/libsensors-devel.template
index 58e2558646..c452364577 100644
--- a/srcpkgs/lm-sensors/libsensors-devel.template
+++ b/srcpkgs/lm-sensors/libsensors-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libsensors-devel'.
 #
+depends="glibc-devel libsensors"
 short_desc="lm-sensors development kit"
 long_desc="${long_desc}
 
  This package contains the static library and header files used in
  development."
 
-Add_dependency run glibc-devel
-Add_dependency run libsensors
 
 do_install()
 {
diff --git a/srcpkgs/lm-sensors/template b/srcpkgs/lm-sensors/template
index 91ba3a42a2..220cffb385 100644
--- a/srcpkgs/lm-sensors/template
+++ b/srcpkgs/lm-sensors/template
@@ -4,6 +4,8 @@ version=3.3.2
 wrksrc="lm_sensors-${version}"
 homepage="http://www.lm-sensors.org/"
 distfiles="http://dl.lm-sensors.org/$pkgname/releases/lm_sensors-$version.tar.bz2"
+makedepends="which flex"
+fulldepends="perl>=0"
 short_desc="Utilities to read temperature/voltage/fan sensors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -15,9 +17,6 @@ long_desc="
 conf_files="/etc/sensors3.conf"
 subpackages="libsensors libsensors-devel"
 
-Add_dependency full perl	">=0"
-Add_dependency build which
-Add_dependency build flex
 
 do_build() {
 	make PREFIX=/usr ${makejobs}
diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index 3c76e94c53..603e7e80af 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -3,6 +3,8 @@ pkgname=logrotate
 version=3.8.1
 distfiles="https://fedorahosted.org/releases/l/o/$pkgname/${pkgname}-${version}.tar.gz"
 revision=1
+makedepends="popt-devel"
+fulldepends="gzip"
 short_desc="Log file rotation and periodic maintenance"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://fedorahosted.org/logrotate/"
@@ -18,8 +20,6 @@ long_desc="
 
 conf_files="/etc/logrotate.conf"
 
-Add_dependency full gzip
-Add_dependency build popt-devel
 
 do_build()
 {
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index a3f19932ff..93e812c53c 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -4,6 +4,7 @@ version=4.84
 revision=1
 wrksrc=lsof_${version}
 distfiles="ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_${version}.tar.bz2"
+depends="glibc"
 short_desc="LiSt Open Files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://people.freebsd.org/~abe/"
@@ -14,7 +15,6 @@ long_desc="
  just that. It lists information about files that are open by the processes
  running on a UNIX system."
 
-Add_dependency run glibc
 
 do_build()
 {
diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index cc0f87e8df..e2c7499dff 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -5,6 +5,7 @@ distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
 revision=1
+makedepends="bison SDL-devel SDL_mixer-devel"
 short_desc="An SDL tetris clone"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d6816aa70f55c73e0de2ccb81281a92aa063d3a90b362810002db010f4e3b3b2
@@ -14,6 +15,3 @@ long_desc="
  units with the aim of building lines without gaps which then disappear
  (causing any block above the deleted line to fall down)."
 
-Add_dependency build bison
-Add_dependency build SDL-devel
-Add_dependency build SDL_mixer-devel
diff --git a/srcpkgs/lua/depends b/srcpkgs/lua/depends
deleted file mode 100644
index b2999dafcf..0000000000
--- a/srcpkgs/lua/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.1.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lua/lua-devel.template b/srcpkgs/lua/lua-devel.template
index 2168a647c5..e6b0532192 100644
--- a/srcpkgs/lua/lua-devel.template
+++ b/srcpkgs/lua/lua-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'lua-devel'.
 #
+depends="ncurses-devel readline-devel lua"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ncurses-devel
-Add_dependency run readline-devel
-Add_dependency run lua
 
 do_install()
 {
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 3214e7ad21..43fac81dc9 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -3,6 +3,7 @@ pkgname=lua
 version=5.1.5
 patch_args="-Np1"
 distfiles="http://www.lua.org/ftp/$pkgname-$version.tar.gz"
+makedepends="ncurses-devel readline-devel"
 short_desc="Lua is a powerful, fast, lightweight, embeddable scripting language."
 maintainer="Robert Djubek <envy1988@gmail.com>"
 homepage="http://www.lua.org"
@@ -18,8 +19,6 @@ rapid prototyping."
 
 subpackages="lua-devel"
 
-Add_dependency build ncurses-devel
-Add_dependency build readline-devel
 
 do_build() {
 	export CFLAGS="$XBPS_CFLAGS -fPIC"
diff --git a/srcpkgs/luafilesystem/template b/srcpkgs/luafilesystem/template
index e29a132ad3..4671915754 100644
--- a/srcpkgs/luafilesystem/template
+++ b/srcpkgs/luafilesystem/template
@@ -5,6 +5,8 @@ homepage="http://keplerproject.github.com/luafilesystem"
 distfiles="https://github.com/downloads/keplerproject/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
 make_install_args="PREFIX=${XBPS_DESTDIR}/${pkgname}-${version}/usr"
+depends="lua"
+makedepends="lua-devel"
 short_desc="File System Library for the Lua Programming Language"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="MIT"
@@ -16,8 +18,6 @@ long_desc="
  LuaFileSystem offers a portable way to access the underlying directory
  structure and file attributes."
 
-Add_dependency run lua
-Add_dependency build lua-devel
 
 post_install() {
 	vinstall tests/test.lua 755 usr/share/examples/${pkgname}
diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template
index 3b0c4c2846..1a4d45ec8b 100644
--- a/srcpkgs/luaposix/template
+++ b/srcpkgs/luaposix/template
@@ -5,6 +5,8 @@ homepage="http://luaforge.net/projects/luaposix/"
 distfiles="https://github.com/downloads/rrthomas/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib/lua/5.1 --datadir=/usr/share/lua/5.1"
+depends="lua"
+makedepends="perl>=0 lua-devel"
 short_desc="A POSIX library for Lua programming language"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, LGPL-2.1"
@@ -15,10 +17,7 @@ long_desc="
  http://www.lua.org/copyright.html; it's basically the same as the BSD
  license). There is no warranty."
 
-Add_dependency run lua
 
-Add_dependency build perl ">=0" 
-Add_dependency build lua-devel
 
 post_install() {
 	vmkdir usr/share/$pkgname/examples
diff --git a/srcpkgs/luasocket/template b/srcpkgs/luasocket/template
index 61c63b42ce..2b24ca077e 100644
--- a/srcpkgs/luasocket/template
+++ b/srcpkgs/luasocket/template
@@ -4,6 +4,8 @@ version=2.0.2
 homepage="http://www.cs.princeton.edu/~diego/professional/luasocket/"
 distfiles="http://luaforge.net/frs/download.php/2664/luasocket-$version.tar.gz"
 build_style=gnu-makefile
+depends="lua"
+makedepends="lua-devel"
 short_desc="Network support for the Lua language "
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="MIT"
@@ -14,5 +16,3 @@ long_desc="
  modules that add support for functionality commonly needed by applications
  that deal with the Internet."
 
-Add_dependency run lua
-Add_dependency build lua-devel
diff --git a/srcpkgs/lutok/depends b/srcpkgs/lutok/depends
deleted file mode 100644
index 4ce94207f0..0000000000
--- a/srcpkgs/lutok/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lutok/lutok-devel.template b/srcpkgs/lutok/lutok-devel.template
index 5585e66b90..c7572f9ffa 100644
--- a/srcpkgs/lutok/lutok-devel.template
+++ b/srcpkgs/lutok/lutok-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'lutok-devel'.
 #
+depends="lua-devel lutok"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run lua-devel
-Add_dependency run lutok
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/lutok/template b/srcpkgs/lutok/template
index a34a18c038..52872bc9bd 100644
--- a/srcpkgs/lutok/template
+++ b/srcpkgs/lutok/template
@@ -5,6 +5,7 @@ homepage="http://code.google.com/p/lutok"
 distfiles="https://lutok.googlecode.com/files/lutok-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-doxygen"
+makedepends="pkg-config doxygen lua-devel"
 short_desc="Lightweight C++ API for Lua"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -19,6 +20,3 @@ long_desc="
 
 subpackages="lutok-devel"
 
-Add_dependency build pkg-config
-Add_dependency build doxygen
-Add_dependency build lua-devel
diff --git a/srcpkgs/lv2-ui/template b/srcpkgs/lv2-ui/template
index 33eae740a1..93cf746e0c 100644
--- a/srcpkgs/lv2-ui/template
+++ b/srcpkgs/lv2-ui/template
@@ -4,6 +4,9 @@ version=2.2
 build_style=waf
 homepage="http://lv2plug.in"
 distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
+depends="glibc"
+makedepends="python"
+fulldepends="lv2core"
 short_desc="UI API for the LV2 plugin standard"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1, BSD"
@@ -14,9 +17,6 @@ long_desc="
 
  This is the UI API."
 
-Add_dependency run glibc
-Add_dependency build python
-Add_dependency full lv2core
 
 post_install()
 {
diff --git a/srcpkgs/lv2core/template b/srcpkgs/lv2core/template
index e8a40dd779..eac82553af 100644
--- a/srcpkgs/lv2core/template
+++ b/srcpkgs/lv2core/template
@@ -5,6 +5,7 @@ revision=3
 build_style=waf
 homepage="http://lv2plug.in"
 distfiles="http://lv2plug.in/spec/lv2core-4.0.tar.bz2"
+makedepends="python"
 short_desc="Plugin standard for audio systems"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1, BSD"
@@ -13,7 +14,6 @@ long_desc="
  LV2 is a plugin standard for audio systems. It defines a minimal yet
  extensible C API for plugin code and a format for plugin bundles."
 
-Add_dependency build python
 
 post_install()
 {
diff --git a/srcpkgs/lvm2/depends b/srcpkgs/lvm2/depends
deleted file mode 100644
index 3e7a9455a0..0000000000
--- a/srcpkgs/lvm2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.02.54"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lvm2/device-mapper-devel.template b/srcpkgs/lvm2/device-mapper-devel.template
index a4c490390e..47c77ddad3 100644
--- a/srcpkgs/lvm2/device-mapper-devel.template
+++ b/srcpkgs/lvm2/device-mapper-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'device-mapper-devel'
 #
+depends="readline-devel ncurses-devel device-mapper>=2.02.95"
 short_desc="${sourcepkg} development files"
 long_desc="
  This package contains the development files for the kernel device-mapper
  library, libdevmapper."
 
-Add_dependency run readline-devel
-Add_dependency run ncurses-devel
-Add_dependency run device-mapper ">=${version}"
 
 
 do_install() {
diff --git a/srcpkgs/lvm2/liblvm2app-devel.template b/srcpkgs/lvm2/liblvm2app-devel.template
index 8e086066b4..9e99603576 100644
--- a/srcpkgs/lvm2/liblvm2app-devel.template
+++ b/srcpkgs/lvm2/liblvm2app-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'liblvm2app-devel'
 #
+depends="device-mapper-devel liblvm2app>=2.02.95"
 short_desc="LVM2 application library - development files"
 long_desc="
  This package contains files needed to develop applications that use the
  lvm2app library."
 
-Add_dependency run device-mapper-devel
-Add_dependency run liblvm2app ">=${version}"
 
 
 do_install() {
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 422ecfcfca..35c7d109b7 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -9,6 +9,8 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig
 --enable-fsadm --enable-applib --sbindir=/usr/sbin --libdir=/usr/lib
 --enable-dmeventd --enable-cmdlib --enable-udev_sync --enable-udev_rules
 --with-udevdir=/lib/udev/rules.d"
+depends="bash"
+makedepends="pkg-config readline-devel libudev-devel"
 short_desc="Logical Volume Manager 2 utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sourceware.org/lvm2/"
@@ -26,10 +28,6 @@ subpackages="liblvm2app liblvm2app-devel device-mapper device-mapper-devel"
 conf_files="/etc/lvm/lvm.conf"
 triggers="initramfs-tools"
 
-Add_dependency run bash
-Add_dependency build pkg-config
-Add_dependency build readline-devel
-Add_dependency build libudev-devel
 
 post_install() {
 	local initramfsdir=usr/share/initramfs-tools
diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index feb895cb2b..971465e146 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -4,6 +4,8 @@ version=0.5.1
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config intltool gtk+-devel freetype-devel"
+fulldepends="desktop-file-utils"
 short_desc="LXDE Theme Switcher"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=74e638257092201a572f1fcd4eb93c195c9fa75e27602662de542b002e6deade
@@ -12,9 +14,4 @@ long_desc="
  change the theme, icons, and fonts used by applications easily."
 
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build freetype-devel
 
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/lxc/depends b/srcpkgs/lxc/depends
deleted file mode 100644
index b3f4f752a0..0000000000
--- a/srcpkgs/lxc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lxc/lxc-devel.template b/srcpkgs/lxc/lxc-devel.template
index 2b2ece6748..463569c142 100644
--- a/srcpkgs/lxc/lxc-devel.template
+++ b/srcpkgs/lxc/lxc-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'lxc-devel'.
 #
+depends="libcap-devel liblxc"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libcap-devel
-Add_dependency run liblxc
 
 do_install()
 {
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 6c86d978a4..aa3abcc936 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -4,6 +4,7 @@ version=0.7.3
 revision=3
 distfiles="http://lxc.sourceforge.net/download/lxc/lxc-$version.tar.gz"
 build_style=gnu-configure
+makedepends="libcap-devel"
 short_desc="LinuX Containers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fa3b28cdb79b7c4735eaa8535dd014f94c8b7683d8ce2934d5836d241f48da09
@@ -18,4 +19,3 @@ long_desc="
 
 subpackages="liblxc lxc-devel"
 
-Add_dependency build libcap-devel
diff --git a/srcpkgs/lxde-icon-theme/template b/srcpkgs/lxde-icon-theme/template
index af7e444523..7e3f9b1b56 100644
--- a/srcpkgs/lxde-icon-theme/template
+++ b/srcpkgs/lxde-icon-theme/template
@@ -3,6 +3,8 @@ pkgname=lxde-icon-theme
 version=0.0.1
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="gtk+"
+makedepends="pkg-config gtk+-devel"
 short_desc="LXDE Standard icon theme"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a75c0412033a0a0bf6b3912bb37409fbdae1b9a574f2821929aca8749e7ff3a3
@@ -13,6 +15,3 @@ long_desc="
 noarch=yes
 gtk_iconcache_dirs="/usr/share/icons/nuoveXT2"
 
-Add_dependency run gtk+
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
diff --git a/srcpkgs/lxde/template b/srcpkgs/lxde/template
index 2a0fc0d876..fd5454d85c 100644
--- a/srcpkgs/lxde/template
+++ b/srcpkgs/lxde/template
@@ -3,6 +3,7 @@ pkgname=lxde
 version=0.5.0
 revision=3
 build_style=meta-template
+fulldepends="openbox pcmanfm lxde-icon-theme lxde-common lxappearance lxsession lxterminal lxlauncher lxinput lxrandr lxpanel lxtask gpicview xdg-utils xdg-user-dirs"
 short_desc="LXDE meta-package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -10,18 +11,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full openbox
-Add_dependency full pcmanfm
-Add_dependency full lxde-icon-theme
-Add_dependency full lxde-common
-Add_dependency full lxappearance
-Add_dependency full lxsession
-Add_dependency full lxterminal
-Add_dependency full lxlauncher
-Add_dependency full lxinput
-Add_dependency full lxrandr
-Add_dependency full lxpanel
-Add_dependency full lxtask
-Add_dependency full gpicview
-Add_dependency full xdg-utils
-Add_dependency full xdg-user-dirs
diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template
index bcf0c43878..d904c66edf 100644
--- a/srcpkgs/lxdm/template
+++ b/srcpkgs/lxdm/template
@@ -6,6 +6,8 @@ homepage="http://www.lxde.org"
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="-with-xconn=xcb"
+makedepends="pkg-config intltool gtk+-devel ConsoleKit-devel"
+fulldepends="iso-codes"
 short_desc="GUI login manager for LXDE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -30,12 +32,7 @@ conf_files="
 /etc/lxdm/lxdm.conf
 /etc/pam.d/lxdm"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build ConsoleKit-devel
 
-Add_dependency full iso-codes
 
 post_install() {
 	# Remove useless script.
diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index 6b1f09eabc..e09e3d4f68 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -4,6 +4,8 @@ version=0.3.1
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config intltool gtk+-devel"
+fulldepends="desktop-file-utils"
 short_desc="LXDE Keyboad/Mouse configurator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b30f3be6cd250d548d40f9d2dcc5882ad5a2fe233149e90b96eab5b6e6e0a256
@@ -17,8 +19,4 @@ long_desc="
   * Mouse acceleration and sensitivity"
 
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
 
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index 8b86b0dc4c..1377c1a96a 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -4,6 +4,7 @@ version=0.2.2
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config intltool gtk+-devel startup-notification-devel menu-cache-devel"
 short_desc="LXDE ASUS EEPC launcher"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ad586e3a2668f98bbf0217ec1be1f8f1be4ff876b180a407c7db2fe354303cbc
@@ -18,8 +19,3 @@ conf_files="
 /etc/xdg/menus/lxlauncher-applications.menu"
 
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build startup-notification-devel
-Add_dependency build menu-cache-devel
diff --git a/srcpkgs/lxmenu-data/template b/srcpkgs/lxmenu-data/template
index 06cd81d536..1789dbf4a0 100644
--- a/srcpkgs/lxmenu-data/template
+++ b/srcpkgs/lxmenu-data/template
@@ -3,6 +3,7 @@ pkgname=lxmenu-data
 version=0.1.2
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config intltool"
 short_desc="LXDE freedesktop menu required files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=34c285a0430404e815263a4bb33a79eb47b168c56469be0f7ffb19730a57a045
@@ -11,5 +12,3 @@ long_desc="
  spec-compliant desktop menus for LXDE."
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency build intltool
diff --git a/srcpkgs/lxpanel/lxpanel-devel.template b/srcpkgs/lxpanel/lxpanel-devel.template
index 99fdc141fc..e8932f27e8 100644
--- a/srcpkgs/lxpanel/lxpanel-devel.template
+++ b/srcpkgs/lxpanel/lxpanel-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'lxpanel-devel'.
 #
+depends="pkg-config alsa-lib-devel gtk+-devel menu-cache-devel lxpanel>=0.5.9"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run alsa-lib-devel
-Add_dependency run gtk+-devel
-Add_dependency run menu-cache-devel
-Add_dependency run lxpanel ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/lxpanel/template b/srcpkgs/lxpanel/template
index f062a84569..8d4a3b391e 100644
--- a/srcpkgs/lxpanel/template
+++ b/srcpkgs/lxpanel/template
@@ -3,6 +3,8 @@ pkgname=lxpanel
 version=0.5.9
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config intltool alsa-lib-devel gtk+-devel menu-cache-devel libwnck2-devel wireless_tools-devel"
+fulldepends="lxmenu-data>=0.1.2"
 short_desc="LXDE Standard panel"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2bde7d68b5a7136b205fcd497f70a67a0610fe04785d4469b3a0f9c7f30b729e
@@ -15,12 +17,4 @@ long_desc="
 CFLAGS="-lgmodule-2.0"
 subpackages="lxpanel-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build alsa-lib-devel
-Add_dependency build gtk+-devel
-Add_dependency build menu-cache-devel
-Add_dependency build libwnck2-devel
-Add_dependency build wireless_tools-devel
 
-Add_dependency full lxmenu-data ">=0.1.2"
diff --git a/srcpkgs/lxpolkit/template b/srcpkgs/lxpolkit/template
index 580457bbbd..f974ad5296 100644
--- a/srcpkgs/lxpolkit/template
+++ b/srcpkgs/lxpolkit/template
@@ -5,6 +5,7 @@ homepage="http://lxde.org"
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config intltool gtk+-devel polkit-devel"
 short_desc="LXDE PolicyKit integration"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -12,7 +13,3 @@ checksum=511affca8f55adc67031fb3627b9889064c685e4b983737d8deecdf4f94f008b
 long_desc="
  LXPolkit is a simple PolicyKit authentication agent."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build polkit-devel
diff --git a/srcpkgs/lxrandr/template b/srcpkgs/lxrandr/template
index 21b618498f..a14ec0ee73 100644
--- a/srcpkgs/lxrandr/template
+++ b/srcpkgs/lxrandr/template
@@ -4,6 +4,9 @@ version=0.1.2
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+depends="atk cairo fontconfig freetype pango"
+makedepends="pkg-config intltool gtk+-devel"
+fulldepends="desktop-file-utils"
 short_desc="LXDE Monitor configuration tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fb8139478f6cfeac6a2d8adb4e55e8cad099bfe2da7c82253c935ba719f9cf19
@@ -19,14 +22,5 @@ long_desc="
  monitor and just want to get their work done without reading a lot of 
  geek-centered manuals or command line tutorials."
 
-Add_dependency run atk
-Add_dependency run cairo
-Add_dependency run fontconfig
-Add_dependency run freetype
-Add_dependency run pango
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
 
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/lxsession/template b/srcpkgs/lxsession/template
index d82e50fcbd..0d899c9c78 100644
--- a/srcpkgs/lxsession/template
+++ b/srcpkgs/lxsession/template
@@ -4,6 +4,8 @@ version=0.4.6.1
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config intltool dbus-devel gtk+-devel"
+fulldepends="dbus-x11 upower ConsoleKit-x11 hicolor-icon-theme"
 short_desc="LXDE X11 Session Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1
@@ -22,12 +24,4 @@ long_desc="
  LXSession has also a built-in lightweight Xsettings daemon, which can
  configure GTK+ themes, keyboard, and mouse for you on session startup."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-devel
-Add_dependency build gtk+-devel
 
-Add_dependency full dbus-x11
-Add_dependency full upower
-Add_dependency full ConsoleKit-x11
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template
index 2466859c85..9c48c3f4b6 100644
--- a/srcpkgs/lxtask/template
+++ b/srcpkgs/lxtask/template
@@ -4,6 +4,8 @@ version=0.1.4
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+-devel"
+fulldepends="desktop-file-utils"
 short_desc="LXDE Task Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,8 +15,4 @@ long_desc="
  xfce4-taskmanager with all dependencies on xfce removed, new features,
  and some improvement of the user interface."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
 
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template
index 06ccf38277..7dc2788af5 100644
--- a/srcpkgs/lxterminal/template
+++ b/srcpkgs/lxterminal/template
@@ -4,6 +4,8 @@ version=0.1.11
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config intltool gtk+-devel vte-devel"
+fulldepends="desktop-file-utils"
 short_desc="LXDE Terminal emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f495166b308a96e8c30c8892b33ab163f3865253a9bbd4bdac462f974fda7253
@@ -16,9 +18,4 @@ long_desc="
  of the terminal are sharing a single process."
 
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build vte-devel
 
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/lzo/depends b/srcpkgs/lzo/depends
deleted file mode 100644
index cfb76a0121..0000000000
--- a/srcpkgs/lzo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.03"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/lzo/lzo-devel.template b/srcpkgs/lzo/lzo-devel.template
index 280acfd4d0..ba6bb80d48 100644
--- a/srcpkgs/lzo/lzo-devel.template
+++ b/srcpkgs/lzo/lzo-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libgrypt-devel'.
 #
+depends="glibc-devel lzo"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run lzo
 
 do_install()
 {
diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 630d747a9b..8aa460ecef 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -4,6 +4,8 @@ version=12.5
 patch_args="-Np1"
 wrksrc=mailx-${version}
 distfiles="http://cvs.fedoraproject.org/repo/pkgs/mailx/mailx-${version}.tar.bz2/acea6f7e8ae727514e498bd8c1895363/mailx-${version}.tar.bz2"
+depends="glibc libssl mit-krb5-libs"
+makedepends="openssl-devel mit-krb5-devel"
 short_desc="Feature-rich BSD mail(1)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c33dc81aaa6136645310c406d61d9b1d7c0a54d424bafe2d1c266e256526afe2
@@ -28,11 +30,6 @@ long_desc="
 conf_files="/etc/mail.rc"
 disable_parallel_build=yes
 
-Add_dependency run glibc
-Add_dependency run libssl
-Add_dependency run mit-krb5-libs
-Add_dependency build openssl-devel
-Add_dependency build mit-krb5-devel
 
 do_build()
 {
diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template
index f3a6074edc..1b8425f2de 100644
--- a/srcpkgs/makedepend/template
+++ b/srcpkgs/makedepend/template
@@ -4,6 +4,7 @@ version=1.0.1
 distfiles="${XORG_SITE}/util/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config xproto"
 short_desc="A dependency generator for makefiles"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b752ad9f210f82d480c8bf397d62649a4306a5534bc38ae7765b9bfbd416b1d2
@@ -17,5 +18,3 @@ long_desc="
  directives can reference files having other include directives, and parsing
  will occur in these files as well."
 
-Add_dependency build pkg-config
-Add_dependency build xproto
diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template
index 731680ecca..6b1e9ef0c1 100644
--- a/srcpkgs/makeself/template
+++ b/srcpkgs/makeself/template
@@ -2,6 +2,7 @@
 pkgname=makeself
 version=2.1.5
 distfiles="http://megastep.org/$pkgname/$pkgname-$version.run"
+fulldepends="tar gzip bzip2>=0"
 short_desc="Make self-extractable archives on Unix"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8227668bb35c34d86e6f0fe69c7bf4bd2813f51edfcbfc227896b4787b0a1a4e
@@ -18,9 +19,6 @@ long_desc="
 noarch=yes
 noextract=yes
 
-Add_dependency full tar
-Add_dependency full gzip
-Add_dependency full bzip2 ">=0"
 
 do_build()
 {
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index a015d9a6b7..ec03486df1 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -8,6 +8,8 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip
 --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
 --with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid
 --without-included-regex --enable-automatic-create" 
+makedepends="pkg-config gdbm-devel zlib-devel libpipeline-devel"
+fulldepends="bzip2 gzip less groff grep coreutils"
 short_desc="The on-line manual database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -21,17 +23,7 @@ long_desc="
 
 conf_files="/etc/man_db.conf"
 
-Add_dependency build pkg-config
-Add_dependency build gdbm-devel
-Add_dependency build zlib-devel
-Add_dependency build libpipeline-devel
 
-Add_dependency full bzip2
-Add_dependency full gzip
-Add_dependency full less
-Add_dependency full groff
-Add_dependency full grep
-Add_dependency full coreutils
 
 post_install() {
 	# Install the cron daily job.
diff --git a/srcpkgs/mash/depends b/srcpkgs/mash/depends
deleted file mode 100644
index b6eb5f5374..0000000000
--- a/srcpkgs/mash/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.0"
-api_depends="${api_depends}"
diff --git a/srcpkgs/mash/mash-devel.template b/srcpkgs/mash/mash-devel.template
index 71785daa14..9bd2d07dc9 100644
--- a/srcpkgs/mash/mash-devel.template
+++ b/srcpkgs/mash/mash-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'mash-devel'.
 #
+depends="clutter-devel mash>=0.2.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run clutter-devel
-Add_dependency run mash ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template
index 830dfd6e71..b3b4d52ed8 100644
--- a/srcpkgs/mash/template
+++ b/srcpkgs/mash/template
@@ -4,6 +4,7 @@ version=0.2.0
 distfiles="http://www.clutter-project.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-introspection --disable-static"
+makedepends="pkg-config intltool gobject-introspection clutter-devel"
 short_desc="A small library for using 3D models within a Clutter scene"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
@@ -17,7 +18,3 @@ long_desc="
 
 subpackages="mash-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build clutter-devel
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index c2615436b8..94fe2d42e1 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -5,6 +5,7 @@ distfiles="http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$pkgname-$ver
 build_style=gnu-configure
 configure_args="--with-screen=mcslang --enable-charset --without-x"
 revision=1
+makedepends="pkg-config glib-devel e2fsprogs-devel"
 short_desc="User-friendly file manager and visual shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
@@ -16,6 +17,3 @@ long_desc="
  preserving the full power of the command prompt. You will wonder how
  you could ever live without it."
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build e2fsprogs-devel
diff --git a/srcpkgs/mcpp/depends b/srcpkgs/mcpp/depends
deleted file mode 100644
index c4aa4697a4..0000000000
--- a/srcpkgs/mcpp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.7.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mcpp/mcpp-devel.template b/srcpkgs/mcpp/mcpp-devel.template
index 2b535d285a..330b897036 100644
--- a/srcpkgs/mcpp/mcpp-devel.template
+++ b/srcpkgs/mcpp/mcpp-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'mcpp-devel'.
 #
+depends="glibc-devel mcpp"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run mcpp
 
 do_install()
 {
diff --git a/srcpkgs/mdbtools/mdbtools-devel.template b/srcpkgs/mdbtools/mdbtools-devel.template
index a5ff4eb924..86635768de 100644
--- a/srcpkgs/mdbtools/mdbtools-devel.template
+++ b/srcpkgs/mdbtools/mdbtools-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'mdbtools-devel'.
 #
+depends="libmdb"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libmdb
 
 do_install()
 {
diff --git a/srcpkgs/mdbtools/template b/srcpkgs/mdbtools/template
index 24935bfd14..163aef86f9 100644
--- a/srcpkgs/mdbtools/template
+++ b/srcpkgs/mdbtools/template
@@ -4,6 +4,7 @@ version=0.5
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-glibtest --enable-sql"
+makedepends="flex bison pkg-config glib-devel"
 short_desc="Library and utilities for reading Microsoft Access Databases"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mdbtools.sourceforge.net/"
@@ -19,7 +20,3 @@ long_desc="
 
 subpackages="${pkgname}-devel ${pkgname}-docs libmdb"
 
-Add_dependency build flex
-Add_dependency build bison
-Add_dependency build pkg-config
-Add_dependency build glib-devel
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index ad7d01ca19..2068e23bcb 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -8,6 +8,7 @@ build_style=gnu-makefile
 make_build_args="DBLIB=-ldb"
 make_install_args="MANDIR=/usr/share/man BINDIR=/usr/bin
 EXAMPLEDIR=/usr/share/examples/mdocml PREFIX=/usr"
+makedepends="db-devel"
 short_desc="mdoc macro compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
@@ -19,7 +20,6 @@ long_desc="
  implementation, for displaying -mdoc pages whilst providing token support
  for -man."
 
-Add_dependency build db-devel
 
 post_install()
 {
diff --git a/srcpkgs/media-player-info/template b/srcpkgs/media-player-info/template
index 5bee7c4180..6fb9fdbfa6 100644
--- a/srcpkgs/media-player-info/template
+++ b/srcpkgs/media-player-info/template
@@ -4,6 +4,8 @@ version=15
 homepage="http://cgit.freedesktop.org/$pkgname/"
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="udev"
+makedepends="libudev-devel pkg-config"
 short_desc="Data files describing media player capabilities, for post-HAL systems"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -13,9 +15,6 @@ long_desc="
  in post-HAL systems."
  
 noarch=yes
-Add_dependency run udev
-Add_dependency build libudev-devel
-Add_dependency build pkg-config
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/menu-cache/depends b/srcpkgs/menu-cache/depends
deleted file mode 100644
index 5943d4eaa0..0000000000
--- a/srcpkgs/menu-cache/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/menu-cache/menu-cache-devel.template b/srcpkgs/menu-cache/menu-cache-devel.template
index 4f94277444..c668009488 100644
--- a/srcpkgs/menu-cache/menu-cache-devel.template
+++ b/srcpkgs/menu-cache/menu-cache-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'menu-cache-devel'.
 #
+depends="glib-devel menu-cache"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run menu-cache
 
 do_install()
 {
diff --git a/srcpkgs/menu-cache/template b/srcpkgs/menu-cache/template
index baf1567f87..542d46de33 100644
--- a/srcpkgs/menu-cache/template
+++ b/srcpkgs/menu-cache/template
@@ -4,6 +4,7 @@ version=0.3.2
 revision=3
 distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config glib-devel"
 short_desc="LXDE freedesktop menu specification"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f
@@ -20,5 +21,3 @@ long_desc="
  * Heavily reduced disk I/O."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build glib-devel
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 450453c9a2..c616c900da 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -4,6 +4,7 @@ version=2.1.2
 homepage="http://mercurial.selenic.com"
 distfiles="$homepage/release/$pkgname-$version.tar.gz"
 build_style=python-module
+makedepends="python-devel"
 short_desc="Fast, lightweight source control management system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -50,7 +51,6 @@ long_desc="
 
 pycompile_module="$pkgname hgext"
 
-Add_dependency build python-devel
 
 post_install() {
 	vmkdir usr/share/man/man1
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index bd48ef265f..618fc45af5 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -4,6 +4,7 @@ version=8.0.1
 revision=3
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/demos/$version/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libX11-devel libXext-devel MesaLib-devel glew-devel"
 short_desc="Mesa 3D demos and tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1
@@ -14,8 +15,3 @@ long_desc="
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build MesaLib-devel
-Add_dependency build glew-devel
diff --git a/srcpkgs/metacity/depends b/srcpkgs/metacity/depends
deleted file mode 100644
index 5a05026074..0000000000
--- a/srcpkgs/metacity/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.30.1"
-api_depends=">=2.34.3_2"
diff --git a/srcpkgs/metacity/metacity-devel.template b/srcpkgs/metacity/metacity-devel.template
index cb5817a843..9eade41cd9 100644
--- a/srcpkgs/metacity/metacity-devel.template
+++ b/srcpkgs/metacity/metacity-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'metacity-devel'.
 #
+depends="gtk+-devel metacity>=2.34.3"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 noarch=yes
-Add_dependency run gtk+-devel
-Add_dependency run metacity ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 108094b016..dafcb4814d 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -5,6 +5,8 @@ revision=3
 distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-scrollkeeper"
+makedepends="pkg-config intltool which gnome-doc-utils libXcomposite-devel libXrandr-devel libXcursor-devel libXinerama-devel libcanberra-devel startup-notification-devel libgtop-devel"
+fulldepends="zenity gnome-icon-theme"
 short_desc="GNOME-compliant window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7
@@ -15,17 +17,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build which
-Add_dependency build gnome-doc-utils
-Add_dependency build libXcomposite-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libcanberra-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libgtop-devel
 
-Add_dependency full zenity
-Add_dependency full gnome-icon-theme
diff --git a/srcpkgs/mex/template b/srcpkgs/mex/template
index dfe05e3b2f..0cbac559c5 100644
--- a/srcpkgs/mex/template
+++ b/srcpkgs/mex/template
@@ -9,6 +9,8 @@ configure_args="--disable-lirc --enable-networks --disable-displayconf
 --enable-library --enable-recommended --enable-search --enable-queue
 --enable-applications --enable-upnp --enable-tracker --disable-telepathy
 --enable-opticaldisc"
+makedepends="pkg-config intltool grilo-devel mx-devel>=1.3.2 gst-plugins-base-devel telepathy-glib-devel clutter-gst-devel avahi-glib-libs-devel tracker-devel libXtst-devel rest-devel NetworkManager-devel libsoup-gnome-devel dbus-glib-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils"
 short_desc="Media centre application for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -28,23 +30,7 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build grilo-devel
-Add_dependency build mx-devel		">=1.3.2"
-Add_dependency build gst-plugins-base-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build clutter-gst-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build tracker-devel
-Add_dependency build libXtst-devel
-Add_dependency build rest-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build dbus-glib-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
 
 pre_configure() {
 	sed -i -e "s|tracker-sparql-0.12|tracker-sparql-0.14|g" \
diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template
index c2312bb8d6..9363576cee 100644
--- a/srcpkgs/midori/template
+++ b/srcpkgs/midori/template
@@ -3,6 +3,8 @@ pkgname=midori
 version=0.4.6
 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$version.tar.bz2"
 build_style=waf
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool python>=0 gtk+-devel libxml2-devel dbus-glib-devel librsvg-devel libnotify-devel libsoup-devel webkit-gtk-devel sqlite-devel libXext-devel libXScrnSaver-devel libunique1-devel vala-devel"
 short_desc="Lightweight web browser using WebKit GTK+"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -22,21 +24,4 @@ long_desc="
 conf_files="/etc/xdg/midori/search"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build python	">=0"
-Add_dependency build gtk+-devel
-Add_dependency build libxml2-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build librsvg-devel
-Add_dependency build libnotify-devel
-Add_dependency build libsoup-devel
-Add_dependency build webkit-gtk-devel
-Add_dependency build sqlite-devel
-Add_dependency build libXext-devel
-Add_dependency build libXScrnSaver-devel
-Add_dependency build libunique1-devel
-Add_dependency build vala-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template
index 80c7c36725..56b1c15ac5 100644
--- a/srcpkgs/mingw-w64-binutils/template
+++ b/srcpkgs/mingw-w64-binutils/template
@@ -3,6 +3,8 @@ pkgname=mingw-w64-binutils
 version=2.21.1
 revision=3
 distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2"
+depends="glibc zlib"
+makedepends="flex"
 short_desc="GNU binary utilities (mingw-w64 version)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnu.org/software/binutils/"
@@ -23,10 +25,7 @@ long_desc="
 
  * This is a special version for mingw-w64."
 
-Add_dependency run glibc
-Add_dependency run zlib
 
-Add_dependency build flex
 
 wrksrc=binutils-$version
 
diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template
index b089fa8049..641693601a 100644
--- a/srcpkgs/mingw-w64-crt/template
+++ b/srcpkgs/mingw-w64-crt/template
@@ -7,6 +7,8 @@ _snapshot=20110523
 version=${_majversion}.${_snapshot}
 revision=3
 distfiles=${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2
+makedepends="flex"
+fulldepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc"
 short_desc="The mingw-w64 cross-compiler runtime"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mingw-w64.sourceforge.net/"
@@ -21,11 +23,7 @@ long_desc="
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-multilib
 fi
-Add_dependency build flex
 
-Add_dependency full mingw-w64-binutils
-Add_dependency full mingw-w64-headers
-Add_dependency full mingw-w64-gcc
 
 _mingwprefix=/opt
 
diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template
index 4fed794c73..a23a8b9169 100644
--- a/srcpkgs/mingw-w64-gcc/template
+++ b/srcpkgs/mingw-w64-gcc/template
@@ -5,6 +5,8 @@ _majorver=4.6
 version=${_majorver}.1
 revision=6
 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2
+makedepends="flex"
+fulldepends="mingw-w64-binutils mingw-w64-headers"
 short_desc="The GNU C Compiler (for mingw-w64)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mingw-w64.sourceforge.net/"
@@ -21,10 +23,7 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-multilib
 fi
 
-Add_dependency build flex
 
-Add_dependency full mingw-w64-binutils
-Add_dependency full mingw-w64-headers
 
 _mingwprefix=/opt
 
diff --git a/srcpkgs/mingw-w64-libgcc/template b/srcpkgs/mingw-w64-libgcc/template
index 02267f1589..e694306274 100644
--- a/srcpkgs/mingw-w64-libgcc/template
+++ b/srcpkgs/mingw-w64-libgcc/template
@@ -5,6 +5,9 @@ _majorver=4.6
 version=${_majorver}.1
 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"
+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>"
 homepage="http://mingw-w64.sourceforge.net/"
@@ -16,23 +19,11 @@ 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."
 
-Add_dependency run glibc
-Add_dependency run cloog-ppl
-Add_dependency run ppl
-Add_dependency run gmp
-Add_dependency run mpc
-Add_dependency run mpfr
-Add_dependency run zlib
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-multilib
 fi
-Add_dependency build flex
 
-Add_dependency full mingw-w64-binutils
-Add_dependency full mingw-w64-headers
-Add_dependency full mingw-w64-gcc
-Add_dependency full mingw-w64-crt
 
 _mingwprefix=/opt
 
diff --git a/srcpkgs/mit-krb5/depends b/srcpkgs/mit-krb5/depends
deleted file mode 100644
index af59bc460d..0000000000
--- a/srcpkgs/mit-krb5/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mit-krb5/mit-krb5-devel.template b/srcpkgs/mit-krb5/mit-krb5-devel.template
index 3cb6434c24..d46acd05c8 100644
--- a/srcpkgs/mit-krb5/mit-krb5-devel.template
+++ b/srcpkgs/mit-krb5/mit-krb5-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'mit-krb5-devel'.
 #
+depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1 mit-krb5-libs"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
@@ -8,10 +9,6 @@ long_desc="${long_desc}
 noverifyrdeps=yes
 conflicts="heimdal-devel>=0"
 
-Add_dependency run db-devel
-Add_dependency run openssl-devel
-Add_dependency run e2fsprogs-devel    ">=1.4.10_1"
-Add_dependency run mit-krb5-libs
 
 do_install()
 {
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 52b31b19f0..66b185c894 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -8,6 +8,8 @@ build_style=gnu-configure
 configure_script="./src/configure"
 configure_args="--disable-rpath --with-system-et
 --with-system-ss --with-system-db --enable-shared CFLAGS=-I/usr/include/et"
+depends="mit-krb5-client"
+makedepends="perl>=0 flex db-devel e2fsprogs-devel openssl-devel"
 short_desc="MIT Kerberos 5 implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -23,13 +25,7 @@ noextract=yes
 subpackages="$pkgname-devel $pkgname-libs $pkgname-client"
 conflicts="heimdal>=0"
 
-Add_dependency run mit-krb5-client
 
-Add_dependency build perl ">=0"
-Add_dependency build flex
-Add_dependency build db-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build openssl-devel
 
 pre_configure() {
 	# We have to do this dance because the real distfile is
diff --git a/srcpkgs/mkfontdir/template b/srcpkgs/mkfontdir/template
index 12af9a800b..74b105f62c 100644
--- a/srcpkgs/mkfontdir/template
+++ b/srcpkgs/mkfontdir/template
@@ -5,6 +5,7 @@ homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 noarch=yes
+fulldepends="mkfontscale"
 short_desc="X11 Font Index Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -14,4 +15,3 @@ long_desc="
  files (such as PCF, SNF, or BDF) in a directory.  The X server
  and font server use the generated "fonts.dir" file to find font files."
 
-Add_dependency full mkfontscale
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index 35a4dc4c00..9cc2ed2fd2 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -4,6 +4,7 @@ version=1.1.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-bzip2"
+makedepends="xproto pkg-config zlib-devel freetype-devel libfontenc-devel"
 short_desc="X11 Scalable Font Index Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.x.org/wiki"
@@ -13,8 +14,3 @@ long_desc="
  This package contains the mkfontscale, a program to generate legacy X11
  font indices for scalable fonts. This is from the modular X.org project."
 
-Add_dependency build xproto
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build freetype-devel
-Add_dependency build libfontenc-devel
diff --git a/srcpkgs/mod_fastcgi/template b/srcpkgs/mod_fastcgi/template
index 16b9f29d44..21dbd724fa 100644
--- a/srcpkgs/mod_fastcgi/template
+++ b/srcpkgs/mod_fastcgi/template
@@ -4,6 +4,8 @@ version=2.4.6
 distfiles="http://www.fastcgi.com/dist/${pkgname}-${version}.tar.gz"
 build_style=gnu-makefile
 revision=1
+depends="apache"
+makedepends="apache-devel"
 short_desc="Apache module to support the FastCGI protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a5a887eecc8fe13e4cb1cab4d140188a3d2b5e6f337f8a1cce88ca441ddbe689
@@ -15,8 +17,6 @@ long_desc="
  scripts written in languages like Perl, as it saves the cost of recompiling
  the scripts and its loaded modules with each invocation."
 
-Add_dependency run apache
-Add_dependency build apache-devel
 
 pre_build()
 {
diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template
index ce2550e5cb..68a8a592d1 100644
--- a/srcpkgs/mod_wsgi/template
+++ b/srcpkgs/mod_wsgi/template
@@ -4,6 +4,7 @@ version=3.2
 revision=2
 distfiles="http://modwsgi.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="apache-devel python-devel"
 short_desc="Python WSGI adapter module for Apache"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0f7394bee6894587df023a382fc35b23913cb4a4faca18394380fe8f921e030a
@@ -14,5 +15,3 @@ long_desc="
  sites, as well as your average self managed personal sites running on web
  hosting services."
 
-Add_dependency build apache-devel
-Add_dependency build python-devel
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 0554d180db..e5952026a3 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -4,6 +4,8 @@ version=1.2
 homepage="http://mosh.mit.edu/"
 distfiles="https://github.com/downloads/keithw/mosh/mosh-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config ncurses-devel protobuf-devel libutempter-devel"
+fulldepends="perl-IO-Tty"
 short_desc="MObile SHell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -15,9 +17,4 @@ long_desc="
  Mosh is a replacement for SSH. It's more robust and responsive, especially over
  Wi-Fi, cellular, and long-distance links."
 
-Add_dependency build pkg-config
-Add_dependency build ncurses-devel
-Add_dependency build protobuf-devel
-Add_dependency build libutempter-devel
 
-Add_dependency full perl-IO-Tty
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 968f2658c1..78810945d2 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -5,6 +5,8 @@ revision=5
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gtk+-devel libxfce4util-devel libxfcegui4-devel"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,11 +18,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfcegui4-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/mpc/depends b/srcpkgs/mpc/depends
deleted file mode 100644
index f38abb5aa6..0000000000
--- a/srcpkgs/mpc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mpc/mpc-devel.template b/srcpkgs/mpc/mpc-devel.template
index 29f3c99336..f6adbbb4ed 100644
--- a/srcpkgs/mpc/mpc-devel.template
+++ b/srcpkgs/mpc/mpc-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'mpc-devel'.
 #
+depends="gmp-devel mpfr-devel mpc"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-Add_dependency run gmp-devel
-Add_dependency run mpfr-devel
-Add_dependency run mpc
 
 do_install()
 {
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index 5240588ec5..6fcb7a9813 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -4,6 +4,7 @@ version=0.9
 distfiles="http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="EGREP=egrep"
+makedepends="gmp-devel mpfr-devel"
 short_desc="C library for the arithmetic of complex numbers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
@@ -14,5 +15,3 @@ long_desc="
 
 bootstrap=yes
 subpackages="mpc-devel"
-Add_dependency build gmp-devel
-Add_dependency build mpfr-devel
diff --git a/srcpkgs/mpfr/depends b/srcpkgs/mpfr/depends
deleted file mode 100644
index ab0d9627ad..0000000000
--- a/srcpkgs/mpfr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mpfr/mpfr-devel.template b/srcpkgs/mpfr/mpfr-devel.template
index cb34df2d33..c75f124b26 100644
--- a/srcpkgs/mpfr/mpfr-devel.template
+++ b/srcpkgs/mpfr/mpfr-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'mpfr-devel'.
 #
+depends="glibc-devel gmp-devel mpfr"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run gmp-devel
-Add_dependency run mpfr
 
 do_install()
 {
diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template
index 6e7c99e265..9306966652 100644
--- a/srcpkgs/mpfr/template
+++ b/srcpkgs/mpfr/template
@@ -6,6 +6,7 @@ distfiles="${homepage}/mpfr-current/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-thread-safe"
 revision=3
+makedepends="gmp-devel"
 short_desc="Library for multiple-precision floating-point computations"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-3"
@@ -20,4 +21,3 @@ long_desc="
 
 bootstrap=yes
 subpackages="$pkgname-devel"
-Add_dependency build gmp-devel
diff --git a/srcpkgs/mpg123/depends b/srcpkgs/mpg123/depends
deleted file mode 100644
index 804945c7fb..0000000000
--- a/srcpkgs/mpg123/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.13.4_2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mpg123/mpg123-alsa.template b/srcpkgs/mpg123/mpg123-alsa.template
index f702271d8b..06eace1e40 100644
--- a/srcpkgs/mpg123/mpg123-alsa.template
+++ b/srcpkgs/mpg123/mpg123-alsa.template
@@ -1,11 +1,11 @@
 # Template file for 'mpg123-alsa'.
 #
+depends="libmpg123"
 short_desc="${short_desc} - ALSA output plugin"
 long_desc="${long_desc}
 
  This package contains the ALSA plugin for output."
 
-Add_dependency run libmpg123
 
 
 replaces="libmpg123<1.13.4_1"
diff --git a/srcpkgs/mpg123/mpg123-devel.template b/srcpkgs/mpg123/mpg123-devel.template
index 77968f27f8..6e7c74a4bc 100644
--- a/srcpkgs/mpg123/mpg123-devel.template
+++ b/srcpkgs/mpg123/mpg123-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'mpg123-devel'.
 #
+depends="glibc-devel libmpg123"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libmpg123
 
 
 do_install()
diff --git a/srcpkgs/mpg123/mpg123-jack.template b/srcpkgs/mpg123/mpg123-jack.template
index 1edb77a878..03c9ac803f 100644
--- a/srcpkgs/mpg123/mpg123-jack.template
+++ b/srcpkgs/mpg123/mpg123-jack.template
@@ -1,11 +1,11 @@
 # Template file for 'mpg123-jack'.
 #
+depends="libmpg123"
 short_desc="${short_desc} - JACK output plugin"
 long_desc="${long_desc}
 
  This package contains the JACK output plugin."
 
-Add_dependency run libmpg123
 
 replaces="libmpg123<1.13.4_1"
 
diff --git a/srcpkgs/mpg123/mpg123-pulseaudio.template b/srcpkgs/mpg123/mpg123-pulseaudio.template
index ecc763e6fa..24c65ece48 100644
--- a/srcpkgs/mpg123/mpg123-pulseaudio.template
+++ b/srcpkgs/mpg123/mpg123-pulseaudio.template
@@ -1,11 +1,11 @@
 # Template file for 'mpg123-pulseaudio'.
 #
+depends="libmpg123"
 short_desc="${short_desc} - Pulseaudio output plugin"
 long_desc="${long_desc}
 
  This package contains the Pulseaudio output plugin."
 
-Add_dependency run libmpg123
 
 replaces="libmpg123<1.13.4_1"
 
diff --git a/srcpkgs/mpg123/mpg123-sdl.template b/srcpkgs/mpg123/mpg123-sdl.template
index c7f27dfc3c..c5c2fa28a4 100644
--- a/srcpkgs/mpg123/mpg123-sdl.template
+++ b/srcpkgs/mpg123/mpg123-sdl.template
@@ -1,11 +1,11 @@
 # Template file for 'mpg123-sdl'.
 #
+depends="libmpg123"
 short_desc="${short_desc} - SDL output plugin"
 long_desc="${long_desc}
 
  This package contains the SDL output plugin."
 
-Add_dependency run libmpg123
 
 replaces="libmpg123<1.13.4_1"
 
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 0bf4563ec7..29c543ca17 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--with-module-suffix=.so --with-optimization=4
 --with-default-audio=alsa --with-audio=pulse,jack,alsa,sdl
 --enable-ipv6=yes --enable-network=yes"
+depends="mpg123-alsa>=1.14.1"
+makedepends="libltdl-devel pulseaudio-devel SDL-devel alsa-lib-devel jack-devel"
 short_desc="Fast console mpeg audio decoder/player"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.mpg123.de/"
@@ -20,10 +22,4 @@ long_desc="
 subpackages="${pkgname}-alsa ${pkgname}-jack ${pkgname}-pulseaudio
 ${pkgname}-sdl lib${pkgname} ${pkgname}-devel"
 
-Add_dependency run mpg123-alsa ">=${version}" # default output plugin
 
-Add_dependency build libltdl-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build SDL-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build jack-devel
diff --git a/srcpkgs/mtdev/depends b/srcpkgs/mtdev/depends
deleted file mode 100644
index 087e37f43a..0000000000
--- a/srcpkgs/mtdev/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mtdev/mtdev-devel.template b/srcpkgs/mtdev/mtdev-devel.template
index 1ac92ab1f9..a9eab91a12 100644
--- a/srcpkgs/mtdev/mtdev-devel.template
+++ b/srcpkgs/mtdev/mtdev-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'mtdev-devel'.
 #
+depends="mtdev"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run mtdev
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/mumble/murmur.template b/srcpkgs/mumble/murmur.template
index a87816cb14..c277f38c93 100644
--- a/srcpkgs/mumble/murmur.template
+++ b/srcpkgs/mumble/murmur.template
@@ -1,12 +1,11 @@
 # Template file for 'murmur'.
 #
+depends="mumble qt-plugin-sqlite"
 short_desc="${short_desc} - The murmur server (for mumble)"
 long_desc="${long_desc}
 
  This package contains the Murmur server (for mumble)"
 
-Add_dependency run mumble
-Add_dependency run qt-plugin-sqlite
 
 
 do_install()
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index bc73246410..552f7bff17 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -4,6 +4,9 @@ version=1.2.3
 revision=6
 homepage="http://mumble.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+depends="qt-plugin-sqlite"
+makedepends="libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel openssl-devel speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -20,27 +23,8 @@ subpackages="murmur"
 replaces="libmumble<=1.2.3"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run qt-plugin-sqlite
 
-Add_dependency build libcap-devel
-Add_dependency build Ice-devel
-Add_dependency build protobuf-devel
-Add_dependency build libXi-devel
-Add_dependency build qt-devel
-Add_dependency build openssl-devel
-Add_dependency build speex-devel
-Add_dependency build libsndfile-devel
-Add_dependency build libX11-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build avahi-compat-libs-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libstdc++-devel
-Add_dependency build libogg-devel
-Add_dependency build boost-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
 
 do_configure()
 {
diff --git a/srcpkgs/mumble122/template b/srcpkgs/mumble122/template
index 210628c0bc..a6a45ec3ae 100644
--- a/srcpkgs/mumble122/template
+++ b/srcpkgs/mumble122/template
@@ -5,6 +5,9 @@ version=1.2.2
 revision=3
 homepage="http://${__pkgname}.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${__pkgname}/${__pkgname}-${version}.tar.gz"
+depends="jack qt-plugin-sqlite"
+makedepends="protobuf-devel libXi-devel qt-devel openssl-devel speex-devel jack-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -25,27 +28,8 @@ provides="${__pkgname}-999"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 build_requires=11
 
-Add_dependency run jack
-Add_dependency run qt-plugin-sqlite
 
-Add_dependency build protobuf-devel
-Add_dependency build libXi-devel
-Add_dependency build qt-devel
-Add_dependency build openssl-devel
-Add_dependency build speex-devel
-Add_dependency build jack-devel
-Add_dependency build libsndfile-devel
-Add_dependency build libX11-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build avahi-compat-libs-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libstdc++-devel
-Add_dependency build libogg-devel
-Add_dependency build boost-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
 
 wrksrc=${__pkgname}-${version}
 
diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template
index 05d221a3fd..093e103fa3 100644
--- a/srcpkgs/mutagen/template
+++ b/srcpkgs/mutagen/template
@@ -5,6 +5,7 @@ homepage="http://code.google.com/p/${pkgname}/"
 license="GPL-2"
 distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.gz"
 build_style=python-module
+fulldepends="python"
 short_desc="Python multimedia tagging library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=7e56c478de154fdcd00d257ebc77be8718188f1a0db916f51f129b7ca01de6e7
@@ -20,4 +21,3 @@ long_desc="
 pycompile_module="mutagen"
 noarch=yes
 
-Add_dependency full python
diff --git a/srcpkgs/mutter/depends b/srcpkgs/mutter/depends
deleted file mode 100644
index 194359d4ef..0000000000
--- a/srcpkgs/mutter/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mutter/mutter-devel.template b/srcpkgs/mutter/mutter-devel.template
index 5e803c09bd..b5445fa688 100644
--- a/srcpkgs/mutter/mutter-devel.template
+++ b/srcpkgs/mutter/mutter-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'mutter-devel'.
 #
+depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel mutter>=3.4.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gsettings-desktop-schemas
-Add_dependency run gtk+3-devel
-Add_dependency run clutter-devel
-Add_dependency run libX11-devel
-Add_dependency run mutter ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index b70c074e95..2a1e0e4fa7 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -4,6 +4,8 @@ version=3.4.1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-compile --disable-static"
+makedepends="pkg-config intltool gnome-doc-utils gobject-introspection gtk+3-devel startup-notification-devel libcanberra-devel clutter-devel libgirepository-devel json-glib-devel libffi-devel"
+fulldepends="zenity desktop-file-utils gsettings-desktop-schemas>=3.3.92_1"
 short_desc="Lightweight GTK+3 window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449
@@ -16,18 +18,4 @@ long_desc="
 
 subpackages="mutter-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libcanberra-devel
-Add_dependency build clutter-devel
-Add_dependency build libgirepository-devel
-Add_dependency build json-glib-devel
-Add_dependency build libffi-devel
 
-Add_dependency full zenity
-Add_dependency full desktop-file-utils
-Add_dependency full gsettings-desktop-schemas ">=3.3.92_1"
diff --git a/srcpkgs/mx/depends b/srcpkgs/mx/depends
deleted file mode 100644
index 9ef35d5289..0000000000
--- a/srcpkgs/mx/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.3_1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mx/mx-devel.template b/srcpkgs/mx/mx-devel.template
index 2c0b836ecd..2d357c8d58 100644
--- a/srcpkgs/mx/mx-devel.template
+++ b/srcpkgs/mx/mx-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'mx-devel'.
 #
+depends="gtk+-devel clutter-devel mx>=1.4.3"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run clutter-devel
-Add_dependency run mx ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/mx/template b/srcpkgs/mx/template
index 759bdc3d31..f296a38947 100644
--- a/srcpkgs/mx/template
+++ b/srcpkgs/mx/template
@@ -4,6 +4,7 @@ version=1.4.3
 revision=2
 distfiles="http://source.clutter-project.org/sources/mx/1.4/mx-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gobject-introspection libXrandr-devel gtk+-devel dbus-glib-devel clutter-devel startup-notification-devel"
 short_desc="A widget toolkit using Clutter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
@@ -17,11 +18,3 @@ long_desc="
 
 subpackages="mx-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build libXrandr-devel
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build clutter-devel
-Add_dependency build startup-notification-devel
diff --git a/srcpkgs/mysql/depends b/srcpkgs/mysql/depends
deleted file mode 100644
index c54a40ac19..0000000000
--- a/srcpkgs/mysql/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.1.14"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/mysql/libmysqlclient-devel.template b/srcpkgs/mysql/libmysqlclient-devel.template
index f8e0978f38..e57051f05d 100644
--- a/srcpkgs/mysql/libmysqlclient-devel.template
+++ b/srcpkgs/mysql/libmysqlclient-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libmysqlclient-devel'.
 #
+depends="libstdc++-devel libmysqlclient>=5.1.54"
 short_desc="MySQL database development files"
 long_desc="${long_desc}
 
  This package includes development libraries and header files."
 
-Add_dependency run libstdc++-devel
-Add_dependency run libmysqlclient ">=${version}"
 
 noverifyrdeps=yes
 
diff --git a/srcpkgs/mysql/libmysqld-devel.template b/srcpkgs/mysql/libmysqld-devel.template
index 9cb625a4dc..ca963ae225 100644
--- a/srcpkgs/mysql/libmysqld-devel.template
+++ b/srcpkgs/mysql/libmysqld-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libmysqld-devel'.
 #
+depends="glibc libmysqlclient-devel"
 short_desc="MySQL embedded database development files"
 long_desc="${long_desc}
 
  This package includes the client library."
 
-Add_dependency run glibc
-Add_dependency run libmysqlclient-devel
 
 do_install()
 {
diff --git a/srcpkgs/mysql/libndbclient-devel.template b/srcpkgs/mysql/libndbclient-devel.template
index 5c2ababc90..88d0aef9f1 100644
--- a/srcpkgs/mysql/libndbclient-devel.template
+++ b/srcpkgs/mysql/libndbclient-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'libndbclient-devel'.
 #
+depends="glibc libndbclient"
 short_desc="MySQL NDB (Network Database) development files"
 long_desc="${long_desc}
 
  This package includes the NDB development files."
 
-Add_dependency run glibc
-Add_dependency run libndbclient
 
 noverifyrdeps=yes
 
diff --git a/srcpkgs/mysql/libndbclient.template b/srcpkgs/mysql/libndbclient.template
index 74947b98ac..84b70436d9 100644
--- a/srcpkgs/mysql/libndbclient.template
+++ b/srcpkgs/mysql/libndbclient.template
@@ -1,11 +1,11 @@
 # Template file for 'libndbclient'.
 #
+depends="zlib"
 short_desc="MySQL NDB (Network Database) client library"
 long_desc="${long_desc}
 
  This package includes the NDB client library."
 
-Add_dependency run zlib
 
 do_install()
 {
diff --git a/srcpkgs/mysql/mysql-client.template b/srcpkgs/mysql/mysql-client.template
index bb7b924914..9bfc036463 100644
--- a/srcpkgs/mysql/mysql-client.template
+++ b/srcpkgs/mysql/mysql-client.template
@@ -1,5 +1,6 @@
 # Template file for 'mysql-client'.
 #
+depends="ncurses-libs perl>=0"
 short_desc="MySQL database client binaries"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
  innotop and mysqlreport."
 
 
-Add_dependency run ncurses-libs
-Add_dependency run perl			">=0"
 
 do_install()
 {
diff --git a/srcpkgs/mysql/mysql-ndb.template b/srcpkgs/mysql/mysql-ndb.template
index f7d3550b97..d82696d97b 100644
--- a/srcpkgs/mysql/mysql-ndb.template
+++ b/srcpkgs/mysql/mysql-ndb.template
@@ -1,5 +1,6 @@
 # Template file for 'mysql-ndb'.
 #
+depends="ncurses-libs"
 short_desc="MySQL NDB (Network Database) binaries"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  component."
 
 
-Add_dependency run ncurses-libs
 
 do_install()
 {
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index 1bac136cca..abc9c3b79b 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -13,6 +13,9 @@ configure_args="--sysconfdir=/etc/mysql
 --with-mysqld-user=mysqld --enable-thread-safe-client
 --libexecdir=/usr/sbin --without-readline"
 revision=4
+depends="mysql-client"
+makedepends="libstdc++-devel zlib-devel tcp_wrappers-devel ncurses-devel openssl-devel readline-devel"
+fulldepends="perl>=0 procps"
 short_desc="The world's most popular open source database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=84370fffc4fe277645fb3a5040d153ff567576b664f0663452be077826b7ab1f
@@ -40,16 +43,7 @@ openrc_services="mysqld default false"
 system_accounts="mysqld"
 mysqld_homedir="/var/lib/mysql"
 
-Add_dependency run mysql-client
 
-Add_dependency build libstdc++-devel
-Add_dependency build zlib-devel
-Add_dependency build tcp_wrappers-devel
-Add_dependency build ncurses-devel
-Add_dependency build openssl-devel
-Add_dependency build readline-devel
-Add_dependency full perl		">=0"
-Add_dependency full procps
 
 post_install()
 {
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 96b8b3554b..272a76fa49 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -4,6 +4,7 @@ version=2.3.1
 revision=2
 distfiles="http://www.nano-editor.org/dist/v2.3/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="file-devel glibc-devel ncurses-devel groff"
 short_desc="The GNU nano editor"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.nano-editor.org/"
@@ -15,7 +16,3 @@ long_desc="
  'emulate Pico as closely as possible and perhaps include extra
  functionality'."
 
-Add_dependency build file-devel
-Add_dependency build glibc-devel
-Add_dependency build ncurses-devel
-Add_dependency build groff
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index b7f3390fd8..f71feabac5 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -6,6 +6,8 @@ http://www.nasm.us/pub/nasm/releasebuilds/$version/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version"
 revision=1
+makedepends="groff perl"
+fulldepends="glibc"
 short_desc="The Netwide Assembler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2fd98d6feb2f3ce25ca5f12a593c625b767104619de4ccd59778793cc055c2d2
@@ -16,6 +18,3 @@ long_desc="
  also output plain binary files.  Its syntax is designed to be simple and easy
  to understand, similar to Intel's but less complex."
 
-Add_dependency build groff
-Add_dependency build perl
-Add_dependency full glibc
diff --git a/srcpkgs/nautilus-sendto/depends b/srcpkgs/nautilus-sendto/depends
deleted file mode 100644
index 54d6305628..0000000000
--- a/srcpkgs/nautilus-sendto/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.2"
-api_depends=">=3.0.2_1"
diff --git a/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template b/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
index f30cd4c44e..77da9f51c3 100644
--- a/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
+++ b/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'nautilus-sendto-devel'.
 #
+depends="glib-devel gtk+3-devel"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gtk+3-devel
 
 noarch=yes
 
diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
index a5717f32cd..fec15c7a08 100644
--- a/srcpkgs/nautilus-sendto/template
+++ b/srcpkgs/nautilus-sendto/template
@@ -4,6 +4,7 @@ version=3.0.3
 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+makedepends="pkg-config intltool evolution-data-server-devel gupnp-devel nautilus-devel"
 short_desc="Nautilus context menu for sending files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://download.gnome.org/sources/nautilus-sendto/"
@@ -21,8 +22,3 @@ long_desc="
 subpackages="${pkgname}-devel"
 
 # XXX: add pidgin and gajim depends for plugins to work.
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build evolution-data-server-devel
-Add_dependency build gupnp-devel
-Add_dependency build nautilus-devel
diff --git a/srcpkgs/nautilus/depends b/srcpkgs/nautilus/depends
deleted file mode 100644
index b8f1f54cc6..0000000000
--- a/srcpkgs/nautilus/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.2.1"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/nautilus/nautilus-devel.template b/srcpkgs/nautilus/nautilus-devel.template
index 0b02e66588..3b84ea77cb 100644
--- a/srcpkgs/nautilus/nautilus-devel.template
+++ b/srcpkgs/nautilus/nautilus-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'nautilus-devel'.
 #
+depends="gtk+3-devel libnautilus>=3.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run libnautilus ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e23e6ee2b5..0f2739eba5 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-update-mimedb --disable-tracker
 --disable-schemas-compile --disable-nst-extension --disable-debug"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gobject-introspection gtk+3-devel libnotify-devel libexif-devel exempi-devel libxml2-devel gnome-desktop-devel"
+fulldepends="gsettings-desktop-schemas"
 short_desc="The GNOME file manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452
@@ -16,17 +19,5 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build gtk+3-devel
-Add_dependency build libnotify-devel
-Add_dependency build libexif-devel
-Add_dependency build exempi-devel
-Add_dependency build libxml2-devel
-Add_dependency build gnome-desktop-devel
 
-Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/ncdu/template b/srcpkgs/ncdu/template
index 7880cae374..91ff50c71a 100644
--- a/srcpkgs/ncdu/template
+++ b/srcpkgs/ncdu/template
@@ -4,6 +4,7 @@ version=1.7
 revision=2
 distfiles="http://dev.yorhel.nl/download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="ncurses-devel glibc-devel"
 short_desc="NCurses Disk Usage"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dev.yorhel.nl/ncdu"
@@ -15,5 +16,3 @@ long_desc="
  directories and show percentages of disk usage with ncurses library.
 "
 
-Add_dependency build ncurses-devel
-Add_dependency build glibc-devel
diff --git a/srcpkgs/ncurses/depends b/srcpkgs/ncurses/depends
deleted file mode 100644
index 96e17b20cc..0000000000
--- a/srcpkgs/ncurses/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ncurses/ncurses-devel.template b/srcpkgs/ncurses/ncurses-devel.template
index cd716c942a..1ddfe8514e 100644
--- a/srcpkgs/ncurses/ncurses-devel.template
+++ b/srcpkgs/ncurses/ncurses-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'ncurses-devel'.
 #
+depends="glibc-devel ncurses"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
 replaces="ncursesw-devel>=0"
-Add_dependency run glibc-devel
-Add_dependency run ncurses
 
 do_install()
 {
diff --git a/srcpkgs/ncurses/ncurses-libs.template b/srcpkgs/ncurses/ncurses-libs.template
index 91403aba8b..f07fc912f0 100644
--- a/srcpkgs/ncurses/ncurses-libs.template
+++ b/srcpkgs/ncurses/ncurses-libs.template
@@ -1,12 +1,12 @@
 # Template file for 'ncurses-libs'.
 #
+depends="ncurses-base"
 short_desc="${sourcepkg} shared libraries"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
 replaces="ncursesw>=0"
-Add_dependency run ncurses-base
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/ncurses/ncurses-term.template b/srcpkgs/ncurses/ncurses-term.template
index 47d46197f4..5e7fc6f1d1 100644
--- a/srcpkgs/ncurses/ncurses-term.template
+++ b/srcpkgs/ncurses/ncurses-term.template
@@ -1,5 +1,6 @@
 # Template file for 'ncurses-term'.
 #
+depends="ncurses-base"
 short_desc="${sourcepkg} full terminal descriptions"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 noarch=yes
 noverifyrdeps=yes
 
-Add_dependency run ncurses-base
 
 do_install()
 {
diff --git a/srcpkgs/ncurses32/ncurses32-devel.template b/srcpkgs/ncurses32/ncurses32-devel.template
index 115bb5a91e..5a71635ed8 100644
--- a/srcpkgs/ncurses32/ncurses32-devel.template
+++ b/srcpkgs/ncurses32/ncurses32-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'ncurses32-devel'.
 #
+depends="glibc32-devel ncurses32"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc32-devel
-Add_dependency run ncurses32
 
 do_install()
 {
diff --git a/srcpkgs/ncurses32/template b/srcpkgs/ncurses32/template
index dedfba459c..699eaa288b 100644
--- a/srcpkgs/ncurses32/template
+++ b/srcpkgs/ncurses32/template
@@ -4,6 +4,8 @@ version=5.9
 distfiles="
 http://xbps.nopcode.org/repos/current/i686/ncurses-libs-${version}.i686.xbps
 http://xbps.nopcode.org/repos/current/i686/ncurses-devel-${version}.i686.xbps"
+depends="glibc32"
+makedepends="bsdtar"
 short_desc="A System V Release 4.0 curses emulation library (32 bits)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
@@ -26,8 +28,6 @@ noextract=yes
 noverifyrdeps=yes
 only_for_archs=x86_64
 
-Add_dependency run glibc32
-Add_dependency build bsdtar
 
 do_install()
 {
diff --git a/srcpkgs/neon/depends b/srcpkgs/neon/depends
deleted file mode 100644
index c8bad8605e..0000000000
--- a/srcpkgs/neon/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.29.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/neon/neon-devel.template b/srcpkgs/neon/neon-devel.template
index 5a8cfdb140..685fc7205e 100644
--- a/srcpkgs/neon/neon-devel.template
+++ b/srcpkgs/neon/neon-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'neon-devel'.
 #
+depends="expat-devel openssl-devel neon"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run expat-devel
-Add_dependency run openssl-devel
-Add_dependency run neon
 
 do_install()
 {
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 02cd62c995..ac58ca6602 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -6,6 +6,8 @@ distfiles="http://www.webdav.org/neon/neon-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+depends="ca-certificates"
+makedepends="zlib-devel expat-devel openssl-devel mit-krb5-devel e2fsprogs-devel libproxy-devel"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=dea3c52b9f3f915651c6279c76758acf7c427727e8b9b0130f8b138f24012290
@@ -28,11 +30,4 @@ long_desc="
     property manipulation."
 
 subpackages="neon-devel"
-Add_dependency run ca-certificates
 
-Add_dependency build zlib-devel
-Add_dependency build expat-devel
-Add_dependency build openssl-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build libproxy-devel
diff --git a/srcpkgs/net-snmp/depends b/srcpkgs/net-snmp/depends
deleted file mode 100644
index c31a3a2f2e..0000000000
--- a/srcpkgs/net-snmp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.7.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/net-snmp/net-snmp-devel.template b/srcpkgs/net-snmp/net-snmp-devel.template
index 7a919dbaba..140352e4c9 100644
--- a/srcpkgs/net-snmp/net-snmp-devel.template
+++ b/srcpkgs/net-snmp/net-snmp-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'net-snmp-devel'.
 #
+depends="libnet-snmp>=5.7.1"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libnet-snmp ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index e4887d8948..cb669f452b 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -2,6 +2,8 @@
 pkgname=net-snmp
 version=5.7.1
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
+depends="python"
+makedepends="perl bzip2-devel openssl-devel libnl-devel pciutils-devel python-devel python-distribute"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.net-snmp.org/"
@@ -15,15 +17,7 @@ long_desc="
 
 subpackages="lib${pkgname} $pkgname-devel"
 
-Add_dependency build perl
-Add_dependency build bzip2-devel
-Add_dependency build openssl-devel
-Add_dependency build libnl-devel
-Add_dependency build pciutils-devel
-Add_dependency build python-devel
-Add_dependency build python-distribute
 
-Add_dependency run python
 
 do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} --enable-ucd-snmp-compatibility \
diff --git a/srcpkgs/netpgp/depends b/srcpkgs/netpgp/depends
deleted file mode 100644
index a0a76cbae9..0000000000
--- a/srcpkgs/netpgp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=20100313"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/netpgp/libnetpgp-devel.template b/srcpkgs/netpgp/libnetpgp-devel.template
index d01faf5801..18c40e781a 100644
--- a/srcpkgs/netpgp/libnetpgp-devel.template
+++ b/srcpkgs/netpgp/libnetpgp-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libnetpgp'.
 #
+depends="zlib-devel bzip2-devel openssl-devel libnetpgp"
 short_desc="BSD licensed library for PGP tasks - development files"
 long_desc="
  The netpgp library is a BSD-licensed library for managing PGP keys.
@@ -11,10 +12,6 @@ long_desc="
 
  This packages includes development files: headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run openssl-devel
-Add_dependency run libnetpgp
 
 do_install()
 {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index ca229b11a8..59170b112f 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -5,6 +5,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="zlib-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -32,5 +33,3 @@ long_desc="
 
 subpackages="libnetpgp libnetpgp-devel"
 
-Add_dependency build zlib-devel
-Add_dependency build openssl-devel
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 516847186a..9ad1c19c40 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -3,6 +3,8 @@ pkgname=netsurf
 version=2.9
 homepage="http://www.netsurf-browser.org"
 distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz"
+depends="desktop-file-utils shared-mime-info"
+makedepends="pkg-config perl jpeg-devel libmng-devel libpng-devel librsvg-devel libxml2-devel libcurl-devel lcms-devel libwebp-devel libparserutils-devel libwapcaplet-devel libhubbub-devel libcss-devel libnsbmp-devel libnsgif-devel gtk+-devel libglade-devel gstreamer-devel"
 short_desc="Free, open source web browser written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, MIT"
@@ -31,28 +33,7 @@ long_desc="
  * Save pages complete with images
  * Fast, lightweight layout and rendering engine"
 
-Add_dependency build pkg-config
-Add_dependency build perl
-Add_dependency build jpeg-devel
-Add_dependency build libmng-devel
-Add_dependency build libpng-devel
-Add_dependency build librsvg-devel
-Add_dependency build libxml2-devel
-Add_dependency build libcurl-devel
-Add_dependency build lcms-devel
-Add_dependency build libwebp-devel
-Add_dependency build libparserutils-devel
-Add_dependency build libwapcaplet-devel
-Add_dependency build libhubbub-devel
-Add_dependency build libcss-devel
-Add_dependency build libnsbmp-devel
-Add_dependency build libnsgif-devel
-Add_dependency build gtk+-devel
-Add_dependency build libglade-devel
-Add_dependency build gstreamer-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run shared-mime-info
 
 do_build() {
 	make ${makejobs} --directory=${pkgname}-${version} \
diff --git a/srcpkgs/network-manager-applet/depends b/srcpkgs/network-manager-applet/depends
deleted file mode 100644
index da0d0ed5ca..0000000000
--- a/srcpkgs/network-manager-applet/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.1.95"
-api_depends=">=0.9.4.1"
diff --git a/srcpkgs/network-manager-applet/network-manager-applet-devel.template b/srcpkgs/network-manager-applet/network-manager-applet-devel.template
index aa8a98e068..0ffc5077f8 100644
--- a/srcpkgs/network-manager-applet/network-manager-applet-devel.template
+++ b/srcpkgs/network-manager-applet/network-manager-applet-devel.template
@@ -1,13 +1,11 @@
 # Template file for network-manager-applet-devel'.
 #
+depends="gtk+3-devel NetworkManager-devel>=0.9.3.997 libnm-gtk>=0.9.4.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run NetworkManager-devel ">=0.9.3.997"
-Add_dependency run libnm-gtk ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index a2233a7901..179e4c234b 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-static
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --with-bluetooth"
+depends="NetworkManager polkit-gnome notification-daemon hicolor-icon-theme"
+makedepends="pkg-config intltool GConf-devel libgnome-keyring-devel NetworkManager-devel gnome-bluetooth-devel libnotify-devel polkit-devel"
+fulldepends="iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
@@ -29,21 +32,8 @@ gconf_schemas="${pkgname}.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 # XXX: mobile-broadband-provier-info deps.
-Add_dependency run NetworkManager
-Add_dependency run polkit-gnome
-Add_dependency run notification-daemon
-Add_dependency run hicolor-icon-theme
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build GConf-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build gnome-bluetooth-devel
-Add_dependency build libnotify-devel
-Add_dependency build polkit-devel
 
-Add_dependency full iso-codes
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template
index e5751668b3..1ff74f6019 100644
--- a/srcpkgs/neverball/template
+++ b/srcpkgs/neverball/template
@@ -3,6 +3,8 @@ pkgname=neverball
 version=1.5.4
 revision=5
 distfiles="http://www.neverball.org/$pkgname-$version.tar.gz"
+makedepends="libpng-devel jpeg-devel libvorbis-devel SDL_ttf-devel physfs-devel MesaLib-devel"
+fulldepends="desktop-file-utils"
 short_desc="Puzzle/action game similar to Super Monkey Ball"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6
@@ -14,13 +16,6 @@ long_desc="
  Also found here is Neverputt, a hot-seat multiplayer miniature golf game
  using the physics and graphics of Neverball."
 
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build libvorbis-devel
-Add_dependency build SDL_ttf-devel
-Add_dependency build physfs-devel
-Add_dependency build MesaLib-devel
-Add_dependency full desktop-file-utils
 
 do_build()
 {
diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template
index e1b9037c1d..79f7948fc4 100644
--- a/srcpkgs/newlisp/template
+++ b/srcpkgs/newlisp/template
@@ -3,6 +3,7 @@ pkgname=newlisp
 version=10.3.9
 homepage="http://www.newlisp.org"
 distfiles="$homepage/downloads/development/$pkgname-$version.tgz"
+makedepends="readline-devel libffi-devel"
 short_desc="Lisp-like, general-purpose scripting language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, zlib, $pkgname"
@@ -15,8 +16,6 @@ long_desc="
  you will ever need are already built in. This includes networking functions,
  support for distributed and parallel processing, and Bayesian statistics."
 
-Add_dependency build readline-devel
-Add_dependency build libffi-devel
 
 do_build() {
 	sed -i "s|i386-linux-gnu/||" newlisp.h
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 859ac3420b..4f23bd12cb 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -7,6 +7,8 @@ build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
 --with-statedir=/var/lib/nfs --enable-libmount-mount
 --without-tcp-wrappers --enable-ipv6"
+depends="rpcbind"
+makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel libcap-devel mit-krb5-devel"
 short_desc="Network File System utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -28,18 +30,7 @@ rpc-mountd.service	on
 rpc-statd.service	on
 rpc-svcgssd.service	on"
 
-Add_dependency run rpcbind
 
-Add_dependency build pkg-config
-Add_dependency build libblkid-devel
-Add_dependency build libmount-devel
-Add_dependency build libtirpc-devel
-Add_dependency build librpcsecgss-devel
-Add_dependency build libnfsidmap-devel
-Add_dependency build libevent-devel
-Add_dependency build device-mapper-devel
-Add_dependency build libcap-devel
-Add_dependency build mit-krb5-devel
 
 post_install() {
 	# conffiles
diff --git a/srcpkgs/nilfs-utils/depends b/srcpkgs/nilfs-utils/depends
deleted file mode 100644
index 5b6269ad02..0000000000
--- a/srcpkgs/nilfs-utils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/nilfs-utils/nilfs-utils-devel.template b/srcpkgs/nilfs-utils/nilfs-utils-devel.template
index 9880a7a4d4..991a6e8365 100644
--- a/srcpkgs/nilfs-utils/nilfs-utils-devel.template
+++ b/srcpkgs/nilfs-utils/nilfs-utils-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'nilfs-devel'.
 #
+depends="libuuid-devel libmount-devel libnilfs"
 short_desc="NILFS userspace development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libuuid-devel
-Add_dependency run libmount-devel
-Add_dependency run libnilfs
 
 do_install() {
         vmove usr/include usr
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index a8861bff74..9cf109933e 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -5,6 +5,7 @@ homepage="http://www.nilfs.org"
 distfiles="$homepage/download/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-libmount"
+makedepends="libuuid-devel libmount-devel"
 short_desc="A log-structured file system for Linux - userspace utils"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -19,5 +20,3 @@ long_desc="
 conf_files="/etc/nilfs_cleanerd.conf"
 subpackages="libnilfs ${pkgname}-devel"
 
-Add_dependency build libuuid-devel
-Add_dependency build libmount-devel
diff --git a/srcpkgs/nodejs/nodejs-devel.template b/srcpkgs/nodejs/nodejs-devel.template
index f154fad36b..487159b7fc 100644
--- a/srcpkgs/nodejs/nodejs-devel.template
+++ b/srcpkgs/nodejs/nodejs-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'nodejs-devel'.
 #
+depends="nodejs"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run nodejs
 
 do_install()
 {
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 612608d1ef..e85a8e570e 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -3,6 +3,8 @@ pkgname=nodejs
 version=0.6.11
 homepage="http://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
+makedepends="pkg-config openssl-devel v8-devel zlib-devel"
+fulldepends="python"
 short_desc="Evented I/O for V8 javascript"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="MIT"
@@ -30,12 +32,7 @@ subpackages="${pkgname}-devel ${pkgname}-docs"
 
 wrksrc=node-v${version}
 
-Add_dependency build pkg-config
-Add_dependency build openssl-devel
-Add_dependency build v8-devel
-Add_dependency build zlib-devel
 
-Add_dependency full python
 
 do_configure()
 {
diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template
index 37106e9159..095996a68f 100644
--- a/srcpkgs/notification-daemon/template
+++ b/srcpkgs/notification-daemon/template
@@ -5,6 +5,8 @@ revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="desktop-file-utils"
+makedepends="pkg-config intltool glib-devel gtk+3-devel libcanberra-devel"
 short_desc="Shows notification messages on the desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9591273ee2099215cfbe1ce7eb7c08e8cbc3743d0a119e331889ffe9004e6f2f
@@ -16,10 +18,4 @@ long_desc="
 replaces="notification-daemon>=0"
 conflicts="xfce4-notifyd>=0"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libcanberra-devel
 
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/notify-python/depends b/srcpkgs/notify-python/depends
deleted file mode 100644
index 56fb9e056a..0000000000
--- a/srcpkgs/notify-python/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template
index 555aacc0c3..bb11fb59c1 100644
--- a/srcpkgs/notify-python/template
+++ b/srcpkgs/notify-python/template
@@ -5,6 +5,8 @@ revision=7
 patch_args="-Np1"
 distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="pygtk"
+makedepends="libnotify-devel gtk+-devel dbus-glib-devel atk-devel glib-devel pango-devel gdk-pixbuf-devel cairo-devel libpng-devel freetype-devel fontconfig-devel dbus-devel python-devel pygtk-devel"
 short_desc="Python bindings for libnotify"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
@@ -18,19 +20,4 @@ long_desc="
 
 pycompile_module="gtk-2.0/pynotify"
 
-Add_dependency run pygtk
 
-Add_dependency build libnotify-devel
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
-Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build dbus-devel
-Add_dependency build python-devel
-Add_dependency build pygtk-devel
diff --git a/srcpkgs/nspr/depends b/srcpkgs/nspr/depends
deleted file mode 100644
index 5fb3140535..0000000000
--- a/srcpkgs/nspr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/nspr/nspr-devel.template b/srcpkgs/nspr/nspr-devel.template
index ba88e8f109..759509cad1 100644
--- a/srcpkgs/nspr/nspr-devel.template
+++ b/srcpkgs/nspr/nspr-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'nspr-devel'.
 #
+depends="glibc-devel nspr"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run nspr
 
 do_install()
 {
diff --git a/srcpkgs/nss-mdns/template b/srcpkgs/nss-mdns/template
index 2e11ebc693..44c039cdbd 100644
--- a/srcpkgs/nss-mdns/template
+++ b/srcpkgs/nss-mdns/template
@@ -5,6 +5,8 @@ revision=2
 distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-avahi --disable-lynx --libdir=/lib"
+makedepends="avahi-libs-devel"
+fulldepends="avahi"
 short_desc="NSS module for Multicast DNS name resolution"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
@@ -15,5 +17,3 @@ long_desc="
  allowing name resolution by common Unix/Linux programs in the ad-hoc mDNS
  domain .local."
 
-Add_dependency full avahi
-Add_dependency build avahi-libs-devel
diff --git a/srcpkgs/nss/depends b/srcpkgs/nss/depends
deleted file mode 100644
index 403c6bfc85..0000000000
--- a/srcpkgs/nss/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.12.4"
-api_depends=">=3.13.1"
diff --git a/srcpkgs/nss/nss-devel.template b/srcpkgs/nss/nss-devel.template
index 79cdaec2e6..1fdb09f462 100644
--- a/srcpkgs/nss/nss-devel.template
+++ b/srcpkgs/nss/nss-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'nss-devel'.
 #
+depends="nspr-devel nss"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run nspr-devel
-Add_dependency run nss
 
 do_install()
 {
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index bb0cff3a90..3a57c7bea2 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,6 +3,7 @@ pkgname=nss
 version=3.13.4
 _distver=$(echo $version|sed -e "s|\.|_|g")
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${_distver}_RTM/src/${pkgname}-${version}.tar.gz"
+makedepends="perl>=0 zlib-devel nspr-devel>=4.9 sqlite-devel"
 short_desc="Mozilla Network Security Services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/projects/security/pki/nss/"
@@ -16,10 +17,6 @@ long_desc="
  security standards."
 
 subpackages="$pkgname-devel"
-Add_dependency build perl ">=0"
-Add_dependency build zlib-devel
-Add_dependency build nspr-devel ">=4.9"
-Add_dependency build sqlite-devel
 
 do_build() {
 	# Respect LDFLAGS
diff --git a/srcpkgs/ntfs-3g/depends b/srcpkgs/ntfs-3g/depends
deleted file mode 100644
index 0c07340077..0000000000
--- a/srcpkgs/ntfs-3g/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2010.10.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ntfs-3g/ntfs-3g-devel.template b/srcpkgs/ntfs-3g/ntfs-3g-devel.template
index 8249f16703..b170e7b3ec 100644
--- a/srcpkgs/ntfs-3g/ntfs-3g-devel.template
+++ b/srcpkgs/ntfs-3g/ntfs-3g-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'ntfs-3g-devel'.
 #
+depends="fuse-devel ntfs-3g"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 replaces="ntfsprogs-devel>=0"
-Add_dependency run fuse-devel
-Add_dependency run ntfs-3g
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template
index d8774fb993..5953c8c936 100644
--- a/srcpkgs/ntfs-3g/template
+++ b/srcpkgs/ntfs-3g/template
@@ -7,6 +7,7 @@ distfiles="http://www.tuxera.com/opensource/${pkgname}_ntfsprogs-${version}.tgz"
 build_style=gnu-configure
 configure_args="--exec-prefix=/usr --disable-static --with-fuse=external
 --enable-posix-acls --enable-xattr-mappings"
+makedepends="pkg-config libuuid-devel fuse-devel"
 short_desc="Stable Read/Write NTFS Driver in userspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6f1611c5000de7ca99141a9b853cba2c8dbd86c8e36d5efbe7ba918af773fb25
@@ -22,9 +23,6 @@ replaces="ntfsprogs>=0"
 subpackages="$pkgname-devel"
 build_requires=16
 
-Add_dependency build pkg-config
-Add_dependency build libuuid-devel
-Add_dependency build fuse-devel
 
 post_install() {
 	vmove "sbin/*" usr/sbin
diff --git a/srcpkgs/ntp/ntp-perl.template b/srcpkgs/ntp/ntp-perl.template
index 6ba574173d..16d5649514 100644
--- a/srcpkgs/ntp/ntp-perl.template
+++ b/srcpkgs/ntp/ntp-perl.template
@@ -1,12 +1,11 @@
 # Template file for 'ntp-perl'.
 #
+depends="ntp perl>=0"
 short_desc="${short_desc} (perl scripts)"
 long_desc="${long_desc}
 
  This package contains perl scripts ntp-wait and ntptrace."
 
-Add_dependency run ntp
-Add_dependency run perl		">=0"
 
 do_install()
 {
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index 3a70a07bcb..5fece2e3ac 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -5,6 +5,8 @@ homepage="http://www.ntp.org/"
 distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-linuxcap"
+depends="readline"
+makedepends="readline-devel openssl-devel libcap-devel"
 short_desc="The Network Time Protocol"
 license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,11 +21,7 @@ subpackages="$pkgname-perl"
 conf_files="/etc/ntp.conf"
 systemd_services="ntpd.service on"
 
-Add_dependency run readline
 
-Add_dependency build readline-devel
-Add_dependency build openssl-devel
-Add_dependency build libcap-devel
 
 post_install()
 {
diff --git a/srcpkgs/obex-data-server/template b/srcpkgs/obex-data-server/template
index e44e1ac8f0..58a009af1d 100644
--- a/srcpkgs/obex-data-server/template
+++ b/srcpkgs/obex-data-server/template
@@ -5,6 +5,7 @@ revision=4
 distfiles="http://tadas.dailyda.com/software/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-bip=gdk-pixbuf --enable-system-config"
+makedepends="glib-devel libusb-compat-devel dbus-devel dbus-glib-devel libbluetooth-devel libopenobex-devel gdk-pixbuf-devel"
 short_desc="D-Bus service providing high-level OBEX functionality"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wiki.muiline.com/obex-data-server"
@@ -22,10 +23,3 @@ conf_files="
 /etc/obex-data-server/capability.xml
 /etc/obex-data-server/imaging_capabilities.xml"
 
-Add_dependency build glib-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build libopenobex-devel
-Add_dependency build gdk-pixbuf-devel
diff --git a/srcpkgs/obexd/depends b/srcpkgs/obexd/depends
deleted file mode 100644
index 4dae9c15e4..0000000000
--- a/srcpkgs/obexd/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.21"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/obexd/template b/srcpkgs/obexd/template
index 48068c7e8f..d1015b0543 100644
--- a/srcpkgs/obexd/template
+++ b/srcpkgs/obexd/template
@@ -4,6 +4,7 @@ version=0.46
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-usb"
+makedepends="pkg-config glib-devel dbus-devel libopenobex-devel libbluetooth-devel>=4.99 libical-devel"
 short_desc="D-Bus OBEX service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
@@ -19,9 +20,3 @@ long_desc="
 subpackages="obexd-client"
 conflicts="obex-data-server>=0"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build dbus-devel
-Add_dependency build libopenobex-devel
-Add_dependency build libbluetooth-devel ">=4.99"
-Add_dependency build libical-devel
diff --git a/srcpkgs/openbox/depends b/srcpkgs/openbox/depends
deleted file mode 100644
index de997e86d8..0000000000
--- a/srcpkgs/openbox/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.5.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/openbox/openbox-devel.template b/srcpkgs/openbox/openbox-devel.template
index 44300124ec..9c1df33e13 100644
--- a/srcpkgs/openbox/openbox-devel.template
+++ b/srcpkgs/openbox/openbox-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'openbox-devel'.
 #
+depends="libopenbox"
 short_desc="openbox development files"
 long_desc="
  ${long_desc}
 
  This package includes development files: headers, static libs, etc."
 
-Add_dependency run libopenbox
 
 do_install() {
 	vmove "usr/lib/*.a" usr/lib
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index 648cc14099..6e4b2276a8 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -6,6 +6,7 @@ homepage="http://www.openbox.org"
 distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-startup-notification"
+makedepends="pkg-config startup-notification-devel libxml2-devel libXrandr-devel libXcursor-devel libXinerama-devel imlib2-devel pango-devel"
 short_desc="Standards compliant, fast, light-weight, extensible window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -39,14 +40,6 @@ conf_files="
 /etc/xdg/openbox/environment
 /etc/xdg/openbox/autostart"
 
-Add_dependency build pkg-config
-Add_dependency build startup-notification-devel
-Add_dependency build libxml2-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXinerama-devel
-Add_dependency build imlib2-devel
-Add_dependency build pango-devel
 
 post_install() {
 	# Doesn't work with GNOME3.
diff --git a/srcpkgs/openjade/depends b/srcpkgs/openjade/depends
deleted file mode 100644
index 27ebe44099..0000000000
--- a/srcpkgs/openjade/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/openjade/openjade-devel.template b/srcpkgs/openjade/openjade-devel.template
index b81451fce7..f5a7c4364d 100644
--- a/srcpkgs/openjade/openjade-devel.template
+++ b/srcpkgs/openjade/openjade-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'opensp-devel'.
 #
+depends="opensp-devel openjade"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run opensp-devel
-Add_dependency run openjade
 
 do_install()
 {
diff --git a/srcpkgs/openjade/template b/srcpkgs/openjade/template
index 6d3e0e903a..34d8d304bd 100644
--- a/srcpkgs/openjade/template
+++ b/srcpkgs/openjade/template
@@ -8,6 +8,7 @@ configure_args="
 --enable-default-catalog=/usr/share/sgml/catalog
 --enable-splibdir=/usr/lib"
 revision=2
+makedepends="perl>=0 opensp-devel"
 short_desc="SGML/XML parser toolkit and DSSSL engine, successor to "jade""
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://openjade.sourceforge.net/"
@@ -21,8 +22,6 @@ long_desc="
 subpackages="${pkgname}-devel"
 export sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --"
 
-Add_dependency build perl ">=0"
-Add_dependency build opensp-devel
 
 post_install() {
 	cd ${DESTDIR}/usr/bin && ln -s openjade jade
diff --git a/srcpkgs/openmpi/depends b/srcpkgs/openmpi/depends
deleted file mode 100644
index eaf929f4dc..0000000000
--- a/srcpkgs/openmpi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/openmpi/openmpi-devel.template b/srcpkgs/openmpi/openmpi-devel.template
index a4642d5716..f4dfc8cdbc 100644
--- a/srcpkgs/openmpi/openmpi-devel.template
+++ b/srcpkgs/openmpi/openmpi-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'openmpi-devel'.
 #
+depends="libstdc++-devel zlib-devel openmpi"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libstdc++-devel
-Add_dependency run zlib-devel
-Add_dependency run openmpi
 
 do_install()
 {
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 55aa81f10c..00d0c01df8 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -4,6 +4,7 @@ version=1.4.1
 distfiles="http://www.open-mpi.org/software/ompi/v1.4/downloads/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="libstdc++-devel zlib-devel libgomp-devel"
 short_desc="A High Performance Message Passing Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
@@ -21,6 +22,3 @@ conf_files="
 /etc/openmpi-mca-params.conf
 /etc/openmpi-totalview.tcl"
 
-Add_dependency build libstdc++-devel
-Add_dependency build zlib-devel
-Add_dependency build libgomp-devel
diff --git a/srcpkgs/openobex/depends b/srcpkgs/openobex/depends
deleted file mode 100644
index fb07b24d64..0000000000
--- a/srcpkgs/openobex/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/openobex/libopenobex-devel.template b/srcpkgs/openobex/libopenobex-devel.template
index 6ddaaf5653..3aeb3e5a0f 100644
--- a/srcpkgs/openobex/libopenobex-devel.template
+++ b/srcpkgs/openobex/libopenobex-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libopenobex-devel'.
 #
+depends="libbluetooth-devel libusb-compat-devel libopenobex"
 short_desc="OBEX protocol library (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libbluetooth-devel
-Add_dependency run libusb-compat-devel
-Add_dependency run libopenobex
 
 do_install()
 {
diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template
index 9e101af360..b3f91f28f9 100644
--- a/srcpkgs/openobex/template
+++ b/srcpkgs/openobex/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="http://ftp.osuosl.org/pub/linux/bluetooth/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb"
+makedepends="pkg-config libusb-compat-devel libbluetooth-devel"
 short_desc="OpenOBEX applications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=13996a1e3c69d857f1c7b1d0d9f1c674ccd395355dcae1442a91386b4d75254c
@@ -19,6 +20,3 @@ long_desc="
  and Nokia 9110 Communicator."
 
 subpackages="libopenobex libopenobex-devel"
-Add_dependency build pkg-config
-Add_dependency build libusb-compat-devel
-Add_dependency build libbluetooth-devel
diff --git a/srcpkgs/opensp/depends b/srcpkgs/opensp/depends
deleted file mode 100644
index b0d100cac2..0000000000
--- a/srcpkgs/opensp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.5.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/opensp/opensp-devel.template b/srcpkgs/opensp/opensp-devel.template
index 8002e38923..e592e8cf33 100644
--- a/srcpkgs/opensp/opensp-devel.template
+++ b/srcpkgs/opensp/opensp-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'opensp-devel'.
 #
+depends="glibc-devel libstdc++-devel opensp"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libstdc++-devel
-Add_dependency run opensp
 
 do_install()
 {
diff --git a/srcpkgs/opensp/template b/srcpkgs/opensp/template
index 8ac344837e..63181118df 100644
--- a/srcpkgs/opensp/template
+++ b/srcpkgs/opensp/template
@@ -6,6 +6,8 @@ distfiles="${SOURCEFORGE_SITE}/openjade/OpenSP-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-http --enable-default-catalog=/usr/share/sgml/catalog"
 revision=2
+makedepends="xmlto"
+fulldepends="xmlcatmgr"
 short_desc="SGML parser, successor to "sp""
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://openjade.sourceforge.net/"
@@ -23,8 +25,6 @@ keep_libtool_archives=yes
 subpackages="opensp-devel"
 export sgml_entries="CATALOG /usr/share/OpenSP/catalog --"
 
-Add_dependency build xmlto
-Add_dependency full xmlcatmgr
 
 post_install() {
 	# Some programs expect 'nsgmls'... make it a symlink.
diff --git a/srcpkgs/openssh/openssh-client.template b/srcpkgs/openssh/openssh-client.template
index 3e3450743b..abef625eef 100644
--- a/srcpkgs/openssh/openssh-client.template
+++ b/srcpkgs/openssh/openssh-client.template
@@ -1,5 +1,6 @@
 # Template file for 'openssh-client'.
 #
+depends="openssh>=6.0p1"
 short_desc="The OpenSSH client"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 conf_files="/etc/ssh/ssh_config"
 
-Add_dependency run openssh ">=${version}"
 
 do_install() {
 	for f in scp sftp slogin ssh ssh-add ssh-agent \
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index b651a6272f..1167f9aff8 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -1,5 +1,6 @@
 # Template file for 'openssh-server'.
 #
+depends="openssh>=6.0p1"
 short_desc="The OpenSSH server"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 systemd_services="sshd.service on sshdgenkeys.service on"
 
-Add_dependency run openssh ">=${version}"
 
 do_install() {
 	vmove usr/libexec/sftp-server usr/libexec
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 84b77c9499..202cb0e1f0 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -8,6 +8,8 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
 --with-mantype=man --without-rpath --with-xauth=/usr/bin/xauth
 --with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh
 --with-kerberos5=/usr"
+depends="shadow"
+makedepends="perl>=0 zlib-devel openssl-devel pam-devel mit-krb5-devel e2fsprogs-devel"
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
@@ -31,14 +33,7 @@ long_desc="
 conf_files="/etc/ssh/moduli"
 subpackages="$pkgname-client $pkgname-server"
 
-Add_dependency run shadow
 
-Add_dependency build perl ">=0"
-Add_dependency build zlib-devel
-Add_dependency build openssl-devel
-Add_dependency build pam-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build e2fsprogs-devel
 
 post_install() {
 	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
diff --git a/srcpkgs/openssl/depends b/srcpkgs/openssl/depends
deleted file mode 100644
index a66f7dfdeb..0000000000
--- a/srcpkgs/openssl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/openssl/openssl-devel.template b/srcpkgs/openssl/openssl-devel.template
index 937680313c..414d3b96b6 100644
--- a/srcpkgs/openssl/openssl-devel.template
+++ b/srcpkgs/openssl/openssl-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'openssl-devel'.
 #
+depends="zlib-devel libssl"
 short_desc="Secure Socket Layer and cryptographic library - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run libssl
 
 do_install()
 {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 51c13e0bbb..d02689e864 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -4,6 +4,8 @@ _openssl_version=1.0.0
 version=${_openssl_version}i
 homepage="http://www.openssl.org/"
 distfiles="${homepage}/source/$pkgname-$version.tar.gz"
+makedepends="zlib-devel"
+fulldepends="perl>=0"
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -22,8 +24,6 @@ make_dirs="
 /etc/ssl/certs 0755 root root
 /etc/ssl/private 0750 root root"
 
-Add_dependency full perl	">=0"
-Add_dependency build zlib-devel
 
 do_configure() {
 	./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
diff --git a/srcpkgs/oprofile/oprofile-qt4-gui.template b/srcpkgs/oprofile/oprofile-qt4-gui.template
index 71a6e21db9..ac86af93d1 100644
--- a/srcpkgs/oprofile/oprofile-qt4-gui.template
+++ b/srcpkgs/oprofile/oprofile-qt4-gui.template
@@ -1,11 +1,11 @@
 # Template file for 'oprofile-qt4-gui'.
 #
+depends="oprofile>=0.9.7"
 short_desc="Qt GUI for oprofile"
 long_desc="${long_desc}
 
  This package contains oprof_start, a Qt4 GUI for oprofile."
 
-Add_dependency run oprofile ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index db6b0ef96b..8d82cb773c 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -6,6 +6,7 @@ homepage="http://oprofile.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-kernel-support --with-x --enable-gui=qt4"
+makedepends="qt-devel zlib-devel popt-devel binutils-devel"
 short_desc="Transparent low-overhead system-wide profiler for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -25,7 +26,3 @@ system_accounts="oprofile"
 oprofile_homedir="/var/lib/oprofile"
 make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
 
-Add_dependency build qt-devel
-Add_dependency build zlib-devel
-Add_dependency build popt-devel
-Add_dependency build binutils-devel
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 8f920b9445..c100c9197b 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -4,6 +4,8 @@ version=4.8.3
 revision=1
 distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool flex libical-devel libnotify-devel gtk+-devel dbus-glib-devel popt-devel xfce4-panel-devel libxfce4util-devel"
 short_desc="Simple calendar application for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/projects/orage/"
@@ -14,16 +16,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build flex
-Add_dependency build libical-devel
-Add_dependency build libnotify-devel
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build popt-devel
-Add_dependency build xfce4-panel-devel
-Add_dependency build libxfce4util-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/orc/depends b/srcpkgs/orc/depends
deleted file mode 100644
index 2750e6131a..0000000000
--- a/srcpkgs/orc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.11"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/orc/orc-devel.template b/srcpkgs/orc/orc-devel.template
index 1b6a57b8a1..e6c95c44d1 100644
--- a/srcpkgs/orc/orc-devel.template
+++ b/srcpkgs/orc/orc-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'orc-devel'.
 #
+depends="glibc-devel orc"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run orc
 
 do_install()
 {
diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 0f7884eb23..9ed6c47530 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -4,6 +4,7 @@ version=0.4.14
 distfiles="http://code.entropywave.com/download/orc/orc-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config"
 short_desc="The Oild Runtime Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6b0c536984871954364976516ea0328e2dcd856111726a23e609504ba2b12313
@@ -14,4 +15,3 @@ long_desc="
  including saturated addition and subtraction, and many arithmetic operations."
 
 subpackages="orc-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/p11-kit/depends b/srcpkgs/p11-kit/depends
deleted file mode 100644
index 4c0b4c554c..0000000000
--- a/srcpkgs/p11-kit/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/p11-kit/p11-kit-devel.template b/srcpkgs/p11-kit/p11-kit-devel.template
index e7577d9bf4..041da63487 100644
--- a/srcpkgs/p11-kit/p11-kit-devel.template
+++ b/srcpkgs/p11-kit/p11-kit-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'p11-kit-devel'.
 #
+depends="glibc-devel p11-kit"
 short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run p11-kit
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template
index ab3372245f..516a4f0b4e 100644
--- a/srcpkgs/p7zip/template
+++ b/srcpkgs/p7zip/template
@@ -4,6 +4,7 @@ version=9.20.1
 wrksrc=${pkgname}_${version}
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 revision=1
+makedepends="yasm nasm"
 short_desc="Command-line version of the 7zip compressed file archive"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
@@ -11,8 +12,6 @@ long_desc="
  p7zip is the Unix port of 7-Zip, a file archiver that archives with very
  high compression ratios."
 
-Add_dependency build yasm
-Add_dependency build nasm
 
 do_build()
 {
diff --git a/srcpkgs/pam/depends b/srcpkgs/pam/depends
deleted file mode 100644
index a66f7dfdeb..0000000000
--- a/srcpkgs/pam/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pam/pam-devel.template b/srcpkgs/pam/pam-devel.template
index 6f804e38bc..165a657e96 100644
--- a/srcpkgs/pam/pam-devel.template
+++ b/srcpkgs/pam/pam-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'pam-devel'.
 #
+depends="cracklib-devel db-devel pam"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run cracklib-devel
-Add_dependency run db-devel
-Add_dependency run pam
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 30ed087b5c..09444d135e 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -5,6 +5,7 @@ wrksrc="Linux-PAM-$version"
 #distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
 distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$version.tar.bz2"
 revision=3
+makedepends="flex cracklib-devel db-devel"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
@@ -24,9 +25,6 @@ conf_files="
 /etc/security/time.conf"
 subpackages="pam-devel pam-userdb"
 
-Add_dependency build flex
-Add_dependency build cracklib-devel
-Add_dependency build db-devel
 
 do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} \
diff --git a/srcpkgs/pango/depends b/srcpkgs/pango/depends
deleted file mode 100644
index 0777ae35bc..0000000000
--- a/srcpkgs/pango/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.24.0"
-api_depends=">=1.30.0"
diff --git a/srcpkgs/pango/pango-devel.template b/srcpkgs/pango/pango-devel.template
index ee98a76879..2a411c3cfd 100644
--- a/srcpkgs/pango/pango-devel.template
+++ b/srcpkgs/pango/pango-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'pango-devel'.
 #
+depends="glib-devel cairo-devel fontconfig-devel freetype-devel libXft-devel pango>=1.30.0"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run cairo-devel
-Add_dependency run fontconfig-devel
-Add_dependency run freetype-devel
-Add_dependency run libXft-devel
-Add_dependency run pango ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 1f93df289d..0cffe17736 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -3,6 +3,7 @@ pkgname=pango
 version=1.30.0
 distfiles="${GNOME_SITE}/pango/1.30/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config glib-devel cairo-devel fontconfig-devel freetype-devel libXft-devel libXrender-devel gobject-introspection"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
@@ -33,12 +34,4 @@ long_desc="
 subpackages="pango-devel"
 triggers="pango-modules"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build cairo-devel
-Add_dependency build fontconfig-devel
-Add_dependency build freetype-devel
-Add_dependency build libXft-devel
-Add_dependency build libXrender-devel
-Add_dependency build gobject-introspection
 # XXX Add missing dependency libthai.
diff --git a/srcpkgs/pangomm/depends b/srcpkgs/pangomm/depends
deleted file mode 100644
index ab4f4ae157..0000000000
--- a/srcpkgs/pangomm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.26.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pangomm/pangomm-devel.template b/srcpkgs/pangomm/pangomm-devel.template
index f01f8f238d..c3960c1080 100644
--- a/srcpkgs/pangomm/pangomm-devel.template
+++ b/srcpkgs/pangomm/pangomm-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'pangomm-devel'.
 #
+depends="glibmm-devel cairomm-devel pango-devel pangomm"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibmm-devel
-Add_dependency run cairomm-devel
-Add_dependency run pango-devel
-Add_dependency run pangomm
 
 do_install()
 {
diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template
index 37d9005824..fc0f31e47d 100644
--- a/srcpkgs/pangomm/template
+++ b/srcpkgs/pangomm/template
@@ -6,6 +6,7 @@ distfiles="${GNOME_SITE}/pangomm/2.28/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-documentation"
 revision=2
+makedepends="pkg-config libsigc++-devel glibmm-devel cairomm-devel pango-devel"
 short_desc="C++ bindings for the pango library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,8 +19,3 @@ long_desc="
  
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libsigc++-devel
-Add_dependency build glibmm-devel
-Add_dependency build cairomm-devel
-Add_dependency build pango-devel
diff --git a/srcpkgs/papyon/template b/srcpkgs/papyon/template
index 3f55af8ce5..08d0a7129e 100644
--- a/srcpkgs/papyon/template
+++ b/srcpkgs/papyon/template
@@ -3,6 +3,9 @@ pkgname=papyon
 version=0.5.6
 distfiles="http://www.freedesktop.org/software/papyon/releases/papyon-${version}.tar.gz"
 build_style=python-module
+depends="gst-python farstream"
+makedepends="farstream-devel gst-python-devel"
+fulldepends="python pygobject pyopenssl pycrypto"
 short_desc="MSN library purely written in Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=85ce086ad8c0a47609d908325008c27f4fc1d88b9e9f30ed6586bf943bc828ec
@@ -27,11 +30,3 @@ long_desc="
 noarch=yes
 pycompile_module="$pkgname tests"
 
-Add_dependency full python
-Add_dependency full pygobject
-Add_dependency full pyopenssl
-Add_dependency full pycrypto
-Add_dependency run gst-python
-Add_dependency run farstream
-Add_dependency build farstream-devel
-Add_dependency build gst-python-devel
diff --git a/srcpkgs/parted/depends b/srcpkgs/parted/depends
deleted file mode 100644
index 7329ca3703..0000000000
--- a/srcpkgs/parted/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/parted/libparted-devel.template b/srcpkgs/parted/libparted-devel.template
index 28beaf8f59..5af8f59dd1 100644
--- a/srcpkgs/parted/libparted-devel.template
+++ b/srcpkgs/parted/libparted-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'libparted-devel'.
 #
+depends="libparted"
 short_desc="The GNU Parted disk partitioning library development files"
 long_desc="${long_desc}
 
  This package contains the static library and header files for libparted, which
  are really only of interest to parted developers."
 
-Add_dependency run libparted
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 26268f3559..7690bf4809 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -4,6 +4,7 @@ version=3.1
 distfiles="http://ftp.gnu.org/gnu/parted/parted-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--without-included-regex --disable-rpath --disable-debug"
+makedepends="pkg-config libuuid-devel libblkid-devel ncurses-devel readline-devel device-mapper-devel"
 short_desc="The GNU Parted disk partition resizing program"
 homepage="http://www.gnu.org/software/parted/"
 license="GPL-3"
@@ -16,9 +17,3 @@ long_desc="
 
 subpackages="libparted libparted-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libuuid-devel
-Add_dependency build libblkid-devel
-Add_dependency build ncurses-devel
-Add_dependency build readline-devel
-Add_dependency build device-mapper-devel
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 813c3b6972..25043534d2 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://freedesktop.org/software/pulseaudio/pavucontrol/"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
 revision=1
+makedepends="pkg-config intltool gtkmm-devel atkmm-devel glibmm-devel libsigc++-devel libcanberra-devel gtk+3-devel glib-devel pulseaudio-devel libstdc++-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -15,14 +16,3 @@ long_desc="
  tools this one allows you to control both the volume of hardware devices and
  of each playback stream separately."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtkmm-devel
-Add_dependency build atkmm-devel
-Add_dependency build glibmm-devel
-Add_dependency build libsigc++-devel
-Add_dependency build libcanberra-devel
-Add_dependency build gtk+3-devel
-Add_dependency build glib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build libstdc++-devel
diff --git a/srcpkgs/pcc-libs/template b/srcpkgs/pcc-libs/template
index 803bbc94db..0d878dec9e 100644
--- a/srcpkgs/pcc-libs/template
+++ b/srcpkgs/pcc-libs/template
@@ -3,6 +3,8 @@ pkgname=pcc-libs
 version=1.0.0
 wrksrc=${pkgname}-${version}
 distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/$pkgname-$version.tgz"
+depends="glibc"
+makedepends="flex"
 short_desc="Portable C Compiler - Support Libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f89ac94e30927a28c78fc8b8b7fef617eeaf843e2268063d43e414cf3179dd62
@@ -13,8 +15,6 @@ long_desc="
 
  This package includes some required object files for PCC to work."
 
-Add_dependency run glibc
-Add_dependency build flex
 
 do_build()
 {
diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template
index 925639d8c2..203c628ba9 100644
--- a/srcpkgs/pcc/template
+++ b/srcpkgs/pcc/template
@@ -5,6 +5,8 @@ distfiles="http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/pcc-$version.tgz"
 build_style=gnu-configure
 configure_args="--enable-tls"
 revision=1
+makedepends="flex"
+fulldepends="pcc-libs"
 short_desc="Portable C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5802dbba46d6ea3f9badaa55b9044a0416bb410020c24a5c2a8a2eaaf41156cb
@@ -15,8 +17,6 @@ long_desc="
 
 disable_parallel_build=yes
 
-Add_dependency build flex
-Add_dependency full pcc-libs
 
 post_install()
 {
diff --git a/srcpkgs/pciutils/depends b/srcpkgs/pciutils/depends
deleted file mode 100644
index 39348cf703..0000000000
--- a/srcpkgs/pciutils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.1.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pciutils/pciutils-devel.template b/srcpkgs/pciutils/pciutils-devel.template
index 14ef9e7014..bfd2f1a5cb 100644
--- a/srcpkgs/pciutils/pciutils-devel.template
+++ b/srcpkgs/pciutils/pciutils-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'pciutils-devel'.
 #
+depends="glibc-devel pciutils"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run pciutils
 
 do_install()
 {
diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index f38a3836d7..0af6b180f9 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -3,6 +3,7 @@ pkgname=pciutils
 version=3.1.9
 homepage="http://mj.ucw.cz/pciutils.html"
 distfiles="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${version}.tar.gz"
+makedepends="which wget"
 short_desc="PCI bus related utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,8 +13,6 @@ long_desc="
  setting devices connected to the PCI bus."
 
 subpackages="$pkgname-devel"
-Add_dependency build which
-Add_dependency build wget
 
 do_build() {
 	./update-pciids.sh
diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template
index 9a54b0d0ef..8f7c21d0da 100644
--- a/srcpkgs/pcmanfm/template
+++ b/srcpkgs/pcmanfm/template
@@ -3,6 +3,8 @@ pkgname=pcmanfm
 version=0.9.10
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="automake pkg-config intltool gtk+-devel libfm-devel"
+fulldepends="desktop-file-utils"
 short_desc="LXDE file manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f133c6f207f719d1fc69fe8bc07b2de6883c6937ffa87448df42e3b1a30e0298
@@ -15,13 +17,7 @@ long_desc="
 
 conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libfm-devel
 
-Add_dependency full desktop-file-utils
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/pcre/depends b/srcpkgs/pcre/depends
deleted file mode 100644
index 7410a959dd..0000000000
--- a/srcpkgs/pcre/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=7.8"
-api_depends=">=8.21_1" # pcre-devel depends on libpcrecpp.
diff --git a/srcpkgs/pcre/pcre-devel.template b/srcpkgs/pcre/pcre-devel.template
index 89c3274138..38dfc5c40d 100644
--- a/srcpkgs/pcre/pcre-devel.template
+++ b/srcpkgs/pcre/pcre-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'pcre-devel'.
 #
+depends="zlib-devel bzip2-devel libpcre libpcrecpp"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run libpcre
-Add_dependency run libpcrecpp
 
 do_install() {
 	vmove usr/bin/pcre-config usr/bin
diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index 344f71874a..77dc5a9e5e 100644
--- a/srcpkgs/pcre/template
+++ b/srcpkgs/pcre/template
@@ -6,6 +6,7 @@ distfiles="${SOURCEFORGE_SITE}/pcre/pcre-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-utf8 --enable-unicode-properties --with-pic
 --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf"
+makedepends="zlib-devel"
 short_desc="Perl Compatible Regular Expressions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pcre.org/"
@@ -20,4 +21,3 @@ long_desc="
 
 subpackages="libpcre libpcrecpp pcre-devel"
 
-Add_dependency build zlib-devel
diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template
index 977d3117d4..718de7eec3 100644
--- a/srcpkgs/pekwm/template
+++ b/srcpkgs/pekwm/template
@@ -4,6 +4,7 @@ version=0.1.14
 homepage="https://www.pekwm.org/projects/pekwm"
 distfiles="http://www.pekwm.org/projects/pekwm/files/pekwm-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libstdc++-devel jpeg-devel libpng-devel libSM-devel libICE-devel libX11-devel libXext-devel libXinerama-devel libXft-devel libXrender-devel fontconfig-devel freetype-devel libXpm-devel libXrandr-devel"
 short_desc="Window manager based on aewm++"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -31,18 +32,3 @@ conf_files="
 /etc/pekwm/start
 /etc/pekwm/vars"
 
-Add_dependency build pkg-config
-Add_dependency build libstdc++-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXft-devel
-Add_dependency build libXrender-devel
-Add_dependency build fontconfig-devel
-Add_dependency build freetype-devel
-Add_dependency build libXpm-devel
-Add_dependency build libXrandr-devel
diff --git a/srcpkgs/perl-Digest-MD5/template b/srcpkgs/perl-Digest-MD5/template
index f8bbeca197..c4b5a23036 100644
--- a/srcpkgs/perl-Digest-MD5/template
+++ b/srcpkgs/perl-Digest-MD5/template
@@ -5,6 +5,8 @@ revision=2
 wrksrc="Digest-MD5-$version"
 distfiles="${CPAN_SITE}/Digest/Digest-MD5-$version.tar.gz"
 build_style=perl-module
+makedepends="glibc-devel"
+fulldepends="perl"
 short_desc="Digest::MD5 - Perl interface to the MD5 Algorithm"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/Digest-MD5/MD5.pm"
@@ -26,6 +28,4 @@ long_desc="
  as an object oriented interface that can handle messages of arbitrary length
  and which can read files directly."
 
-Add_dependency build glibc-devel
  
-Add_dependency full perl
diff --git a/srcpkgs/perl-Encode-Locale/template b/srcpkgs/perl-Encode-Locale/template
index d7a9d8e371..a5056ddc92 100644
--- a/srcpkgs/perl-Encode-Locale/template
+++ b/srcpkgs/perl-Encode-Locale/template
@@ -5,6 +5,7 @@ noarch=yes
 wrksrc="Encode-Locale-$version"
 distfiles="${CPAN_SITE}/Encode/Encode-Locale-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Encode::Locale - Determine the locale encoding"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/Encode-Locale-1.02/lib/Encode/Locale.pm"
@@ -24,4 +25,3 @@ long_desc="
  can be converted to Unicode strings by calling Encode::encode(locale =>
  $bytes) and converted back again with Encode::decode(locale => $string)."
 
-Add_dependency full perl
diff --git a/srcpkgs/perl-ExtUtils-Depends/template b/srcpkgs/perl-ExtUtils-Depends/template
index dfce352950..37336c25cd 100644
--- a/srcpkgs/perl-ExtUtils-Depends/template
+++ b/srcpkgs/perl-ExtUtils-Depends/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="ExtUtils-Depends-$version"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-Depends-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Easily build XS extensions that depend on XS extensions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c913136c2b6a19f7f9be2defb2ed86f01c84cd1685a0f76c9d50ee56fc2a42fc
@@ -15,4 +16,3 @@ long_desc="
  also a C and an XS interface besides the perl one."
 
 noarch=yes
-Add_dependency full perl
diff --git a/srcpkgs/perl-ExtUtils-PkgConfig/template b/srcpkgs/perl-ExtUtils-PkgConfig/template
index 873b0fdd7e..5054768093 100644
--- a/srcpkgs/perl-ExtUtils-PkgConfig/template
+++ b/srcpkgs/perl-ExtUtils-PkgConfig/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="ExtUtils-PkgConfig-$version"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-PkgConfig-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl pkg-config"
 short_desc="Simplistic perl interface to pkg-config"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6330b9d1165363837ac1ab014888e3d908f8fb9eb76b31a36096d0e504f6ff42
@@ -18,5 +19,3 @@ long_desc="
  that you would've written yourself."
 
 noarch=yes
-Add_dependency full perl
-Add_dependency full pkg-config
diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index a930e563ac..c9828245b8 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -4,6 +4,7 @@ version=6.02
 wrksrc="File-Listing-$version"
 distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-HTTP-Date perl"
 short_desc="File::Listing - parse directory listing"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/File-Listing-6.02/lib/File/Listing.pm"
@@ -15,5 +16,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-HTTP-Date
-Add_dependency full perl
diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template
index 331744721e..1703e5d76f 100644
--- a/srcpkgs/perl-Fuse/template
+++ b/srcpkgs/perl-Fuse/template
@@ -5,6 +5,8 @@ wrksrc="Fuse-$version"
 distfiles="${CPAN_SITE}/Fuse/Fuse-$version.tar.gz"
 build_style=perl-module
 revision=1
+makedepends="pkg-config fuse-devel"
+fulldepends="perl"
 short_desc="Write filesystems in Perl using FUSE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/~dpavlin/Fuse-0.13/Fuse.pm"
@@ -14,6 +16,3 @@ long_desc="
  This lets you implement filesystems in perl, through the FUSE
  (Filesystem in USErspace) kernel/lib interface."
 
-Add_dependency build pkg-config
-Add_dependency build fuse-devel
-Add_dependency full perl
diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index afa25956b0..f4eb937a1a 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -6,6 +6,8 @@ homepage="http://gtk2-perl.sourceforge.net/"
 license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Glib-$version.tar.gz"
 build_style=perl-module
+makedepends="perl-ExtUtils-Depends>=0.300 perl-ExtUtils-PkgConfig>=1.00 glib-devel"
+fulldepends="perl"
 short_desc="Perl bindings for Glib 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0ebb78bcb3d10c9564473b084ef2989cf86347c1ba4acd5e55bc6c46b6d08d78
@@ -17,7 +19,3 @@ long_desc="
  that make up the Gnome environment, and are used in many unrelated
  projects."
 
-Add_dependency full perl
-Add_dependency build perl-ExtUtils-Depends	">=0.300"
-Add_dependency build perl-ExtUtils-PkgConfig	">=1.00"
-Add_dependency build glib-devel
diff --git a/srcpkgs/perl-HTML-Form/template b/srcpkgs/perl-HTML-Form/template
index 5beaecafe6..0b7aabd915 100644
--- a/srcpkgs/perl-HTML-Form/template
+++ b/srcpkgs/perl-HTML-Form/template
@@ -4,6 +4,7 @@ version=6.00
 wrksrc="HTML-Form-$version"
 distfiles="${CPAN_SITE}/HTML/HTML-Form-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-HTML-Parser perl-URI perl-HTTP-Message perl"
 short_desc="HTML::Form - Class that represents an HTML form element"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTML-Form-6.00/lib/HTML/Form.pm"
@@ -18,7 +19,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-HTML-Parser
-Add_dependency full perl-URI
-Add_dependency full perl-HTTP-Message
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTML-Parser/template b/srcpkgs/perl-HTML-Parser/template
index de86a88fe1..69c7909b8d 100644
--- a/srcpkgs/perl-HTML-Parser/template
+++ b/srcpkgs/perl-HTML-Parser/template
@@ -5,6 +5,9 @@ wrksrc="HTML-Parser-$version"
 distfiles="${CPAN_SITE}/HTML/HTML-Parser-$version.tar.gz"
 build_style=perl-module
 revision=1
+depends="perl-HTML-Tagset"
+makedepends="glibc-devel"
+fulldepends="perl"
 short_desc="HTML::Parser - HTML parser class"
 homepage="http://search.cpan.org/~gaas/HTML-Parser-3.68/Parser.pm"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -13,6 +16,3 @@ long_desc="
  The HTML-Parser distribution is is a collection of modules that parse and
  extract information from HTML documents."
 
-Add_dependency run perl-HTML-Tagset
-Add_dependency build glibc-devel
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTML-Tagset/template b/srcpkgs/perl-HTML-Tagset/template
index a58246a3e6..246cfd4c99 100644
--- a/srcpkgs/perl-HTML-Tagset/template
+++ b/srcpkgs/perl-HTML-Tagset/template
@@ -4,6 +4,7 @@ version=3.20
 wrksrc="HTML-Tagset-$version"
 distfiles="${CPAN_SITE}/HTML/HTML-Tagset-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="HTML::Tagset - data tables useful in parsing HTML"
 homepage="http://search.cpan.org/~petdance/HTML-Tagset-3.20/Tagset.pm"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -14,4 +15,3 @@ long_desc="
 
 noarch=yes
  
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTTP-Cookies/template b/srcpkgs/perl-HTTP-Cookies/template
index e444e584e2..deaa21d12e 100644
--- a/srcpkgs/perl-HTTP-Cookies/template
+++ b/srcpkgs/perl-HTTP-Cookies/template
@@ -4,6 +4,7 @@ version=6.00
 wrksrc="HTTP-Cookies-$version"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Cookies-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-HTTP-Message perl"
 short_desc="HTTP::Cookies - HTTP cookie jars"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Cookies-6.00/lib/HTTP/Cookies.pm"
@@ -27,5 +28,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-HTTP-Message
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTTP-Daemon/template b/srcpkgs/perl-HTTP-Daemon/template
index 105d574193..0fae4445a3 100644
--- a/srcpkgs/perl-HTTP-Daemon/template
+++ b/srcpkgs/perl-HTTP-Daemon/template
@@ -4,6 +4,7 @@ version=6.00
 wrksrc="HTTP-Daemon-$version"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Daemon-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-HTTP-Message perl-LWP-MediaTypes perl"
 short_desc="HTTP::Daemon - a simple http server class"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Daemon-6.00/lib/HTTP/Daemon.pm"
@@ -16,6 +17,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-HTTP-Message
-Add_dependency full perl-LWP-MediaTypes
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTTP-Date/template b/srcpkgs/perl-HTTP-Date/template
index 52f429b5c2..77e38c9b74 100644
--- a/srcpkgs/perl-HTTP-Date/template
+++ b/srcpkgs/perl-HTTP-Date/template
@@ -4,6 +4,7 @@ version=6.00
 wrksrc="HTTP-Date-$version"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Date-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="HTTP::Date - date conversion routines"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Date-6.00/lib/HTTP/Date.pm"
@@ -16,4 +17,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTTP-Message/template b/srcpkgs/perl-HTTP-Message/template
index 5c073c8872..92a5d6b145 100644
--- a/srcpkgs/perl-HTTP-Message/template
+++ b/srcpkgs/perl-HTTP-Message/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="HTTP-Message-$version"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Message-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-LWP-MediaTypes perl-Encode-Locale perl-URI perl-HTTP-Date perl-HTML-Parser perl"
 short_desc="HTTP::Message - HTTP style message (base class)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Message-6.02/lib/HTTP/Message.pm"
@@ -20,9 +21,3 @@ long_desc='
 
 noarch=yes
 
-Add_dependency full perl-LWP-MediaTypes
-Add_dependency full perl-Encode-Locale
-Add_dependency full perl-URI
-Add_dependency full perl-HTTP-Date
-Add_dependency full perl-HTML-Parser
-Add_dependency full perl
diff --git a/srcpkgs/perl-HTTP-Negotiate/template b/srcpkgs/perl-HTTP-Negotiate/template
index 102432e1f5..294ae0e144 100644
--- a/srcpkgs/perl-HTTP-Negotiate/template
+++ b/srcpkgs/perl-HTTP-Negotiate/template
@@ -4,6 +4,7 @@ version=6.00
 wrksrc="HTTP-Negotiate-$version"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Negotiate-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-HTTP-Message perl"
 short_desc="HTTP::Negotiate - choose a variant to serve"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Negotiate-6.00/lib/HTTP/Negotiate.pm"
@@ -18,5 +19,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-HTTP-Message
-Add_dependency full perl
diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index 5f784e1c7e..d1ae0fb2eb 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -4,6 +4,7 @@ version=1.10
 wrksrc="IO-Tty-$version"
 distfiles="${CPAN_SITE}/IO/IO-Tty-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="IO::Tty - Perl interface to Low-level allocate a pseudo-Tty"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/IO-Tty/"
@@ -12,4 +13,3 @@ checksum=31a6e21ad187ec5ea93c2b898d6b3519647c5fce9f394b6d3c05a1f7c3f6f8b1
 long_desc="
  IO::Tty and IO::Pty provide an interface to pseudo tty's."
 
-Add_dependency full perl
diff --git a/srcpkgs/perl-IPC-Run/template b/srcpkgs/perl-IPC-Run/template
index 5231e5d104..3cfa478dd0 100644
--- a/srcpkgs/perl-IPC-Run/template
+++ b/srcpkgs/perl-IPC-Run/template
@@ -4,6 +4,7 @@ version=0.90
 wrksrc="IPC-Run-$version"
 distfiles="${CPAN_SITE}/IPC/IPC-Run-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="system() and background procs w/ piping, redirs, ptys"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/IPC-Run/lib/IPC/Run.pm"
@@ -16,4 +17,3 @@ long_desc="
  both supported and may be mixed."
 
 noarch=yes
-Add_dependency full perl
diff --git a/srcpkgs/perl-LWP-MediaTypes/template b/srcpkgs/perl-LWP-MediaTypes/template
index 8ab59186bc..86e7a035ee 100644
--- a/srcpkgs/perl-LWP-MediaTypes/template
+++ b/srcpkgs/perl-LWP-MediaTypes/template
@@ -4,6 +4,7 @@ version=6.01
 wrksrc="LWP-MediaTypes-$version"
 distfiles="${CPAN_SITE}/LWP/LWP-MediaTypes-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="LWP::MediaTypes - guess media type for a file or a URL"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/LWP-MediaTypes-6.01/lib/LWP/MediaTypes.pm"
@@ -17,4 +18,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl
diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index fdb5aa399b..92311e0600 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -4,6 +4,7 @@ version=6.02
 wrksrc="libwww-perl-$version"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP perl-HTTP-Cookies perl-WWW-RobotRules perl"
 short_desc="LWP - The World-Wide Web library for Perl (libwww-perl)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/libwww-perl-6.02/lib/LWP.pm"
@@ -23,14 +24,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-URI
-Add_dependency full perl-LWP-MediaTypes
-Add_dependency full perl-Encode-Locale
-Add_dependency full perl-HTTP-Message
-Add_dependency full perl-File-Listing
-Add_dependency full perl-HTTP-Negotiate
-Add_dependency full perl-HTTP-Daemon
-Add_dependency full perl-Net-HTTP
-Add_dependency full perl-HTTP-Cookies
-Add_dependency full perl-WWW-RobotRules
-Add_dependency full perl
diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template
index 7e832b5523..5f7cac10c8 100644
--- a/srcpkgs/perl-Net-HTTP/template
+++ b/srcpkgs/perl-Net-HTTP/template
@@ -4,6 +4,7 @@ version=6.01
 wrksrc="Net-HTTP-$version"
 distfiles="${CPAN_SITE}/Net/Net-HTTP-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Net::HTTP - Low-level HTTP connection (client)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/Net-HTTP-6.01/lib/Net/HTTP.pm"
@@ -16,4 +17,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl
diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index 75466cfac5..65dff5a64b 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -4,6 +4,7 @@ version=1.005000_002
 wrksrc="Test-Simple-$version"
 distfiles="http://cpan.uwinnipeg.ca/cpan/authors/id/M/MS/MSCHWERN/Test-Simple-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Perl module with a simple framework for writing tests"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b7ccaa175831f491ada10f021035e80dc50837c77d34e5662cb04f848594b6ff
@@ -14,4 +15,3 @@ long_desc="
  replacement for this one)."
 
 noarch=yes
-Add_dependency full perl
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index e13b2754da..333c2d7aab 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -4,6 +4,7 @@ version=1.58
 wrksrc="URI-$version"
 distfiles="${CPAN_SITE}/URI/GAAS/URI-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 homepage="http://search.cpan.org/~gaas/URI-1.58/URI.pm"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,4 +24,3 @@ long_desc="
  the new interface."
 
 noarch=yes
-Add_dependency full perl
diff --git a/srcpkgs/perl-WWW-RobotRules/template b/srcpkgs/perl-WWW-RobotRules/template
index 54ca1da370..254a0b93a9 100644
--- a/srcpkgs/perl-WWW-RobotRules/template
+++ b/srcpkgs/perl-WWW-RobotRules/template
@@ -4,6 +4,7 @@ version=6.01
 wrksrc="WWW-RobotRules-$version"
 distfiles="${CPAN_SITE}/WWW/WWW-RobotRules-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl-URI perl"
 short_desc="WWW::RobotRules - database of robots.txt-derived permissions"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/WWW-RobotRules-6.01/lib/WWW/RobotRules.pm"
@@ -22,5 +23,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full perl-URI
-Add_dependency full perl
diff --git a/srcpkgs/perl-XML-NamespaceSupport/template b/srcpkgs/perl-XML-NamespaceSupport/template
index 6cebecd3dc..d823159947 100644
--- a/srcpkgs/perl-XML-NamespaceSupport/template
+++ b/srcpkgs/perl-XML-NamespaceSupport/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="XML-NamespaceSupport-$version"
 distfiles="${CPAN_SITE}/XML/XML-NamespaceSupport-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Perl module to the SAX2 NamespaceSupport class"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a12cee7ad43d9969fb4c3cf547958367a8547fa959801ea47b0f49e32e89c25b
@@ -15,4 +16,3 @@ long_desc="
  basic checks."
 
 noarch=yes
-Add_dependency full perl
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index d34d566aac..291546eeec 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -5,6 +5,8 @@ wrksrc="XML-Parser-$version"
 homepage="http://search.cpan.org/dist/XML-Parser/"
 distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz"
 build_style=perl-module
+makedepends="expat-devel"
+fulldepends="perl>=5.14.0"
 short_desc="Perl extension interface to James Clark's XML parser, expat"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,5 +16,3 @@ long_desc="
  XML::Parser::Expat, which is a lower level interface to James Clark's
  expat library."
 
-Add_dependency full perl	">=5.14.0"
-Add_dependency build expat-devel
diff --git a/srcpkgs/perl-XML-SAX-Base/template b/srcpkgs/perl-XML-SAX-Base/template
index 54bd2d2c87..fbfaf21125 100644
--- a/srcpkgs/perl-XML-SAX-Base/template
+++ b/srcpkgs/perl-XML-SAX-Base/template
@@ -4,6 +4,7 @@ version=1.08
 wrksrc="${pkgname#perl-}-$version"
 distfiles="${CPAN_SITE}/XML/${pkgname#perl-}-${version}.tar.gz"
 build_style=perl-module
+fulldepends="perl"
 short_desc="Perl Base class SAX Drivers and Filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/XML-SAX-Base"
@@ -16,4 +17,3 @@ long_desc="
  have to, for example, implement the characters() callback."
 
 noarch=yes
-Add_dependency full perl
diff --git a/srcpkgs/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template
index ff2538e7bd..7a14e623b9 100644
--- a/srcpkgs/perl-XML-SAX/template
+++ b/srcpkgs/perl-XML-SAX/template
@@ -5,6 +5,7 @@ revision=1
 wrksrc="XML-SAX-$version"
 distfiles="${CPAN_SITE}/XML/XML-SAX-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl perl-XML-NamespaceSupport perl-XML-SAX-Base"
 short_desc="Perl interface to the SAX2 XML Parser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/XML-SAX"
@@ -16,6 +17,3 @@ long_desc="
  expat library."
 
 noarch=yes
-Add_dependency full perl
-Add_dependency full perl-XML-NamespaceSupport
-Add_dependency full perl-XML-SAX-Base
diff --git a/srcpkgs/perl-XML-Simple/template b/srcpkgs/perl-XML-Simple/template
index b51f50cb9d..444ef5edb3 100644
--- a/srcpkgs/perl-XML-Simple/template
+++ b/srcpkgs/perl-XML-Simple/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="XML-Simple-$version"
 distfiles="${CPAN_SITE}/XML/XML-Simple-$version.tar.gz"
 build_style=perl-module
+fulldepends="perl expat perl-XML-Parser perl-XML-SAX perl-XML-NamespaceSupport perl-Test-Simple"
 short_desc="Easy Perl API to read/write XML"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
@@ -13,9 +14,3 @@ long_desc="
  (especially configuration files)."
 
 noarch=yes
-Add_dependency full perl
-Add_dependency full expat
-Add_dependency full perl-XML-Parser
-Add_dependency full perl-XML-SAX
-Add_dependency full perl-XML-NamespaceSupport
-Add_dependency full perl-Test-Simple
diff --git a/srcpkgs/perl/depends b/srcpkgs/perl/depends
deleted file mode 100644
index 7f9e0f2d2a..0000000000
--- a/srcpkgs/perl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.12.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 8546e50356..a90170e9b8 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -3,6 +3,7 @@ pkgname=perl
 version=5.14.2
 distfiles="http://www.cpan.org/src/5.0/$pkgname-$version.tar.bz2"
 revision=4
+makedepends="gdbm-devel db-devel less groff"
 short_desc="Practical Extraction and Report Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.perl.org"
@@ -19,10 +20,6 @@ long_desc="
  support for text processing, and has one of the world's most impressive
  collections of third-party modules."
 
-Add_dependency build gdbm-devel
-Add_dependency build db-devel
-Add_dependency build less
-Add_dependency build groff
 
 do_build() {
 	./Configure							\
diff --git a/srcpkgs/physfs/depends b/srcpkgs/physfs/depends
deleted file mode 100644
index fb63eee7d0..0000000000
--- a/srcpkgs/physfs/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/physfs/physfs-devel.template b/srcpkgs/physfs/physfs-devel.template
index 45a5e37c9a..f8c1453270 100644
--- a/srcpkgs/physfs/physfs-devel.template
+++ b/srcpkgs/physfs/physfs-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'physfs-devel'.
 #
+depends="readline-devel zlib-devel"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run readline-devel
-Add_dependency run zlib-devel
 
 do_install()
 {
diff --git a/srcpkgs/physfs/template b/srcpkgs/physfs/template
index 57f4f6bef7..7030e92e0f 100644
--- a/srcpkgs/physfs/template
+++ b/srcpkgs/physfs/template
@@ -4,6 +4,7 @@ version=2.0.2
 distfiles="http://icculus.org/physfs/downloads/physfs-$version.tar.gz"
 build_style=cmake
 revision=2
+makedepends="cmake zlib-devel readline-devel"
 short_desc="Library to provide abstract access to various archives"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ae296d3148228e03fd56cc9ea58af02f87dcbb1fadef125c18b709ab37f0bc09
@@ -14,6 +15,3 @@ long_desc="
  leave that write directory, for security."
 
 subpackages="$pkgname-devel"
-Add_dependency build cmake
-Add_dependency build zlib-devel
-Add_dependency build readline-devel
diff --git a/srcpkgs/pixman/depends b/srcpkgs/pixman/depends
deleted file mode 100644
index 3d77fdf442..0000000000
--- a/srcpkgs/pixman/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.14.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pixman/pixman-devel.template b/srcpkgs/pixman/pixman-devel.template
index 3f322b9f51..4d7a4df30d 100644
--- a/srcpkgs/pixman/pixman-devel.template
+++ b/srcpkgs/pixman/pixman-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'pixman-devel'.
 #
+depends="glibc-devel pixman"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run pixman
 
 do_install()
 {
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index cd9ee6b7d8..f3b16d9865 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -4,6 +4,7 @@ version=0.24.4
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-gtk" # do not require gtk+!
+makedepends="pkg-config perl"
 short_desc="Library of low-level pixel manipulation routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
@@ -13,8 +14,6 @@ long_desc="
  Pixel manipulation library for modular X.org."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build perl
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/$pkgname
diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template
index 0ca0dc6d2c..be087ec845 100644
--- a/srcpkgs/pkg-config/template
+++ b/srcpkgs/pkg-config/template
@@ -5,6 +5,7 @@ distfiles="http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-installed-popt"
 revision=1
+makedepends="popt-devel"
 short_desc="System for managing library compile/link flags"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e
@@ -13,4 +14,3 @@ long_desc="
  works with automake and autoconf.  It replaces the ubiquitous
  *-config scripts you may have seen with a single tool."
 
-Add_dependency build popt-devel
diff --git a/srcpkgs/plymouth/depends b/srcpkgs/plymouth/depends
deleted file mode 100644
index 9579ac7ff2..0000000000
--- a/srcpkgs/plymouth/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/plymouth/plymouth-devel.template b/srcpkgs/plymouth/plymouth-devel.template
index 1e9923545e..b3b6d60bcf 100644
--- a/srcpkgs/plymouth/plymouth-devel.template
+++ b/srcpkgs/plymouth/plymouth-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'plymouth-devel'.
 #
+depends="gtk+-devel libdrm-devel libplymouth"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+-devel
-Add_dependency run libdrm-devel
-Add_dependency run libplymouth
 
 do_install()
 {
diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template
index 44333e5e6c..fc45522207 100644
--- a/srcpkgs/plymouth/template
+++ b/srcpkgs/plymouth/template
@@ -11,6 +11,8 @@ configure_args="--enable-pango --enable-libdrm_intel --enable-libdrm_radeon
 --with-release-file=/etc/os-release --disable-tests --disable-static
 --without-rhgb-compat-link --with-logo=/usr/share/void-artwork/splash.png
 --with-background-color=0xffffff"
+depends="void-artwork"
+makedepends="automake pkg-config gtk+-devel libdrm-devel"
 short_desc="Graphical boot animation and logger"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -26,12 +28,7 @@ make_dirs="
 /var/lib/plymouth 0755 root root
 /var/spool/plymouth 0755 root root"
 
-Add_dependency run void-artwork
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build libdrm-devel
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/pm-utils/depends b/srcpkgs/pm-utils/depends
deleted file mode 100644
index cc3626fc49..0000000000
--- a/srcpkgs/pm-utils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pm-utils/template b/srcpkgs/pm-utils/template
index 2869640fd2..776059e756 100644
--- a/srcpkgs/pm-utils/template
+++ b/srcpkgs/pm-utils/template
@@ -8,6 +8,9 @@ http://pm-utils.freedesktop.org/releases/$pkgname-$version.tar.gz
 http://pm-utils.freedesktop.org/releases/pm-quirks-20100619.tar.gz"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
+depends="bash"
+makedepends="xmlto"
+fulldepends="procps dmidecode ethtool vbetool"
 short_desc="Power Management Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://pm-utils.freedesktop.org"
@@ -19,12 +22,6 @@ long_desc="
  The pm-utils package contains utilities and scripts useful for tasks related
  to power management."
 
-Add_dependency run bash
-Add_dependency full procps
-Add_dependency full dmidecode
-Add_dependency full ethtool
-Add_dependency full vbetool
-Add_dependency build xmlto
 
 post_install()
 {
diff --git a/srcpkgs/polkit-gnome/depends b/srcpkgs/polkit-gnome/depends
deleted file mode 100644
index a05441ddc8..0000000000
--- a/srcpkgs/polkit-gnome/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.99"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a9842a5432..3ee6cc9336 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -4,6 +4,7 @@ version=0.105
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config intltool gobject-introspection polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -19,11 +20,6 @@ long_desc="
 
  This package contains the glue to integrate with the GNOME desktop."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build polkit-devel
-Add_dependency build gtk+3-devel
 
 post_install()
 {
diff --git a/srcpkgs/polkit/depends b/srcpkgs/polkit/depends
deleted file mode 100644
index a05441ddc8..0000000000
--- a/srcpkgs/polkit/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.99"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/polkit/polkit-devel.template b/srcpkgs/polkit/polkit-devel.template
index a220c26761..17ded2777c 100644
--- a/srcpkgs/polkit/polkit-devel.template
+++ b/srcpkgs/polkit/polkit-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'polkit-devel'.
 #
+depends="pkg-config gobject-introspection glib-devel expat-devel pam-devel polkit"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
@@ -7,12 +8,6 @@ long_desc="${long_desc}
 
 replaces="PolicyKit-devel>=0"
 
-Add_dependency run pkg-config
-Add_dependency run gobject-introspection
-Add_dependency run glib-devel
-Add_dependency run expat-devel
-Add_dependency run pam-devel
-Add_dependency run polkit
 
 do_install()
 {
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 1f6c9bf996..a5f6e32abc 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -5,6 +5,7 @@ revision=2
 distfiles="http://www.freedesktop.org/software/polkit/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-systemd=yes"
+makedepends="pkg-config intltool libxslt docbook-xsl glib-devel expat-devel pam-devel systemd-devel gobject-introspection"
 short_desc="Authorization Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -25,15 +26,6 @@ make_dirs="
 /etc/polkit-1/localauthority 700 root root
 /var/lib/polkit-1 700 root root"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build glib-devel
-Add_dependency build expat-devel
-Add_dependency build pam-devel
-Add_dependency build systemd-devel
-Add_dependency build gobject-introspection
 
 post_install() {
 	vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
diff --git a/srcpkgs/poppler-qt4/depends b/srcpkgs/poppler-qt4/depends
deleted file mode 120000
index 2f90cc7131..0000000000
--- a/srcpkgs/poppler-qt4/depends
+++ /dev/null
@@ -1 +0,0 @@
-../poppler/depends
\ No newline at end of file
diff --git a/srcpkgs/poppler-qt4/poppler-qt4-devel.template b/srcpkgs/poppler-qt4/poppler-qt4-devel.template
index bc2d3195d3..3b56206be9 100644
--- a/srcpkgs/poppler-qt4/poppler-qt4-devel.template
+++ b/srcpkgs/poppler-qt4/poppler-qt4-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'poppler-qt4-devel'.
 #
+depends="poppler-qt4>=0.20.0"
 short_desc="${sourcepkg} QT 4 bindings (development files)"
 long_desc="${long_desc}
 
  This package contains development files for QT 4 bindings."
 
-Add_dependency run poppler-qt4 ">=${version}"
 
 do_install() {
 	vmove usr/include/poppler/qt4 usr/include/poppler
diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template
index c537584fff..6bd2e51910 100644
--- a/srcpkgs/poppler-qt4/template
+++ b/srcpkgs/poppler-qt4/template
@@ -3,6 +3,8 @@
 
 pkgname=poppler-qt4
 wrksrc="poppler-${version}"
+makedepends="pkg-config gobject-introspection tiff-devel lcms2-devel libcurl-devel qt-devel"
+fulldepends="poppler-data"
 short_desc="${short_desc} -- QT bindings"
 long_desc="${long_desc}
 
@@ -11,7 +13,6 @@ configure_args="${configure_args} --disable-poppler-glib --enable-poppler-qt4
 --disable-poppler-cpp --disable-utils --disable-gtk-test"
 subpackages="poppler-qt4-devel"
 
-Add_dependency build qt-devel
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/libpoppler.*
diff --git a/srcpkgs/poppler/depends b/srcpkgs/poppler/depends
deleted file mode 100644
index 4c2e319b69..0000000000
--- a/srcpkgs/poppler/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.20.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/poppler/poppler-cpp-devel.template b/srcpkgs/poppler/poppler-cpp-devel.template
index 34af158c2c..6c8aed4a2e 100644
--- a/srcpkgs/poppler/poppler-cpp-devel.template
+++ b/srcpkgs/poppler/poppler-cpp-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'poppler-cpp-devel'.
 #
+depends="libstdc++-devel zlib-devel poppler-devel>=0.20.0"
 short_desc="${sourcepkg} C++ bindings (development files)"
 long_desc="${long_desc}
 
  This package contains development files for C++ bindings."
 
-Add_dependency run libstdc++-devel
-Add_dependency run zlib-devel
-Add_dependency run poppler-devel ">=${version}"
 
 do_install() {
 	vmove usr/include/poppler/cpp usr/include/poppler
diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template
index e07ac181ae..ed100c2f79 100644
--- a/srcpkgs/poppler/poppler-devel.template
+++ b/srcpkgs/poppler/poppler-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'poppler-devel'.
 #
+depends="glib-devel poppler>=0.20.0"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run poppler ">=${version}"
 
 do_install() {
 	vmove usr/include/poppler usr/include
diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template
index b060c94fb6..6d946e384a 100644
--- a/srcpkgs/poppler/poppler-glib-devel.template
+++ b/srcpkgs/poppler/poppler-glib-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'poppler-glib'.
 #
+depends="poppler-devel>=0.20.0 poppler-glib>=0.20.0"
 short_desc="${sourcepkg} GLib bindings (development files)"
 long_desc="${long_desc}
 
  This package contains development files for GTK+/Glib bindings."
 
-Add_dependency run poppler-devel ">=${version}"
-Add_dependency run poppler-glib ">=${version}"
 
 do_install() {
 	vmove usr/include/poppler/glib usr/include/poppler
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index e05d0c972f..60ac69dbc3 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -7,6 +7,8 @@ build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
 --enable-libtiff --disable-libopenjpeg --enable-cairo-output
 --enable-xpdf-headers --disable-poppler-qt4 --disable-gtk-test"
+makedepends="pkg-config gobject-introspection tiff-devel lcms2-devel libcurl-devel"
+fulldepends="poppler-data"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -25,10 +27,4 @@ subpackages="$pkgname-glib $pkgname-glib-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-cpp $pkgname-cpp-devel"
 subpackages="$subpackages $pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build tiff-devel
-Add_dependency build lcms2-devel
-Add_dependency build libcurl-devel
 
-Add_dependency full poppler-data
diff --git a/srcpkgs/popt/depends b/srcpkgs/popt/depends
deleted file mode 100644
index 5b63e2f6a3..0000000000
--- a/srcpkgs/popt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.15"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/popt/popt-devel.template b/srcpkgs/popt/popt-devel.template
index f9312c269a..61b738fa47 100644
--- a/srcpkgs/popt/popt-devel.template
+++ b/srcpkgs/popt/popt-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'popt-devel'.
 #
+depends="glibc-devel popt"
 short_desc="popt development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run popt
 
 do_install()
 {
diff --git a/srcpkgs/portaudio/depends b/srcpkgs/portaudio/depends
deleted file mode 100644
index 92d05510ad..0000000000
--- a/srcpkgs/portaudio/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=19.20110326"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/portaudio/portaudio-devel.template b/srcpkgs/portaudio/portaudio-devel.template
index cccf447aa4..e1c57b8211 100644
--- a/srcpkgs/portaudio/portaudio-devel.template
+++ b/srcpkgs/portaudio/portaudio-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'portaudio-devel'.
 #
+depends="portaudio glibc-devel libstdc++-devel alsa-lib-devel jack-devel"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run portaudio
-Add_dependency run glibc-devel
-Add_dependency run libstdc++-devel
-Add_dependency run alsa-lib-devel
-Add_dependency run jack-devel
 
 do_install()
 {
diff --git a/srcpkgs/portaudio/portaudiocpp-devel.template b/srcpkgs/portaudio/portaudiocpp-devel.template
index f639b1df71..a7df2184bf 100644
--- a/srcpkgs/portaudio/portaudiocpp-devel.template
+++ b/srcpkgs/portaudio/portaudiocpp-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'portaudiocpp-devel'.
 #
+depends="portaudiocpp portaudio-devel"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains development, headers, static libs, etc
  for the C++ bindings."
 
-Add_dependency run portaudiocpp
-Add_dependency run portaudio-devel
 
 do_install()
 {
diff --git a/srcpkgs/portaudio/template b/srcpkgs/portaudio/template
index a242b0d89d..c47e6f052a 100644
--- a/srcpkgs/portaudio/template
+++ b/srcpkgs/portaudio/template
@@ -8,6 +8,7 @@ configure_args="--enable-cxx --with-jack"
 homepage="http://www.portaudio.com"
 license="PA, GPL"
 revision=5
+makedepends="glibc-devel libstdc++-devel alsa-lib-devel jack-devel"
 short_desc="Portable cross-platform audio i/o library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=328a89adc42c66840641d2d557d01e8bd9e6be32e12d3802e3b638e0791de540
@@ -21,8 +22,4 @@ long_desc="
 disable_parallel_build=yes
 subpackages="$pkgname-devel ${pkgname}cpp ${pkgname}cpp-devel"
 
-Add_dependency build glibc-devel
-Add_dependency build libstdc++-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build jack-devel
 
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 793c6a2d18..6fdb639ae7 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -3,6 +3,7 @@ pkgname=postfix
 version=2.9.1
 homepage="http://www.postfix.org/"
 distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$version.tar.gz"
+makedepends="perl>=0 openssl-devel db-devel pcre-devel libsasl-devel libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel"
 short_desc="High-performance mail transport agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="IBM Public License 1.0, BSD-alike"
@@ -52,15 +53,6 @@ system_groups="postdrop"
 provides="smtp-server-0"
 replaces="smtp-server>=0"
 
-Add_dependency build perl ">=0"
-Add_dependency build openssl-devel
-Add_dependency build db-devel
-Add_dependency build pcre-devel
-Add_dependency build libsasl-devel
-Add_dependency build libldap-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build postgresql-libs-devel
-Add_dependency build sqlite-devel
 
 do_build() {
 	make makefiles DEBUG='' CCARGS=' \
diff --git a/srcpkgs/postgresql/depends b/srcpkgs/postgresql/depends
deleted file mode 100644
index eb6270e19d..0000000000
--- a/srcpkgs/postgresql/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=8.4.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/postgresql/postgresql-libs-devel.template b/srcpkgs/postgresql/postgresql-libs-devel.template
index d15a0c558a..2004e30760 100644
--- a/srcpkgs/postgresql/postgresql-libs-devel.template
+++ b/srcpkgs/postgresql/postgresql-libs-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'postgresql-libs-devel'.
 #
+depends="postgresql-libs"
 short_desc="PostgreSQL shared libraries (development files)"
 long_desc="${long_desc}
 
  This package provides the development files required to build any
  PostgreSQL application."
 
-Add_dependency run postgresql-libs
 
 do_install() {
 	for f in pg_config ecpg; do
diff --git a/srcpkgs/postgresql/postgresql-plperl.template b/srcpkgs/postgresql/postgresql-plperl.template
index 403c64d6fc..72511ff95b 100644
--- a/srcpkgs/postgresql/postgresql-plperl.template
+++ b/srcpkgs/postgresql/postgresql-plperl.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-plperl'.
 #
+depends="postgresql"
 short_desc="PL/Perl procedural language for PostgreSQL"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  PostgreSQL 8.4 in Perl. You need this package if you have any PostgreSQL 8.4
  functions that use the languages plperl or plperlu."
 
-Add_dependency run postgresql
 
 do_install() {
 	vmove "usr/lib/postgresql/plperl*" usr/lib/postgresql
diff --git a/srcpkgs/postgresql/postgresql-plpython.template b/srcpkgs/postgresql/postgresql-plpython.template
index b2e0c96ffb..21206e84d0 100644
--- a/srcpkgs/postgresql/postgresql-plpython.template
+++ b/srcpkgs/postgresql/postgresql-plpython.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-plpython'.
 #
+depends="postgresql"
 short_desc="PL/Python procedural language for PostgreSQL"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  PostgreSQL 8.4 in Python. You need this package if you have any PostgreSQL 8.4
  functions that use the languages plpython or plpythonu."
 
-Add_dependency run postgresql
 
 do_install() {
 	vmove "usr/lib/postgresql/plpython*" usr/lib/postgresql
diff --git a/srcpkgs/postgresql/postgresql-pltcl.template b/srcpkgs/postgresql/postgresql-pltcl.template
index 6c820da6dd..04e6557d00 100644
--- a/srcpkgs/postgresql/postgresql-pltcl.template
+++ b/srcpkgs/postgresql/postgresql-pltcl.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-pltcl'.
 #
+depends="postgresql"
 short_desc="PL/Tcl procedural language for PostgreSQL"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  PostgreSQL 8.4 in Tcl. You need this package if you have any PostgreSQL 8.4
  functions that use the languages pltcl or pltclu."
 
-Add_dependency run postgresql
 
 do_install() {
 	vmove "usr/bin/pltcl*" usr/bin
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b05aac0404..5a1b7a59bf 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -8,6 +8,7 @@ configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python
 --with-perl --with-tcl --without-ldap --without-gssapi --without-krb5
 --without-bonjour --with-libxml --with-libxslt --disable-rpath
 --with-system-tzdata=/usr/share/zoneinfo --enable-nls"
+makedepends="flex readline-devel openssl-devel perl tcl-devel python-devel libxml2-devel libxslt-devel pam-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.postgresql.org"
@@ -36,15 +37,6 @@ postgres_homedir="/var/lib/${pkgname}"
 postgres_shell="/bin/sh"
 postgres_descr="PostgreSQL database server user"
 
-Add_dependency build flex
-Add_dependency build readline-devel
-Add_dependency build openssl-devel
-Add_dependency build perl
-Add_dependency build tcl-devel
-Add_dependency build python-devel
-Add_dependency build libxml2-devel
-Add_dependency build libxslt-devel
-Add_dependency build pam-devel
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.confd 644 etc/default ${pkgname}
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index da6a665b5f..84bb7003e3 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -4,6 +4,7 @@ version=2.0
 homepage="https://01.org/powertop/"
 distfiles="https://01.org/powertop/sites/default/files/downloads/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config ncurses-devel pciutils-devel libnl3-devel"
 short_desc="Linux tool to find out what is using power on a laptop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,7 +21,3 @@ long_desc="
  the kernel into one convenient screen so that you can see how well your system
  is doing, and which components are the biggest problem."
 
-Add_dependency build pkg-config
-Add_dependency build ncurses-devel
-Add_dependency build pciutils-devel
-Add_dependency build libnl3-devel
diff --git a/srcpkgs/ppl/depends b/srcpkgs/ppl/depends
deleted file mode 100644
index b2827314d7..0000000000
--- a/srcpkgs/ppl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.11"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index d065f6cbc6..91834cd530 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-rpath --enable-interfaces=c,cxx
 --with-gmp-prefix=${XBPS_MASTERDIR}/usr --with-gnu-ld --disable-debugging"
 revision=3
+makedepends="gmp-devel"
 short_desc="The Parma Polyhedra Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e3fbd1c19ef44c6f020951807cdb6fc6a8153cd3a5c53b0ab9cf4c4f6e8cbbeb
@@ -25,7 +26,6 @@ long_desc="
 disable_parallel_build=yes
 subpackages="ppl-devel"
 
-Add_dependency build gmp-devel
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
diff --git a/srcpkgs/ppp/depends b/srcpkgs/ppp/depends
deleted file mode 100644
index 9778c1333e..0000000000
--- a/srcpkgs/ppp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.4.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/ppp/ppp-devel.template b/srcpkgs/ppp/ppp-devel.template
index 0f8653e088..f2e8afc6fb 100644
--- a/srcpkgs/ppp/ppp-devel.template
+++ b/srcpkgs/ppp/ppp-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'ppp-devel'.
 #
+depends="libpcap-devel"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 noarch=yes
-Add_dependency run libpcap-devel
 
 do_install()
 {
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 0e8aaf5859..978f3fd9d0 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,6 +6,7 @@ build_style=configure
 configure_args="--prefix=/usr"
 make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version/usr install"
 revision=2
+makedepends="libpcap-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505
@@ -24,7 +25,6 @@ conf_files="
 
 subpackages="ppp-devel"
 
-Add_dependency build libpcap-devel
 
 pre_configure()
 {
diff --git a/srcpkgs/prelink/template b/srcpkgs/prelink/template
index 6ff7909ca7..4b018b7af9 100644
--- a/srcpkgs/prelink/template
+++ b/srcpkgs/prelink/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
 homepage="http://people.redhat.com/jakub/prelink/"
 distfiles="http://people.redhat.com/jakub/${pkgname}/${pkgname}-${version}.tar.bz2"
 revision=1
+makedepends="libelf-devel"
 short_desc="ELF prelinking utility to speed up dynamic linking."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -18,5 +19,4 @@ long_desc="
 wrksrc=prelink
 
 
-Add_dependency build libelf-devel
 
diff --git a/srcpkgs/procps/template b/srcpkgs/procps/template
index 15f1e29b0a..0047ff5a6d 100644
--- a/srcpkgs/procps/template
+++ b/srcpkgs/procps/template
@@ -5,6 +5,7 @@ revision=6
 distfiles="http://procps.sf.net/$pkgname-$version.tar.gz"
 patch_args="-Np1"
 build_style=gnu-makefile
+makedepends="ncurses-devel"
 short_desc="The /proc file system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
@@ -16,4 +17,3 @@ long_desc="
  Version 3 includes NPTL thread support, a rewritten top, many bug fixes,
  performance improvements, and new features."
 
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/proplib/depends b/srcpkgs/proplib/depends
deleted file mode 100644
index 4ce94207f0..0000000000
--- a/srcpkgs/proplib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/proplib/proplib-devel.template b/srcpkgs/proplib/proplib-devel.template
index 94121f5094..e910d2dd72 100644
--- a/srcpkgs/proplib/proplib-devel.template
+++ b/srcpkgs/proplib/proplib-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'proplib-devel'.
 #
+depends="zlib-devel proplib>=0.6.1"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run zlib-devel
-Add_dependency run proplib ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/proplib/template b/srcpkgs/proplib/template
index 4a2998a0cc..d006727206 100644
--- a/srcpkgs/proplib/template
+++ b/srcpkgs/proplib/template
@@ -5,6 +5,7 @@ revision=2
 homepage="http://code.google.com/p/portableproplib"
 distfiles="http://portableproplib.googlecode.com/files/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="zlib-devel"
 short_desc="Portable Property container object library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Simplified BSD"
@@ -26,4 +27,3 @@ long_desc="
  been converted to be built through the GNU autotools."
 
 subpackages="$pkgname-devel"
-Add_dependency build zlib-devel
diff --git a/srcpkgs/protobuf/depends b/srcpkgs/protobuf/depends
deleted file mode 100644
index ecc3dffeb9..0000000000
--- a/srcpkgs/protobuf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.4.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/protobuf/protobuf-devel.template b/srcpkgs/protobuf/protobuf-devel.template
index 9e14653567..60da065dd1 100644
--- a/srcpkgs/protobuf/protobuf-devel.template
+++ b/srcpkgs/protobuf/protobuf-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'protobuf-devel'.
 #
+depends="protobuf protobuf-lite zlib-devel"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run protobuf
-Add_dependency run protobuf-lite
-Add_dependency run zlib-devel
 
 do_install()
 {
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index c512d19c56..6fba8da8c6 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 homepage="http://code.google.com/p/${pkgname}/"
 license="BSD"
 revision=2
+makedepends="libstdc++-devel zlib-devel pkg-config"
 short_desc="Google's data interchange format"
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
@@ -16,6 +17,3 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-lite"
 
-Add_dependency build libstdc++-devel
-Add_dependency build zlib-devel
-Add_dependency build pkg-config
diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template
index e6d2e81400..9bc588e166 100644
--- a/srcpkgs/psmisc/template
+++ b/srcpkgs/psmisc/template
@@ -3,6 +3,7 @@ pkgname=psmisc
 version=22.16
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="ncurses-devel"
 short_desc="Small set of utilities that use the linux proc filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://psmisc.sourceforge.net/index.html"
@@ -13,7 +14,6 @@ long_desc="
  the proc filesystem. We're not about changing the world, but providing
  the system administratror with some help in common tasks."
 
-Add_dependency build ncurses-devel
 
 post_install() {
 	# provide pidof symlink.
diff --git a/srcpkgs/pulseaudio/depends b/srcpkgs/pulseaudio/depends
deleted file mode 100644
index 791454dd49..0000000000
--- a/srcpkgs/pulseaudio/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0"
-api_depends=">=2.0"
diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template
index 05bb1e6db4..f489c39dca 100644
--- a/srcpkgs/pulseaudio/pulseaudio-devel.template
+++ b/srcpkgs/pulseaudio/pulseaudio-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'pulseaudio-devel'.
 #
+depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=2.0"
 short_desc="${short_desc} - development files"
 long_desc="
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -8,10 +9,6 @@ long_desc="
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libasyncns-devel
-Add_dependency run dbus-devel
-Add_dependency run libXtst-devel
-Add_dependency run libpulseaudio ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 2a39b0bc1d..66d018bcdb 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,12 +1,15 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=2.0
-revision=2
+revision=3
 distfiles="$FREEDESKTOP_SITE/$pkgname/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
 --enable-jack --disable-lirc --disable-hal --disable-hal-compat
 --disable-gconf --with-database=tdb --enable-orc"
+depends="libpulseaudio>=${version}"
+makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel speex-devel libXi-devel libXtst-devel xcb-util-devel libxcb-devel libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel libbluetooth-devel avahi-libs-devel alsa-lib-devel libudev-devel openssl-devel libsamplerate-devel json-c-devel orc-devel glib-devel jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel"
+fulldepends="rtkit"
 short_desc="A featureful, general-purpose sound server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/PulseAudio"
@@ -39,45 +42,12 @@ long_desc="
 
 subpackages="libpulseaudio $pkgname-devel"
 
-shlib_depends="libpulseaudio>=${version}"
-
 conf_files="
 /etc/pulse/system.pa
 /etc/pulse/daemon.conf
-etc/pulse/client.conf
+/etc/pulse/client.conf
 /etc/pulse/default.pa"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build zlib-devel
-Add_dependency build gtk+-devel
-Add_dependency build libltdl-devel
-Add_dependency build speex-devel
-Add_dependency build libXi-devel
-Add_dependency build libXtst-devel
-Add_dependency build xcb-util-devel
-Add_dependency build libxcb-devel
-Add_dependency build libsndfile-devel
-Add_dependency build libasyncns-devel
-Add_dependency build dbus-devel
-Add_dependency build tdb-devel
-Add_dependency build libcap-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libudev-devel
-Add_dependency build openssl-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build json-c-devel
-Add_dependency build orc-devel
-Add_dependency build glib-devel
-Add_dependency build jack-devel
-Add_dependency build fftw-devel
-Add_dependency build systemd-devel
-Add_dependency build webrtc-audio-processing-devel
-
-Add_dependency full rtkit
-
 post_install() {
 	vinstall ${FILESDIR}/pulseaudio.xinit 755 \
 		etc/X11/xinit/xinitrc.d pulseaudio
diff --git a/srcpkgs/pyatspi/template b/srcpkgs/pyatspi/template
index 7caf5ef529..3764ee0da5 100644
--- a/srcpkgs/pyatspi/template
+++ b/srcpkgs/pyatspi/template
@@ -3,6 +3,8 @@ pkgname=pyatspi
 version=2.3.92
 distfiles="${GNOME_SITE}/$pkgname/2.3/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="at-spi2-core pygobject"
+makedepends="at-spi2-core-devel pygobject-devel"
 short_desc="Python bindings for AT-SPI"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -14,7 +16,3 @@ long_desc="
 pycompile_module="$pkgname"
 noarch=yes
 
-Add_dependency run at-spi2-core
-Add_dependency run pygobject
-Add_dependency build at-spi2-core-devel
-Add_dependency build pygobject-devel
diff --git a/srcpkgs/pycairo/depends b/srcpkgs/pycairo/depends
deleted file mode 100644
index 7bca9f4f29..0000000000
--- a/srcpkgs/pycairo/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.8.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pycairo/pycairo-devel.template b/srcpkgs/pycairo/pycairo-devel.template
index 748266d73e..d748c543b9 100644
--- a/srcpkgs/pycairo/pycairo-devel.template
+++ b/srcpkgs/pycairo/pycairo-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'pycairo-devel'.
 #
+depends="pycairo"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pycairo
 
 do_install()
 {
diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template
index db0c79c82a..ec5704d55b 100644
--- a/srcpkgs/pycairo/template
+++ b/srcpkgs/pycairo/template
@@ -4,6 +4,8 @@ version=1.8.8
 revision=6
 distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="python"
+makedepends="pkg-config cairo-devel glibc-devel python-devel"
 short_desc="Python bindings for the cairo graphics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860
@@ -13,8 +15,3 @@ long_desc="
 pycompile_module="cairo"
 subpackages="$pkgname-devel"
 
-Add_dependency run python
-Add_dependency build pkg-config
-Add_dependency build cairo-devel
-Add_dependency build glibc-devel
-Add_dependency build python-devel
diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template
index fa8370c42c..47bc60a730 100644
--- a/srcpkgs/pycrypto/template
+++ b/srcpkgs/pycrypto/template
@@ -4,6 +4,7 @@ version=2.3
 revision=2
 distfiles="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$pkgname-$version.tar.gz"
 build_style=python-module
+makedepends="gmp-devel python-devel"
 short_desc="The Python Cryptography Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182
@@ -13,5 +14,3 @@ long_desc="
 
 pycompile_module="Crypto"
 
-Add_dependency build gmp-devel
-Add_dependency build python-devel
diff --git a/srcpkgs/pycurl/template b/srcpkgs/pycurl/template
index 99281542a4..7dd2801af1 100644
--- a/srcpkgs/pycurl/template
+++ b/srcpkgs/pycurl/template
@@ -4,6 +4,7 @@ version=7.19.0
 revision=2
 distfiles="http://pycurl.sourceforge.net/download/${pkgname}-${version}.tar.gz"
 build_style=python-module
+makedepends="openssl-devel libcurl-devel python-devel"
 short_desc="Python interface to the CURL library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642
@@ -14,6 +15,3 @@ long_desc="
 
 pycompile_module="curl"
 
-Add_dependency build openssl-devel
-Add_dependency build libcurl-devel
-Add_dependency build python-devel
diff --git a/srcpkgs/pygobject/depends b/srcpkgs/pygobject/depends
deleted file mode 100644
index a64e647ded..0000000000
--- a/srcpkgs/pygobject/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.27.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pygobject/pygobject-devel.template b/srcpkgs/pygobject/pygobject-devel.template
index 8c0da694d8..d2a334f26a 100644
--- a/srcpkgs/pygobject/pygobject-devel.template
+++ b/srcpkgs/pygobject/pygobject-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'pygobject-devel'.
 #
+depends="libffi-devel glib-devel libgirepository-devel pycairo-devel pygobject>=3.2.2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libffi-devel
-Add_dependency run glib-devel
-Add_dependency run libgirepository-devel
-Add_dependency run pycairo-devel
-Add_dependency run pygobject ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template
index 798f827081..f977a417af 100644
--- a/srcpkgs/pygobject/template
+++ b/srcpkgs/pygobject/template
@@ -3,6 +3,8 @@ pkgname=pygobject
 version=3.2.2
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="python pycairo"
+makedepends="pkg-config glib-devel cairo-devel libffi-devel python-devel pycairo-devel gobject-introspection"
 short_desc="Python bindings for GObject"
 homepage="http://www.pygtk.org/"
 license="LGPL-2.1"
@@ -14,13 +16,4 @@ long_desc="
 pycompile_module="gi"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build cairo-devel
-Add_dependency build libffi-devel
-Add_dependency build python-devel
-Add_dependency build pycairo-devel
-Add_dependency build gobject-introspection
 
-Add_dependency run python
-Add_dependency run pycairo
diff --git a/srcpkgs/pygobject2/depends b/srcpkgs/pygobject2/depends
deleted file mode 100644
index 63bcd4b9fd..0000000000
--- a/srcpkgs/pygobject2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.28.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pygobject2/pygobject2-devel.template b/srcpkgs/pygobject2/pygobject2-devel.template
index c5e3f1fc62..36f35ca20f 100644
--- a/srcpkgs/pygobject2/pygobject2-devel.template
+++ b/srcpkgs/pygobject2/pygobject2-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'pygobject-devel'.
 #
+depends="libffi-devel glib-devel libgirepository-devel pycairo-devel pygobject2"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -8,11 +9,6 @@ long_desc="${long_desc}
 pycompile_module="usr/share/pygobject/2.0/codegen"
 replaces="pygobject-devel<3.0.0"
 
-Add_dependency run libffi-devel
-Add_dependency run glib-devel
-Add_dependency run libgirepository-devel
-Add_dependency run pycairo-devel
-Add_dependency run pygobject2
 
 do_install()
 {
diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template
index 421f2f2bdc..5d121b263a 100644
--- a/srcpkgs/pygobject2/template
+++ b/srcpkgs/pygobject2/template
@@ -6,6 +6,8 @@ wrksrc=${pkgname%2}-${version}
 distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-introspection"
+depends="cairo libgirepository python pycairo"
+makedepends="pkg-config glib-devel cairo-devel libffi-devel python-devel pycairo-devel"
 short_desc="Python bindings for GObject (GLib 2.x)"
 homepage="http://www.pygtk.org/"
 license="LGPL-2.1"
@@ -19,14 +21,4 @@ pycompile_module="glib gobject gtk-2.0 pygtk"
 replaces="pygobject<3.0.0"
 subpackages="$pkgname-devel"
 
-Add_dependency run cairo
-Add_dependency run libgirepository
-Add_dependency run python
-Add_dependency run pycairo
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build cairo-devel
-Add_dependency build libffi-devel
-Add_dependency build python-devel
-Add_dependency build pycairo-devel
diff --git a/srcpkgs/pygtk/depends b/srcpkgs/pygtk/depends
deleted file mode 100644
index bd368daa0e..0000000000
--- a/srcpkgs/pygtk/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.16.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/pygtk/pygtk-devel.template b/srcpkgs/pygtk/pygtk-devel.template
index e26adb87fe..1daa41d21d 100644
--- a/srcpkgs/pygtk/pygtk-devel.template
+++ b/srcpkgs/pygtk/pygtk-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'pygtk-devel'.
 #
+depends="python-devel gtk+-devel pygobject2-devel pycairo-devel pygtk"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -7,11 +8,6 @@ long_desc="${long_desc}
 
 pycompile_module="demos ."
 
-Add_dependency run python-devel
-Add_dependency run gtk+-devel
-Add_dependency run pygobject2-devel
-Add_dependency run pycairo-devel
-Add_dependency run pygtk
 
 do_install()
 {
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 4485ab79a2..46a4ff5a49 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -4,6 +4,8 @@ version=2.24.0
 revision=4
 distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="python pygobject2 pycairo"
+makedepends="pkg-config python-devel gtk+-devel libxml2-devel pygobject2-devel pycairo-devel"
 short_desc="Python bindings for the GTK+ toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
@@ -14,16 +16,7 @@ pycompile_module="gtk-2.0/gtk"
 subpackages="pygtk-devel"
 
 # XXX: missing python-numpy build dep
-Add_dependency run python
-Add_dependency run pygobject2
-Add_dependency run pycairo
 
-Add_dependency build pkg-config
-Add_dependency build python-devel
-Add_dependency build gtk+-devel
-Add_dependency build libxml2-devel
-Add_dependency build pygobject2-devel
-Add_dependency build pycairo-devel
 
 post_install()
 {
diff --git a/srcpkgs/pyopenssl/template b/srcpkgs/pyopenssl/template
index 89e36d292d..a2c43021cd 100644
--- a/srcpkgs/pyopenssl/template
+++ b/srcpkgs/pyopenssl/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="pyOpenSSL-${version}"
 distfiles="http://launchpad.net/pyopenssl/main/0.11/+download/pyOpenSSL-${version}.tar.gz"
 build_style=python-module
+makedepends="openssl-devel python-devel"
 short_desc="Python interface to the OpenSSL library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=42ae2dc29a5ebf5088521cb8df2b1bdf039d28e14845fd9df4ab59658b565cfd
@@ -15,5 +16,3 @@ long_desc="
 
 pycompile_module="OpenSSL"
 
-Add_dependency build openssl-devel
-Add_dependency build python-devel
diff --git a/srcpkgs/pysqlite/template b/srcpkgs/pysqlite/template
index a076bdf55d..c1fcf71faa 100644
--- a/srcpkgs/pysqlite/template
+++ b/srcpkgs/pysqlite/template
@@ -4,6 +4,7 @@ version=2.6.0
 revision=2
 distfiles="http://pysqlite.googlecode.com/files/${pkgname}-${version}.tar.gz"
 build_style=python-module
+makedepends="sqlite-devel python-devel"
 short_desc="DB-API 2.0 interface for SQLite databases"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=555834d7def68a7fddf3c89eb7d66980b8a0d5dc9327705f5c752e78b4e35879
@@ -12,8 +13,6 @@ long_desc="
 
 pycompile_module="pysqlite2"
 
-Add_dependency build sqlite-devel
-Add_dependency build python-devel
 
 post_install()
 {
diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
index db0d565a90..9941d95dfb 100644
--- a/srcpkgs/python-MarkupSafe/template
+++ b/srcpkgs/python-MarkupSafe/template
@@ -5,6 +5,9 @@ revision=1
 wrksrc="MarkupSafe-${version}"
 distfiles="http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
 build_style=python-module
+depends="glibc"
+makedepends="python-distribute"
+fulldepends="python"
 short_desc="Implements a XML/HTML/XHTML Markup safe string for Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f19442168c44db14b7093d1f93444233b05271dd76b4bb96ff8007ef83ac8855
@@ -14,6 +17,3 @@ long_desc="
 
 pycompile_module="markupsafe"
 
-Add_dependency run glibc
-Add_dependency full python
-Add_dependency build python-distribute
diff --git a/srcpkgs/python-distribute/template b/srcpkgs/python-distribute/template
index 596fc6feb3..7c2fbb62a5 100644
--- a/srcpkgs/python-distribute/template
+++ b/srcpkgs/python-distribute/template
@@ -6,6 +6,7 @@ wrksrc="distribute-${version}"
 patch_args="-Np1"
 distfiles="http://pypi.python.org/packages/source/d/distribute/distribute-$version.tar.gz"
 build_style=python-module
+fulldepends="python"
 short_desc="A collection of extensions to the Python distutils"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=44c92b7edbc0ff9cd5847291e7dcb4cc75e24247a306bd4b8a139abd355b0db0
@@ -15,4 +16,3 @@ long_desc="
 pycompile_module="setuptools pkg_resources easy_install site"
 noarch=yes 
 
-Add_dependency full python
diff --git a/srcpkgs/python-jinja/template b/srcpkgs/python-jinja/template
index af80790df0..e841242e92 100644
--- a/srcpkgs/python-jinja/template
+++ b/srcpkgs/python-jinja/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="Jinja2-${version}"
 distfiles="http://pypi.python.org/packages/source/J/Jinja2/Jinja2-${version}.tar.gz"
 build_style=python-module
+fulldepends="python python-MarkupSafe python-distribute"
 short_desc="Modern and designer friendly templating language for Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=22f9675e42dc640c4469d4f7d210baecb5e695823af954c813d51c930235675d
@@ -23,6 +24,3 @@ long_desc="
 pycompile_module="jinja2"
 noarch=yes
 
-Add_dependency full python
-Add_dependency full python-MarkupSafe
-Add_dependency full python-distribute
diff --git a/srcpkgs/python-urwid/depends b/srcpkgs/python-urwid/depends
deleted file mode 100644
index 41d76b2ada..0000000000
--- a/srcpkgs/python-urwid/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.8.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
index 8572e9c7cf..6e374a3bf9 100644
--- a/srcpkgs/python-urwid/template
+++ b/srcpkgs/python-urwid/template
@@ -5,6 +5,7 @@ revision=3
 wrksrc="urwid-${version}"
 distfiles="http://excess.org/urwid/urwid-$version.tar.gz"
 build_style=python-module
+makedepends="python-devel"
 short_desc="Console user interface library for Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=66a106faf77d3231e40ff469f01619866cdf3d9fb718a965fc25781cb6e094a7
@@ -28,4 +29,3 @@ long_desc="
 
 pycompile_module="urwid"
 
-Add_dependency build python-devel
diff --git a/srcpkgs/python/depends b/srcpkgs/python/depends
deleted file mode 100644
index 66f288a02c..0000000000
--- a/srcpkgs/python/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-abi_depends=">=2.7"
-# Require this version for Linux 3.x sys.platform fix.
-api_depends=">=2.7.2_1"
diff --git a/srcpkgs/python/python-devel.template b/srcpkgs/python/python-devel.template
index 2542ed2cb0..5c726c1d35 100644
--- a/srcpkgs/python/python-devel.template
+++ b/srcpkgs/python/python-devel.template
@@ -1,21 +1,11 @@
 # Template file for 'python-devel'.
 #
+depends="libffi-devel zlib-devel readline-devel bzip2-devel gdbm-devel openssl-devel expat-devel db-devel ncurses-devel sqlite-devel python>=2.7.3"
 short_desc="Python development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libffi-devel
-Add_dependency run zlib-devel
-Add_dependency run readline-devel
-Add_dependency run bzip2-devel
-Add_dependency run gdbm-devel
-Add_dependency run openssl-devel
-Add_dependency run expat-devel
-Add_dependency run db-devel
-Add_dependency run ncurses-devel
-Add_dependency run sqlite-devel
-Add_dependency run python ">=${version}"
 
 do_install() {
 	vmkdir usr/include/python2.7
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index b8ba0ebe7a..742e179d15 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,6 +3,7 @@ pkgname=python
 version=2.7.3
 wrksrc="Python-$version"
 distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz"
+makedepends="libffi-devel zlib-devel readline-devel gdbm-devel openssl-devel expat-devel db-devel ncurses-devel sqlite-devel"
 short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.python.org"
@@ -23,15 +24,6 @@ long_desc="
 pycompile_dirs="usr/lib/python2.7"
 subpackages="$pkgname-devel"
 
-Add_dependency build libffi-devel
-Add_dependency build zlib-devel
-Add_dependency build readline-devel
-Add_dependency build gdbm-devel
-Add_dependency build openssl-devel
-Add_dependency build expat-devel
-Add_dependency build db-devel
-Add_dependency build ncurses-devel
-Add_dependency build sqlite-devel
 
 do_configure() {
 	# Enable built-in SQLite3 module to load extensions (Arch fix FS#22122)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 7ae82c88fa..cd3f443b3e 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -5,6 +5,7 @@ distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.gz"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-spice
 --enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen"
+makedepends="perl>=0 python>=0 attr-devel libpng-devel jpeg-devel zlib-devel ncurses-devel libuuid-devel libX11-devel alsa-lib-devel gnutls-devel SDL-devel libbluetooth-devel libsasl-devel spice-devel glib-devel MesaLib-devel pulseaudio-devel nss-devel libcurl-devel"
 short_desc="Open Source Processor Emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://qemu.org"
@@ -20,26 +21,6 @@ long_desc="
 conf_files="/etc/qemu/target-${XBPS_MACHINE}.conf"
 nostrip=yes
 
-Add_dependency build perl ">=0"
-Add_dependency build python ">=0"
-Add_dependency build attr-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build zlib-devel
-Add_dependency build ncurses-devel
-Add_dependency build libuuid-devel
-Add_dependency build libX11-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build gnutls-devel
-Add_dependency build SDL-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build libsasl-devel
-Add_dependency build spice-devel
-Add_dependency build glib-devel
-Add_dependency build MesaLib-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build nss-devel
-Add_dependency build libcurl-devel
 
 pre_configure() {
 	sed -i -e 's/lib64/lib/g' x86_64.ld
diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index c6156b5d42..84eee257d1 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -5,6 +5,9 @@ homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+depends="jack"
+makedepends="pkg-config qt-devel jack-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="JACK Audio Connection Kit - Qt GUI Interface"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -23,11 +26,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run jack # depend on the server too
 
-Add_dependency build pkg-config
-Add_dependency build qt-devel
-Add_dependency build jack-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b2de0f1efa..b5bd3c7e93 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -5,6 +5,9 @@ homepage="http://qsynth.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+depends="jack"
+makedepends="pkg-config qt-devel jack-devel fluidsynth-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="Qt GUI Interface for FluidSynth"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -19,12 +22,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run jack # depend on the server too
 
-Add_dependency build pkg-config
-Add_dependency build qt-devel
-Add_dependency build jack-devel
-Add_dependency build fluidsynth-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/qt/depends b/srcpkgs/qt/depends
deleted file mode 100644
index 01dad75795..0000000000
--- a/srcpkgs/qt/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.5.3"
-api_depends=">=4.8.1"
diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template
index d74e682f11..f56a411bc8 100644
--- a/srcpkgs/qt/qt-demos.template
+++ b/srcpkgs/qt/qt-demos.template
@@ -1,5 +1,6 @@
 # Template file for 'qt-demos'.
 #
+depends="hicolor-icon-theme qt-docs"
 short_desc="Qt examples and demos"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run qt-docs
 
 do_install()
 {
diff --git a/srcpkgs/qt/qt-designer.template b/srcpkgs/qt/qt-designer.template
index 86002c67ba..185456ca2b 100644
--- a/srcpkgs/qt/qt-designer.template
+++ b/srcpkgs/qt/qt-designer.template
@@ -1,5 +1,6 @@
 # Template file for 'qt-designer'.
 #
+depends="hicolor-icon-theme"
 short_desc="Qt GUI designer"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
 
 do_install()
 {
diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template
index b17ca80892..5f84196f72 100644
--- a/srcpkgs/qt/qt-devel-tools.template
+++ b/srcpkgs/qt/qt-devel-tools.template
@@ -1,5 +1,6 @@
 # Template file for 'qt-devel-tools'.
 #
+depends="hicolor-icon-theme"
 short_desc="Qt development tools"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
 
 do_install()
 {
diff --git a/srcpkgs/qt/qt-devel.template b/srcpkgs/qt/qt-devel.template
index ef3cb7230f..18fadb3f87 100644
--- a/srcpkgs/qt/qt-devel.template
+++ b/srcpkgs/qt/qt-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'qt-devel'.
 #
+depends="qt-qmake"
 short_desc="Qt development files"
 long_desc="${long_desc}
 
  This package contains the header development files and development
  programs used for runing Qt applications."
 
-Add_dependency run qt-qmake
 
 do_install()
 {
diff --git a/srcpkgs/qt/qt-docs.template b/srcpkgs/qt/qt-docs.template
index 0ce47de2a4..c5cc1b7e79 100644
--- a/srcpkgs/qt/qt-docs.template
+++ b/srcpkgs/qt/qt-docs.template
@@ -1,5 +1,6 @@
 # Template file for 'qt-docs'.
 #
+depends="qt"
 short_desc="Qt API documentation"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 noarch=yes
 
-Add_dependency run qt
 
 do_install()
 {
diff --git a/srcpkgs/qt/qt-qtconfig.template b/srcpkgs/qt/qt-qtconfig.template
index 3e5e92aaa3..f3cc5aac24 100644
--- a/srcpkgs/qt/qt-qtconfig.template
+++ b/srcpkgs/qt/qt-qtconfig.template
@@ -1,5 +1,6 @@
 # Template file for 'qt-qtconfig'.
 #
+depends="hicolor-icon-theme"
 short_desc="Qt configuration tool"
 long_desc="${long_desc}
 
@@ -8,7 +9,6 @@ long_desc="${long_desc}
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
 
 do_install()
 {
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index add4c080ab..3b3a2fcac5 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -6,6 +6,7 @@ _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 homepage="http://qt.nokia.com/"
 distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz"
+makedepends="pkg-config freetype-devel MesaLib-devel libXrender-devel fontconfig-devel libXext-devel libX11-devel libstdc++-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel libXcursor-devel zlib-devel dbus-devel glib-devel gstreamer-devel gst-plugins-base-devel sqlite-devel alsa-lib-devel openssl-devel tiff-devel libmng-devel jpeg-devel libpng-devel libSM-devel libICE-devel libmysqlclient-devel postgresql-libs-devel pulseaudio-devel gtk+-devel icu-devel cups-devel"
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-2.1"
@@ -20,39 +21,6 @@ subpackages="${subpackages} qt-designer qt-devel qt-devel-tools"
 subpackages="${subpackages} qt-plugin-gstreamer"
 
 # XXX Missing dependencies: unixodbc.
-Add_dependency build pkg-config
-Add_dependency build freetype-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libXrender-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libXext-devel
-Add_dependency build libX11-devel
-Add_dependency build libstdc++-devel
-Add_dependency build libXi-devel
-Add_dependency build libXv-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXcursor-devel
-Add_dependency build zlib-devel
-Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build sqlite-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build openssl-devel
-Add_dependency build tiff-devel
-Add_dependency build libmng-devel
-Add_dependency build jpeg-devel
-Add_dependency build libpng-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build postgresql-libs-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build gtk+-devel
-Add_dependency build icu-devel
-Add_dependency build cups-devel
 
 do_configure() {
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 481ef13ca2..1a2879cd3a 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -5,6 +5,9 @@ homepage="http://qtractor.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args=" --enable-lilv"
+depends="jack dssi lilv"
+makedepends="pkg-config zlib-devel jack-devel alsa-lib-devel libsndfile-devel libvorbis-devel libmad-devel libsamplerate-devel libX11-devel qt-devel liblo-devel rubberband-devel vamp-plugin-sdk-devel ladspa-sdk dssi-devel lv2core lilv-devel suil-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="Audio/MIDI multi-track sequencer application written in C++/Qt4"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -19,28 +22,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run jack
-Add_dependency run dssi
-Add_dependency run lilv # need programs too
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build jack-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libsndfile-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libmad-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build libX11-devel
-Add_dependency build qt-devel
-Add_dependency build liblo-devel
-Add_dependency build rubberband-devel
-Add_dependency build vamp-plugin-sdk-devel
-Add_dependency build ladspa-sdk
-Add_dependency build dssi-devel
-Add_dependency build lv2core
-Add_dependency build lilv-devel
-Add_dependency build suil-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/quvi/template b/srcpkgs/quvi/template
index 4134399198..edef0f308b 100644
--- a/srcpkgs/quvi/template
+++ b/srcpkgs/quvi/template
@@ -4,6 +4,7 @@ version=0.4.1
 homepage="http://quvi.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/quvi/quvi-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libquvi-devel"
 short_desc="Command-line tool for parsing video download links"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -19,5 +20,3 @@ long_desc="
   * Supports 40+ websites
   * C API is simple to use"
 
-Add_dependency build pkg-config
-Add_dependency build libquvi-devel
diff --git a/srcpkgs/radare2/radare2-devel.template b/srcpkgs/radare2/radare2-devel.template
index 4490614c32..5c9c4e8188 100644
--- a/srcpkgs/radare2/radare2-devel.template
+++ b/srcpkgs/radare2/radare2-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'radare2-devel'.
 #
+depends="radare2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run radare2
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 54f4c5f2c3..9716b345b5 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -6,6 +6,7 @@ distfiles="$homepage/get/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--without-ewf --with-sysmagic --without-ssl"
 revision=3
+makedepends="file-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-3"
@@ -18,4 +19,3 @@ long_desc="
 
 broken_as_needed=yes
 subpackages="$pkgname-devel"
-Add_dependency build file-devel
diff --git a/srcpkgs/raptor/depends b/srcpkgs/raptor/depends
deleted file mode 100644
index 3630beb107..0000000000
--- a/srcpkgs/raptor/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/raptor/raptor-devel.template b/srcpkgs/raptor/raptor-devel.template
index cc5052c803..c27a6bd4f1 100644
--- a/srcpkgs/raptor/raptor-devel.template
+++ b/srcpkgs/raptor/raptor-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'aubio-devel'.
 #
+depends="libxml2-devel zlib-devel libraptor"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxml2-devel
-Add_dependency run zlib-devel
-Add_dependency run lib${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 960b6ec39f..aeacb37cf8 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -6,6 +6,7 @@ homepage="http://librdf.org/raptor"
 distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --with-yajl=no"
+makedepends="pkg-config libcurl-devel libxslt-devel"
 short_desc="Raptor RDF Syntax Library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -22,6 +23,3 @@ long_desc="
 
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libcurl-devel
-Add_dependency build libxslt-devel
diff --git a/srcpkgs/rarian/depends b/srcpkgs/rarian/depends
deleted file mode 100644
index f38abb5aa6..0000000000
--- a/srcpkgs/rarian/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/rarian/rarian-devel.template b/srcpkgs/rarian/rarian-devel.template
index c282175d68..fbc2c6beef 100644
--- a/srcpkgs/rarian/rarian-devel.template
+++ b/srcpkgs/rarian/rarian-devel.template
@@ -1,15 +1,12 @@
 # Template file for 'rarian-devel'.
 #
+depends="pkg-config libstdc++-devel libxslt-devel rarian"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run pkg-config
-Add_dependency run libstdc++-devel
-Add_dependency run libxslt-devel
-Add_dependency run rarian
 
 do_install()
 {
diff --git a/srcpkgs/rarian/template b/srcpkgs/rarian/template
index 690f76f46b..227d64f74f 100644
--- a/srcpkgs/rarian/template
+++ b/srcpkgs/rarian/template
@@ -4,6 +4,8 @@ version=0.8.1
 distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+depends="bash"
+makedepends="libstdc++-devel pkg-config libxslt"
 short_desc="Documentation metadata library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577
@@ -13,10 +15,6 @@ long_desc="
 
 subpackages="rarian-devel"
 
-Add_dependency run bash
-Add_dependency build libstdc++-devel
-Add_dependency build pkg-config
-Add_dependency build libxslt
 
 post_install()
 {
diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template
index 674d03f79e..9765d3959b 100644
--- a/srcpkgs/rawtherapee/template
+++ b/srcpkgs/rawtherapee/template
@@ -5,6 +5,8 @@ homepage="http://rawtherapee.com/"
 license="GPL-3"
 distfiles="http://rawtherapee.googlecode.com/files/rawtherapee-source-$version.tar.xz"
 build_style=cmake
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="cmake pkg-config gtkmm2-devel lcms2-devel libiptcdata-devel libgomp-devel mercurial"
 short_desc="Free RAW converter and digital photo processing software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b0cbeac634d927b6afc0527434b24304b9d1ab2a681915933a872cf1a27f39cd
@@ -22,13 +24,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build cmake
-Add_dependency build pkg-config
-Add_dependency build gtkmm2-devel
-Add_dependency build lcms2-devel
-Add_dependency build libiptcdata-devel
-Add_dependency build libgomp-devel
-Add_dependency build mercurial
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/readline/depends b/srcpkgs/readline/depends
deleted file mode 100644
index df2b67e13a..0000000000
--- a/srcpkgs/readline/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=6.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/readline/readline-devel.template b/srcpkgs/readline/readline-devel.template
index b1887fb74e..0cb0f17bf2 100644
--- a/srcpkgs/readline/readline-devel.template
+++ b/srcpkgs/readline/readline-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'readline-devel'.
 #
+depends="ncurses-devel readline"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ncurses-devel
-Add_dependency run readline
 
 do_install()
 {
diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template
index 12d63ff069..6e482994d5 100644
--- a/srcpkgs/readline/template
+++ b/srcpkgs/readline/template
@@ -10,6 +10,7 @@ distfiles="http://ftp.gnu.org/gnu/readline/${pkgname}-${_dist_ver}.tar.gz"
 build_style=gnu-configure
 configure_args="--with-curses --enable-multibyte"
 make_build_args="SHLIB_LIBS=-lncurses"
+makedepends="ncurses-devel"
 short_desc="The GNU Readline Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381
@@ -23,7 +24,6 @@ long_desc="
  commands."
 
 subpackages="$pkgname-devel"
-Add_dependency build ncurses-devel
 
 pre_configure() {
 	local url="http://ftp.gnu.org/gnu/$pkgname/$pkgname-${_dist_ver}-patches"
diff --git a/srcpkgs/recode/depends b/srcpkgs/recode/depends
deleted file mode 100644
index cc903616eb..0000000000
--- a/srcpkgs/recode/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/recode/recode-devel.template b/srcpkgs/recode/recode-devel.template
index 22148a9ab0..e9b98ed82c 100644
--- a/srcpkgs/recode/recode-devel.template
+++ b/srcpkgs/recode/recode-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'recode-devel'.
 #
+depends="glib-devel librecode"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glib-devel
-Add_dependency run librecode
 
 do_install()
 {
diff --git a/srcpkgs/recode/template b/srcpkgs/recode/template
index 8ccb4ac936..27fa9ea9b0 100644
--- a/srcpkgs/recode/template
+++ b/srcpkgs/recode/template
@@ -6,6 +6,7 @@ distfiles="${DEBIAN_SITE}/main/r/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 build_style=gnu-configure
 configure_args="--without-included-gettext"
 revision=2
+makedepends="automake"
 short_desc="Character set conversion utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
@@ -18,7 +19,6 @@ long_desc="
  libiconv character sets, are supported."
 
 subpackages="librecode $pkgname-devel"
-Add_dependency build automake
 
 pre_configure() {
 	sed -i -e "/^AM_C_PROTOTYPES.*/d" configure.in
diff --git a/srcpkgs/rest/depends b/srcpkgs/rest/depends
deleted file mode 100644
index 4c0b4c554c..0000000000
--- a/srcpkgs/rest/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/rest/rest-devel.template b/srcpkgs/rest/rest-devel.template
index 1832beef99..3af50b80c5 100644
--- a/srcpkgs/rest/rest-devel.template
+++ b/srcpkgs/rest/rest-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'rest-devel'.
 #
+depends="glib-devel libsoup-devel libxml2-devel rest"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libsoup-devel
-Add_dependency run libxml2-devel
-Add_dependency run rest
 
 do_install()
 {
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index 6823778ff4..99fd573c7c 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -5,6 +5,7 @@ homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config gobject-introspection glib-devel libsoup-devel libsoup-gnome-devel libxml2-devel"
 short_desc="RESTful library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,9 +19,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gobject-introspection
-Add_dependency build glib-devel
-Add_dependency build libsoup-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/rgb/template b/srcpkgs/rgb/template
index fee2a9172a..e57692d40e 100644
--- a/srcpkgs/rgb/template
+++ b/srcpkgs/rgb/template
@@ -4,6 +4,8 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config xproto"
+fulldepends="glibc"
 short_desc="RGB color database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95
@@ -12,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
  
-Add_dependency build pkg-config
-Add_dependency build xproto
-Add_dependency full glibc
diff --git a/srcpkgs/rhythmbox/depends b/srcpkgs/rhythmbox/depends
deleted file mode 100644
index d83ae7e528..0000000000
--- a/srcpkgs/rhythmbox/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.95"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/rhythmbox/librhythmbox.template b/srcpkgs/rhythmbox/librhythmbox.template
index ca2d7ac1c2..859330451c 100644
--- a/srcpkgs/rhythmbox/librhythmbox.template
+++ b/srcpkgs/rhythmbox/librhythmbox.template
@@ -6,7 +6,7 @@ long_desc="
 
  This package includes the shared library."
 
-shlib_depends="webkit-gtk3>=1.8.0"
+depends="webkit-gtk3>=1.8.0"
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/rhythmbox/rhythmbox-devel.template b/srcpkgs/rhythmbox/rhythmbox-devel.template
index 26d60b1e7e..41c5aac315 100644
--- a/srcpkgs/rhythmbox/rhythmbox-devel.template
+++ b/srcpkgs/rhythmbox/rhythmbox-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'rhythmbox-devel'.
 #
+depends="gtk+3-devel librhythmbox>=2.96"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run librhythmbox ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template
index 5f99548436..501f54c2da 100644
--- a/srcpkgs/rhythmbox/template
+++ b/srcpkgs/rhythmbox/template
@@ -3,10 +3,15 @@ pkgname=rhythmbox
 version=2.96
 homepage="http://www.rhythmbox.org"
 distfiles="${GNOME_SITE}/$pkgname/2.96/$pkgname-$version.tar.xz"
+build_requires=15
 build_style=gnu-configure
 configure_args="--with-mdns=avahi --disable-scrollkeeper --disable-static
 --disable-schemas-install --enable-daap --with-webkit --without-hal
 --disable-schemas-compile --enable-vala --enable-musicbrainz"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+subpackages="lib${pkgname} ${pkgname}-devel"
+depends="desktop-file-utils hicolor-icon-theme libtdb>=1.2.6 webkit-gtk3>=1.8.0"
+makedepends="which pkg-config intltool gnome-doc-utils gtk+3-devel totem-pl-parser-devel libsoup-devel libsoup-gnome-devel gst-plugins-base-devel json-glib-devel libgudev-devel GConf-devel libmusicbrainz-devel libdiscid-devel libmtp-devel avahi-glib-libs-devel webkit-gtk3-devel libpeas-devel brasero-devel libnotify-devel grilo-devel json-glib-devel clutter-gtk-devel clutter-gst-devel mx-devel libdmapsharing-devel tdb-devel>=1.2.6 libgnome-keyring-devel pygobject-devel vala-devel"
 short_desc="GNOME integrated music management application, inspired by Apple's iTunes"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -29,42 +34,3 @@ long_desc="
  * Play, rip, and burn audio CDs
  * Automatically download audio podcasts
  * Browse, preview, and download albums from Magnatune and Jamendo"
-
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="lib${pkgname} ${pkgname}-devel"
-build_requires=15
-shlib_depends="libtdb>=1.2.6 webkit-gtk3>=1.8.0"
-
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build totem-pl-parser-devel
-Add_dependency build libsoup-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build json-glib-devel
-Add_dependency build libgudev-devel
-Add_dependency build GConf-devel
-Add_dependency build libmusicbrainz-devel
-Add_dependency build libdiscid-devel
-Add_dependency build libmtp-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build webkit-gtk3-devel
-Add_dependency build libpeas-devel
-Add_dependency build brasero-devel
-Add_dependency build libnotify-devel 
-Add_dependency build grilo-devel
-Add_dependency build json-glib-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build clutter-gst-devel
-Add_dependency build mx-devel
-Add_dependency build libdmapsharing-devel
-Add_dependency build tdb-devel ">=1.2.6"
-Add_dependency build libgnome-keyring-devel
-Add_dependency build pygobject-devel
-Add_dependency build vala-devel
-
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index cf64cb680e..7be7a4825f 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -4,6 +4,8 @@ version=0.6.0
 homepage="http://goodies.xfce.org/projects/applications/ristretto"
 distfiles="http://archive.xfce.org/src/apps/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gtk+-devel libexif-devel xfconf-devel dbus-glib-devel libxfce4util-devel libxfce4ui-devel exo-devel"
 short_desc="Picture-viewer for the Xfce desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,15 +16,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libexif-devel
-Add_dependency build xfconf-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build exo-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template
index 34a8b34403..46955bbf50 100644
--- a/srcpkgs/rpcbind/template
+++ b/srcpkgs/rpcbind/template
@@ -5,6 +5,7 @@ homepage="http://rpcbind.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-warmstarts --with-statedir=/run"
+makedepends="libtirpc-devel"
 short_desc="Converts RPC program numbers into universal addresses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3
@@ -15,7 +16,6 @@ long_desc="
 
 systemd_services="${pkgname}.service on"
 
-Add_dependency build libtirpc-devel
 
 post_install() {
 	vinstall man/rpcbind.8 644 usr/share/man/man8
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index e0041ff15f..4a1a518c1a 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -5,6 +5,7 @@ homepage="http://samba.anu.edu.au/rsync/"
 distfiles="http://www.samba.org/ftp/rsync/src/rsync-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="perl>=0 acl-devel popt-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -20,6 +21,3 @@ long_desc="
  first glance this may seem impossible because the calculation of diffs
  between two files normally requires local access to both files."
 
-Add_dependency build perl ">=0"
-Add_dependency build acl-devel
-Add_dependency build popt-devel
diff --git a/srcpkgs/rsyslog/rsyslog-gnutls.template b/srcpkgs/rsyslog/rsyslog-gnutls.template
index 06094db7eb..bd2767e158 100644
--- a/srcpkgs/rsyslog/rsyslog-gnutls.template
+++ b/srcpkgs/rsyslog/rsyslog-gnutls.template
@@ -1,11 +1,11 @@
 # Template file for 'rsyslog-gnutls'.
 #
+depends="rsyslog"
 short_desc="${sourcepkg} GnuTLS add-on"
 long_desc="${long_desc}
 
  This package contains the GnuTLS add-on to send encrypted messages."
 
-Add_dependency run rsyslog
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog-gssapi.template b/srcpkgs/rsyslog/rsyslog-gssapi.template
index ececc924ac..c22511eb88 100644
--- a/srcpkgs/rsyslog/rsyslog-gssapi.template
+++ b/srcpkgs/rsyslog/rsyslog-gssapi.template
@@ -1,11 +1,11 @@
 # Template file for 'rsyslog-gssapi'.
 #
+depends="rsyslog"
 short_desc="${sourcepkg} Kerberos5 GSSAPI add-on"
 long_desc="${long_desc}
 
  This package contains the Kerberos5 GSSAPI add-on."
 
-Add_dependency run rsyslog
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog-mysql.template b/srcpkgs/rsyslog/rsyslog-mysql.template
index 889ee9c624..d4b669ff9a 100644
--- a/srcpkgs/rsyslog/rsyslog-mysql.template
+++ b/srcpkgs/rsyslog/rsyslog-mysql.template
@@ -1,11 +1,11 @@
 # Template file for 'rsyslog-mysql'.
 #
+depends="rsyslog"
 short_desc="${sourcepkg} MySQL add-on"
 long_desc="${long_desc}
 
  This package contains the MySQL add-on to store log messages."
 
-Add_dependency run rsyslog
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog-postgresql.template b/srcpkgs/rsyslog/rsyslog-postgresql.template
index a6c1cbfdce..c91ed653e3 100644
--- a/srcpkgs/rsyslog/rsyslog-postgresql.template
+++ b/srcpkgs/rsyslog/rsyslog-postgresql.template
@@ -1,11 +1,11 @@
 # Template file for 'rsyslog-postgresql'.
 #
+depends="rsyslog"
 short_desc="${sourcepkg} PostgreSQL add-on"
 long_desc="${long_desc}
 
  This package contains the PostgreSQL add-on to store log messages."
 
-Add_dependency run rsyslog
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 300096303b..a13135194d 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -13,6 +13,7 @@ configure_args="--enable-gnutls --enable-mysql --enable-pgsql
 --enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock
 --enable-smcustbindcdr --enable-imtemplate --enable-omtemplate
 LDFLAGS=-Wl,--allow-shlib-undefined"
+makedepends="automake pkg-config zlib-devel gnutls-devel postgresql-libs-devel libmysqlclient-devel mit-krb5-devel libee-devel"
 short_desc="An Enhanced multi-threaded syslog daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -32,14 +33,6 @@ make_dirs="/etc/rsyslog.d 0755 root root"
 build_requires=11
 disable_parallel_build=yes
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build gnutls-devel
-Add_dependency build postgresql-libs-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build libee-devel
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/rtkit/depends b/srcpkgs/rtkit/depends
deleted file mode 100644
index 1e7ac30399..0000000000
--- a/srcpkgs/rtkit/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index ca5953c571..ead0166ddd 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -6,6 +6,7 @@ homepage="http://git.0pointer.de/?p=rtkit.git"
 distfiles="http://0pointer.de/public/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-systemdsystemunitdir=/lib/systemd/system"
+makedepends="pkg-config dbus-devel libcap-devel"
 short_desc="Realtime Policy and Watchdog Daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD, GPL-2"
@@ -20,9 +21,6 @@ system_accounts="rtkit"
 rtkit_homedir="/proc"
 systemd_services="rtkit-daemon.service on"
 
-Add_dependency build pkg-config
-Add_dependency build dbus-devel
-Add_dependency build libcap-devel
 
 post_install()
 {
diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template
index cb37cc5e39..16d298ad66 100644
--- a/srcpkgs/rtorrent/template
+++ b/srcpkgs/rtorrent/template
@@ -5,6 +5,7 @@ distfiles="http://libtorrent.rakshasa.no/downloads/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-debug"
 revision=1
+makedepends="glibc-devel libcurl-devel libsigc++-devel libstdc++-devel libtorrent-devel ncurses-devel"
 short_desc="Ncurses BitTorrent client based on libTorrent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libtorrent.rakshasa.no"
@@ -16,9 +17,3 @@ long_desc="
  while delivering equivalent features to those found in GUI based clients 
  in an ncurses client."
 
-Add_dependency build glibc-devel
-Add_dependency build libcurl-devel
-Add_dependency build libsigc++-devel
-Add_dependency build libstdc++-devel
-Add_dependency build libtorrent-devel
-Add_dependency build ncurses-devel
diff --git a/srcpkgs/rubberband/depends b/srcpkgs/rubberband/depends
deleted file mode 100644
index 89acd330c2..0000000000
--- a/srcpkgs/rubberband/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.6.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/rubberband/rubberband-devel.template b/srcpkgs/rubberband/rubberband-devel.template
index 2a783dac32..1741bb2b6e 100644
--- a/srcpkgs/rubberband/rubberband-devel.template
+++ b/srcpkgs/rubberband/rubberband-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'rubberband-devel'.
 #
+depends="librubberband"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run lib${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template
index c0d86cbad3..2ba4cdd289 100644
--- a/srcpkgs/rubberband/template
+++ b/srcpkgs/rubberband/template
@@ -5,6 +5,8 @@ homepage="http://www.breakfastquay.com/rubberband/"
 distfiles="http://code.breakfastquay.com/attachments/download/16/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
 revision=2
+depends="libvamp-plugin-sdk"
+makedepends="pkg-config ladspa-sdk libsamplerate-devel vamp-plugin-sdk-devel fftw-devel"
 short_desc="Time-stretching and pitch-shifting audio library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -17,10 +19,4 @@ long_desc="
 
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency run libvamp-plugin-sdk
 
-Add_dependency build pkg-config
-Add_dependency build ladspa-sdk
-Add_dependency build libsamplerate-devel
-Add_dependency build vamp-plugin-sdk-devel
-Add_dependency build fftw-devel
diff --git a/srcpkgs/ruby/ruby-devel.template b/srcpkgs/ruby/ruby-devel.template
index 8a5e6017a6..aa16db3e26 100644
--- a/srcpkgs/ruby/ruby-devel.template
+++ b/srcpkgs/ruby/ruby-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'ruby-devel'.
 #
+depends="ruby"
 short_desc="ruby development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ruby
 
 do_install()
 {
diff --git a/srcpkgs/ruby/ruby-gems.template b/srcpkgs/ruby/ruby-gems.template
index 10d14d2069..39d6ef285d 100644
--- a/srcpkgs/ruby/ruby-gems.template
+++ b/srcpkgs/ruby/ruby-gems.template
@@ -1,5 +1,6 @@
 # Template file for 'ruby-gems'.
 #
+depends="ruby-rdoc ruby"
 short_desc="Package management framework for Ruby libraries/applications"
 long_desc="
  This is a way to package Ruby libraries/applications for distribution.
@@ -15,8 +16,6 @@ long_desc="
 
 noarch=yes
 
-Add_dependency run ruby-rdoc 
-Add_dependency run ruby
 
 do_install()
 {
diff --git a/srcpkgs/ruby/ruby-irb.template b/srcpkgs/ruby/ruby-irb.template
index d7a7306be0..1fe6b5bcfd 100644
--- a/srcpkgs/ruby/ruby-irb.template
+++ b/srcpkgs/ruby/ruby-irb.template
@@ -1,5 +1,6 @@
 # Template file for 'ruby-irb'.
 #
+depends="ruby"
 short_desc="Interactive Ruby"
 long_desc="
  The irb is acronym for Interactive RuBy. It evaluates Ruby expression from
@@ -9,7 +10,6 @@ long_desc="
 
 noarch=yes
  
-Add_dependency run ruby
 
 do_install()
 {
diff --git a/srcpkgs/ruby/ruby-rdoc.template b/srcpkgs/ruby/ruby-rdoc.template
index f03838db1c..34361f8109 100644
--- a/srcpkgs/ruby/ruby-rdoc.template
+++ b/srcpkgs/ruby/ruby-rdoc.template
@@ -1,5 +1,6 @@
 # Template file for 'ruby-rdoc'.
 #
+depends="ruby-irb ruby"
 short_desc="Generate documentation from Ruby source files"
 long_desc="
  RDoc - Documentation from Ruby Source Files:
@@ -17,8 +18,6 @@ long_desc="
 
 noarch=yes
  
-Add_dependency run ruby-irb
-Add_dependency run ruby
 
 do_install()
 {
diff --git a/srcpkgs/ruby/ruby-ri.template b/srcpkgs/ruby/ruby-ri.template
index 8bd77cdf27..7c9279f92e 100644
--- a/srcpkgs/ruby/ruby-ri.template
+++ b/srcpkgs/ruby/ruby-ri.template
@@ -1,5 +1,6 @@
 # Template file for 'ruby-ri'.
 #
+depends="ruby-rdoc ruby"
 short_desc="Ruby Interactive reference"
 long_desc="
  ri is a command line tool that displays descriptions of built-in Ruby
@@ -11,8 +12,6 @@ long_desc="
 
 noarch=yes
  
-Add_dependency run ruby-rdoc
-Add_dependency run ruby
 
 do_install()
 {
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 7da5ab0c54..39086b2471 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,6 +9,7 @@ distfiles="ftp://ftp.ruby-lang.org/pub/ruby/1.9/$pkgname-${_ruby_distver}.tar.bz
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
 DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
+makedepends="pkg-config bison groff doxygen graphviz zlib-devel ncurses-devel readline-devel libffi-devel openssl-devel gdbm-devel libyaml-devel pango-devel"
 short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -22,16 +23,3 @@ long_desc="
 
 subpackages="ruby-devel ruby-gems ruby-irb ruby-rdoc ruby-ri"
 
-Add_dependency build pkg-config
-Add_dependency build bison
-Add_dependency build groff
-Add_dependency build doxygen
-Add_dependency build graphviz
-Add_dependency build zlib-devel
-Add_dependency build ncurses-devel
-Add_dependency build readline-devel
-Add_dependency build libffi-devel
-Add_dependency build openssl-devel
-Add_dependency build gdbm-devel
-Add_dependency build libyaml-devel
-Add_dependency build pango-devel
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 9e067cb805..570343f774 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -8,6 +8,8 @@ configure_args="--with-terminfo=/usr/share/terminfo --enable-256-color
 --enable-selectionscrolling --enable-smart-resize --enable-transparency
 --enable-utmp --enable-wtmp --enable-lastlog --disable-frills
 --enable-startup-notification --enable-combining --with-term=rxvt-256color"
+makedepends="pkg-config renderproto freetype-devel fontconfig-devel libX11-devel libXrender-devel libXft-devel glib-devel gdk-pixbuf-devel startup-notification-devel"
+fulldepends="perl>=0"
 short_desc="rxvt clone supporting Xft fonts and Unicode"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -19,18 +21,7 @@ long_desc="
  locale-correct input and output. It also supports mixing multiple
  fonts at the same time, including Xft fonts."
 
-Add_dependency full perl		">=0"
 
-Add_dependency build pkg-config
-Add_dependency build renderproto
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libX11-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXft-devel
-Add_dependency build glib-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build startup-notification-devel
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
diff --git a/srcpkgs/rygel/rygel-devel.template b/srcpkgs/rygel/rygel-devel.template
index 609fceb4c1..73167148c3 100644
--- a/srcpkgs/rygel/rygel-devel.template
+++ b/srcpkgs/rygel/rygel-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'rygel-devel'.
 #
+depends="libgee-devel gupnp-av-devel gstreamer-devel libuuid-devel glib-devel"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libgee-devel
-Add_dependency run gupnp-av-devel
-Add_dependency run gstreamer-devel
-Add_dependency run libuuid-devel
-Add_dependency run glib-devel
 
 noarch=yes
 
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 7b6081188a..ea7ca46c55 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -4,6 +4,8 @@ version=0.14.1
 distfiles="${GNOME_SITE}/$pkgname/0.14/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-gst-launch-plugin"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool sqlite-devel vala-devel gtk+3-devel libsoup-devel libgee-devel gssdp-devel>=0.12.0 gupnp-av-devel gupnp-dlna-devel"
 short_desc="GNOME home media solution"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -21,16 +23,4 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 conf_files="/etc/rygel.conf"
 subpackages="${pkgname}-devel"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build sqlite-devel
-Add_dependency build vala-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libsoup-devel
-Add_dependency build libgee-devel
-Add_dependency build gssdp-devel	">=0.12.0"
-Add_dependency build gupnp-av-devel
-Add_dependency build gupnp-dlna-devel
diff --git a/srcpkgs/samba/depends b/srcpkgs/samba/depends
deleted file mode 100644
index 76829e8048..0000000000
--- a/srcpkgs/samba/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.5.6"
-api_depends=">=3.6.3_1"
diff --git a/srcpkgs/samba/libsmbclient.template b/srcpkgs/samba/libsmbclient.template
index c98ecd59d0..770ceed3b0 100644
--- a/srcpkgs/samba/libsmbclient.template
+++ b/srcpkgs/samba/libsmbclient.template
@@ -5,7 +5,7 @@ long_desc="
  This package provides a shared library that enables client applications to
  talk to Microsoft Windows and Samba servers using the SMB/CIFS protocol."
 
-shlib_depends="mit-krb5-libs>=1.10.1"
+depends="mit-krb5-libs>=1.10.1"
 
 do_install() {
 	vmove "usr/lib/libwbclient.so*" usr/lib
diff --git a/srcpkgs/samba/samba-devel.template b/srcpkgs/samba/samba-devel.template
index e7ca252573..724f00918c 100644
--- a/srcpkgs/samba/samba-devel.template
+++ b/srcpkgs/samba/samba-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'samba-devel'.
 #
+depends="libsmbclient>=3.6.5"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
@@ -7,7 +8,6 @@ long_desc="
  This package provides development files: headers, static libraries, etc."
 
 noarch=yes
-Add_dependency run libsmbclient ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 81a0460e8c..a094f46905 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -14,6 +14,8 @@ configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap
 --with-syslog --enable-external-libtalloc --with-quotas --enable-cups
 --enable-external-libtdb --disable-fam --with-ads --with-acl-support
 --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2"
+depends="smbclient libsmbclient>=$version"
+makedepends="perl readline-devel python-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel>=1.10.1 libldap-devel pam-devel acl-devel avahi-libs-devel tdb-devel talloc-devel cups-devel"
 short_desc="SMB/CIFS file, print, and login server for Unix"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -25,8 +27,6 @@ long_desc="
  NT4-style domain controller, and can integrate with both NT4 domains and
  Active Directory realms as a member server."
 
-# Require a newer libsmclient.
-shlib_depends="libsmbclient>=${version}"
 subpackages="smbclient libsmbclient samba-devel"
 
 # Don't restart services automatically.
@@ -37,23 +37,6 @@ winbindd.service off"
 
 conf_files="/etc/samba/smb.conf /etc/pam.d/samba"
 
-Add_dependency run smbclient
-
-Add_dependency build perl
-Add_dependency build readline-devel
-Add_dependency build python-devel
-Add_dependency build libcap-devel
-Add_dependency build popt-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build mit-krb5-devel	">=1.10.1"
-Add_dependency build libldap-devel
-Add_dependency build pam-devel
-Add_dependency build acl-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build tdb-devel
-Add_dependency build talloc-devel
-Add_dependency build cups-devel
-
 post_install() {
 	# conf file
 	cd ${wrksrc}
diff --git a/srcpkgs/sane/depends b/srcpkgs/sane/depends
deleted file mode 100644
index a90f3f73ed..0000000000
--- a/srcpkgs/sane/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.22"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/sane/sane-devel.template b/srcpkgs/sane/sane-devel.template
index 0d3dd7f7bd..2b81d0cf38 100644
--- a/srcpkgs/sane/sane-devel.template
+++ b/srcpkgs/sane/sane-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'sane-devel'.
 #
+depends="libsane>=1.0.22"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libsane ">=$version"
 
 noarch=yes
 
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index e0a4aa53f1..8a56f3e11f 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -8,6 +8,8 @@ distfiles="ftp://ftp2.sane-project.org/pub/sane/sane-backends-${version}/sane-ba
 build_style=gnu-configure
 configure_args="--disable-locking --enable-avahi --with-docdir=/usr/share/doc/sane
 --disable-latex --enable-libusb_1_0 --enable-pthread"
+depends="net-snmp"
+makedepends="pkg-config avahi-libs-devel jpeg-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel net-snmp-devel libieee1284-devel"
 short_desc="Scanner Access Now Easy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.sane-project.org/"
@@ -99,17 +101,7 @@ conf_files="
 
 subpackages="lib${pkgname} $pkgname-devel"
 
-Add_dependency run net-snmp
 
-Add_dependency build pkg-config
-Add_dependency build avahi-libs-devel
-Add_dependency build jpeg-devel
-Add_dependency build tiff-devel
-Add_dependency build libgphoto2-devel
-Add_dependency build v4l-utils-devel
-Add_dependency build libusb-devel
-Add_dependency build net-snmp-devel
-Add_dependency build libieee1284-devel
 
 post_install() {
 	# fix hp officejets
diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template
index 8d2f17f8fc..03dda1b5d8 100644
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@@ -4,6 +4,7 @@ version=2.0.1
 revision=2
 distfiles="http://prdownloads.sourceforge.net/$pkgname/$pkgname-$version.tar.gz"
 build_style=python-module
+fulldepends="python"
 short_desc="SCons, a software construction tool"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.scons.org/"
@@ -19,7 +20,6 @@ long_desc="
 
 noarch=yes
 pycompile_dirs="usr/lib/scons-$version/SCons"
-Add_dependency full python
 
 post_install() {
 	vmkdir usr/share
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 0cc5e0923d..4771c19a39 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -5,6 +5,7 @@ revision=5
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-sys-screenrc=/etc/screenrc -enable-pam --enable-colors256"
+makedepends="pam-devel ncurses-devel glibc-devel"
 short_desc="The GNU screen utility"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnu.org/s/screen/"
@@ -29,9 +30,6 @@ long_desc="
  currently not visible and even when the whole screen session is detached
  from the users terminal."
 
-Add_dependency build pam-devel
-Add_dependency build ncurses-devel
-Add_dependency build glibc-devel
 
 post_install()
 {
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 8fb760321b..83afe43d98 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -5,6 +5,7 @@ distfiles="http://linuxbrit.co.uk/downloads/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
 revision=1
+makedepends="libX11-devel giblib-devel imlib2-devel glibc-devel"
 short_desc="A simple command-line screenshot utility for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://scrot.sourcearchive.com/"
@@ -14,7 +15,3 @@ long_desc="
  scrot is a commandline screen capture util like "import",
  but using imlib2."
 
-Add_dependency build libX11-devel
-Add_dependency build giblib-devel
-Add_dependency build imlib2-devel
-Add_dependency build glibc-devel
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 68b7f6d0e4..00e25f8fcc 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -4,6 +4,7 @@ version=1.4.1
 revision=1
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=fa0a7f0d59524611be0c5b9be9ac7f8e7a72bab1826732e056f88332aa3139da
+makedepends="pkg-config nasm zlib-devel libpng-devel SDL-devel libmad-devel fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel faad2-devel"
 short_desc="Free implementation of LucasArts' SCUMM interpreter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.scummvm.org/"
@@ -17,17 +18,6 @@ long_desc="
  See the official compatibility list at http://www.scummvm.org/compatibility.php
  for a full list of supported games."
 
-Add_dependency build pkg-config
-Add_dependency build nasm
-Add_dependency build zlib-devel
-Add_dependency build libpng-devel
-Add_dependency build SDL-devel
-Add_dependency build libmad-devel
-Add_dependency build fluidsynth-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libtheora-devel
-Add_dependency build libflac-devel
-Add_dependency build faad2-devel
 
 do_configure() {
 	./configure --prefix=/usr --backend=sdl --disable-debug \
diff --git a/srcpkgs/sdlmame/template b/srcpkgs/sdlmame/template
index 756a0813f1..c939e2503e 100644
--- a/srcpkgs/sdlmame/template
+++ b/srcpkgs/sdlmame/template
@@ -10,6 +10,8 @@ fi
 wrksrc=mame-${_distver}s
 homepage="http://mamedev.org"
 distfiles="${homepage}/downloader.php?file=releases/mame${_distver}s.zip"
+makedepends="perl>=0 pkg-config SDL-devel SDL_ttf-devel libXinerama-devel gtk+-devel GConf-devel"
+fulldepends="liberation-fonts-ttf"
 short_desc="Multiple Arcade Machine Emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="mame"
@@ -20,15 +22,7 @@ long_desc="
 
 noextract=yes
 
-Add_dependency build perl ">=0"
-Add_dependency build pkg-config
-Add_dependency build SDL-devel
-Add_dependency build SDL_ttf-devel
-Add_dependency build libXinerama-devel
-Add_dependency build gtk+-devel
-Add_dependency build GConf-devel
 
-Add_dependency full liberation-fonts-ttf
 
 do_extract() {
 	# mame source code is double-zipped to save space.
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index 87efb12ab6..55b42d8c34 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas" 
+depends="desktop-file-utils"
+makedepends="pkg-config intltool gnome-doc-utils dbus-glib-devel gtk+3-devel nautilus-devel GConf-devel libnotify-devel gpgme-devel libgnome-keyring-devel libcryptui-devel"
+fulldepends="gnupg"
 short_desc="A Nautilus plugin for OpenPGP file encryption/decryption"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/seahorse/"
@@ -25,18 +28,5 @@ long_desc="
  This package contains a plugin for the GNOME file manager, Nautilus to
  encrypt or decrypt OpenPGP files with GnuPG."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+3-devel
-Add_dependency build nautilus-devel
-Add_dependency build GConf-devel
-Add_dependency build libnotify-devel
-Add_dependency build gpgme-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build libcryptui-devel
 
-Add_dependency run desktop-file-utils
 
-Add_dependency full gnupg
diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index 94cc2fdc1b..a0aa23dc6d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -3,6 +3,8 @@ pkgname=seahorse-sharing
 version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel gpgme-devel libsoup-devel avahi-glib-libs-devel"
+fulldepends="gnupg"
 short_desc="Sharing of PGP public keys via DNS-SD and HKP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/seahorse/"
@@ -23,12 +25,4 @@ long_desc="
  This package contains additional functionality for GNOME's Seahorse
  to share PGP public keys via DNS-SD and HKP."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build gpgme-devel
-Add_dependency build libsoup-devel
-Add_dependency build avahi-glib-libs-devel 
 
-Add_dependency full gnupg
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 6163ab46df..3395d80040 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-compile
 --enable-ldap --enable-hkp --disable-debug"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils gtk+3-devel gpgme-devel libldap-devel libsoup-devel libgnome-keyring-devel avahi-libs-devel avahi-glib-libs-devel gcr-devel"
+fulldepends="openssh-client"
 short_desc="Encryption Made Easy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa
@@ -23,20 +26,5 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build gpgme-devel
-Add_dependency build libldap-devel
-Add_dependency build libsoup-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build gcr-devel
 
-Add_dependency full openssh-client
diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template
index b5b94ad965..88d1c38dc3 100644
--- a/srcpkgs/sed/template
+++ b/srcpkgs/sed/template
@@ -6,6 +6,7 @@ homepage="http://www.gnu.org/software/sed"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--without-included-regex"
+makedepends="acl-devel"
 short_desc="The GNU stream editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -14,4 +15,3 @@ long_desc="
  Sed, the GNU Stream Editor, copies the named files (standard input default)
  to the standard output, edited according to a script of commands."
 
-Add_dependency build acl-devel
diff --git a/srcpkgs/seed/depends b/srcpkgs/seed/depends
deleted file mode 100644
index ab0d9627ad..0000000000
--- a/srcpkgs/seed/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/seed/libseed-devel.template b/srcpkgs/seed/libseed-devel.template
index ca495274ab..39bdd7fa9c 100644
--- a/srcpkgs/seed/libseed-devel.template
+++ b/srcpkgs/seed/libseed-devel.template
@@ -1,22 +1,12 @@
 # Template file for 'libseed-devel'.
 #
+depends="coreutils pkg-config intltool mpfr-devel readline-devel gobject-introspection webkit-gtk3-devel libsoup-devel gir-freedesktop gnome-js-common libseed"
 short_desc="GObject JavaScript bindings for the webkit engine - Development"
 long_desc="${long_desc}
 
  This package contains the static libraries and development headers, needed
  to build programs using the Seed interpreter."
 
-Add_dependency run coreutils
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run mpfr-devel
-Add_dependency run readline-devel
-Add_dependency run gobject-introspection
-Add_dependency run webkit-gtk3-devel
-Add_dependency run libsoup-devel
-Add_dependency run gir-freedesktop
-Add_dependency run gnome-js-common
-Add_dependency run libseed
 
 do_install()
 {
diff --git a/srcpkgs/seed/template b/srcpkgs/seed/template
index 50052f02f6..cbb8772d08 100644
--- a/srcpkgs/seed/template
+++ b/srcpkgs/seed/template
@@ -4,6 +4,8 @@ version=3.2.0
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config intltool readline-devel gobject-introspection webkit-gtk3-devel libsoup-devel dbus-glib-devel"
+fulldepends="gir-freedesktop gnome-js-common"
 short_desc="GObject JavaScript bindings for the webkit engine - Interpreter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Seed/"
@@ -18,13 +20,4 @@ long_desc="
 
 subpackages="libseed libseed-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build readline-devel
-Add_dependency build gobject-introspection
-Add_dependency build webkit-gtk3-devel
-Add_dependency build libsoup-devel
-Add_dependency build dbus-glib-devel
 
-Add_dependency full gir-freedesktop
-Add_dependency full gnome-js-common
diff --git a/srcpkgs/serd/depends b/srcpkgs/serd/depends
deleted file mode 100644
index 766067bc22..0000000000
--- a/srcpkgs/serd/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.5.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/serd/serd-devel.template b/srcpkgs/serd/serd-devel.template
index 0f727cb268..24c4a5b4f1 100644
--- a/srcpkgs/serd/serd-devel.template
+++ b/srcpkgs/serd/serd-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'serd-devel'.
 #
+depends="glibc-devel libserd"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libserd
 
 do_install()
 {
diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template
index 5e5a7f610a..2c29791882 100644
--- a/srcpkgs/serd/template
+++ b/srcpkgs/serd/template
@@ -5,6 +5,7 @@ build_style=waf
 homepage="http://drobilla.net/software/serd/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 revision=2
+makedepends="python"
 short_desc="Lightweight C library for RDF syntax."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="ISC"
@@ -20,4 +21,3 @@ long_desc="
 
 subpackages="$pkgname-devel lib$pkgname"
 
-Add_dependency build python
diff --git a/srcpkgs/sessreg/template b/srcpkgs/sessreg/template
index cf09c888b8..1ccb2636e0 100644
--- a/srcpkgs/sessreg/template
+++ b/srcpkgs/sessreg/template
@@ -4,6 +4,7 @@ version=1.0.6
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel"
 short_desc="Manage utmp/wtmp entries for xdm"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190
@@ -11,5 +12,3 @@ long_desc="
  Sessreg is a simple program to manage utmp/wtmp entries for
  xdm sessions and other clients not started from init."
  
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 47ec97e203..555cba66cb 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -4,12 +4,10 @@ version=1.2.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libxkbfile-devel"
 short_desc="Set the keyboard map using the X Keyboard Extension"
 checksum=999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39
 long_desc="
  The setxkbmap command maps the keyboard to use the layout determined
  by the options specified on the command line."
  
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libxkbfile-devel
diff --git a/srcpkgs/sexy-python/depends b/srcpkgs/sexy-python/depends
deleted file mode 100644
index f848c13276..0000000000
--- a/srcpkgs/sexy-python/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.9"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/sexy-python/template b/srcpkgs/sexy-python/template
index 34fad8d1aa..0039ca74c9 100644
--- a/srcpkgs/sexy-python/template
+++ b/srcpkgs/sexy-python/template
@@ -4,12 +4,11 @@ version=0.1.9
 revision=2
 distfiles="http://releases.chipx86.com/libsexy/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+depends="pygtk"
+makedepends="libsexy-devel pygtk-devel"
 short_desc="Python bindings for libsexy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15
 long_desc="
  This packages provides the Python bindings."
 
-Add_dependency run pygtk
-Add_dependency build libsexy-devel
-Add_dependency build pygtk-devel
diff --git a/srcpkgs/sg3_utils/depends b/srcpkgs/sg3_utils/depends
deleted file mode 100644
index 759a920557..0000000000
--- a/srcpkgs/sg3_utils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.28"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/sg3_utils/sg3_utils-devel.template b/srcpkgs/sg3_utils/sg3_utils-devel.template
index 22df2ba605..ff1ca3aac5 100644
--- a/srcpkgs/sg3_utils/sg3_utils-devel.template
+++ b/srcpkgs/sg3_utils/sg3_utils-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'sg3_utils-devel'.
 #
+depends="glibc-devel libsgutils"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libsgutils
 
 do_install()
 {
diff --git a/srcpkgs/sg3_utils/template b/srcpkgs/sg3_utils/template
index c1f2fde5e2..9785ce9218 100644
--- a/srcpkgs/sg3_utils/template
+++ b/srcpkgs/sg3_utils/template
@@ -3,6 +3,7 @@ pkgname=sg3_utils
 version=1.33
 distfiles="http://sg.danny.cz/sg/p/$pkgname-$version.tgz"
 build_style=gnu-configure
+makedepends="pkg-config"
 short_desc="Generic SCSI utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sg.danny.cz/sg/sg3_utils.html"
@@ -16,4 +17,3 @@ long_desc="
  SBP protocol), SAS, iSCSI and FCoE devices (amongst others)"
  
 subpackages="libsgutils $pkgname-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index aacd1ef2a9..c40bf6b606 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -7,6 +7,7 @@ distfiles="$homepage/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--libdir=/lib --enable-shared --disable-static
 --with-libpam --without-selinux --with-acl --with-attr"
+makedepends="acl-devel pam-devel"
 short_desc="Shadow password file utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -25,8 +26,6 @@ conf_files="/etc/pam.d/usermod /etc/pam.d/userdel /etc/pam.d/useradd
 CFLAGS="-fPIE"
 LDFLAGS="-pie"
 
-Add_dependency build acl-devel
-Add_dependency build pam-devel
 
 pre_build() {
 	# Don't install the groups cmd, we use the one from coreutils.
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index fd940771f7..83bb018b2a 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -5,6 +5,7 @@ homepage="http://freedesktop.org/Software/shared-mime-info"
 distfiles="http://people.freedesktop.org/~hadess/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
+makedepends="pkg-config intltool glib-devel libxml2-devel"
 short_desc="Core database of common types"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -24,7 +25,3 @@ long_desc="
 
 disable_parallel_build=yes
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 06877c2355..a9ec3cf419 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -6,6 +6,8 @@ distfiles="http://yorba.org/download/shotwell/stable/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-desktop-update
 --disable-icon-update --release"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config vala-devel libgomp-devel glib-devel libgee-devel libgphoto2-devel libgexiv2-devel libunique-devel libraw-devel rest-devel webkit-gtk3-devel"
 short_desc="Open source photo manager for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,17 +20,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build vala-devel
-Add_dependency build libgomp-devel
-Add_dependency build glib-devel
-Add_dependency build libgee-devel
-Add_dependency build libgphoto2-devel
-Add_dependency build libgexiv2-devel
-Add_dependency build libunique-devel
-Add_dependency build libraw-devel
-Add_dependency build rest-devel
-Add_dependency build webkit-gtk3-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index 5aa3c08739..5514dfe169 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -6,6 +6,8 @@ homepage="http://launchpad.net/simple-scan"
 distfiles="https://launchpad.net/$pkgname/3.4/$version/+download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+depends="hicolor-icon-theme sane"
+makedepends="pkg-config itstool intltool colord-devel gtk+3-devel dconf-devel sane-devel libgudev-devel"
 short_desc="Simple scanning utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -19,14 +21,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build itstool
-Add_dependency build intltool
-Add_dependency build colord-devel
-Add_dependency build gtk+3-devel
-Add_dependency build dconf-devel
-Add_dependency build sane-devel
-Add_dependency build libgudev-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run sane
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index a2bd9d23e8..b2ef3a4330 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -5,6 +5,7 @@ only_for_archs=i686
 version=2.2.0.35
 distfiles="http://download.skype.com/linux/skype-2.2.0.35.tar.bz2"
 checksum=b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94
+fulldepends="hicolor-icon-theme desktop-file-utils"
 short_desc="P2P software for high-quality voice communication"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.skype.com"
@@ -27,8 +28,6 @@ gtk_iconcache_dirs="
 /usr/share/icons/hicolor
 /usr/share/pixmaps"
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
 
 do_install()
 {
diff --git a/srcpkgs/skypetab-ng/template b/srcpkgs/skypetab-ng/template
index 3ea8e6e6bd..e5fd4c22f0 100644
--- a/srcpkgs/skypetab-ng/template
+++ b/srcpkgs/skypetab-ng/template
@@ -1,6 +1,8 @@
 # Template file for 'skypetab-ng'
 pkgname=skypetab-ng
 version="$(date -u +%Y%m%d)"
+depends="skype"
+makedepends="pkg-config qt-devel libX11-devel git"
 short_desc="A program that adds tabs to Skype for Linux"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://keks-n.net/skypetab"
@@ -17,12 +19,7 @@ only_for_archs=i686
 nofetch=yes
 noextract=yes
 
-Add_dependency run skype
 
-Add_dependency build pkg-config
-Add_dependency build qt-devel
-Add_dependency build libX11-devel
-Add_dependency build git
 
 do_fetch() {
 	local url="git://github.com/kekekeks/${pkgname}.git"
diff --git a/srcpkgs/smpeg/depends b/srcpkgs/smpeg/depends
deleted file mode 100644
index 6ea24dd545..0000000000
--- a/srcpkgs/smpeg/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.4.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/smpeg/smpeg-devel.template b/srcpkgs/smpeg/smpeg-devel.template
index 0dd89adfea..d0ed78a7d1 100644
--- a/srcpkgs/smpeg/smpeg-devel.template
+++ b/srcpkgs/smpeg/smpeg-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'smpeg-devel'.
 #
+depends="SDL-devel smpeg"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run SDL-devel
-Add_dependency run smpeg
 
 do_install()
 {
diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template
index 55662fec1a..6ea71ae204 100644
--- a/srcpkgs/smpeg/template
+++ b/srcpkgs/smpeg/template
@@ -6,6 +6,7 @@ distfiles="http://mirrors.dotsrc.org/lokigames/open-source/smpeg/smpeg-$version.
 build_style=gnu-configure
 configure_args="--disable-gtk-player --disable-opengl-player"
 make_build_args="LDFLAGS+=-lstdc++"
+makedepends="SDL-devel"
 short_desc="SDL MPEG Player Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1efa7984d0aada0c2954cd0aaef357e9d7871dadd3368dbe742ab5f260523e57
@@ -14,7 +15,6 @@ long_desc="
  and SPLAY, an MPEG audio decoder created by Woo-jae Jung."
 
 subpackages="$pkgname-devel"
-Add_dependency build SDL-devel
 
 post_install()
 {
diff --git a/srcpkgs/smproxy/template b/srcpkgs/smproxy/template
index 8a944a8135..3994fb0f8e 100644
--- a/srcpkgs/smproxy/template
+++ b/srcpkgs/smproxy/template
@@ -4,15 +4,10 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libSM-devel libICE-devel libXt-devel libXmu-devel libX11-devel"
 short_desc="X11R6 session management application"
 checksum=3792e5772f74ac4a1bcb1d3feee2f899b24ffa958250ed6f9944269d15f94472
 long_desc="
  smproxy allows X applications that do not support X11R6 session
  management to participate in an X11R6 session."
 
-Add_dependency build pkg-config
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libXt-devel
-Add_dependency build libXmu-devel
-Add_dependency build libX11-devel
diff --git a/srcpkgs/sord/depends b/srcpkgs/sord/depends
deleted file mode 100644
index 766067bc22..0000000000
--- a/srcpkgs/sord/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.5.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/sord/sord-devel.template b/srcpkgs/sord/sord-devel.template
index 1089d33395..4dbb7bcc65 100644
--- a/srcpkgs/sord/sord-devel.template
+++ b/srcpkgs/sord/sord-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'sord-devel'.
 #
+depends="glibc-devel serd-devel libsord"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run serd-devel
-Add_dependency run libsord
 
 
 do_install()
diff --git a/srcpkgs/sord/template b/srcpkgs/sord/template
index bf47f96ab0..dd3a336d63 100644
--- a/srcpkgs/sord/template
+++ b/srcpkgs/sord/template
@@ -5,6 +5,7 @@ build_style=waf
 homepage="http://drobilla.net/software/sord/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 revision=2
+makedepends="pkg-config python serd-devel"
 short_desc="Lightweight C library for storing RDF data in memory."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="ISC"
@@ -13,6 +14,3 @@ long_desc="
  Sord is a lightweight C library for storing RDF data in memory."
 subpackages="$pkgname-devel lib$pkgname"
 
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build serd-devel
diff --git a/srcpkgs/sound-juicer/template b/srcpkgs/sound-juicer/template
index e08cf0ba34..9e17551ee9 100644
--- a/srcpkgs/sound-juicer/template
+++ b/srcpkgs/sound-juicer/template
@@ -5,6 +5,9 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas" 
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool gnome-doc-utils glib-devel GConf-devel brasero-devel libmusicbrainz-devel"
+fulldepends="gst-plugins-good"
 short_desc="CD ripping tool using GTK+ and GStreamer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/seahorse/"
@@ -16,19 +19,8 @@ long_desc="
 gconf_schemas="sound-juicer.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build glib-devel
-Add_dependency build GConf-devel
-Add_dependency build brasero-devel
-Add_dependency build libmusicbrainz-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency full gst-plugins-good
 
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
diff --git a/srcpkgs/sound-theme-freedesktop/template b/srcpkgs/sound-theme-freedesktop/template
index e24e212d1a..39be0b1820 100644
--- a/srcpkgs/sound-theme-freedesktop/template
+++ b/srcpkgs/sound-theme-freedesktop/template
@@ -3,6 +3,7 @@ pkgname=sound-theme-freedesktop
 version=0.7
 distfiles="http://people.freedesktop.org/~mccann/dist/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool"
 short_desc="Freedesktop sound theme"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e6595afb02b76099ef6df42c2ac7c4f9680c21c3f26b2a7ca0943d1fdbbd9aef
@@ -13,5 +14,3 @@ long_desc="
 
 noarch=yes
 
-Add_dependency build pkg-config
-Add_dependency build intltool
diff --git a/srcpkgs/speex/depends b/srcpkgs/speex/depends
deleted file mode 100644
index 19862a1b53..0000000000
--- a/srcpkgs/speex/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/speex/speex-devel.template b/srcpkgs/speex/speex-devel.template
index a585fa8f04..58ecc4f534 100644
--- a/srcpkgs/speex/speex-devel.template
+++ b/srcpkgs/speex/speex-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'speex-devel'.
 #
+depends="glibc-devel libspeex"
 short_desc="${sourcepkg} development files"
 long_desc="
  Speex is an audio codec especially designed for compressing voice at low
@@ -10,8 +11,6 @@ long_desc="
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libspeex
 
 do_install()
 {
diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template
index bd9530dbac..d629e11c9d 100644
--- a/srcpkgs/speex/template
+++ b/srcpkgs/speex/template
@@ -4,6 +4,7 @@ version=1.2rc1
 revision=3
 distfiles="http://downloads.xiph.org/releases/speex/speex-$version.tar.gz"
 build_style=gnu-configure
+makedepends="pkg-config libogg-devel"
 short_desc="A free codec for free speech"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6
@@ -16,5 +17,3 @@ long_desc="
  This package contains the encoder and decoder command-line applications."
 
 subpackages="libspeex $pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libogg-devel
diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template
index 4fa153a65b..3138456db6 100644
--- a/srcpkgs/spice-vdagent/template
+++ b/srcpkgs/spice-vdagent/template
@@ -3,6 +3,9 @@ pkgname=spice-vdagent
 version=0.8.1
 distfiles="http://www.spicespace.org/download/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="dbus ConsoleKit-x11"
+makedepends="pkg-config dbus-devel libXfixes-devel libXrandr-devel spice-protocol"
+fulldepends="desktop-file-utils"
 short_desc="Spice agent for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=99ec232805a6201da78d409e6f874ff0aa6bb25e7ffe623aa77752539ae7d7ff
@@ -18,15 +21,7 @@ Features:
 
 systemd_services="${pkgname}d.service on"
 
-Add_dependency run dbus
-Add_dependency run ConsoleKit-x11
-Add_dependency full desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build dbus-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXrandr-devel
-Add_dependency build spice-protocol
 
 post_install() {
 	rm -rf ${DESTDIR}/etc/rc.d
diff --git a/srcpkgs/spice/depends b/srcpkgs/spice/depends
deleted file mode 100644
index 6527064c48..0000000000
--- a/srcpkgs/spice/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.6.4"
-api_depends=">=0.10.1_1"
diff --git a/srcpkgs/spice/spice-devel.template b/srcpkgs/spice/spice-devel.template
index a7d46d6897..8e33eff69e 100644
--- a/srcpkgs/spice/spice-devel.template
+++ b/srcpkgs/spice/spice-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'spice-devel'.
 #
+depends="pixman-devel celt051-devel openssl-devel libXinerama-devel spice-protocol spice"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pixman-devel
-Add_dependency run celt051-devel
-Add_dependency run openssl-devel
-Add_dependency run libXinerama-devel
-Add_dependency run spice-protocol
-Add_dependency run spice
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 386e56d95b..96cc337d29 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -6,6 +6,7 @@ distfiles="$homepage/download/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --disable-smartcard --with-sasl"
 revision=2
+makedepends="pkg-config spice-protocol>=0.10.1 jpeg-devel pixman-devel openssl-devel celt051-devel alsa-lib-devel libXfixes-devel libXrender-devel libXrandr-devel libXinerama-devel libsasl-devel"
 short_desc="Implements the SPICE protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,15 +20,3 @@ long_desc="
 
 subpackages="spice-devel"
 
-Add_dependency build pkg-config
-Add_dependency build spice-protocol ">=0.10.1"
-Add_dependency build jpeg-devel
-Add_dependency build pixman-devel
-Add_dependency build openssl-devel
-Add_dependency build celt051-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libsasl-devel
diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index 79cdc70364..2ebb431699 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -4,6 +4,8 @@ version=3.1.2
 distfiles="http://www.splint.org/downloads/$pkgname-$version.src.tgz"
 build_style=gnu-configure
 revision=1
+makedepends="flex"
+fulldepends="glibc"
 short_desc="Secure Programming Lint"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c78db643df663313e3fa9d565118391825dd937617819c6efc7966cdf444fb0a
@@ -16,5 +18,3 @@ long_desc="
 
 disable_parallel_build=yes
 
-Add_dependency full glibc
-Add_dependency build flex
diff --git a/srcpkgs/sqlite/depends b/srcpkgs/sqlite/depends
deleted file mode 100644
index 129f477244..0000000000
--- a/srcpkgs/sqlite/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.6.13"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/sqlite/sqlite-devel.template b/srcpkgs/sqlite/sqlite-devel.template
index 81325eeb6c..3b3059816f 100644
--- a/srcpkgs/sqlite/sqlite-devel.template
+++ b/srcpkgs/sqlite/sqlite-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'sqlite-devel'.
 #
+depends="tcl-devel readline-devel glibc-devel sqlite"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run tcl-devel
-Add_dependency run readline-devel
-Add_dependency run glibc-devel
-Add_dependency run sqlite
 
 do_install()
 {
diff --git a/srcpkgs/sqlite/sqlite-tcl.template b/srcpkgs/sqlite/sqlite-tcl.template
index 1ab2054941..b8f3c9f1b6 100644
--- a/srcpkgs/sqlite/sqlite-tcl.template
+++ b/srcpkgs/sqlite/sqlite-tcl.template
@@ -1,12 +1,11 @@
 # Template file for 'sqlite-tcl'.
 #
+depends="sqlite tcl"
 short_desc="${sourcepkg} TCL bindings"
 long_desc="${long_desc}
 
  This package contains TCL bindings for sqlite."
 
-Add_dependency run sqlite
-Add_dependency run tcl
 
 do_install()
 {
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 2ccaa33523..631c7ce6ce 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -5,6 +5,7 @@ _amalgamationver=3071100
 wrksrc=sqlite
 create_wrksrc=yes
 distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz"
+makedepends="readline-devel tcl-devel"
 short_desc="SQL Database Engine in a C Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.sqlite.org"
@@ -23,8 +24,6 @@ long_desc="
  from the database files on disk."
 
 subpackages="$pkgname-devel $pkgname-tcl"
-Add_dependency build readline-devel
-Add_dependency build tcl-devel
 
 do_configure() {
 	export CFLAGS="$XBPS_CFLAGS -DSQLITE_ENABLE_FTS3=1 \
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 4e3f53b54e..994f7e5a8b 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -4,6 +4,7 @@ version=4.2
 wrksrc="squashfs${version}"
 distfiles="${SOURCEFORGE_SITE}/squashfs/squashfs${version}.tar.gz"
 revision=1
+makedepends="zlib-devel lzo-devel liblzma-devel"
 short_desc="Tool to create and append to squashfs filesystems"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96
@@ -19,9 +20,6 @@ long_desc="
  needed."
 
 
-Add_dependency build zlib-devel
-Add_dependency build lzo-devel
-Add_dependency build liblzma-devel
 
 do_build()
 {
diff --git a/srcpkgs/sshfs-fuse/template b/srcpkgs/sshfs-fuse/template
index c6a88efdf1..5eab5e90a1 100644
--- a/srcpkgs/sshfs-fuse/template
+++ b/srcpkgs/sshfs-fuse/template
@@ -4,6 +4,8 @@ version=2.3
 distfiles="${SOURCEFORGE_SITE}/fuse/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config glib-devel fuse-devel"
+fulldepends="openssh-client>=0"
 short_desc="FUSE client based on the SSH File Transfer Protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://fuse.sourceforge.net/sshfs.html"
@@ -16,8 +18,4 @@ long_desc="
  the filesystem is as easy as logging into the server with ssh."
 
 
-Add_dependency build pkg-config
-Add_dependency build glib-devel
-Add_dependency build fuse-devel
 
-Add_dependency full openssh-client ">=0"
diff --git a/srcpkgs/startup-notification/depends b/srcpkgs/startup-notification/depends
deleted file mode 100644
index beb99f5da3..0000000000
--- a/srcpkgs/startup-notification/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.10"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/startup-notification/startup-notification-devel.template b/srcpkgs/startup-notification/startup-notification-devel.template
index 986ae61ab3..6ac47f721e 100644
--- a/srcpkgs/startup-notification/startup-notification-devel.template
+++ b/srcpkgs/startup-notification/startup-notification-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'startup-notification-devel'.
 #
+depends="pkg-config libSM-devel libICE-devel libX11-devel xcb-util-devel libxcb-devel startup-notification"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run xcb-util-devel
-Add_dependency run libxcb-devel
-Add_dependency run startup-notification
 
 do_install()
 {
diff --git a/srcpkgs/startup-notification/template b/srcpkgs/startup-notification/template
index 68006f87c9..2206b0b229 100644
--- a/srcpkgs/startup-notification/template
+++ b/srcpkgs/startup-notification/template
@@ -4,6 +4,7 @@ version=0.12
 distfiles="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config libX11-devel xcb-util-devel libxcb-devel"
 short_desc="Library for tracking application startup"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
@@ -15,7 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build xcb-util-devel
-Add_dependency build libxcb-devel
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 638b779b46..996b2ea518 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -3,6 +3,8 @@ pkgname=strace
 version=4.7
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="xz"
+fulldepends="perl>=0"
 short_desc="System Call Tracer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sourceforge.net/projects/strace"
@@ -13,5 +15,3 @@ long_desc="
  a trace of all the system calls made by a process/program."
 
 # Required by strace-graph
-Add_dependency full perl	">=0"
-Add_dependency build xz
diff --git a/srcpkgs/strigi/depends b/srcpkgs/strigi/depends
deleted file mode 100644
index a3e5642e47..0000000000
--- a/srcpkgs/strigi/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.7.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/strigi/strigi-devel.template b/srcpkgs/strigi/strigi-devel.template
index 28a66cb9ad..9cc3036c9d 100644
--- a/srcpkgs/strigi/strigi-devel.template
+++ b/srcpkgs/strigi/strigi-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'strigi-devel'.
 #
+depends="exiv2-devel libxml2-devel clucene-devel dbus-devel qt-devel strigi"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run exiv2-devel
-Add_dependency run libxml2-devel
-Add_dependency run clucene-devel
-Add_dependency run dbus-devel
-Add_dependency run qt-devel
-Add_dependency run strigi
 
 do_install()
 {
diff --git a/srcpkgs/strigi/template b/srcpkgs/strigi/template
index 752a09f2ec..183ae3fc04 100644
--- a/srcpkgs/strigi/template
+++ b/srcpkgs/strigi/template
@@ -5,6 +5,7 @@ revision=3
 distfiles="http://www.vandenoever.info/software/${pkgname}/${pkgname}-${version}.tar.bz2"
 build_style=cmake
 configure_args="-DENABLE_INOTIFY=ON"
+makedepends="pkg-config cmake exiv2-devel libxml2-devel clucene-devel dbus-devel qt-devel"
 short_desc="Small fast desktop searching program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1ca421bbe420d1839bbe6bfe7c4b52a05590a9b7a7eda77924b554c98e602ab8
@@ -17,10 +18,3 @@ long_desc="
 
 subpackages="strigi-devel"
 
-Add_dependency build pkg-config
-Add_dependency build cmake
-Add_dependency build exiv2-devel
-Add_dependency build libxml2-devel
-Add_dependency build clucene-devel
-Add_dependency build dbus-devel
-Add_dependency build qt-devel
diff --git a/srcpkgs/subversion/depends b/srcpkgs/subversion/depends
deleted file mode 100644
index c8bad8605e..0000000000
--- a/srcpkgs/subversion/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.29.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/subversion/subversion-devel.template b/srcpkgs/subversion/subversion-devel.template
index 158662c99b..706547745a 100644
--- a/srcpkgs/subversion/subversion-devel.template
+++ b/srcpkgs/subversion/subversion-devel.template
@@ -1,30 +1,11 @@
 # Template file for 'subversion-devel'.
 #
+depends="pkg-config perl ruby-devel python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel zlib-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel libsvn"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run perl
-Add_dependency run ruby-devel
-Add_dependency run python-devel
-Add_dependency run swig
-Add_dependency run apr-util-devel
-Add_dependency run libldap-devel
-Add_dependency run db-devel
-Add_dependency run gdbm-devel
-Add_dependency run expat-devel
-Add_dependency run apr-devel
-Add_dependency run libuuid-devel
-Add_dependency run zlib-devel
-Add_dependency run sqlite-devel
-Add_dependency run libsasl-devel
-Add_dependency run dbus-devel
-Add_dependency run libgnome-keyring-devel
-Add_dependency run glib-devel
-Add_dependency run neon-devel
-Add_dependency run libsvn
 
 do_install()
 {
diff --git a/srcpkgs/subversion/subversion-perl.template b/srcpkgs/subversion/subversion-perl.template
index 83df6435fb..ce6d787f4f 100644
--- a/srcpkgs/subversion/subversion-perl.template
+++ b/srcpkgs/subversion/subversion-perl.template
@@ -1,11 +1,11 @@
 # Template file for 'subversion-perl'.
 #
+depends="perl"
 short_desc="${short_desc} - perl bindings"
 long_desc="${long_desc}
 
  This package contains the perl language bindings for subversion."
 
-Add_dependency run perl
 
 do_install()
 {
diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template
index 6e552f8af7..66d44c4bd5 100644
--- a/srcpkgs/subversion/subversion-python.template
+++ b/srcpkgs/subversion/subversion-python.template
@@ -1,5 +1,6 @@
 # Template file for 'subversion-python'.
 #
+depends="python"
 short_desc="${short_desc} - python bindings"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
 
 pycompile_module="libsvn svn"
 
-Add_dependency run python
 
 do_install() {
 	vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 1e2c62ee30..246edb9750 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -3,6 +3,7 @@ pkgname=subversion
 version=1.7.5
 homepage="http://subversion.apache.org/"
 distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2"
+makedepends="pkg-config perl python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel zlib-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel apache-devel"
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0, BSD"
@@ -19,26 +20,7 @@ subpackages="$pkgname-python $pkgname-perl"
 subpackages="${subpackages} $pkgname-gnome-keyring-auth $pkgname-devel"
 subpackages="${subpackages} $pkgname-apache libsvn"
 
-Add_dependency build pkg-config
-Add_dependency build perl
 #Add_dependency build ruby-devel
-Add_dependency build python-devel
-Add_dependency build swig
-Add_dependency build apr-util-devel
-Add_dependency build libldap-devel
-Add_dependency build db-devel
-Add_dependency build gdbm-devel
-Add_dependency build expat-devel
-Add_dependency build apr-devel
-Add_dependency build libuuid-devel
-Add_dependency build zlib-devel
-Add_dependency build sqlite-devel
-Add_dependency build libsasl-devel
-Add_dependency build dbus-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build glib-devel
-Add_dependency build neon-devel
-Add_dependency build apache-devel
 
 do_configure() {
 	./configure --prefix=/usr --with-apxs --disable-javahl \
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index a3c642cf26..740ce89809 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 configure_args="--with-ignore-dot -with-all-insults --with-env-editor
 --enable-shell-sets-home --enable-noargs-shell --without-sendmail
 --disable-root-sudo --with-logfac=auth --disable-root-mailer"
+makedepends="zlib-devel pam-devel"
 short_desc="Allow others to run commands as root"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gratisoft.us/sudo/"
@@ -25,8 +26,6 @@ CFLAGS="-fPIE"
 LDFLAGS="-pie"
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
 
-Add_dependency build zlib-devel
-Add_dependency build pam-devel
 
 post_install() {
 	vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
diff --git a/srcpkgs/suil/suil-devel.template b/srcpkgs/suil/suil-devel.template
index 31646f211c..6265a8149f 100644
--- a/srcpkgs/suil/suil-devel.template
+++ b/srcpkgs/suil/suil-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'suil-devel'.
 #
+depends="glibc-devel suil"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run suil
 
 do_install()
 {
diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index ba62f25238..f3c5487262 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -5,6 +5,7 @@ build_style=waf
 homepage="http://drobilla.net/software/suil/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
 revision=2
+makedepends="python lv2-ui gtk+-devel qt-devel libstdc++-devel"
 short_desc="Lightweight C library for loading and wrapping LV2 plugin UIs"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD-style"
@@ -26,9 +27,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build python
-Add_dependency build lv2-ui
-Add_dependency build gtk+-devel
-Add_dependency build qt-devel
-Add_dependency build libstdc++-devel
 
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index b0ab64caf4..be1455c994 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -3,6 +3,8 @@ pkgname=sushi
 version=0.4.1
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+depends="webkit-gtk3>=1.6.3"
+makedepends="pkg-config intltool webkit-gtk3-devel gtksourceview-devel gjs-devel clutter-gst-devel clutter-gtk-devel evince-devel libmusicbrainz-devel gobject-introspection"
 short_desc="A quick previewer for Nautilus"
 homepage="http://www.gnome.org"
 license="GPL-2"
@@ -10,16 +12,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7889e4309443dd7dfd5c9546af23565d15813c3f8f2af6c6776702ca8911a7bd
 long_desc="
  This package contains sushi, ${short_desc}."
-
-shlib_depends="webkit-gtk3>=1.6.3"
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build webkit-gtk3-devel
-Add_dependency build gtksourceview-devel
-Add_dependency build gjs-devel
-Add_dependency build clutter-gst-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build evince-devel
-Add_dependency build libmusicbrainz-devel
-Add_dependency build gobject-introspection
diff --git a/srcpkgs/swh-lv2/template b/srcpkgs/swh-lv2/template
index b617f0607a..6a0f8571ce 100644
--- a/srcpkgs/swh-lv2/template
+++ b/srcpkgs/swh-lv2/template
@@ -6,6 +6,7 @@ build_style=gnu-makefile
 make_install_target="install-system"
 homepage="http://plugin.org.uk/"
 distfiles="http://plugin.org.uk/lv2/${pkgname}-${version}.tar.gz"
+makedepends="pkg-config fftw-devel libxslt"
 short_desc="Collection of GPL (free software) LV2 audio plugins"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -13,9 +14,6 @@ checksum=5809441a94571d2f492a5e015ad035ea747127e0322e531b79a960fd0c3d250d
 long_desc="
  Collection of GPL (free software) LV2 audio plugins"
 
-Add_dependency build pkg-config
-Add_dependency build fftw-devel
-Add_dependency build libxslt
 
 pre_build() {
 	sed -i -e "s|/usr/local|$DESTDIR/usr|" Makefile
diff --git a/srcpkgs/swig/template b/srcpkgs/swig/template
index db78832ac4..1bb5256638 100644
--- a/srcpkgs/swig/template
+++ b/srcpkgs/swig/template
@@ -4,6 +4,7 @@ version=2.0.4
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+makedepends="bison pcre-devel zlib-devel"
 short_desc="Simplified Wrapper and Interface Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.swig.org"
@@ -18,6 +19,3 @@ long_desc="
  features that let you tailor the wrapping process to suit your application."
 
 
-Add_dependency build bison
-Add_dependency build pcre-devel
-Add_dependency build zlib-devel
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 5a50b7ac41..a39f15e4e9 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,6 +5,7 @@ homepage="http://sylpheed.sraoss.jp"
 distfiles="http://sylpheed.sraoss.jp/sylpheed/v3.1/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-compface --disable-gtkspell"
+makedepends="pkg-config flex zlib-devel openssl-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel gtk+-devel gpgme-devel"
 short_desc="GTK+ Lightweight and user-friendly e-mail client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -28,18 +29,6 @@ long_desc="
     * Junk mail control
     * Flexible cooperation with external commands"
 
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build zlib-devel
-Add_dependency build openssl-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build gtk+-devel
-Add_dependency build gpgme-devel
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 685f2cfe3c..2416cec089 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -4,6 +4,7 @@ version=1.3.6
 revision=2
 wrksrc=${pkgname}-${version}-Source
 distfiles="http://synergy.googlecode.com/files/$pkgname-$version-Source.tar.gz"
+makedepends="cmake libXtst-devel libXext-devel libXinerama-devel"
 short_desc="Share a single mouse and keyboard between multiple computers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://synergy-foss.org/"
@@ -19,10 +20,6 @@ long_desc="
 
 conf_files="/etc/${pkgname}.conf"
 
-Add_dependency build cmake
-Add_dependency build libXtst-devel
-Add_dependency build libXext-devel
-Add_dependency build libXinerama-devel
 
 do_build() {
 	cmake  -DCMAKE_INSTALL_PREFIX=/usr .
diff --git a/srcpkgs/sysfsutils/depends b/srcpkgs/sysfsutils/depends
deleted file mode 100644
index 5b6269ad02..0000000000
--- a/srcpkgs/sysfsutils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/sysfsutils/libsysfs-devel.template b/srcpkgs/sysfsutils/libsysfs-devel.template
index 027d3053b3..3332eb99da 100644
--- a/srcpkgs/sysfsutils/libsysfs-devel.template
+++ b/srcpkgs/sysfsutils/libsysfs-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libsysfs-devel'.
 #
+depends="glibc-devel libsysfs"
 short_desc="libsysfs - development tools"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
  static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run libsysfs
 
 do_install()
 {
diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template
index 606199b6d5..df5b49cbfb 100644
--- a/srcpkgs/syslinux/template
+++ b/srcpkgs/syslinux/template
@@ -2,6 +2,7 @@
 pkgname=syslinux
 version=4.05
 distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.bz2"
+makedepends="perl nasm libuuid-devel"
 short_desc="A boot loader for the Linux operating system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project"
@@ -16,9 +17,6 @@ long_desc="
 
 broken_as_needed=yes
 
-Add_dependency build perl
-Add_dependency build nasm
-Add_dependency build libuuid-devel
 
 do_build() {
 	# Disable this file which causes an error.
diff --git a/srcpkgs/systemd/depends b/srcpkgs/systemd/depends
deleted file mode 100644
index 28f368156e..0000000000
--- a/srcpkgs/systemd/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=43"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/systemd/systemd-admin.template b/srcpkgs/systemd/systemd-admin.template
index bc22a7c872..91d8ed9cf4 100644
--- a/srcpkgs/systemd/systemd-admin.template
+++ b/srcpkgs/systemd/systemd-admin.template
@@ -1,11 +1,11 @@
 # Template file for 'systemd-admin'.
 #
+depends="systemd"
 short_desc="${sourcepkg} - system administration GUI"
 long_desc="${long_desc}
 
  This package contains systemadm, a GTK+2 application to administer systemd."
 
-Add_dependency run systemd
 
 do_install()
 {
diff --git a/srcpkgs/systemd/systemd-analyze.template b/srcpkgs/systemd/systemd-analyze.template
index a78e5e3b70..868b5aeee2 100644
--- a/srcpkgs/systemd/systemd-analyze.template
+++ b/srcpkgs/systemd/systemd-analyze.template
@@ -1,14 +1,12 @@
 # Template file for 'systemd-analyze'.
 #
+depends="python dbus-python systemd"
 short_desc="${sourcepkg} - systemd analyze"
 long_desc="${long_desc}
 
  This package contains systemd-analyze, a python application to analyze
  systemd."
 
-Add_dependency run python
-Add_dependency run dbus-python
-Add_dependency run systemd
 
 do_install()
 {
diff --git a/srcpkgs/systemd/systemd-devel.template b/srcpkgs/systemd/systemd-devel.template
index f3f25ed74a..98c8d605a6 100644
--- a/srcpkgs/systemd/systemd-devel.template
+++ b/srcpkgs/systemd/systemd-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'systemd-devel'.
 #
+depends="systemd-libs"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains development files and/or documentation."
 
 noarch=yes
-Add_dependency run systemd-libs
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/systemd/systemd-gnome-passwd-agent.template b/srcpkgs/systemd/systemd-gnome-passwd-agent.template
index 8300646257..9862645f6e 100644
--- a/srcpkgs/systemd/systemd-gnome-passwd-agent.template
+++ b/srcpkgs/systemd/systemd-gnome-passwd-agent.template
@@ -1,12 +1,12 @@
 # Template file for 'systemd-gnome-passwd-aggent'.
 #
+depends="systemd"
 short_desc="${sourcepkg} - GNOME password agent helper"
 long_desc="${long_desc}
 
  This package contains systemd-gnome-ask-password-agent, a GNOME
  helper to assist in password changes with systemd."
 
-Add_dependency run systemd
 
 do_install()
 {
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index e78597cfce..d43ca85df2 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--with-distro=other --with-rootprefix=
 --with-pamlibdir=/lib/security --disable-selinux --disable-tcpwrap
 --with-sysvinit-path= --with-sysvrcd-path= --disable-audit"
+depends="dbus run-parts kbd>=1.15.3_5"
+makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel libudev-devel pam-devel dbus-devel libcap-devel gtk+-devel libgee-devel libnotify-devel vala-devel libkmod-devel liblzma-devel cryptsetup-devel"
 short_desc="A system and service manager for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
@@ -39,27 +41,7 @@ make_dirs="
 /etc/local.d 0755 root root
 /var/lib/systemd 0755 root root"
 
-Add_dependency run dbus
-Add_dependency run run-parts
-Add_dependency run kbd ">=1.15.3_5" # switched to /usr.
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gperf
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build acl-devel
-Add_dependency build libudev-devel
-Add_dependency build pam-devel
-Add_dependency build dbus-devel
-Add_dependency build libcap-devel
-Add_dependency build gtk+-devel
-Add_dependency build libgee-devel
-Add_dependency build libnotify-devel
-Add_dependency build vala-devel
-Add_dependency build libkmod-devel
-Add_dependency build liblzma-devel
-Add_dependency build cryptsetup-devel
 
 pre_configure() {
 	sed -i -e "s|/bin/loadkeys|/usr/bin/loadkeys|g" Makefile.in
diff --git a/srcpkgs/t1lib/depends b/srcpkgs/t1lib/depends
deleted file mode 100644
index d678f8520d..0000000000
--- a/srcpkgs/t1lib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.1.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/t1lib/t1lib-devel.template b/srcpkgs/t1lib/t1lib-devel.template
index 5e0a22970f..2e98e405c3 100644
--- a/srcpkgs/t1lib/t1lib-devel.template
+++ b/srcpkgs/t1lib/t1lib-devel.template
@@ -1,12 +1,11 @@
 # Template file for 't1lib-devel'.
 #
+depends="libXaw-devel libt1"
 short_desc="Development files for the DjVu image format"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libXaw-devel
-Add_dependency run libt1
 
 do_install()
 {
diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template
index e4c797c1c5..77698938c8 100644
--- a/srcpkgs/t1lib/template
+++ b/srcpkgs/t1lib/template
@@ -6,6 +6,7 @@ distfiles="http://www.ibiblio.org/pub/Linux/libs/graphics/$pkgname-$version.tar.
 build_style=gnu-configure
 make_build_target="without_doc"
 revision=2
+makedepends="libXaw-devel"
 short_desc="Rasterizer library for Adobe Type 1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -19,4 +20,3 @@ long_desc="
 subpackages="libt1 ${pkgname}-devel"
 
 
-Add_dependency build libXaw-devel
diff --git a/srcpkgs/taglib/depends b/srcpkgs/taglib/depends
deleted file mode 100644
index 193fc43d2c..0000000000
--- a/srcpkgs/taglib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.6.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/taglib/taglib-devel.template b/srcpkgs/taglib/taglib-devel.template
index d520de838d..68c51b700e 100644
--- a/srcpkgs/taglib/taglib-devel.template
+++ b/srcpkgs/taglib/taglib-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'taglib-devel'.
 #
+depends="glibc-devel zlib-devel taglib"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run zlib-devel
-Add_dependency run taglib
 
 do_install()
 {
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index 82bbbb0bca..fe5dfed6a0 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -5,6 +5,7 @@ distfiles="http://developer.kde.org/~wheeler/files/src/$pkgname-$version.tar.gz"
 build_style=cmake
 configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
 revision=2
+makedepends="zlib-devel pkg-config cmake"
 short_desc="Library for accessing ID tags in various media files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a9ba089cc2c6d26d266bad492de31cadaeb878dea858e22ae3196091718f284b
@@ -14,6 +15,3 @@ long_desc="
  Vorbis comments and ID3 tags and Vorbis comments in FLAC files."
 
 subpackages="$pkgname-devel"
-Add_dependency build zlib-devel
-Add_dependency build pkg-config
-Add_dependency build cmake
diff --git a/srcpkgs/talloc/depends b/srcpkgs/talloc/depends
deleted file mode 100644
index f5b81e443e..0000000000
--- a/srcpkgs/talloc/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/talloc/talloc-devel.template b/srcpkgs/talloc/talloc-devel.template
index dac8811368..0af1294193 100644
--- a/srcpkgs/talloc/talloc-devel.template
+++ b/srcpkgs/talloc/talloc-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'talloc-devel'.
 #
+depends="pkg-config glibc-devel"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run glibc-devel
 
 do_install()
 {
diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index 75ed0d8a5b..bdb09a88d9 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -5,6 +5,7 @@ distfiles="http://samba.org/ftp/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-talloc-compat1 --enable-largefile"
 revision=2
+makedepends="pkg-config libxslt docbook-xsl"
 short_desc="Hierarchical pool based memory allocator with destructors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4
@@ -13,9 +14,6 @@ long_desc="
  allocator with destructors."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
 
 post_install()
 {
diff --git a/srcpkgs/tcc/template b/srcpkgs/tcc/template
index a3b0081355..9f3f41591d 100644
--- a/srcpkgs/tcc/template
+++ b/srcpkgs/tcc/template
@@ -4,6 +4,7 @@ version=0.9.25
 build_style=gnu-configure
 distfiles="${NONGNU_SITE}/tinycc/tcc-$version.tar.bz2"
 revision=1
+makedepends="perl"
 short_desc="The Tiny C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1bed6cb0fb2ef4100df1b94435d22863679e84cf419ec48ef96d9c0e9063de35
@@ -24,4 +25,3 @@ long_desc="
       line of your C source, and execute it directly from the command line.
     * With libtcc, you can use TCC as a backend for dynamic code generation."
 
-Add_dependency build perl # for pod2man
diff --git a/srcpkgs/tcl/depends b/srcpkgs/tcl/depends
deleted file mode 100644
index 55b9457dc9..0000000000
--- a/srcpkgs/tcl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=8.5.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/tcl/tcl-devel.template b/srcpkgs/tcl/tcl-devel.template
index 916fb7c32f..3dce663fea 100644
--- a/srcpkgs/tcl/tcl-devel.template
+++ b/srcpkgs/tcl/tcl-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'tcl-devel'.
 #
+depends="glibc-devel tcl"
 short_desc="TCL development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run tcl
 
 do_install()
 {
diff --git a/srcpkgs/tcp_wrappers/depends b/srcpkgs/tcp_wrappers/depends
deleted file mode 100644
index b834c38976..0000000000
--- a/srcpkgs/tcp_wrappers/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=7.6"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template b/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
index 58a105315d..86a8f3e8d4 100644
--- a/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
+++ b/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'tcp_wrappers-devel'.
 #
+depends="glibc-devel tcp_wrappers-libs"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run tcp_wrappers-libs
 
 do_install()
 {
diff --git a/srcpkgs/tdb/depends b/srcpkgs/tdb/depends
deleted file mode 100644
index b4422d83d2..0000000000
--- a/srcpkgs/tdb/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/tdb/tdb-devel.template b/srcpkgs/tdb/tdb-devel.template
index bfb701df6f..96ff3970d7 100644
--- a/srcpkgs/tdb/tdb-devel.template
+++ b/srcpkgs/tdb/tdb-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'tdb-devel'.
 #
+depends="libtdb"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libtdb
 
 do_install()
 {
diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index d84c6c27c3..3791157071 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -5,6 +5,7 @@ homepage="http://tdb.samba.org/"
 distfiles="http://samba.org/ftp/tdb/tdb-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config python-devel libxslt docbook-xsl"
 short_desc="Hierarchical pool based memory allocator with destructors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -16,7 +17,3 @@ long_desc="
 
 subpackages="libtdb tdb-devel tdb-python"
 
-Add_dependency build pkg-config
-Add_dependency build python-devel
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
diff --git a/srcpkgs/telepathy-butterfly/template b/srcpkgs/telepathy-butterfly/template
index 68cb691b2a..26e6d688bc 100644
--- a/srcpkgs/telepathy-butterfly/template
+++ b/srcpkgs/telepathy-butterfly/template
@@ -4,6 +4,7 @@ version=0.5.15
 revision=1
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+fulldepends="python papyon telepathy-python"
 short_desc="A MSN connection manager for Telepathy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d48eef7f938c2b5bb805dd6bbbcde673b1c6526ca15af6b5f8fe03d926d35b90
@@ -16,6 +17,3 @@ long_desc="
 pycompile_module="butterfly"
 noarch=yes
 
-Add_dependency full python
-Add_dependency full papyon
-Add_dependency full telepathy-python
diff --git a/srcpkgs/telepathy-farstream/depends b/srcpkgs/telepathy-farstream/depends
deleted file mode 100644
index 6ef2aa1c6b..0000000000
--- a/srcpkgs/telepathy-farstream/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template b/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template
index fa732f90f7..1c430111b4 100644
--- a/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template
+++ b/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template
@@ -1,15 +1,11 @@
 # Template file for 'telepathy-glib-devel'.
 #
+depends="dbus-glib-devel telepathy-glib-devel farstream-devel gstreamer-devel telepathy-farstream>=0.4.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run dbus-glib-devel
-Add_dependency run telepathy-glib-devel
-Add_dependency run farstream-devel
-Add_dependency run gstreamer-devel
-Add_dependency run telepathy-farstream ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template
index 996efcc885..4faac93de6 100644
--- a/srcpkgs/telepathy-farstream/template
+++ b/srcpkgs/telepathy-farstream/template
@@ -5,6 +5,7 @@ homepage="http://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static"
+makedepends="pkg-config intltool vala-devel libxslt gobject-introspection dbus-glib-devel telepathy-glib-devel farstream-devel python-devel pygobject2-devel gst-python-devel"
 short_desc="Telepathy library that uses Farstream to handle Call channels"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,14 +19,3 @@ long_desc="
 subpackages="$pkgname-devel"
 replaces="telepathy-farsight>=0"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build vala-devel
-Add_dependency build libxslt
-Add_dependency build gobject-introspection
-Add_dependency build dbus-glib-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build farstream-devel
-Add_dependency build python-devel
-Add_dependency build pygobject2-devel
-Add_dependency build gst-python-devel
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 1c74e5ec78..eef14a9563 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -6,6 +6,8 @@ distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
 --enable-handle-leak-debug --disable-debug --disable-static"
+depends="ca-certificates"
+makedepends="python pkg-config libxslt glib-devel dbus-devel dbus-glib-devel libxml2-devel sqlite-devel gnutls-devel telepathy-glib-devel libsoup-devel libnice-devel"
 short_desc="A Jabber/XMPP connection manager for Telepathy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -16,17 +18,4 @@ long_desc="
  differences between protocols to provide a unified interface for
  applications."
 
-Add_dependency run ca-certificates
 
-Add_dependency build python
-Add_dependency build pkg-config
-Add_dependency build libxslt
-Add_dependency build glib-devel
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build sqlite-devel
-Add_dependency build gnutls-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build libsoup-devel
-Add_dependency build libnice-devel
diff --git a/srcpkgs/telepathy-glib/depends b/srcpkgs/telepathy-glib/depends
deleted file mode 100644
index 693e46db55..0000000000
--- a/srcpkgs/telepathy-glib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.15.5"
-api_depends=">=0.18.0"
diff --git a/srcpkgs/telepathy-glib/telepathy-glib-devel.template b/srcpkgs/telepathy-glib/telepathy-glib-devel.template
index cbdd420b76..104d00c578 100644
--- a/srcpkgs/telepathy-glib/telepathy-glib-devel.template
+++ b/srcpkgs/telepathy-glib/telepathy-glib-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'telepathy-glib-devel'.
 #
+depends="vala-devel dbus-glib-devel telepathy-glib>=0.18.1"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run vala-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run telepathy-glib ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
index 384da07bce..cd1688c323 100644
--- a/srcpkgs/telepathy-glib/template
+++ b/srcpkgs/telepathy-glib/template
@@ -5,6 +5,7 @@ homepage="http://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-vala-bindings --disable-static"
+makedepends="pkg-config intltool vala-devel libxslt gobject-introspection dbus-glib-devel"
 short_desc="Library for GLib-based Telepathy components"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -17,9 +18,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build vala-devel
-Add_dependency build libxslt
-Add_dependency build gobject-introspection
-Add_dependency build dbus-glib-devel
diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template
index 7b5f3252fe..330e532138 100644
--- a/srcpkgs/telepathy-idle/template
+++ b/srcpkgs/telepathy-idle/template
@@ -5,6 +5,7 @@ homepage="http://telepathy.freedesktop.org"
 distfiles="${homepage}/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config python libxslt glib-devel openssl-devel dbus-glib-devel telepathy-glib-devel"
 short_desc="An IRC connection manager for Telepathy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -15,10 +16,3 @@ long_desc="
  differences between protocols to provide a unified interface for
  applications."
 
-Add_dependency build pkg-config
-Add_dependency build python
-Add_dependency build libxslt
-Add_dependency build glib-devel
-Add_dependency build openssl-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build telepathy-glib-devel
diff --git a/srcpkgs/telepathy-logger/depends b/srcpkgs/telepathy-logger/depends
deleted file mode 100644
index 3913996189..0000000000
--- a/srcpkgs/telepathy-logger/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.2.12" # call support
-api_depends=">=0.4.0"
diff --git a/srcpkgs/telepathy-logger/telepathy-logger-devel.template b/srcpkgs/telepathy-logger/telepathy-logger-devel.template
index f2962eb1fd..641a047ab7 100644
--- a/srcpkgs/telepathy-logger/telepathy-logger-devel.template
+++ b/srcpkgs/telepathy-logger/telepathy-logger-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'telepathy-logger-devel'.
 #
+depends="libxml2-devel telepathy-glib-devel telepathy-logger>=0.4.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxml2-devel
-Add_dependency run telepathy-glib-devel
-Add_dependency run telepathy-logger ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template
index 7328eab7b2..7181481625 100644
--- a/srcpkgs/telepathy-logger/template
+++ b/srcpkgs/telepathy-logger/template
@@ -4,6 +4,7 @@ version=0.4.0
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
+makedepends="pkg-config intltool libxslt gobject-introspection dbus-glib-devel libxml2-devel sqlite-devel telepathy-glib-devel"
 short_desc="Telepathy framework logging daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://telepathy.freedesktop.org/wiki/Logger"
@@ -17,11 +18,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build gobject-introspection
-Add_dependency build dbus-glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build sqlite-devel
-Add_dependency build telepathy-glib-devel
diff --git a/srcpkgs/telepathy-mission-control/depends b/srcpkgs/telepathy-mission-control/depends
deleted file mode 100644
index b4fbea9ebb..0000000000
--- a/srcpkgs/telepathy-mission-control/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.9.2"
-api_depends=">=5.12.0"
diff --git a/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template b/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
index 12432eba20..26172d783b 100644
--- a/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
+++ b/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'telepathy-mission-control-devel'.
 #
+depends="pkg-config libgnome-keyring-devel telepathy-glib-devel telepathy-mission-control>=5.12.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run libgnome-keyring-devel
-Add_dependency run telepathy-glib-devel
-Add_dependency run telepathy-mission-control ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template
index 5ccf8102d9..b8c0206dd1 100644
--- a/srcpkgs/telepathy-mission-control/template
+++ b/srcpkgs/telepathy-mission-control/template
@@ -6,6 +6,7 @@ distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-gnome-keyring
 --disable-schemas-compile"
+makedepends="pkg-config intltool libxslt libgnome-keyring-devel telepathy-glib-devel NetworkManager-devel upower-devel"
 short_desc="Telepathy component providing abstraction for details of connection managers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -18,11 +19,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build libgnome-keyring-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build upower-devel
 
diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template
index 5a74aa086e..ca6fa2d148 100644
--- a/srcpkgs/telepathy-python/template
+++ b/srcpkgs/telepathy-python/template
@@ -4,6 +4,8 @@ version=0.15.19
 revision=2
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="libxslt"
+fulldepends="python dbus-python"
 short_desc="Python libraries for use in Telepathy clients and connection managers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376
@@ -16,6 +18,3 @@ long_desc="
 pycompile_module="telepathy"
 noarch=yes
 
-Add_dependency build libxslt
-Add_dependency full python
-Add_dependency full dbus-python
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index c0c0f56362..30c3214b87 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -5,6 +5,8 @@ distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.
 build_style=gnu-configure
 configure_args="--disable-tests --disable-debug --disable-plugins --with-tls=openssl
 --disable-avahi-tests --disable-static"
+depends="avahi"
+makedepends="pkg-config xmldiff avahi-glib-libs-devel libsoup-devel telepathy-glib-devel openssl-devel libuuid-devel sqlite-devel"
 short_desc="A link-local XMPP connection manager for Telepathy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://telepathy.freedesktop.org"
@@ -16,13 +18,4 @@ long_desc="
  differences between protocols to provide a unified interface for
  applications."
 
-Add_dependency run avahi
 
-Add_dependency build pkg-config
-Add_dependency build xmldiff
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build libsoup-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build openssl-devel
-Add_dependency build libuuid-devel
-Add_dependency build sqlite-devel
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index e347b68dad..1a72053bf8 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -4,6 +4,8 @@ version=6.13
 distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-ewf --enable-sudo"
+makedepends="jpeg-devel libuuid-devel e2fsprogs-devel openssl-devel ntfs-3g-devel"
+fulldepends="sudo"
 short_desc="Powerful free data recovery software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -27,9 +29,3 @@ long_desc="
     Undelete files from FAT, exFAT, NTFS and ext2 filesystem
     Copy files from deleted FAT, exFAT, NTFS and ext2/ext3/ext4 partitions."
 
-Add_dependency full sudo
-Add_dependency build jpeg-devel
-Add_dependency build libuuid-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build openssl-devel
-Add_dependency build ntfs-3g-devel
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index 6da934cf32..075f51b86d 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -6,6 +6,8 @@ wrksrc="$pkgname-4.13"
 homepage="http://www.gnu.org/software/texinfo/"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+makedepends="ncurses-devel"
+fulldepends="gzip"
 short_desc="The GNU Documentation System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -16,8 +18,6 @@ long_desc="
  on Brian Reid's Scribe and other formatting languages of the time. It is
  used by many non-GNU projects as well."
 
-Add_dependency full gzip
-Add_dependency build ncurses-devel
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/info/dir
diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index fbe755d175..1e595022cd 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -4,6 +4,8 @@ version=0.8.0
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/thunar-volman/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool gtk+-devel libgudev-devel libnotify-devel libxfce4util-devel libxfce4ui-devel xfconf-devel exo-devel"
 short_desc="Thunar Volume Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,15 +20,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libgudev-devel
-Add_dependency build libnotify-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build xfconf-devel
-Add_dependency build exo-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/tiff/depends b/srcpkgs/tiff/depends
deleted file mode 100644
index 487aa86df2..0000000000
--- a/srcpkgs/tiff/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index 88d521d6eb..7cf6773989 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -5,6 +5,7 @@ homepage="http://www.remotesensing.org/libtiff/"
 distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
+makedepends="zlib-devel jpeg-devel liblzma-devel"
 short_desc="Library and tools for reading and writing TIFF data files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -22,6 +23,3 @@ long_desc="
  esoteric portions of the 6.0 TIFF spec."
 
 subpackages="$pkgname-devel"
-Add_dependency build zlib-devel
-Add_dependency build jpeg-devel
-Add_dependency build liblzma-devel
diff --git a/srcpkgs/tiff/tiff-devel.template b/srcpkgs/tiff/tiff-devel.template
index d5f7400939..c012e2fd78 100644
--- a/srcpkgs/tiff/tiff-devel.template
+++ b/srcpkgs/tiff/tiff-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'tiff-devel'.
 #
+depends="zlib-devel jpeg-devel tiff"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run jpeg-devel
-Add_dependency run tiff
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/time/template b/srcpkgs/time/template
index 44eb30e6c0..ed105dc698 100644
--- a/srcpkgs/time/template
+++ b/srcpkgs/time/template
@@ -3,6 +3,7 @@ pkgname=time
 version=1.7
 distfiles="$GNU_SITE/$pkgname/$pkgname-$version.tar.gz"
 revision=1
+makedepends="glibc-devel"
 short_desc="The GNU time program for measuring cpu resource usage"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://directory.fsf.org/project/time"
@@ -15,7 +16,6 @@ long_desc="
 	which it is shown, or have time save the information in a file instead of
 	display it on the screen."
 
-Add_dependency build glibc-devel
 
 do_build()
 {
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index a04e1596a3..0b89cb7e0e 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -5,6 +5,7 @@ distfiles="${SOURCEFORGE_SITE}/tmux/tmux-$version.tar.gz"
 build_style=gnu-configure
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"
+makedepends="ncurses-devel libevent-devel"
 short_desc="Terminal Multiplexer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://tmux.sourceforge.net"
@@ -16,5 +17,3 @@ long_desc="
  a single screen. tmux may be detached from a screen and continue running in
  the background, then later reattached."
 
-Add_dependency build ncurses-devel
-Add_dependency build libevent-devel
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index b44975e3e0..d97dd184a5 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -4,6 +4,8 @@ version=0.2.2.35
 homepage="http://www.torproject.org/"
 distfiles="http://www.torproject.org/dist/tor-$version.tar.gz"
 build_style=gnu-configure
+makedepends="zlib-devel openssl-devel libevent-devel"
+fulldepends="ca-certificates tsocks"
 short_desc="Anonymity Online"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -22,11 +24,6 @@ systemd_services="tor.service on"
 system_accounts="tor"
 tor_homedir="/var/lib/tor"
 
-Add_dependency build zlib-devel
-Add_dependency build openssl-devel
-Add_dependency build libevent-devel
-Add_dependency full ca-certificates
-Add_dependency full tsocks
 
 post_install() {
 	# Use our own default config file.
diff --git a/srcpkgs/totem-pl-parser/depends b/srcpkgs/totem-pl-parser/depends
deleted file mode 100644
index 101d86f6e6..0000000000
--- a/srcpkgs/totem-pl-parser/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.32.0"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index 89cc17fbbe..05b46cdec5 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -4,6 +4,7 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-quvi --enable-libarchive --enable-libgcrypt"
+makedepends="pkg-config intltool gobject-introspection libsoup-gnome-devel glib-devel gmime-devel libarchive-devel libgcrypt-devel libquvi-devel"
 short_desc="Totem playlist parser library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7b336f599610898beca8238408c9c8e1f1f264602cefb2d1f5601acf9a261ecd
@@ -13,12 +14,3 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build libsoup-gnome-devel
-Add_dependency build glib-devel
-Add_dependency build gmime-devel
-Add_dependency build libarchive-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libquvi-devel
diff --git a/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template b/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template
index 22d6eeffc7..39afd21850 100644
--- a/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template
+++ b/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template
@@ -1,16 +1,11 @@
 # Template file for 'totem-pl-parser-devel'.
 #
+depends="glib-devel libxml2-devel gmime-devel libquvi-devel libgcrypt-devel totem-pl-parser>=3.4.2"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run gmime-devel
-Add_dependency run libquvi-devel
-Add_dependency run libgcrypt-devel
-Add_dependency run totem-pl-parser ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/totem/depends b/srcpkgs/totem/depends
deleted file mode 100644
index 13ec5d9828..0000000000
--- a/srcpkgs/totem/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.7"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index d84f8750fa..4d1a3a2427 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -5,6 +5,8 @@ distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 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"
 short_desc="A GNOME2 integrated movie player based on Gstreamer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -40,30 +42,5 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 # XXX reenable python plugin if pylint pkg exists.
 #pycompile_dirs="usr/lib/totem/plugins"
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gnutls-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build totem-pl-parser-devel
-Add_dependency build nautilus-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build libsoup-devel
-Add_dependency build mx-devel
 #Add_dependency build pygobject-devel
-Add_dependency build clutter-gst-devel
-Add_dependency build clutter-gtk-devel
-Add_dependency build libpeas-devel
-Add_dependency build libXtst-devel
-Add_dependency build grilo-devel
-Add_dependency build libepc-devel
 
-Add_dependency full grilo-plugins
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
-Add_dependency full gst-ffmpeg
-Add_dependency full gst-plugins-bad
-Add_dependency full gst-plugins-ugly
-Add_dependency full gst-plugins-good
diff --git a/srcpkgs/totem/totem-devel.template b/srcpkgs/totem/totem-devel.template
index 830c9ac57d..a9d2e9a6c9 100644
--- a/srcpkgs/totem/totem-devel.template
+++ b/srcpkgs/totem/totem-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'totem-devel'.
 #
+depends="gtk+3-devel totem-pl-parser-devel totem>=3.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run totem-pl-parser-devel
-Add_dependency run totem ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/tracker/depends b/srcpkgs/tracker/depends
deleted file mode 100644
index 3d77fdf442..0000000000
--- a/srcpkgs/tracker/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.14.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index d5bc4a6c0b..b2272308a3 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -6,6 +6,7 @@ distfiles="${GNOME_SITE}/$pkgname/0.14/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests
 --enable-libtiff --disable-static --enable-network-manager"
+makedepends="pkg-config intltool gobject-introspection libgee-devel libgnome-keyring-devel upower-devel exempi-devel poppler-glib-devel libgsf-devel icu-devel enca-devel libvorbis-devel libflac-devel nautilus-devel gnome-panel-devel taglib-devel giflib-devel totem-pl-parser-devel gupnp-dlna-devel libexif-devel tiff-devel network-manager-applet-devel"
 short_desc="Personal search tool and storage system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,25 +23,3 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel libtracker"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gobject-introspection
-Add_dependency build libgee-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build upower-devel
-Add_dependency build exempi-devel
-Add_dependency build poppler-glib-devel
-Add_dependency build libgsf-devel
-Add_dependency build icu-devel
-Add_dependency build enca-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libflac-devel
-Add_dependency build nautilus-devel
-Add_dependency build gnome-panel-devel
-Add_dependency build taglib-devel
-Add_dependency build giflib-devel
-Add_dependency build totem-pl-parser-devel
-Add_dependency build gupnp-dlna-devel
-Add_dependency build libexif-devel
-Add_dependency build tiff-devel
-Add_dependency build network-manager-applet-devel
diff --git a/srcpkgs/tracker/tracker-devel.template b/srcpkgs/tracker/tracker-devel.template
index 05021525b9..07e298fe4c 100644
--- a/srcpkgs/tracker/tracker-devel.template
+++ b/srcpkgs/tracker/tracker-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'tracker-devel'.
 #
+depends="glib-devel libtracker"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run libtracker
 
 do_install()
 {
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 3911b5e169..f0a888f96d 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -4,6 +4,8 @@ version=2.52
 distfiles="http://download.transmissionbt.com/files/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool zlib-devel openssl-devel dbus-glib-devel libcurl-devel libevent-devel gtk+3-devel"
 short_desc="A fast, easy, and free BitTorrent client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.transmissionbt.com/"
@@ -16,14 +18,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build zlib-devel
-Add_dependency build openssl-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libcurl-devel
-Add_dependency build libevent-devel
-Add_dependency build gtk+3-devel
diff --git a/srcpkgs/tumbler/depends b/srcpkgs/tumbler/depends
deleted file mode 100644
index 171cfd569d..0000000000
--- a/srcpkgs/tumbler/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.9.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index fe39fea557..cf022c3e00 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -4,6 +4,7 @@ version=0.1.25
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/$pkgname/0.1/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+-devel dbus-glib-devel jpeg-devel libgsf-devel poppler-glib-devel gst-plugins-base-devel"
 short_desc="D-Bus Thumbnailer service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,11 +20,3 @@ long_desc="
 subpackages="tumbler-devel"
 
 # XXX: missing support: libopenraw, ffmpegthumbnailer
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build jpeg-devel
-Add_dependency build libgsf-devel
-Add_dependency build poppler-glib-devel
-Add_dependency build gst-plugins-base-devel
diff --git a/srcpkgs/tumbler/tumbler-devel.template b/srcpkgs/tumbler/tumbler-devel.template
index 554d43febe..3338be5522 100644
--- a/srcpkgs/tumbler/tumbler-devel.template
+++ b/srcpkgs/tumbler/tumbler-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'tumbler-devel'.
 #
+depends="glib-devel tumbler>=0.1.25"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run tumbler ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 9c4ea6f50e..2ff2fea5d2 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -10,6 +10,7 @@ ftp://munnari.oz.au/pub/tzcode${_tzcode_ver}.tar.gz
 ftp://munnari.oz.au/pub/tzdata${_tzdata_ver}.tar.gz"
 build_style=gnu-makefile
 homepage="http://www.iana.org/time-zones"
+depends="bash gawk"
 short_desc="Time zone and daylight-saving time data"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,8 +23,6 @@ long_desc="
  updated periodically to reflect changes made by political bodies to time
  zone boundaries, UTC offsets, and daylight-saving rules."
 
-Add_dependency run bash
-Add_dependency run gawk
 
 post_install() {
 	# Remove useless stuff
diff --git a/srcpkgs/udev/depends b/srcpkgs/udev/depends
deleted file mode 100644
index 1a8b6a4bd5..0000000000
--- a/srcpkgs/udev/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=149"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template
index d27a67d1fe..d4cde4d4d1 100644
--- a/srcpkgs/udev/libudev-devel.template
+++ b/srcpkgs/udev/libudev-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'libudev-devel'.
 #
+depends="glibc-devel libudev"
 short_desc="libudev development files"
 long_desc="${long_desc}
 
  This package contains the files needed for developing applications
  that use libudev."
 
-Add_dependency run glibc-devel
-Add_dependency run libudev
 
 do_install()
 {
diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template
index 5bd1a4a8e9..ebb83d2c1a 100644
--- a/srcpkgs/udev/template
+++ b/srcpkgs/udev/template
@@ -8,6 +8,8 @@ configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib
 --with-systemdsystemunitdir=/lib/systemd/system --disable-gudev
 --disable-static --disable-rule-generator
 --with-firmware-path=/lib/firmware/updates:/lib/firmware"
+makedepends="pkg-config gperf libxslt libblkid-devel libkmod-devel"
+fulldepends="usbutils>=0.82 pciutils"
 short_desc="/dev/ and hotplug management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -21,14 +23,7 @@ systemd_services="udev.service on"
 conf_files="/etc/udev/udev.conf"
 subpackages="libudev libudev-devel"
 
-Add_dependency build pkg-config
-Add_dependency build gperf
-Add_dependency build libxslt
-Add_dependency build libblkid-devel
-Add_dependency build libkmod-devel
 
-Add_dependency full usbutils	">=0.82"
-Add_dependency full pciutils
 
 post_install() {
         # Install the initramfs-tools hook/scripts.
diff --git a/srcpkgs/udisks/depends b/srcpkgs/udisks/depends
deleted file mode 100644
index 0dcb50045f..0000000000
--- a/srcpkgs/udisks/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template
index 71e98cc1e4..50723dc109 100644
--- a/srcpkgs/udisks/template
+++ b/srcpkgs/udisks/template
@@ -5,6 +5,8 @@ revision=6
 distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-lvm2"
+depends="udev"
+makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel dbus-glib-devel libgudev-devel sg3_utils-devel"
 short_desc="Disk Management Service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/udisks"
@@ -23,20 +25,7 @@ long_desc="
 systemd_services="udisks.service on"
 make_dirs="/var/lib/udisks 0750 root root"
 
-Add_dependency run udev
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build device-mapper-devel
-Add_dependency build liblvm2app-devel
-Add_dependency build libparted-devel
-Add_dependency build libatasmart-devel
-Add_dependency build polkit-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libgudev-devel
-Add_dependency build sg3_utils-devel
 
 pre_build() {
 	# Fix location for bash completion stuff.
diff --git a/srcpkgs/udisks2/depends b/srcpkgs/udisks2/depends
deleted file mode 100644
index 1ce20b8e28..0000000000
--- a/srcpkgs/udisks2/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.93.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
index bbea9ba230..514e0f6ab9 100644
--- a/srcpkgs/udisks2/template
+++ b/srcpkgs/udisks2/template
@@ -5,6 +5,8 @@ wrksrc="udisks-${version}"
 distfiles="http://udisks.freedesktop.org/releases/udisks-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static --with-systemdsystemunitdir=/lib/systemd/system"
+depends="udev"
+makedepends="pkg-config intltool libxslt docbook-xsl acl-devel device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel"
 short_desc="Disk Management Service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/udisks"
@@ -23,17 +25,4 @@ long_desc="
 subpackages="udisks2-devel"
 make_dirs="/var/lib/udisks2 0750 root root"
 
-Add_dependency run udev
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build acl-devel
-Add_dependency build device-mapper-devel
-Add_dependency build liblvm2app-devel
-Add_dependency build libparted-devel
-Add_dependency build libatasmart-devel
-Add_dependency build polkit-devel
-Add_dependency build libgudev-devel
-Add_dependency build sg3_utils-devel
diff --git a/srcpkgs/udisks2/udisks2-devel.template b/srcpkgs/udisks2/udisks2-devel.template
index 597d05e6ea..46e93c5d10 100644
--- a/srcpkgs/udisks2/udisks2-devel.template
+++ b/srcpkgs/udisks2/udisks2-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'udisks2-devel'.
 #
+depends="glib-devel udisks2>=1.97.0"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run udisks2 ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 417d161d9b..3517b2301a 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -4,6 +4,8 @@ version=0.30.1
 revision=5
 distfiles="http://launchpad.net/ufw/0.30/$version/+download/$pkgname-$version.tar.gz"
 build_style=python-module
+depends="iptables python"
+makedepends="python iptables"
 short_desc="Uncomplicated Firewall"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://launchpad.net/ufw"
@@ -18,10 +20,6 @@ noarch=yes
 pycompile_module="ufw"
 conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
 
-Add_dependency run iptables
-Add_dependency run python
-Add_dependency build python
-Add_dependency build iptables
 
 post_install()
 {
diff --git a/srcpkgs/uml-utilities/template b/srcpkgs/uml-utilities/template
index d1a380f94e..d9df7c2481 100644
--- a/srcpkgs/uml-utilities/template
+++ b/srcpkgs/uml-utilities/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc=tools-${version}
 distfiles="http://user-mode-linux.sourceforge.net/uml_utilities_${version}.tar.bz2"
 build_style=gnu-makefile
+makedepends="readline-devel ncurses-devel fuse-devel"
 short_desc="User Mode Linux Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e
@@ -17,9 +18,6 @@ long_desc="
  This package contains userspace utilities for use with User-mode Linux,
  including uml_mconsole, uml_moo, uml_switch, uml_net and tunctl."
 
-Add_dependency build readline-devel
-Add_dependency build ncurses-devel
-Add_dependency build fuse-devel
 
 pre_build()
 {
diff --git a/srcpkgs/upower/depends b/srcpkgs/upower/depends
deleted file mode 100644
index 2ace6d3fb1..0000000000
--- a/srcpkgs/upower/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.9.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index 7ce2241958..28dc5637a8 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -6,6 +6,9 @@ distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-backend=linux
 --with-systemdsystemunitdir=/lib/systemd/system"
+depends="dbus"
+makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection libusb-devel libgudev-devel dbus-glib-devel polkit-devel"
+fulldepends="udev pm-utils"
 short_desc="Abstraction for enumerating power devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -21,17 +24,5 @@ systemd_services="upower.service on"
 conf_files="/etc/UPower/UPower.conf"
 subpackages="upower-devel"
 
-Add_dependency run dbus
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxslt
-Add_dependency build docbook-xsl
-Add_dependency build gobject-introspection
-Add_dependency build libusb-devel
-Add_dependency build libgudev-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build polkit-devel
 
-Add_dependency full udev
-Add_dependency full pm-utils
diff --git a/srcpkgs/upower/upower-devel.template b/srcpkgs/upower/upower-devel.template
index 7f241016a6..c57973eeb1 100644
--- a/srcpkgs/upower/upower-devel.template
+++ b/srcpkgs/upower/upower-devel.template
@@ -1,22 +1,12 @@
 # Template file for 'upower-devel'.
 #
+depends="pkg-config intltool libxslt docbook-xsl libusb-compat-devel glib-devel libgudev-devel dbus-devel dbus-glib-devel polkit-devel upower"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains the files needed for developing applications
  that use UPower."
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run libxslt
-Add_dependency run docbook-xsl
-Add_dependency run libusb-compat-devel
-Add_dependency run glib-devel
-Add_dependency run libgudev-devel
-Add_dependency run dbus-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run polkit-devel
-Add_dependency run upower
 
 do_install()
 {
diff --git a/srcpkgs/urlgrabber/template b/srcpkgs/urlgrabber/template
index 5d1c20d533..a9454827a4 100644
--- a/srcpkgs/urlgrabber/template
+++ b/srcpkgs/urlgrabber/template
@@ -4,6 +4,7 @@ version=3.9.1
 revision=1
 distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz"
 build_style=python-module
+fulldepends="python>=0 pycurl"
 short_desc="A high-level cross-protocol url-grabber and Python library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0
@@ -19,5 +20,3 @@ long_desc="
 noarch=yes
 pycompile_module="$pkgname"
 
-Add_dependency full python ">=0"
-Add_dependency full pycurl
diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index 5d3f1393a2..f5a5008447 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -4,6 +4,7 @@ version=005
 homepage="http://linux-usb.sourceforge.net/"
 #distfiles="${KERNEL_SITE}/utils/usb/$pkgname/$pkgname-$version.tar.bz2"
 distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.bz2"
+makedepends="pkg-config which libusb-devel libusb-compat-devel"
 short_desc="Linux USB utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,10 +13,6 @@ long_desc="
  This package contains utilities for inspecting devices connected to a
  USB bus."
 
-Add_dependency build pkg-config
-Add_dependency build which
-Add_dependency build libusb-devel
-Add_dependency build libusb-compat-devel
 
 do_build() {
 	rm usb.ids
diff --git a/srcpkgs/util-linux/depends b/srcpkgs/util-linux/depends
deleted file mode 100644
index f1429dbc70..0000000000
--- a/srcpkgs/util-linux/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.18"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/util-linux/libblkid-devel.template b/srcpkgs/util-linux/libblkid-devel.template
index 61b23ffa5d..d0d7ac385c 100644
--- a/srcpkgs/util-linux/libblkid-devel.template
+++ b/srcpkgs/util-linux/libblkid-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libblkid-devel'.
 #
+depends="zlib-devel libuuid-devel libblkid"
 short_desc="libblkid development files"
 long_desc="
  libblkid contains a library to handle device identification
@@ -7,9 +8,6 @@ long_desc="
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run zlib-devel
-Add_dependency run libuuid-devel
-Add_dependency run libblkid
 
 do_install()
 {
diff --git a/srcpkgs/util-linux/libmount-devel.template b/srcpkgs/util-linux/libmount-devel.template
index 9911e9cc27..3eb0f9c2dd 100644
--- a/srcpkgs/util-linux/libmount-devel.template
+++ b/srcpkgs/util-linux/libmount-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libmount-devel'.
 #
+depends="glibc-devel libuuid-devel libblkid-devel libmount"
 short_desc="mount(8) library development files"
 long_desc="
  This NEW LIBRARY is designed to be used in low-level utils like
@@ -8,10 +9,6 @@ long_desc="
  
  This packages contains files for development, static files, headers, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libuuid-devel
-Add_dependency run libblkid-devel
-Add_dependency run libmount
 
 do_install()
 {
diff --git a/srcpkgs/util-linux/libuuid-devel.template b/srcpkgs/util-linux/libuuid-devel.template
index 4b075558e3..19304da654 100644
--- a/srcpkgs/util-linux/libuuid-devel.template
+++ b/srcpkgs/util-linux/libuuid-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libuuid-devel'.
 #
+depends="glibc-devel libuuid"
 short_desc="UUID library development files"
 long_desc="
  libuuid generates and parses 128-bit universally unique id's (UUIDs).
@@ -7,8 +8,6 @@ long_desc="
  
  This packages contains files for development, static files, headers, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libuuid
 
 do_install()
 {
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index d457d4a856..03880a6c6b 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,6 +2,8 @@
 pkgname=util-linux
 version=2.21.1
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.21/${pkgname}-${version}.tar.xz"
+depends="coreutils shadow"
+makedepends="pkg-config zlib-devel ncurses-devel"
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@@ -16,12 +18,7 @@ replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1"
 subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel"
 make_dirs="/var/lib/hwclock 0755 0 0"
 
-Add_dependency run coreutils
-Add_dependency run shadow
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build ncurses-devel
 
 do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} \
diff --git a/srcpkgs/v4l-utils/depends b/srcpkgs/v4l-utils/depends
deleted file mode 100644
index cc44b7ef8a..0000000000
--- a/srcpkgs/v4l-utils/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.8.5"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template
index c39c6f7592..e449a1860b 100644
--- a/srcpkgs/v4l-utils/template
+++ b/srcpkgs/v4l-utils/template
@@ -3,6 +3,8 @@ pkgname=v4l-utils
 version=0.8.5
 revision=5
 distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2"
+depends="sysfsutils"
+makedepends="which jpeg-devel libsysfs-devel qt-devel libstdc++-devel"
 short_desc="Userspace tools and libraries for Video 4 Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freshmeat.net/projects/libv4l"
@@ -28,13 +30,7 @@ long_desc="
 conf_files="/etc/rc_maps.cfg"
 subpackages="$pkgname-devel qv4l2"
 
-Add_dependency run sysfsutils
 
-Add_dependency build which
-Add_dependency build jpeg-devel
-Add_dependency build libsysfs-devel
-Add_dependency build qt-devel
-Add_dependency build libstdc++-devel
 
 do_build()
 {
diff --git a/srcpkgs/v4l-utils/v4l-utils-devel.template b/srcpkgs/v4l-utils/v4l-utils-devel.template
index e0e6759c05..e146c6083c 100644
--- a/srcpkgs/v4l-utils/v4l-utils-devel.template
+++ b/srcpkgs/v4l-utils/v4l-utils-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libv4l-devel'.
 #
+depends="jpeg-devel libsysfs-devel v4l-utils"
 short_desc="${short_desc} - development files"
 long_desc="
  ${long_desc}
 
  This package contains development files: headers, static libs, etc."
 
-Add_dependency run jpeg-devel
-Add_dependency run libsysfs-devel
-Add_dependency run v4l-utils
 
 do_install()
 {
diff --git a/srcpkgs/v8/depends b/srcpkgs/v8/depends
deleted file mode 100644
index 315d69b743..0000000000
--- a/srcpkgs/v8/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.9.8"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template
index e0fc362308..749b55d2db 100644
--- a/srcpkgs/v8/template
+++ b/srcpkgs/v8/template
@@ -2,6 +2,7 @@
 pkgname=v8
 version=3.9.8
 distfiles="http://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-$version.tar.bz2"
+makedepends="python readline-devel"
 short_desc="V8 JavaScript Engine"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://code.google.com/p/v8/"
@@ -21,8 +22,6 @@ long_desc="
 
 subpackages="${pkgname}-devel lib${pkgname}"
 
-Add_dependency build python
-Add_dependency build readline-devel
 
 do_build()
 {
diff --git a/srcpkgs/v8/v8-devel.template b/srcpkgs/v8/v8-devel.template
index 43d7d61a38..4c23fd84bd 100644
--- a/srcpkgs/v8/v8-devel.template
+++ b/srcpkgs/v8/v8-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'v8-devel'.
 #
+depends="libv8"
 short_desc="${short_desc} (Development headers)"
 long_desc="${long_desc}
 
  This package contains the v8 development headers."
 
-Add_dependency run libv8
 
 do_install()
 {
diff --git a/srcpkgs/vala/depends b/srcpkgs/vala/depends
deleted file mode 100644
index 911971baf6..0000000000
--- a/srcpkgs/vala/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.15.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index fbe750ca41..350831487b 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -4,6 +4,7 @@ version=0.16.0
 distfiles="${GNOME_SITE}/vala/0.16/vala-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-vapigen"
+makedepends="pkg-config flex libxslt>=0 glib-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Vala"
@@ -17,7 +18,3 @@ long_desc="
 
 subpackages="libvala vala-devel"
 
-Add_dependency build pkg-config
-Add_dependency build flex
-Add_dependency build libxslt	">=0"
-Add_dependency build glib-devel
diff --git a/srcpkgs/vala/vala-devel.template b/srcpkgs/vala/vala-devel.template
index 03d74a2f41..48e8938cc3 100644
--- a/srcpkgs/vala/vala-devel.template
+++ b/srcpkgs/vala/vala-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'vala-devel'.
 #
+depends="pkg-config glib-devel libvala>=0.16.0 vala>=0.16.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run glib-devel
-Add_dependency run libvala	">=${version}"
-Add_dependency run vala		">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index a6647531b0..7b05633704 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -4,6 +4,7 @@ version=0.6.5
 homepage="http://radare.org"
 distfiles="$homepage/get/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
+makedepends="pkg-config vala-devel glib-devel"
 short_desc="Tool to transform vala source files to swig, GIR or GEAR"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-3"
@@ -19,6 +20,3 @@ long_desc="
 
 disable_parallel_build=yes
 
-Add_dependency build pkg-config
-Add_dependency build vala-devel
-Add_dependency build glib-devel
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 2ca38e35a7..94a6b2c904 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -4,6 +4,8 @@ version=3.7.0
 distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-tls --with-mpicc=/dev/null"
+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/"
@@ -17,5 +19,3 @@ long_desc="
  detect a lot of problems that are otherwise very hard to find/diagnose."
 
 subpackages="$pkgname-devel"
-Add_dependency full perl	">=0"
-Add_dependency build pkg-config
diff --git a/srcpkgs/valgrind/valgrind-devel.template b/srcpkgs/valgrind/valgrind-devel.template
index 50357bc61f..712d5bd6f8 100644
--- a/srcpkgs/valgrind/valgrind-devel.template
+++ b/srcpkgs/valgrind/valgrind-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'valgrind-devel'.
 #
+depends="valgrind"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run valgrind
 
 do_install()
 {
diff --git a/srcpkgs/vamp-plugin-sdk/depends b/srcpkgs/vamp-plugin-sdk/depends
deleted file mode 100644
index 8a68c701ce..0000000000
--- a/srcpkgs/vamp-plugin-sdk/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/vamp-plugin-sdk/template b/srcpkgs/vamp-plugin-sdk/template
index 205eb18893..1b32c00cf0 100644
--- a/srcpkgs/vamp-plugin-sdk/template
+++ b/srcpkgs/vamp-plugin-sdk/template
@@ -5,6 +5,7 @@ homepage="http://www.vamp-plugins.org/"
 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"
@@ -16,8 +17,6 @@ long_desc="
 
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency build pkg-config
-Add_dependency build libsndfile-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/vamp-plugin-sdk/vamp-plugin-sdk-devel.template b/srcpkgs/vamp-plugin-sdk/vamp-plugin-sdk-devel.template
index 086b57cb9f..ac29e7e63d 100644
--- a/srcpkgs/vamp-plugin-sdk/vamp-plugin-sdk-devel.template
+++ b/srcpkgs/vamp-plugin-sdk/vamp-plugin-sdk-devel.template
@@ -1,12 +1,11 @@
 # 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."
 
-Add_dependency run libsndfile-devel
-Add_dependency run lib${sourcepkg}
 
 do_install()
 {
diff --git a/srcpkgs/vbetool/template b/srcpkgs/vbetool/template
index 6c901b557c..18f89a783c 100644
--- a/srcpkgs/vbetool/template
+++ b/srcpkgs/vbetool/template
@@ -5,6 +5,8 @@ revision=2
 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"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4d26ddc43144593742349e69481e3536ce3482faaa9ad4494fdc7c8b7662f954
@@ -13,7 +15,3 @@ long_desc="
  able to alter DPMS states, save/restore video card state and attempt to
  initialize the video card from scratch."
 
-Add_dependency run pciutils
-Add_dependency build zlib-devel
-Add_dependency build libx86-devel
-Add_dependency build pciutils-devel
diff --git a/srcpkgs/vdpau-video/template b/srcpkgs/vdpau-video/template
index ef9ed9e82d..445327b3f1 100644
--- a/srcpkgs/vdpau-video/template
+++ b/srcpkgs/vdpau-video/template
@@ -5,6 +5,7 @@ homepage="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/"
 distfiles="${homepage}/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+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"
@@ -12,7 +13,3 @@ checksum=28f66adc7d87a513a765dd79fda469e895b76692173d2aa79a26f4a618f91266
 long_desc="
  vdpau-video consists in a VDPAU-based backend for VA-API."
 
-Add_dependency build pkg-config
-Add_dependency build libva-devel
-Add_dependency build libvdpau-devel
-Add_dependency build MesaLib-devel
diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template
index e435927a23..96d901080a 100644
--- a/srcpkgs/vdpauinfo/template
+++ b/srcpkgs/vdpauinfo/template
@@ -4,6 +4,7 @@ version=0.0.6
 homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
 distfiles="http://cgit.freedesktop.org/~aplattner/$pkgname/snapshot/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="automake pkg-config libvdpau-devel"
 short_desc="Command line utility for querying the capabilities of a VDPAU device"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,9 +13,6 @@ long_desc="
  vdpauinfo queries the capabilities of a VDPAU device and shows them via
  a command line utility."
 
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build libvdpau-devel
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/vim-x11/template b/srcpkgs/vim-x11/template
index 6fb964da5e..4d2a58df0b 100644
--- a/srcpkgs/vim-x11/template
+++ b/srcpkgs/vim-x11/template
@@ -7,6 +7,8 @@
 unset subpackages
 pkgname=vim-x11
 configure_args="${configure_args} --enable-gui=no --with-x"
+depends="vim-common>=7.3.515"
+makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel"
 short_desc="${short_desc} (x11)"
 long_desc="${long_desc}
 
@@ -16,8 +18,6 @@ provides="vim-${version}"
 replaces="vim>=${version}"
 build_requires=11
 
-Add_dependency build pkg-config
-Add_dependency build libXt-devel
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 03c565329b..979d9fb68b 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -8,6 +8,8 @@ configure_args="--disable-perlinterp --disable-pythoninterp --disable-rubyinterp
 --disable-cscope --disable-workshop --disable-netbeans --disable-sniff
 --disable-gpm --disable-hangulinput --disable-xim --enable-gui=no
 --without-x --enable-multibyte --with-tlib=ncursesw"
+depends="vim-common>=7.3.515"
+makedepends="mercurial ncurses-devel acl-devel"
 short_desc="Vim editor (vi clone)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -19,10 +21,6 @@ nofetch=yes
 noextract=yes
 subpackages="vim-common"
 
-Add_dependency run vim-common		">=${version}"
-Add_dependency build mercurial
-Add_dependency build ncurses-devel
-Add_dependency build acl-devel
 
 do_fetch() {
 	local url="http://code.google.com/p/vim/"
diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template
index bda7b0876d..6663e983a5 100644
--- a/srcpkgs/vinagre/template
+++ b/srcpkgs/vinagre/template
@@ -4,6 +4,8 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-spice --disable-rdp"
+makedepends="pkg-config intltool itstool gnome-doc-utils libxml2-devel dbus-glib-devel libgnome-keyring-devel avahi-ui-libs-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel gtk-vnc-devel"
+fulldepends="openssh-client gnome-icon-theme desktop-file-utils hicolor-icon-theme"
 short_desc="VNC client for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/vinagre"
@@ -20,20 +22,4 @@ long_desc="
 # XXX rdp (rdesktop) plugin
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build gnome-doc-utils
-Add_dependency build libxml2-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build avahi-ui-libs-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build vte3-devel
-Add_dependency build gtk-vnc-devel
 
-Add_dependency full openssh-client
-Add_dependency full gnome-icon-theme
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
index 900a018d0c..2af44cee82 100644
--- a/srcpkgs/vino/template
+++ b/srcpkgs/vino/template
@@ -4,6 +4,8 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+depends="desktop-file-utils"
+makedepends="pkg-config intltool gnome-doc-utils jpeg-devel gtk+3-devel libnotify-devel avahi-glib-libs-devel dbus-glib-devel telepathy-glib-devel libsoup-devel libXtst-devel NetworkManager-devel libgnome-keyring-devel gnutls-devel"
 short_desc="VNC server for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -12,19 +14,4 @@ checksum=b58f7f7e1ce207246dfe98ff777c665cbcbc52abab0cbafc0a1b4f5fc5b3e0c8
 long_desc="
  The package contains an integrated VNC server for GNOME."
 
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build jpeg-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libnotify-devel
-Add_dependency build avahi-glib-libs-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build telepathy-glib-devel
-Add_dependency build libsoup-devel
-Add_dependency build libXtst-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build gnutls-devel
diff --git a/srcpkgs/virtinst/template b/srcpkgs/virtinst/template
index cd29230018..b49478c68c 100644
--- a/srcpkgs/virtinst/template
+++ b/srcpkgs/virtinst/template
@@ -3,6 +3,7 @@ pkgname=virtinst
 version=0.500.5
 distfiles="http://virt-manager.org/download/sources/$pkgname/$pkgname-$version.tar.gz"
 build_style=python-module
+fulldepends="python libvirt-python urlgrabber"
 short_desc="Virtual Machine Installation module"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0f297442f7fb2096ecf4205c866e37f4d6d044c9ca55deca4976459713b7b710
@@ -14,6 +15,3 @@ long_desc="
  guests. It uses libvirt (http://www.libvirt.org) for starting things."
 
 noarch=yes
-Add_dependency full python
-Add_dependency full libvirt-python
-Add_dependency full urlgrabber
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 2b8d9a0158..44225108c1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -5,6 +5,8 @@ version=${_vbox_distver}
 wrksrc="VirtualBox-${version}"
 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"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virtualbox.org"
@@ -19,37 +21,10 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="${pkgname}-dkms ${pkgname}-guest ${pkgname}-guest-dkms"
 systemd_services="virtualbox.service on"
 
-Add_dependency build which
-Add_dependency build openssl-devel
-Add_dependency build libcurl-devel
-Add_dependency build libpng-devel
-Add_dependency build SDL-devel
-Add_dependency build qt-devel
-Add_dependency build libXext-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libIDL-devel
-Add_dependency build glib-devel
-Add_dependency build pam-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build libxslt-devel
-Add_dependency build libcap-devel
-Add_dependency build xorg-server-devel
-Add_dependency build docbook-xsl
-Add_dependency build acpica-utils
-Add_dependency build kernel-headers
-Add_dependency build dev86
-Add_dependency build yasm
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-c++-multilib
 fi
 
-Add_dependency run ${pkgname}-dkms	">=${version}"
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
 do_build() {
 	local _khdrver=$($XBPS_PKGDB_CMD version kernel-headers)
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
index f65560e633..0778b2c08f 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
@@ -1,5 +1,6 @@
 # Template file for 'virtualbox-ose-guest'.
 #
+depends="virtualbox-ose-guest-dkms>=4.1.16"
 short_desc="${short_desc} - guest utilities"
 long_desc="${long_desc}
 
@@ -9,7 +10,6 @@ long_desc="${long_desc}
  between the host system and the virtual machine."
 
 systemd_services="virtualbox-guest.service on"
-Add_dependency run virtualbox-ose-guest-dkms ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index d316dcf6bf..c39768ebcd 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --disable-jack
 --disable-telepathy --disable-lua --disable-live555 --disable-fluidsynth
 --enable-dvdread --enable-flac --disable-gnomevfs --disable-portaudio"
+depends="pulseaudio freefont-ttf hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config videoproto libogg-devel libvorbis-devel SDL-devel SDL_image-devel x264-devel ffmpeg-devel xcb-util-devel libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel libmpeg2-devel libflac-devel fribidi-devel freetype-devel qt-devel avahi-libs-devel MesaLib-devel libmad-devel liba52-devel libdca-devel libdvbpsi-devel libgcrypt-devel gtk+-devel libnotify-devel dbus-glib-devel gnutls-devel taglib-devel libmatroska-devel libmpcdec-devel libproxy-devel libcdio-devel libdvdnav-devel libsysfs-devel libusb-compat-devel libmtp-devel sqlite-devel librsvg-devel libtheora-devel speex-devel pulseaudio-devel samba-devel libmodplug-devel libva-devel v4l-utils-devel libsamplerate-devel"
 short_desc="VideoLan Client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/vlc/"
@@ -24,60 +26,7 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 # XXX Add missing deps: gme, telepathy, lua, live555,
 # 	libtar (for skins2).
-Add_dependency run pulseaudio
-Add_dependency run freefont-ttf
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
-Add_dependency build pkg-config
-Add_dependency build videoproto
-Add_dependency build libogg-devel
-Add_dependency build libvorbis-devel
-Add_dependency build SDL-devel
-Add_dependency build SDL_image-devel
-Add_dependency build x264-devel
-Add_dependency build ffmpeg-devel
-Add_dependency build xcb-util-devel
-Add_dependency build libXxf86vm-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXpm-devel
-Add_dependency build libXvMC-devel
-Add_dependency build libXv-devel
-Add_dependency build libmpeg2-devel
-Add_dependency build libflac-devel
-Add_dependency build fribidi-devel
-Add_dependency build freetype-devel
-Add_dependency build qt-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libmad-devel
-Add_dependency build liba52-devel
-Add_dependency build libdca-devel
-Add_dependency build libdvbpsi-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build gtk+-devel
-Add_dependency build libnotify-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gnutls-devel
-Add_dependency build taglib-devel
-Add_dependency build libmatroska-devel
-Add_dependency build libmpcdec-devel
-Add_dependency build libproxy-devel
-Add_dependency build libcdio-devel
-Add_dependency build libdvdnav-devel
-Add_dependency build libsysfs-devel
-Add_dependency build libusb-compat-devel
-Add_dependency build libmtp-devel
-Add_dependency build sqlite-devel
-Add_dependency build librsvg-devel
-Add_dependency build libtheora-devel
-Add_dependency build speex-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build samba-devel
-Add_dependency build libmodplug-devel
-Add_dependency build libva-devel
-Add_dependency build v4l-utils-devel
-Add_dependency build libsamplerate-devel
 
 pre_configure() {
 	# hostname -s is not valid, at least in coreutils!
diff --git a/srcpkgs/vmklive/template b/srcpkgs/vmklive/template
index 860d3845f3..a6d1063395 100644
--- a/srcpkgs/vmklive/template
+++ b/srcpkgs/vmklive/template
@@ -1,6 +1,7 @@
 # Template file for 'vmklive'
 pkgname=vmklive
 version=0.8.5
+fulldepends="initramfs-tools xbps-casper>=0.25.1.236 cdrtools squashfs-tools syslinux"
 short_desc="Void GNU/Linux live image maker"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
@@ -13,11 +14,6 @@ replaces="xbps-mklive>=0 vanilla-mklive>=0"
 noextract=yes
 noarch=yes
 
-Add_dependency full initramfs-tools
-Add_dependency full xbps-casper	">=0.25.1.236" # autoinstaller support.
-Add_dependency full cdrtools
-Add_dependency full squashfs-tools
-Add_dependency full syslinux
 
 do_build() {
 	sed "s|@@MKLIVE_VERSION@@|${version}|g" \
diff --git a/srcpkgs/void-installer/template b/srcpkgs/void-installer/template
index 22cc9102d9..a0288900f5 100644
--- a/srcpkgs/void-installer/template
+++ b/srcpkgs/void-installer/template
@@ -1,6 +1,8 @@
 # Template file for 'void-installer'
 pkgname=void-installer
 version="$(date -u +%Y%m%d)"
+makedepends="git"
+fulldepends="dialog"
 short_desc="The Void Linux installer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps/wiki/VoidLinux"
@@ -12,8 +14,6 @@ nofetch=yes
 noextract=yes
 noarch=yes
 
-Add_dependency full dialog
-Add_dependency build git
 
 do_fetch() {
 	local url="git://github.com/xtraeme/void-installer"
diff --git a/srcpkgs/vte/depends b/srcpkgs/vte/depends
deleted file mode 100644
index 44bfc589a6..0000000000
--- a/srcpkgs/vte/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.20.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
index 6e77596ecb..d55c22f185 100644
--- a/srcpkgs/vte/template
+++ b/srcpkgs/vte/template
@@ -5,6 +5,7 @@ distfiles="${GNOME_SITE}/vte/0.28/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-gtk=2.0"
 revision=3
+makedepends="pkg-config intltool gtk+-devel ncurses-devel pygtk-devel"
 short_desc="Terminal widget with improved accessibility and I18N support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -16,8 +17,3 @@ long_desc="
 
 subpackages="vte-python vte-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build ncurses-devel
-Add_dependency build pygtk-devel
diff --git a/srcpkgs/vte/vte-devel.template b/srcpkgs/vte/vte-devel.template
index c497504ec6..67b6edd6aa 100644
--- a/srcpkgs/vte/vte-devel.template
+++ b/srcpkgs/vte/vte-devel.template
@@ -1,23 +1,11 @@
 # Template file for 'vte-devel'.
 #
+depends="pkg-config intltool gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel ncurses-devel libX11-devel pygtk-devel vte"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run ncurses-devel
-Add_dependency run libX11-devel
-Add_dependency run pygtk-devel
-Add_dependency run vte
 
 do_install()
 {
diff --git a/srcpkgs/vte/vte-python.template b/srcpkgs/vte/vte-python.template
index 44ac213716..1bd2ac50b8 100644
--- a/srcpkgs/vte/vte-python.template
+++ b/srcpkgs/vte/vte-python.template
@@ -1,11 +1,11 @@
 # Template file for 'vte-python'.
 #
+depends="pygtk"
 short_desc="${sourcepkg} - Python bindings"
 long_desc="${long_desc}
 
  This package contains the Python bindings."
 
-Add_dependency run pygtk
 
 do_install()
 {
diff --git a/srcpkgs/vte3/depends b/srcpkgs/vte3/depends
deleted file mode 100644
index b2ba4f1866..0000000000
--- a/srcpkgs/vte3/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.28.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 0ace0f405e..5086929d9f 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -6,6 +6,8 @@ distfiles="${GNOME_SITE}/vte/0.32/vte-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-gtk=3.0 --enable-introspection
 --disable-gnome-pty-helper --disable-static"
+makedepends="pkg-config intltool gtk+3-devel ncurses-devel gobject-introspection"
+fulldepends="vte>=0"
 short_desc="Terminal widget with improved accessibility and I18N support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -17,10 +19,4 @@ long_desc="
 
 subpackages="vte3-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build ncurses-devel
-Add_dependency build gobject-introspection
 
-Add_dependency full vte ">=0"	# for gnome-pty-helper
diff --git a/srcpkgs/vte3/vte3-devel.template b/srcpkgs/vte3/vte3-devel.template
index 4a45f6a458..8cbf42a5d3 100644
--- a/srcpkgs/vte3/vte3-devel.template
+++ b/srcpkgs/vte3/vte3-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'vte3-devel'.
 #
+depends="gtk+3-devel vte3>=0.32.1"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gtk+3-devel
-Add_dependency run vte3 ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/wavpack/depends b/srcpkgs/wavpack/depends
deleted file mode 100644
index ff7a03308d..0000000000
--- a/srcpkgs/wavpack/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.60.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index c752b64030..ad408f5a0c 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -5,6 +5,7 @@ revision=3
 distfiles="http://www.wavpack.com//${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-mmx"
+makedepends="pkg-config"
 short_desc="An audio codec (lossy and lossless)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5
@@ -16,4 +17,3 @@ long_desc="
  performance and functionality."
 
 subpackages="libwavpack $pkgname-devel"
-Add_dependency build pkg-config
diff --git a/srcpkgs/wavpack/wavpack-devel.template b/srcpkgs/wavpack/wavpack-devel.template
index ddbf78a918..281796ab61 100644
--- a/srcpkgs/wavpack/wavpack-devel.template
+++ b/srcpkgs/wavpack/wavpack-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'wavpack-devel'.
 #
+depends="glib-devel libwavpack"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glib-devel
-Add_dependency run libwavpack
 
 do_install()
 {
diff --git a/srcpkgs/webkit-gtk3/depends b/srcpkgs/webkit-gtk3/depends
deleted file mode 100644
index 0cf9e67cc5..0000000000
--- a/srcpkgs/webkit-gtk3/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.3.12"
-api_depends=">=1.6.3"
diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template
index 6a55a032d7..4770edbff0 100644
--- a/srcpkgs/webkit-gtk3/template
+++ b/srcpkgs/webkit-gtk3/template
@@ -5,6 +5,7 @@ wrksrc=webkit-${version}
 homepage="http://webkitgtk.org/"
 license="LGPL-2.1, Simplified BSD (2 clause)"
 distfiles="${homepage}/releases/webkit-${version}.tar.xz"
+makedepends="perl>=0 pkg-config intltool which gperf flex jpeg-devel sqlite-devel gtk+-devel gtk+3-devel gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel enchant-devel geoclue-devel gobject-introspection"
 short_desc="GTK+3 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28
@@ -20,23 +21,6 @@ long_desc="
 disable_parallel_build=yes
 subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel"
 
-Add_dependency build perl	">=0"
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build which
-Add_dependency build gperf
-Add_dependency build flex
-Add_dependency build jpeg-devel
-Add_dependency build sqlite-devel
-Add_dependency build gtk+-devel
-Add_dependency build gtk+3-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build libsoup-devel
-Add_dependency build libxslt-devel
-Add_dependency build icu-devel
-Add_dependency build enchant-devel
-Add_dependency build geoclue-devel
-Add_dependency build gobject-introspection
 
 do_configure() {
 	local args="--enable-video --enable-jit \
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
index 09ba89f531..695c985657 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
+++ b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'webkit-gtk-devel'.
 #
+depends="gobject-introspection enchant-devel gtk+-devel gstreamer-devel gst-plugins-base-devel jpeg-devel libsoup-devel libxslt-devel zlib-devel libxml2-devel freetype-devel fontconfig-devel libpng-devel sqlite-devel icu-devel libXt-devel libX11-devel libXrender-devel webkit-gtk>=1.8.1"
 short_desc="GTK+ port of the WebKit browser engine - development files"
 long_desc="${long_desc}
  WebKit is an open source web browser engine. WebKit is also the name of
@@ -10,25 +11,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gobject-introspection
-Add_dependency run enchant-devel
-Add_dependency run gtk+-devel
-Add_dependency run gstreamer-devel
-Add_dependency run gst-plugins-base-devel
-Add_dependency run jpeg-devel
-Add_dependency run libsoup-devel
-Add_dependency run libxslt-devel
-Add_dependency run zlib-devel
-Add_dependency run libxml2-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libpng-devel
-Add_dependency run sqlite-devel
-Add_dependency run icu-devel
-Add_dependency run libXt-devel
-Add_dependency run libX11-devel
-Add_dependency run libXrender-devel
-Add_dependency run webkit-gtk ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
index 34a9973846..e9cff05d76 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
+++ b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
@@ -1,35 +1,11 @@
 # Template file for 'webkit-gtk-devel'.
 #
+depends="enchant-devel gdk-pixbuf-devel gtk+3-devel gst-plugins-base-devel gstreamer-devel glib-devel atk-devel pango-devel cairo-devel jpeg-devel libsoup-devel libxslt-devel zlib-devel libxml2-devel freetype-devel fontconfig-devel libpng-devel sqlite-devel icu-devel libXt-devel libX11-devel libSM-devel libICE-devel libXrender-devel webkit-gtk3>=1.8.1"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run enchant-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run gtk+3-devel
-Add_dependency run gst-plugins-base-devel
-Add_dependency run gstreamer-devel
-Add_dependency run glib-devel
-Add_dependency run atk-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run jpeg-devel
-Add_dependency run libsoup-devel
-Add_dependency run libxslt-devel
-Add_dependency run zlib-devel
-Add_dependency run libxml2-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libpng-devel
-Add_dependency run sqlite-devel
-Add_dependency run icu-devel
-Add_dependency run libXt-devel
-Add_dependency run libX11-devel
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libXrender-devel
-Add_dependency run webkit-gtk3 ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/webrtc-audio-processing/depends b/srcpkgs/webrtc-audio-processing/depends
deleted file mode 100644
index 4ce94207f0..0000000000
--- a/srcpkgs/webrtc-audio-processing/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template b/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template
index a19e2928af..d3ab5e2ea5 100644
--- a/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template
+++ b/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'webrtc-audio-processing--devel'.
 #
+depends="glibc-devel webrtc-audio-processing>=0.1"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run ${sourcepkg} ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 4e4744c542..cdc7bf1f7e 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -4,6 +4,7 @@ version=0.3.7
 homepage="http://www.weechat.org"
 distfiles="${homepage}/files/src/$pkgname-$version.tar.bz2"
 build_style=cmake
+makedepends="cmake perl pkg-config tcl-devel aspell-devel libgcrypt-devel gnutls-devel python-devel ruby-devel lua-devel libcurl-devel"
 short_desc="Fast, light and extensible IRC client (curses UI)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -19,14 +20,3 @@ long_desc="
 subpackages="$pkgname-aspell $pkgname-devel $pkgname-perl $pkgname-python"
 subpackages="${subpackages} $pkgname-ruby $pkgname-tcl $pkgname-lua"
 
-Add_dependency build cmake
-Add_dependency build perl
-Add_dependency build pkg-config
-Add_dependency build tcl-devel
-Add_dependency build aspell-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build gnutls-devel
-Add_dependency build python-devel
-Add_dependency build ruby-devel
-Add_dependency build lua-devel
-Add_dependency build libcurl-devel
diff --git a/srcpkgs/weechat/weechat-aspell.template b/srcpkgs/weechat/weechat-aspell.template
index 41a41bad3e..e15d5e50ac 100644
--- a/srcpkgs/weechat/weechat-aspell.template
+++ b/srcpkgs/weechat/weechat-aspell.template
@@ -1,11 +1,11 @@
 # Template file for 'weechat-aspell'.
 #
+depends="weechat>=0.3.7"
 short_desc="${sourcepkg} aspell add-on"
 long_desc="${long_desc}
 
  This package contains the aspell plugin."
 
-Add_dependency run weechat ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/weechat/weechat-devel.template b/srcpkgs/weechat/weechat-devel.template
index aac6083bac..ef1120265a 100644
--- a/srcpkgs/weechat/weechat-devel.template
+++ b/srcpkgs/weechat/weechat-devel.template
@@ -1,19 +1,11 @@
 # Template file for 'weechat-devel'.
 #
+depends="cmake glibc-devel aspell-devel gnutls-devel libgcrypt-devel python-devel ruby-devel tcl-devel ncurses-devel"
 short_desc="${sourcepkg} - development package"
 long_desc="${long_desc}
 
  This package contains development files."
 
-Add_dependency run cmake
-Add_dependency run glibc-devel
-Add_dependency run aspell-devel
-Add_dependency run gnutls-devel
-Add_dependency run libgcrypt-devel
-Add_dependency run python-devel
-Add_dependency run ruby-devel
-Add_dependency run tcl-devel
-Add_dependency run ncurses-devel
 
 do_install()
 {
diff --git a/srcpkgs/weechat/weechat-lua.template b/srcpkgs/weechat/weechat-lua.template
index 0dc0cf6549..b773df5733 100644
--- a/srcpkgs/weechat/weechat-lua.template
+++ b/srcpkgs/weechat/weechat-lua.template
@@ -1,11 +1,11 @@
 # Template file for 'weechat-lua'.
 #
+depends="weechat>=0.3.7"
 short_desc="${sourcepkg} lua add-on"
 long_desc="${long_desc}
 
  This package contains the lua plugin."
 
-Add_dependency run weechat	">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/weechat/weechat-perl.template b/srcpkgs/weechat/weechat-perl.template
index 0239b53faf..6286db76ec 100644
--- a/srcpkgs/weechat/weechat-perl.template
+++ b/srcpkgs/weechat/weechat-perl.template
@@ -1,11 +1,11 @@
 # Template file for 'weechat-perl'.
 #
+depends="weechat>=0.3.7"
 short_desc="${sourcepkg} perl add-on"
 long_desc="${long_desc}
 
  This package contains the perl plugin."
 
-Add_dependency run weechat	">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/weechat/weechat-python.template b/srcpkgs/weechat/weechat-python.template
index de80980f43..76a1c808c8 100644
--- a/srcpkgs/weechat/weechat-python.template
+++ b/srcpkgs/weechat/weechat-python.template
@@ -1,11 +1,11 @@
 # Template file for 'weechat-python'.
 #
+depends="weechat>=0.3.7"
 short_desc="${sourcepkg} python add-on"
 long_desc="${long_desc}
 
  This package contains the python plugin."
 
-Add_dependency run weechat	">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/weechat/weechat-ruby.template b/srcpkgs/weechat/weechat-ruby.template
index 3f8beeceb6..42e71260fc 100644
--- a/srcpkgs/weechat/weechat-ruby.template
+++ b/srcpkgs/weechat/weechat-ruby.template
@@ -1,11 +1,11 @@
 # Template file for 'weechat-ruby'.
 #
+depends="weechat>=0.3.7"
 short_desc="${sourcepkg} ruby add-on"
 long_desc="${long_desc}
 
  This package contains the ruby plugin."
 
-Add_dependency run weechat	">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/weechat/weechat-tcl.template b/srcpkgs/weechat/weechat-tcl.template
index faa8bd4d68..c774b21f44 100644
--- a/srcpkgs/weechat/weechat-tcl.template
+++ b/srcpkgs/weechat/weechat-tcl.template
@@ -1,11 +1,11 @@
 # Template file for 'weechat-tcl'.
 #
+depends="weechat>=0.3.7"
 short_desc="${sourcepkg} tcl add-on"
 long_desc="${long_desc}
 
  This package contains the tcl plugin."
 
-Add_dependency run weechat	">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index b7070f194c..79c2c8d390 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -5,6 +5,8 @@ distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-ssl=openssl"
 revision=1
+depends="ca-certificates"
+makedepends="perl>=0 openssl-devel libidn-devel"
 short_desc="The GNU wget utility"
 maintainer="Juan RP <xtraeme@gmail.org>"
 homepage="http://www.gnu.org/software/wget/wget.html"
@@ -33,10 +35,6 @@ long_desc="
     * GNU Wget is distributed under the GNU General Public License."
 
 conf_files="/etc/wgetrc"
-Add_dependency run ca-certificates
-Add_dependency build perl	">=0"
-Add_dependency build openssl-devel
-Add_dependency build libidn-devel
 
 post_install()
 {
diff --git a/srcpkgs/wgetpaste/template b/srcpkgs/wgetpaste/template
index da77b90674..50d746bb14 100644
--- a/srcpkgs/wgetpaste/template
+++ b/srcpkgs/wgetpaste/template
@@ -2,6 +2,7 @@
 pkgname=wgetpaste
 version=2.20
 distfiles="http://wgetpaste.zlin.dk/$pkgname-$version.tar.bz2"
+fulldepends="bash wget"
 short_desc="A script that automates pasting to a number of pastebin services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wgetpaste.zlin.dk/"
@@ -12,8 +13,6 @@ long_desc="
 
 noarch=yes
 
-Add_dependency full bash
-Add_dependency full wget
 
 do_install() {
         vinstall ${pkgname} 755 usr/bin
diff --git a/srcpkgs/which/template b/srcpkgs/which/template
index d8f390bfc4..a3b45cbdb0 100644
--- a/srcpkgs/which/template
+++ b/srcpkgs/which/template
@@ -4,6 +4,7 @@ version=2.20
 distfiles="http://www.xs4all.nl/~carlo17/which/which-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+fulldepends="glibc bash"
 short_desc="Displays where a particular program in your path is located"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8
@@ -11,5 +12,3 @@ long_desc="
  The which command shows the full pathname of a specified program, if
  the specified program is in your PATH."
 
-Add_dependency full glibc
-Add_dependency full bash
diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template
index eb11613084..57a294525e 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -3,6 +3,7 @@ pkgname=wicd
 version=1.7.1
 revision=2
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+fulldepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-python pygobject2 python-urwid>=0.9.9"
 short_desc="Open source wired and wireless network manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wicd.sourceforge.net"
@@ -36,13 +37,6 @@ conf_files="
 
 systemd_services="wicd.service on"
 
-Add_dependency full dhcpcd
-Add_dependency full wpa_supplicant
-Add_dependency full wireless_tools
-Add_dependency full ethtool
-Add_dependency full dbus-python
-Add_dependency full pygobject2
-Add_dependency full python-urwid	">=0.9.9"
 
 do_install() {
 	python setup.py configure \
diff --git a/srcpkgs/wicd/wicd-gtk.template b/srcpkgs/wicd/wicd-gtk.template
index ff9b3054c7..ec4a9f41f4 100644
--- a/srcpkgs/wicd/wicd-gtk.template
+++ b/srcpkgs/wicd/wicd-gtk.template
@@ -1,5 +1,6 @@
 # Template file for 'wicd-gtk'.
 #
+depends="wicd>=1.7.1 pygtk notify-python shared-mime-info desktop-file-utils hicolor-icon-theme"
 short_desc="${short_desc} - GTK UI"
 long_desc="${long_desc}
 
@@ -9,12 +10,6 @@ noarch=yes
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 pycompile_dirs="usr/share/wicd/gtk"
 
-Add_dependency run wicd ">=${version}"
-Add_dependency run pygtk
-Add_dependency run notify-python
-Add_dependency run shared-mime-info
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
 
 do_install() {
 	vmove etc/xdg etc
diff --git a/srcpkgs/wifi-firmware/template b/srcpkgs/wifi-firmware/template
index 37b4543381..1cfdb1fe20 100644
--- a/srcpkgs/wifi-firmware/template
+++ b/srcpkgs/wifi-firmware/template
@@ -2,6 +2,7 @@
 pkgname=wifi-firmware
 version=1.2
 build_style=meta-template
+fulldepends="ipw2100-firmware ipw2200-firmware zd1211-firmware"
 short_desc="WiFi firmware meta-package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -9,6 +10,3 @@ long_desc="
  files for some WiFi drivers in the Linux kernel."
 
 noarch=yes
-Add_dependency full ipw2100-firmware
-Add_dependency full ipw2200-firmware
-Add_dependency full zd1211-firmware
diff --git a/srcpkgs/wine-unstable/depends b/srcpkgs/wine-unstable/depends
deleted file mode 100644
index 279bbc74c4..0000000000
--- a/srcpkgs/wine-unstable/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 89083c648c..8cb67f0a82 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -7,6 +7,9 @@ build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
 distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${version}.tar.bz2"
+depends="libwine-unstable"
+makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel MesaLib-devel libSM-devel libXext-devel libX11-devel libXpm-devel libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel alsa-lib-devel libgphoto2-devel libxml2-devel libxslt-devel glib-devel gst-plugins-base-devel freetype-devel mpg123-devel libgsm-devel libopenal-devel giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel prelink"
+fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -30,52 +33,11 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 # XXX libcups (printing support)
 # XXX libcapi20 (ISDN support)
 
-Add_dependency run libwine-unstable
-
-Add_dependency build flex
-Add_dependency build gettext-devel
-Add_dependency build lcms-devel
-Add_dependency build zlib-devel
-Add_dependency build ncurses-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libSM-devel
-Add_dependency build libXext-devel
-Add_dependency build libX11-devel
-Add_dependency build libXpm-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXxf86vm-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXi-devel
-Add_dependency build libldap-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libgphoto2-devel
-Add_dependency build libxml2-devel
-Add_dependency build libxslt-devel
-Add_dependency build glib-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build freetype-devel
-Add_dependency build mpg123-devel
-Add_dependency build libgsm-devel
-Add_dependency build libopenal-devel
-Add_dependency build giflib-devel
-Add_dependency build libpng-devel
-Add_dependency build v4l-utils-devel
-Add_dependency build fontconfig-devel
-Add_dependency build gnutls-devel
-Add_dependency build dbus-devel
 
 
-Add_dependency build prelink	# WINE only needs it to build the DLLs,
+
 				# Otherwise, throws a nasty warning.
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
-Add_dependency full liberation-fonts-ttf # else stuff appears in hebrew
-Add_dependency full fontconfig
 
 pre_configure()
 {
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 456ca4b891..85e57d4e1f 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libwine-unstable'.
 #
+depends="glibc-devel libwine-unstable"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
@@ -10,8 +11,6 @@ replaces="wine-devel>=0"
 provides="wine-devel-$version"
 conflicts="wine-devel>=0"
 
-Add_dependency run glibc-devel
-Add_dependency run libwine-unstable
 
 do_install()
 {
diff --git a/srcpkgs/wine/depends b/srcpkgs/wine/depends
deleted file mode 100644
index 279bbc74c4..0000000000
--- a/srcpkgs/wine/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.3"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 1b1eb83d22..5ac5aa32bf 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -5,6 +5,8 @@ build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
 distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2"
+makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel MesaLib-devel libSM-devel libXext-devel libX11-devel libXpm-devel libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel alsa-lib-devel libgphoto2-devel libxml2-devel libxslt-devel glib-devel gst-plugins-base-devel freetype-devel mpg123-devel libgsm-devel libopenal-devel giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel prelink"
+fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -25,50 +27,10 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 # XXX libcapi20 (ISDN support)
 
 
-Add_dependency build flex
-Add_dependency build gettext-devel
-Add_dependency build lcms-devel
-Add_dependency build zlib-devel
-Add_dependency build ncurses-devel
-Add_dependency build MesaLib-devel
-Add_dependency build libSM-devel
-Add_dependency build libXext-devel
-Add_dependency build libX11-devel
-Add_dependency build libXpm-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXxf86vm-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXi-devel
-Add_dependency build libldap-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libgphoto2-devel
-Add_dependency build libxml2-devel
-Add_dependency build libxslt-devel
-Add_dependency build glib-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build freetype-devel
-Add_dependency build mpg123-devel
-Add_dependency build libgsm-devel
-Add_dependency build libopenal-devel
-Add_dependency build giflib-devel
-Add_dependency build libpng-devel
-Add_dependency build v4l-utils-devel
-Add_dependency build fontconfig-devel
-Add_dependency build gnutls-devel
-Add_dependency build dbus-devel
 
 
-Add_dependency build prelink	# WINE only needs it to build the DLLs,
 				# Otherwise, throws a nasty warning.
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
-Add_dependency full liberation-fonts-ttf # else stuff appears in hebrew
-Add_dependency full fontconfig
 
 pre_configure()
 {
diff --git a/srcpkgs/wine/wine-devel.template b/srcpkgs/wine/wine-devel.template
index 73024f7ec9..a2092bf48e 100644
--- a/srcpkgs/wine/wine-devel.template
+++ b/srcpkgs/wine/wine-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'wine-devel'.
 #
+depends="glibc-devel libwine"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libwine
 
 only_for_archs=i686
 replaces="wine-unstable-devel>=0"
diff --git a/srcpkgs/wireless_tools/wireless_tools-devel.template b/srcpkgs/wireless_tools/wireless_tools-devel.template
index 66d1a085a7..8171455e52 100644
--- a/srcpkgs/wireless_tools/wireless_tools-devel.template
+++ b/srcpkgs/wireless_tools/wireless_tools-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'wireless_tools-devel'.
 #
+depends="glibc-devel wireless_tools"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc-devel
-Add_dependency run wireless_tools
 
 do_install()
 {
diff --git a/srcpkgs/wmfs/template b/srcpkgs/wmfs/template
index 4885efa774..ca7818a38a 100644
--- a/srcpkgs/wmfs/template
+++ b/srcpkgs/wmfs/template
@@ -6,6 +6,7 @@ distfiles="http://wmfs.info/attachments/download/45/wmfs-$version.tar.gz"
 build_style=configure
 configure_args="--prefix /usr --man-prefix /usr/share/man --xdg-config-dir /etc/xdg"
 revision=2
+makedepends="pkg-config libXft-devel libXrender-devel fontconfig-devel libX11-devel freetype-devel libXinerama-devel libXrandr-devel imlib2-devel"
 short_desc="Window Manager From Scratch"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -20,12 +21,3 @@ long_desc="
 
 conf_files="/etc/xdg/wmfs/wmfsrc"
 
-Add_dependency build pkg-config
-Add_dependency build libXft-devel
-Add_dependency build libXrender-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libX11-devel
-Add_dependency build freetype-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXrandr-devel
-Add_dependency build imlib2-devel
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 2ebce69fa5..02da731400 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -5,6 +5,7 @@ revision=8
 build_wrksrc=$pkgname
 homepage="http://hostap.epitest.fi"
 distfiles="$homepage/releases/$pkgname-$version.tar.gz"
+makedepends="libnl3-devel openssl-devel dbus-devel readline-devel"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -25,10 +26,6 @@ long_desc="
 conf_files="/etc/${pkgname}.conf"
 systemd_services="${pkgname}.service on"
 
-Add_dependency build libnl3-devel
-Add_dependency build openssl-devel
-Add_dependency build dbus-devel
-Add_dependency build readline-devel
 
 do_build() {
 	sed -i 's|/usr/local|$(PREFIX)|g' Makefile
diff --git a/srcpkgs/wv/depends b/srcpkgs/wv/depends
deleted file mode 100644
index 55813ed4c8..0000000000
--- a/srcpkgs/wv/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template
index c8bba80823..157754b42e 100644
--- a/srcpkgs/wv/template
+++ b/srcpkgs/wv/template
@@ -4,6 +4,7 @@ version=1.2.4
 distfiles="${SOURCEFORGE_SITE}/${pkgname}ware/${pkgname}-$version.tar.gz"
 build_style=gnu-configure
 revision=3
+makedepends="libgsf-devel glib-devel libxml2-devel libpng-devel zlib-devel pkg-config"
 short_desc="wv is a library which allows access to Microsoft Word files."
 homepage="http://wvware.sourceforge.net/"
 license="GPL-3"
@@ -17,9 +18,3 @@ long_desc="
 
 subpackages="lib$pkgname $pkgname-devel"
 
-Add_dependency build libgsf-devel
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-Add_dependency build libpng-devel
-Add_dependency build zlib-devel
-Add_dependency build pkg-config
diff --git a/srcpkgs/wv/wv-devel.template b/srcpkgs/wv/wv-devel.template
index 9cee708beb..6abfcd9fe8 100644
--- a/srcpkgs/wv/wv-devel.template
+++ b/srcpkgs/wv/wv-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'wv-devel'.
 #
+depends="glibc-devel libwv"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run libwv
 
 do_install()
 {
diff --git a/srcpkgs/wxGTK/template b/srcpkgs/wxGTK/template
index 624d924438..1b1c29506a 100644
--- a/srcpkgs/wxGTK/template
+++ b/srcpkgs/wxGTK/template
@@ -3,6 +3,7 @@ pkgname=wxGTK
 version=2.8.12.1
 distfiles="${SOURCEFORGE_SITE}/wxpython/wxPython-src-${version}.tar.bz2"
 wrksrc="wxPython-src-${version}"
+makedepends="pkg-config zlib-devel libpng-devel jpeg-devel libXpm-devel tiff-devel expat-devel libX11-devel libXinerama-devel GConf-devel cairo-devel gtk+-devel MesaLib-devel"
 short_desc="The wxWidgets GUI toolkit library (GTK Version)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.wxwidgets.org/"
@@ -21,19 +22,6 @@ long_desc="
 subpackages="${pkgname}-devel"
 
 # XXX: GStreamer support?
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build libXpm-devel
-Add_dependency build tiff-devel
-Add_dependency build expat-devel
-Add_dependency build libX11-devel
-Add_dependency build libXinerama-devel
-Add_dependency build GConf-devel
-Add_dependency build cairo-devel
-Add_dependency build gtk+-devel
-Add_dependency build MesaLib-devel
 
 do_configure() {
 	./configure --prefix=/usr --enable-monolithic --with-gtk=2 --with-x \
diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template
index 65d42bf159..7b27a216bc 100644
--- a/srcpkgs/wxPython/template
+++ b/srcpkgs/wxPython/template
@@ -3,6 +3,8 @@ pkgname=wxPython
 version=2.8.12.1
 distfiles="${SOURCEFORGE_SITE}/wxpython/${pkgname}-src-${version}.tar.bz2"
 wrksrc="${pkgname}-src-${version}"
+makedepends="pkg-config zlib-devel libpng-devel jpeg-devel libXpm-devel tiff-devel expat-devel libX11-devel libXinerama-devel GConf-devel cairo-devel gtk+-devel MesaLib-devel wxGTK-devel python-devel"
+fulldepends="python"
 short_desc="The wxWidgets GUI toolkit library (Python Bindings)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.wxwidgets.org/"
@@ -20,23 +22,7 @@ long_desc="
 
  This package contains the python bindings."
 
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build libXpm-devel
-Add_dependency build tiff-devel
-Add_dependency build expat-devel
-Add_dependency build libX11-devel
-Add_dependency build libXinerama-devel
-Add_dependency build GConf-devel
-Add_dependency build cairo-devel
-Add_dependency build gtk+-devel
-Add_dependency build MesaLib-devel
-Add_dependency build wxGTK-devel
-Add_dependency build python-devel # for Python.h
 
-Add_dependency full python
 
 subpackages="${pkgname}-devel"
 
diff --git a/srcpkgs/wxPython/wxPython-devel.template b/srcpkgs/wxPython/wxPython-devel.template
index 3d501be7c2..ce89d97852 100644
--- a/srcpkgs/wxPython/wxPython-devel.template
+++ b/srcpkgs/wxPython/wxPython-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'wxPython-devel'.
 #
+depends="wxGTK-devel wxPython"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run wxGTK-devel
-Add_dependency run wxPython
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/x11perf/template b/srcpkgs/x11perf/template
index 3cc34dee3d..7481420b4e 100644
--- a/srcpkgs/x11perf/template
+++ b/srcpkgs/x11perf/template
@@ -4,15 +4,10 @@ version=1.5.2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libXext-devel libXft-devel libXrender-devel libX11-devel libXmu-devel"
 short_desc="X11 server performance test program"
 checksum=a1fd752abd3496568614c2f2209d21452bdd5b8c9a5c14a5705725bd8c298e12
 long_desc="
  The x11perf program runs one or more performance tests and reports how
  fast an X server can execute the tests."
 
-Add_dependency build pkg-config
-Add_dependency build libXext-devel
-Add_dependency build libXft-devel
-Add_dependency build libXrender-devel
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
diff --git a/srcpkgs/x264/depends b/srcpkgs/x264/depends
deleted file mode 100644
index b0c3a35350..0000000000
--- a/srcpkgs/x264/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=20120126"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index f7cd2b8307..390be4291b 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -5,6 +5,7 @@ _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
 distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
+makedepends="yasm"
 short_desc="Free library for encoding H264/AVC video streams"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/developers/x264.html"
@@ -14,7 +15,6 @@ long_desc="
  Stable snapshot version of x264, a high quality H.264 codec."
 
 subpackages="$pkgname-devel"
-Add_dependency build yasm
 
 do_configure() {
 	./configure --disable-swscale --enable-pic --enable-shared
diff --git a/srcpkgs/x264/x264-devel.template b/srcpkgs/x264/x264-devel.template
index b6e8ce286c..3ac5445497 100644
--- a/srcpkgs/x264/x264-devel.template
+++ b/srcpkgs/x264/x264-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'x264-devel'.
 #
+depends="glibc-devel x264"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run x264
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index b73aedf807..39fc336140 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -4,6 +4,8 @@ version=0.5.2
 revision=2
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool glib-devel pango-devel gdk-pixbuf-devel gtk+-devel"
+fulldepends="xdg-utils desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+2 lightweight desktop independent archive manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa677ad2a
@@ -17,13 +19,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+-devel
 
-Add_dependency full xdg-utils
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index c3201724a0..d29f6c1a3a 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -4,6 +4,7 @@ version=1.0.6
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config xtrans libXau-devel libXext-devel libXmu-devel libX11-devel"
 short_desc="X authentication utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -14,9 +15,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build xtrans
-Add_dependency build libXau-devel
-Add_dependency build libXext-devel
-Add_dependency build libXmu-devel
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xbacklight/template b/srcpkgs/xbacklight/template
index e82701d509..96d9003b32 100644
--- a/srcpkgs/xbacklight/template
+++ b/srcpkgs/xbacklight/template
@@ -4,6 +4,7 @@ version=1.1.2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXrandr-devel"
 short_desc="Adjust backlight brightness using RandR extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=af2f02d09de8a19848e3f3b322320141bceebf9d4097b7bd505457a1bd936509
@@ -14,6 +15,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXrandr-devel
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index 969ed0506b..4209b00661 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -7,6 +7,8 @@ configure_args="--disable-debug --enable-sdl --enable-vdpau --enable-vaapi
 --disable-crystalhd --disable-tegra --disable-nfs --disable-afpclient
 --disable-hal --disable-webserver --enable-udev --enable-libusb
 --enable-external-libraries --enable-external-ffmpeg --disable-ccache"
+depends="dbus>=0 udisks>=0 upower>=0 hicolor-icon-theme desktop-file-utils mesa-demos"
+makedepends="pkg-config gperf cmake zip unzip nasm yasm pcre-devel expat-devel libpng-devel jpeg-devel tiff-devel libXmu-devel libXrandr-devel avahi-libs-devel pulseaudio-devel SDL_mixer-devel samba-devel libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel MesaLib-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel jasper-devel faac-devel SDL_image-devel faad2-devel libmodplug-devel openssl-devel libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel libbluetooth-devel yajl-devel libplist-devel ffmpeg-devel libusb-compat-devel"
 short_desc="XBMC Media Center"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xbmc.org"
@@ -20,64 +22,7 @@ long_desc="
 broken_as_needed=yes
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run dbus		">=0"
-Add_dependency run udisks	">=0"
-Add_dependency run upower	">=0"
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
-Add_dependency run mesa-demos # required glxinfo
 
-Add_dependency build pkg-config
-Add_dependency build gperf
-Add_dependency build cmake
-Add_dependency build zip
-Add_dependency build unzip
-Add_dependency build nasm
-Add_dependency build yasm
-Add_dependency build pcre-devel
-Add_dependency build expat-devel
-Add_dependency build libpng-devel
-Add_dependency build jpeg-devel
-Add_dependency build tiff-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXrandr-devel
-Add_dependency build avahi-libs-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build SDL_mixer-devel
-Add_dependency build samba-devel
-Add_dependency build libmysqlclient-devel
-Add_dependency build libmpeg2-devel
-Add_dependency build wavpack-devel
-Add_dependency build zlib-devel
-Add_dependency build lzo-devel
-Add_dependency build MesaLib-devel
-Add_dependency build glew-devel
-Add_dependency build fribidi-devel
-Add_dependency build sqlite-devel
-Add_dependency build libcdio-devel
-Add_dependency build freetype-devel
-Add_dependency build jasper-devel
-Add_dependency build faac-devel
-Add_dependency build SDL_image-devel
-Add_dependency build faad2-devel
-Add_dependency build libmodplug-devel
-Add_dependency build openssl-devel
-Add_dependency build libmad-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libsamplerate-devel
-Add_dependency build libmms-devel
-Add_dependency build enca-devel
-Add_dependency build boost-devel
-Add_dependency build libcurl-devel
-Add_dependency build libva-devel
-Add_dependency build libvdpau-devel
-Add_dependency build libass-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build yajl-devel
-Add_dependency build libplist-devel
-Add_dependency build ffmpeg-devel
-Add_dependency build libusb-compat-devel
 
 post_install() {
 	vinstall tools/Linux/xbmc.desktop 644 usr/share/applications
diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template
index 3e216ca720..19b10acd87 100644
--- a/srcpkgs/xbps-casper/template
+++ b/srcpkgs/xbps-casper/template
@@ -3,6 +3,7 @@ pkgname=xbps-casper
 _localver=0.25	# XBPS package version
 _distver=1.236	# This should match the upstream (Ubuntu) version
 version=${_localver}.${_distver}
+fulldepends="udev>=174 initramfs-tools"
 short_desc="Run a live preinstalled system from read-only media"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,8 +15,6 @@ noextract=yes
 noarch=yes
 conf_files="/etc/casper.conf"
 
-Add_dependency full udev ">=174" # no path_id anymore
-Add_dependency full initramfs-tools
 
 do_install() {
 	# /etc config files
diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template
index 2269f383d1..5ae11ec388 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-devel/template
@@ -4,6 +4,8 @@ version="$(date -u +%Y%m%d)"
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
 --with-pie --with-tests"
+depends="xbps-triggers"
+makedepends="git which pkg-config zlib-devel proplib-devel openssl-devel libarchive-devel libfetch-devel confuse-devel atf-devel"
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -21,18 +23,7 @@ replaces="xbps>=0"
 nofetch=yes
 noextract=yes
 
-Add_dependency run xbps-triggers
 
-Add_dependency build git
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build proplib-devel
-Add_dependency build openssl-devel
-Add_dependency build libarchive-devel
-Add_dependency build libfetch-devel
-Add_dependency build confuse-devel
-Add_dependency build atf-devel
 
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps"
diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template
index 80e04dfe47..d5eac99f28 100644
--- a/srcpkgs/xbps-devel/xbps-devel-static.template
+++ b/srcpkgs/xbps-devel/xbps-devel-static.template
@@ -1,5 +1,6 @@
 # Template file for 'xbps-devel-static'.
 #
+depends="xbps-triggers"
 short_desc="${sourcepkg} static binaries"
 long_desc="${long_desc}
 
@@ -9,7 +10,6 @@ long_desc="${long_desc}
 provides="xbps-static-9999"
 replaces="xbps-static>=0"
 
-Add_dependency run xbps-triggers
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xbps-src-git/template b/srcpkgs/xbps-src-git/template
index 2a31517cff..aca47abb33 100644
--- a/srcpkgs/xbps-src-git/template
+++ b/srcpkgs/xbps-src-git/template
@@ -1,9 +1,17 @@
 # Template file for 'xbps-src-git'
 pkgname=xbps-src-git
 version="$(date -u +%Y%m%d)"
+nofetch=yes
+noextract=yes
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
 make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
+depends="gcc-c++ make bison gettext texinfo patch perl>=0 fakeroot libcap-progs xbps-static"
+makedepends="libcap-devel"
+fulldepends="git"
+provides="xbps-src-9999"
+replaces="xbps-src>=0"
+conf_files="/etc/xbps/xbps-src.conf"
 short_desc="The XBPS package system - binary package builder (git snaphost)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -16,25 +24,6 @@ long_desc="
  This package includes code from master branch of development git
  repository. Do not use it if you aren't a developer."
 
-provides="xbps-src-9999"
-replaces="xbps-src>=0"
-conf_files="/etc/xbps/xbps-src.conf"
-nofetch=yes
-noextract=yes
-
-Add_dependency run gcc-c++
-Add_dependency run make
-Add_dependency run bison
-Add_dependency run gettext
-Add_dependency run texinfo
-Add_dependency run patch
-Add_dependency run perl ">=0"
-Add_dependency run fakeroot
-Add_dependency run libcap-progs
-Add_dependency run xbps-static
-Add_dependency full git
-Add_dependency build libcap-devel
-
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps-src"
 	msg_normal "Fetching source from $url ...\n"
diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template
index 510f811613..0fe198cc67 100644
--- a/srcpkgs/xbps-src/template
+++ b/srcpkgs/xbps-src/template
@@ -5,6 +5,9 @@ distfiles="https://github.com/downloads/xtraeme/xbps-src/xbps-src-${version}.tar
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
 make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
+depends="gcc-c++ make bison gettext texinfo patch perl>=0 fakeroot libcap-progs xbps-static"
+makedepends="libcap-devel"
+fulldepends="git"
 short_desc="The XBPS package system - binary package builder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -18,15 +21,3 @@ long_desc="
 replaces="xbps-src>=0"
 conf_files="/etc/xbps/xbps-src.conf"
 
-Add_dependency run gcc-c++
-Add_dependency run make
-Add_dependency run bison
-Add_dependency run gettext
-Add_dependency run texinfo
-Add_dependency run patch
-Add_dependency run perl ">=0"
-Add_dependency run fakeroot
-Add_dependency run libcap-progs
-Add_dependency run xbps-static
-Add_dependency full git
-Add_dependency build libcap-devel
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 218ef78688..b96e9d1ca9 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -5,6 +5,8 @@ distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --with-pie --sbindir=/usr/sbin
 --with-tests"
+depends="xbps-triggers"
+makedepends="which pkg-config zlib-devel proplib-devel openssl-devel libfetch-devel libarchive-devel confuse-devel atf-devel"
 short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -19,14 +21,4 @@ conf_files="/etc/xbps/xbps.conf"
 subpackages="$pkgname-static"
 replaces="xbps>=0"
 
-Add_dependency run xbps-triggers
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build zlib-devel
-Add_dependency build proplib-devel
-Add_dependency build openssl-devel
-Add_dependency build libfetch-devel
-Add_dependency build libarchive-devel
-Add_dependency build confuse-devel
-Add_dependency build atf-devel
diff --git a/srcpkgs/xbps/xbps-static.template b/srcpkgs/xbps/xbps-static.template
index 99293687a8..a9db96f2da 100644
--- a/srcpkgs/xbps/xbps-static.template
+++ b/srcpkgs/xbps/xbps-static.template
@@ -1,5 +1,6 @@
 # Template file for 'xbps-static'.
 #
+depends="xbps-triggers"
 short_desc="${short_desc} - static binaries and development files"
 long_desc="${long_desc}
 
@@ -7,7 +8,6 @@ long_desc="${long_desc}
  used on any GNU/Linux distribution matching the architecture."
 
 replaces="xbps-static>=0"
-Add_dependency run xbps-triggers
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template
index 5e95b5f49e..1ab7edfcf8 100644
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@@ -3,6 +3,8 @@ pkgname=xcb-proto
 version=1.7
 distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="libxml2"
+fulldepends="python"
 short_desc="XML-XCB (X C Bindings) protocol descriptions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38
@@ -28,5 +30,3 @@ long_desc="
 noarch=yes
 pycompile_module="xcbgen"
 
-Add_dependency full python
-Add_dependency build libxml2
diff --git a/srcpkgs/xcb-util/depends b/srcpkgs/xcb-util/depends
deleted file mode 100644
index aa20135311..0000000000
--- a/srcpkgs/xcb-util/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.3.4"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index 51ed01599b..4ede63b78e 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -4,6 +4,7 @@ version=0.3.6
 revision=3
 distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config gperf libxcb-devel"
 short_desc="XCB utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57
@@ -28,6 +29,3 @@ long_desc="
  wm: Framework for window manager implementation."
 
 subpackages="$pkgname-devel"
-Add_dependency build pkg-config
-Add_dependency build gperf
-Add_dependency build libxcb-devel
diff --git a/srcpkgs/xcb-util/xcb-util-devel.template b/srcpkgs/xcb-util/xcb-util-devel.template
index 3f6cd42db0..0b46ec1e23 100644
--- a/srcpkgs/xcb-util/xcb-util-devel.template
+++ b/srcpkgs/xcb-util/xcb-util-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'xcb-util-devel'.
 #
+depends="libxcb-devel xcb-util"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run libxcb-devel
-Add_dependency run xcb-util
 
 do_install()
 {
diff --git a/srcpkgs/xcmsdb/template b/srcpkgs/xcmsdb/template
index 6e962427f7..ea8f25b616 100644
--- a/srcpkgs/xcmsdb/template
+++ b/srcpkgs/xcmsdb/template
@@ -4,6 +4,7 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel"
 short_desc="Device Color Characterization utility for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b237d060f1eed71fa2bfe089b7fb04508299e1a49091a7d7b0e536f8344d5a80
@@ -12,5 +13,3 @@ long_desc="
  data stored in properties on the root window of the screen as specified
  in section 7, Device Color Characterization, of the ICCCM."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel 
diff --git a/srcpkgs/xcursorgen/template b/srcpkgs/xcursorgen/template
index 9c6e0eda91..69be46a84b 100644
--- a/srcpkgs/xcursorgen/template
+++ b/srcpkgs/xcursorgen/template
@@ -4,13 +4,10 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXcursor-devel libpng-devel"
 short_desc="X cursor generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=de2adb2f44ffee906024e53322aeb728d46061e6ca8e6f5a7e0da2c00d6f5f1d
 long_desc="
  $pkgname creates an X cursor file from a collection of PNG images."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libpng-devel
diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4e971e8ddf..09599c89a1 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -4,6 +4,8 @@ version=0.9
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+3-devel"
+fulldepends="xdg-user-dirs"
 short_desc="GTK+ tool to help manage user directories"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,8 +15,4 @@ long_desc="
  the desktop folder and the music folder. It also handles localization
  (i.e. translation) of the filenames."
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
 
-Add_dependency full xdg-user-dirs
diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 7bf2fb1886..d392db96d3 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -4,6 +4,7 @@ version=1.2.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libXext-devel libX11-devel libXtst-devel libXxf86vm-devel libXxf86misc-devel libXi-devel libXrender-devel libXcomposite-devel libXinerama-devel libdmx-devel"
 short_desc="Display information utility for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce
@@ -12,14 +13,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libXext-devel
-Add_dependency build libX11-devel
-Add_dependency build libXtst-devel
-Add_dependency build libXxf86vm-devel
-Add_dependency build libXxf86misc-devel
-Add_dependency build libXi-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libdmx-devel
diff --git a/srcpkgs/xdriinfo/template b/srcpkgs/xdriinfo/template
index dae2372907..062fd16063 100644
--- a/srcpkgs/xdriinfo/template
+++ b/srcpkgs/xdriinfo/template
@@ -4,6 +4,7 @@ version=1.0.4
 revision=2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libX11-devel MesaLib-devel"
 short_desc="X.org DRI information utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c
@@ -13,6 +14,3 @@ long_desc="
  No X connection is needed if the driver name is explicitly specified."
 
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build MesaLib-devel
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index d719e0cdf8..1451e3b296 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -3,6 +3,8 @@ pkgname=xen
 version=4.1.2
 wrksrc=xen-${version}
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
+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"
 short_desc="Xen Hypervisor and Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
@@ -37,26 +39,7 @@ conf_files="
 /etc/xen/xend-pci-quirks.sxp
 /etc/xen/xend-pci-permissive.sxp"
 
-Add_dependency run iproute2	# Requires ip
-Add_dependency run bridge-utils	# Required brctl
 
-Add_dependency build openssl-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build zlib-devel
-Add_dependency build gnutls-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build pciutils-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build SDL-devel
-Add_dependency build MesaLib-devel
-Add_dependency build ncurses-devel
-Add_dependency build liblzma-devel
-Add_dependency build python-devel
-Add_dependency build dev86
-Add_dependency build acpica-utils
-Add_dependency build wget
-Add_dependency build git
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-multilib
diff --git a/srcpkgs/xen/xen-devel.template b/srcpkgs/xen/xen-devel.template
index 7c40cc19ef..3ead5a2848 100644
--- a/srcpkgs/xen/xen-devel.template
+++ b/srcpkgs/xen/xen-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'xen-devel'.
 #
+depends="xen"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xen
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xev/template b/srcpkgs/xev/template
index 2fdb8c57e3..ec624768d4 100644
--- a/srcpkgs/xev/template
+++ b/srcpkgs/xev/template
@@ -4,6 +4,7 @@ version=1.1.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel"
 short_desc="Display X events"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6
@@ -15,5 +16,3 @@ long_desc="
 
  This is the version of xev maintained by Xorg."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xextproto/template b/srcpkgs/xextproto/template
index bc7fc6c83e..cb4cdc951a 100644
--- a/srcpkgs/xextproto/template
+++ b/srcpkgs/xextproto/template
@@ -3,12 +3,12 @@ pkgname=xextproto
 version=7.2.0
 distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="xmlto"
 short_desc="XExt extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
 long_desc="
  This provides the XExt extension headers from modular X.org project."
 
-Add_dependency build xmlto
 
 noarch=yes
diff --git a/srcpkgs/xf86-input-acecad/template b/srcpkgs/xf86-input-acecad/template
index 3fb63f20c6..51211631d4 100644
--- a/srcpkgs/xf86-input-acecad/template
+++ b/srcpkgs/xf86-input-acecad/template
@@ -4,14 +4,11 @@ version=1.4.0
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc libsysfs xorg-server"
+makedepends="libsysfs-devel xorg-server-devel"
 short_desc="Xorg acecad input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
 long_desc="
  This is the acecad input driver for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run libsysfs
-Add_dependency run xorg-server
-Add_dependency build libsysfs-devel
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-aiptek/template b/srcpkgs/xf86-input-aiptek/template
index 7b656d8be3..6f9a1caddb 100644
--- a/srcpkgs/xf86-input-aiptek/template
+++ b/srcpkgs/xf86-input-aiptek/template
@@ -4,12 +4,11 @@ version=1.3.0
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg aiptek input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b37f35bb021dffc337c731bfbbb6ce7c0953dc69f7c660cbe48b0f84a07b5e5c
 long_desc="
  This is the aiptek input driver for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-evdev/depends b/srcpkgs/xf86-input-evdev/depends
deleted file mode 100644
index 1d0c5048b0..0000000000
--- a/srcpkgs/xf86-input-evdev/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.2.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template
index 3868611087..67f71bd034 100644
--- a/srcpkgs/xf86-input-evdev/template
+++ b/srcpkgs/xf86-input-evdev/template
@@ -3,6 +3,8 @@ pkgname=xf86-input-evdev
 version=2.7.0
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel mtdev-devel"
 short_desc="Xorg event device input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3ee1feee0ccf748005ca30b0993d0c1b80f85158b726745f9e0cb220902d6ec7
@@ -11,6 +13,3 @@ long_desc="
  Xorg X11 server."
 
 subpackages="$pkgname-devel"
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
-Add_dependency build mtdev-devel
diff --git a/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template b/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template
index ea5fe49ce1..a57bf16588 100644
--- a/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template
+++ b/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'xf86-input-evdev-devel'.
 #
+depends="xorg-server-devel xf86-input-evdev"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xorg-server-devel
-Add_dependency run xf86-input-evdev
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xf86-input-joystick/depends b/srcpkgs/xf86-input-joystick/depends
deleted file mode 100644
index fd55a5e347..0000000000
--- a/srcpkgs/xf86-input-joystick/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.4.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template
index 42c61e1b14..7693dafeb3 100644
--- a/srcpkgs/xf86-input-joystick/template
+++ b/srcpkgs/xf86-input-joystick/template
@@ -3,6 +3,8 @@ pkgname=xf86-input-joystick
 version=1.5.0
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Joystick Input driver for Xorg"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
@@ -10,6 +12,3 @@ long_desc="
  This is the Joystick Input driver for the Xorg X11 server."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
index 60de5d485e..c7aadc5585 100644
--- a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
+++ b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'xf86-input-joystick-devel'.
 #
+depends="xorg-server-devel xf86-input-joystick"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run xorg-server-devel
-Add_dependency run xf86-input-joystick
 
 do_install()
 {
diff --git a/srcpkgs/xf86-input-keyboard/template b/srcpkgs/xf86-input-keyboard/template
index aa414ba54a..6a4cbe4bff 100644
--- a/srcpkgs/xf86-input-keyboard/template
+++ b/srcpkgs/xf86-input-keyboard/template
@@ -4,12 +4,11 @@ version=1.4.0
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg keyboard input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
 long_desc="
  This is the keyboard input driver for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-mouse/template b/srcpkgs/xf86-input-mouse/template
index 7a4280b752..b926c817b1 100644
--- a/srcpkgs/xf86-input-mouse/template
+++ b/srcpkgs/xf86-input-mouse/template
@@ -4,12 +4,11 @@ version=1.5.0
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg mouse input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397
 long_desc="
  This is the mouse input driver for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-synaptics/depends b/srcpkgs/xf86-input-synaptics/depends
deleted file mode 100644
index 7d08e28214..0000000000
--- a/srcpkgs/xf86-input-synaptics/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.1.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template
index cdc0df2910..0f4d7a7041 100644
--- a/srcpkgs/xf86-input-synaptics/template
+++ b/srcpkgs/xf86-input-synaptics/template
@@ -3,6 +3,8 @@ pkgname=xf86-input-synaptics
 version=1.6.1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="libXtst-devel libX11-devel libXi-devel mtdev-devel pixman-devel libpciaccess-devel xorg-server-devel"
 short_desc="Xorg synaptics touchpad input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.x.org/"
@@ -13,12 +15,4 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency run xorg-server
 
-Add_dependency build libXtst-devel
-Add_dependency build libX11-devel
-Add_dependency build libXi-devel
-Add_dependency build mtdev-devel
-Add_dependency build pixman-devel
-Add_dependency build libpciaccess-devel
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template b/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template
index 07f56f0324..acb0bcec22 100644
--- a/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template
+++ b/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template
@@ -1,17 +1,11 @@
 # Template file for 'xf86-input-synaptics-devel'.
 #
+depends="libXtst-devel libX11-devel libXi-devel pixman-devel libpciaccess-devel xorg-server-devel xf86-input-synaptics"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libXtst-devel
-Add_dependency run libX11-devel
-Add_dependency run libXi-devel
-Add_dependency run pixman-devel
-Add_dependency run libpciaccess-devel
-Add_dependency run xorg-server-devel
-Add_dependency run xf86-input-synaptics
 
 do_install()
 {
diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template
index e660615851..3427c56452 100644
--- a/srcpkgs/xf86-input-vmmouse/template
+++ b/srcpkgs/xf86-input-vmmouse/template
@@ -3,14 +3,14 @@ pkgname=xf86-input-vmmouse
 version=12.8.0
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg VMware virtual mouse input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a8a6ec0b567c48c130ccb830e15dfc2b201831841de0c2cc56bd87256d2d869a
 long_desc="
  This is the VMware virtual mouse input driver for the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
 
 post_install() {
 	# Remove HAL stuff, it's obsolete.
diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template
index 9382ae82fa..e436b970af 100644
--- a/srcpkgs/xf86-input-wacom/template
+++ b/srcpkgs/xf86-input-wacom/template
@@ -3,6 +3,8 @@ pkgname=xf86-input-wacom
 version=0.14.0
 distfiles="${SOURCEFORGE_SITE}/linuxwacom/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel libXrandr-devel libXinerama-devel libXi-devel"
 short_desc="Xorg Wacom tablet input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=929817ec7979d87432226245c687a1fdd211dcd3057c9d10dce72a933d80a69e
@@ -12,11 +14,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXi-devel
 
 post_install() {
 	vinstall ${FILESDIR}/70-wacom.rules 644 lib/udev/rules.d
diff --git a/srcpkgs/xf86-video-apm/template b/srcpkgs/xf86-video-apm/template
index ff187b75e1..58f073a6ca 100644
--- a/srcpkgs/xf86-video-apm/template
+++ b/srcpkgs/xf86-video-apm/template
@@ -4,6 +4,8 @@ version=1.2.3
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Alliance ProMotion video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for Alliance ProMotion video cards for
  the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-ark/template b/srcpkgs/xf86-video-ark/template
index 268e115f5f..d486ab70cf 100644
--- a/srcpkgs/xf86-video-ark/template
+++ b/srcpkgs/xf86-video-ark/template
@@ -4,6 +4,8 @@ version=0.7.3
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg ARK Logic video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for the ARK Logic video cards for
  the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-ast/template b/srcpkgs/xf86-video-ast/template
index 9583ec9def..ecc34863c2 100644
--- a/srcpkgs/xf86-video-ast/template
+++ b/srcpkgs/xf86-video-ast/template
@@ -4,11 +4,11 @@ version=0.91.10
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg AST2000  video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7e1b1490f894677f616c0215a7d5fb7d6c5355ce393cf5dc9c9ab4b635b8cc15
 long_desc="
  This is the video driver for AST2000 video cards for the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-ati-git-snapshot/template b/srcpkgs/xf86-video-ati-git-snapshot/template
index 7429ae911a..8d22cdc664 100644
--- a/srcpkgs/xf86-video-ati-git-snapshot/template
+++ b/srcpkgs/xf86-video-ati-git-snapshot/template
@@ -2,6 +2,8 @@
 pkgname=xf86-video-ati-git-snapshot
 version="$(date -u +%Y%m%d)"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="git automake pkg-config randrproto libudev-devel libpciaccess-devel libdrm-devel libXrandr-devel pixman-devel xorg-util-macros xorg-server-devel MesaLib-devel"
 short_desc="Xorg ATI Radeon video driver (git snapshot)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -13,20 +15,7 @@ provides="xf86-video-ati-6.15"
 nofetch=yes
 noextract=yes
 
-Add_dependency run xorg-server
 
-Add_dependency build git
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build randrproto
-Add_dependency build libudev-devel
-Add_dependency build libpciaccess-devel
-Add_dependency build libdrm-devel
-Add_dependency build libXrandr-devel
-Add_dependency build pixman-devel
-Add_dependency build xorg-util-macros
-Add_dependency build xorg-server-devel
-Add_dependency build MesaLib-devel
 
 do_fetch() {
 	local url="git://anongit.freedesktop.org/xorg/driver/xf86-video-ati"
diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index c2c03047bd..d40578cb7b 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -5,6 +5,8 @@ revision=1
 patch_args="-Np1"
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="pkg-config xf86driproto libudev-devel libpciaccess-devel libdrm-devel pixman-devel xorg-server-devel MesaLib-devel"
 short_desc="Xorg ATI Radeon video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4ffe435ef8fbe0989f6576f04f789e147a2de7fdefc3644e39d5ef626c37ef85
@@ -13,13 +15,4 @@ long_desc="
 
 replaces="${pkgname}>=0"
 
-Add_dependency run xorg-server
 
-Add_dependency build pkg-config
-Add_dependency build xf86driproto
-Add_dependency build libudev-devel
-Add_dependency build libpciaccess-devel
-Add_dependency build libdrm-devel
-Add_dependency build pixman-devel
-Add_dependency build xorg-server-devel
-Add_dependency build MesaLib-devel
diff --git a/srcpkgs/xf86-video-chips/template b/srcpkgs/xf86-video-chips/template
index d245a78c0b..fb0b765b7e 100644
--- a/srcpkgs/xf86-video-chips/template
+++ b/srcpkgs/xf86-video-chips/template
@@ -3,6 +3,8 @@ pkgname=xf86-video-chips
 version=1.2.3
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Chips and Technologies video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d
@@ -10,6 +12,3 @@ long_desc="
  This is the video driver for Chips and Technologies video cards for
  the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index 55d8eb7346..3d11cf083c 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -4,6 +4,8 @@ version=1.3.2
 revision=4
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Cirrus Logic video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for Cirrus Logic video cards for
  the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template
index e1731634de..777899d50b 100644
--- a/srcpkgs/xf86-video-fbdev/template
+++ b/srcpkgs/xf86-video-fbdev/template
@@ -4,11 +4,11 @@ version=0.4.2
 revision=3
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg framebuffer video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
 long_desc="
  This is the video driver for framebuffer devices for the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template
index 747fbc4f83..e384ac6899 100644
--- a/srcpkgs/xf86-video-geode/template
+++ b/srcpkgs/xf86-video-geode/template
@@ -4,6 +4,8 @@ version=2.11.6
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg AMD Geode GX/LX video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4a1ada47bc08db13a57f32e73cbc5a5f0774f87ba447071737e50dfefb741f91
@@ -11,6 +13,3 @@ long_desc="
  This is the video driver for AMD Geode GX/LX video cards for the
  Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-glint/template b/srcpkgs/xf86-video-glint/template
index f5c22bfe58..9ba698f6d4 100644
--- a/srcpkgs/xf86-video-glint/template
+++ b/srcpkgs/xf86-video-glint/template
@@ -3,6 +3,8 @@ pkgname=xf86-video-glint
 version=1.2.5
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg GLINT/Permedia video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b
@@ -10,6 +12,3 @@ long_desc="
  This is the video driver for 3Dlabs and Texas Instruments GLINT/Permedia
  based video cards for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-i128/template b/srcpkgs/xf86-video-i128/template
index 43ea9ca408..4a357ae34a 100644
--- a/srcpkgs/xf86-video-i128/template
+++ b/srcpkgs/xf86-video-i128/template
@@ -4,6 +4,8 @@ version=1.3.4
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Number 9 I128 video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for Number 9 I128 video cards for
  the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-i740/template b/srcpkgs/xf86-video-i740/template
index 8418c64154..6ffc124071 100644
--- a/srcpkgs/xf86-video-i740/template
+++ b/srcpkgs/xf86-video-i740/template
@@ -4,6 +4,8 @@ version=1.3.2
 revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Intel 740 video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for Intel 740 video cards for
  the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index 76883cded9..995380be38 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -4,6 +4,8 @@ version=2.19.0
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-sna"
+depends="xorg-server"
+makedepends="dri2proto>=2.6 libudev-devel libdrm-devel libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel libxcb-devel xcb-util-devel xorg-server-devel"
 short_desc="Xorg Intel video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -13,19 +15,7 @@ long_desc="
  This is the video driver for Intel video chips for the
  Xorg X11 server."
 
-Add_dependency run xorg-server
 
-Add_dependency build dri2proto		">=2.6"
-Add_dependency build libudev-devel
-Add_dependency build libdrm-devel
-Add_dependency build libpciaccess-devel
-Add_dependency build libXext-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXv-devel
-Add_dependency build libXvMC-devel
-Add_dependency build libxcb-devel
-Add_dependency build xcb-util-devel
-Add_dependency build xorg-server-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
diff --git a/srcpkgs/xf86-video-mach64/template b/srcpkgs/xf86-video-mach64/template
index 30e04ff323..884d713a15 100644
--- a/srcpkgs/xf86-video-mach64/template
+++ b/srcpkgs/xf86-video-mach64/template
@@ -4,6 +4,8 @@ version=6.8.2
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg ATI Mach64 video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
@@ -11,6 +13,3 @@ long_desc="
  This is the video driver for ATI Mach64 video cards for
  the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 83317b430a..1197e928a9 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -3,12 +3,11 @@ pkgname=xf86-video-mga
 version=1.4.13
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Matrox video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
 long_desc="
  This is the video driver for Matrox video cards for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-neomagic/template b/srcpkgs/xf86-video-neomagic/template
index fedbc19c5d..d7668a16d1 100644
--- a/srcpkgs/xf86-video-neomagic/template
+++ b/srcpkgs/xf86-video-neomagic/template
@@ -3,12 +3,11 @@ pkgname=xf86-video-neomagic
 version=1.2.5
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Neomagic video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
 long_desc="
  This is the video driver for Neomagic video cards for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index 0dbf9916c6..42b7482b60 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -4,6 +4,8 @@ _distver=0.0.16
 _gitver="$(date +%Y%m%d)"
 version=${_distver}.${_gitver}
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="git automake pkg-config libdrm-devel libudev-devel xorg-server-devel xorg-util-macros"
 short_desc="Xorg OpenSource NVIDIA video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://nouveau.freedesktop.org/wiki/"
@@ -16,15 +18,7 @@ long_desc="
 nofetch=yes
 noextract=yes
 
-Add_dependency run xorg-server
 
-Add_dependency build git
-Add_dependency build automake
-Add_dependency build pkg-config
-Add_dependency build libdrm-devel
-Add_dependency build libudev-devel
-Add_dependency build xorg-server-devel
-Add_dependency build xorg-util-macros
 
 do_fetch() {
 	local gitrepo="git://anongit.freedesktop.org/nouveau/xf86-video-nouveau"
diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template
index 1ab0794f0c..2e47a22c7c 100644
--- a/srcpkgs/xf86-video-openchrome/template
+++ b/srcpkgs/xf86-video-openchrome/template
@@ -3,6 +3,7 @@ pkgname=xf86-video-openchrome
 version=0.2.906
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel MesaLib-devel xorg-server-devel"
 short_desc="Xorg VIA Unichromes video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41
@@ -10,10 +11,3 @@ long_desc="
  This is the video driver for VIA Unichromes video cards for
  the Xorg X11 server."
 
-Add_dependency build libdrm-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXv-devel
-Add_dependency build libXvMC-devel
-Add_dependency build MesaLib-devel
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-qxl/template b/srcpkgs/xf86-video-qxl/template
index 5a237eb7ca..d0df39df1d 100644
--- a/srcpkgs/xf86-video-qxl/template
+++ b/srcpkgs/xf86-video-qxl/template
@@ -4,14 +4,11 @@ version=0.0.17
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-xspice=yes"
+depends="xorg-server"
+makedepends="xf86dgaproto spice-protocol spice-devel xorg-server-devel"
 short_desc="Modular Xorg QXL virtual video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=193c2bb4889de39f7b0071990adaae1753b45e542f68d76cc0d55a7299b49f82
 long_desc="
  This is the QXL virtual video driver for the modular Xorg server."
 
-Add_dependency run xorg-server
-Add_dependency build xf86dgaproto
-Add_dependency build spice-protocol
-Add_dependency build spice-devel
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-r128/template b/srcpkgs/xf86-video-r128/template
index fc83ba5b4f..e9620240c5 100644
--- a/srcpkgs/xf86-video-r128/template
+++ b/srcpkgs/xf86-video-r128/template
@@ -4,6 +4,8 @@ version=6.8.1
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg ATI Rage 128 video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
@@ -11,6 +13,3 @@ long_desc="
  This is the video driver for ATI Rage 128 video cards for
  the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-radeonhd/template b/srcpkgs/xf86-video-radeonhd/template
index 9b4fe35a5a..c95e05a581 100644
--- a/srcpkgs/xf86-video-radeonhd/template
+++ b/srcpkgs/xf86-video-radeonhd/template
@@ -4,6 +4,8 @@ version=1.3.0
 revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="libdrm xorg-server"
+makedepends="libpciaccess-devel libdrm-devel xorg-server-devel"
 short_desc="Xorg ATI Radeon HD series video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5adad675e60e973f2e3522a01457d9214157fbb5005090fe48092e6e5e698ad5
@@ -11,8 +13,3 @@ long_desc="
  This is the video driver for ATI Radeon HD video cards for the
  Xorg X11 server."
 
-Add_dependency run libdrm
-Add_dependency run xorg-server
-Add_dependency build libpciaccess-devel
-Add_dependency build libdrm-devel
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-s3/template b/srcpkgs/xf86-video-s3/template
index 41da326388..e0b83c73be 100644
--- a/srcpkgs/xf86-video-s3/template
+++ b/srcpkgs/xf86-video-s3/template
@@ -4,11 +4,11 @@ version=0.6.3
 revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg S3 video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 long_desc="
  This is the video driver for S3 video cards for the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-s3virge/template b/srcpkgs/xf86-video-s3virge/template
index cca106dd3e..909dac9dae 100644
--- a/srcpkgs/xf86-video-s3virge/template
+++ b/srcpkgs/xf86-video-s3virge/template
@@ -4,6 +4,8 @@ version=1.10.4
 revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg S3 Virge video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for S3 Virge video cards for the Xorg
  X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-savage/template b/srcpkgs/xf86-video-savage/template
index 4d6d7cde30..a840c79f43 100644
--- a/srcpkgs/xf86-video-savage/template
+++ b/srcpkgs/xf86-video-savage/template
@@ -4,6 +4,8 @@ version=2.3.1
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg S3 Savage video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab
@@ -11,6 +13,3 @@ long_desc="
  This is the video driver for S3 Savage video cards for the Xorg
  X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-siliconmotion/template b/srcpkgs/xf86-video-siliconmotion/template
index a3b8bf6294..f07e7f865f 100644
--- a/srcpkgs/xf86-video-siliconmotion/template
+++ b/srcpkgs/xf86-video-siliconmotion/template
@@ -4,6 +4,8 @@ version=1.7.3
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Silicon Motion video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
@@ -11,6 +13,3 @@ long_desc="
  This is the video driver for Silicon Motion video cards for
  the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-sis/template b/srcpkgs/xf86-video-sis/template
index 790bc6e4d2..3e15e8d4ff 100644
--- a/srcpkgs/xf86-video-sis/template
+++ b/srcpkgs/xf86-video-sis/template
@@ -4,6 +4,8 @@ version=0.10.3
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
@@ -11,6 +13,3 @@ long_desc="
  This is the video driver for SiS (Silicon Integrated Systems) and XGI
  video chips for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template
index 77e8cf0862..fd5985c5c4 100644
--- a/srcpkgs/xf86-video-sisusb/template
+++ b/srcpkgs/xf86-video-sisusb/template
@@ -6,6 +6,8 @@ wrksrc="${pkgname}-${_gitrev}"
 distfiles="http://xbps.nopcode.org/distfiles/${pkgname}-${_gitrev}.tar.gz"
 #distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="automake xorg-util-macros xorg-server-devel"
 short_desc="Xorg SiS USB video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b9dbc4a32b383bcdcb8ebcca0eb8ce8a0fe6bc91e74f9d9b1ec83120e90c4468
@@ -13,10 +15,6 @@ long_desc="
  This is the video driver for SiS (Silicon Integrated Systems) video chips
  that are connected via a Net2280-based USB dongle for the Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build automake
-Add_dependency build xorg-util-macros
-Add_dependency build xorg-server-devel
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/xf86-video-tdfx/template b/srcpkgs/xf86-video-tdfx/template
index 5cfaf78ea6..4f9d62aa11 100644
--- a/srcpkgs/xf86-video-tdfx/template
+++ b/srcpkgs/xf86-video-tdfx/template
@@ -4,12 +4,11 @@ version=1.4.3
 revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg 3Dfx video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 long_desc="
  This is the video driver for 3Dfx video cards for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-trident/template b/srcpkgs/xf86-video-trident/template
index 3e5ca8b4d9..33d9a1d2fd 100644
--- a/srcpkgs/xf86-video-trident/template
+++ b/srcpkgs/xf86-video-trident/template
@@ -3,12 +3,11 @@ pkgname=xf86-video-trident
 version=1.3.4
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Trident video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
 long_desc="
  This is the video driver for Trident video cards for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-tseng/template b/srcpkgs/xf86-video-tseng/template
index b1469ce59d..1778fd3674 100644
--- a/srcpkgs/xf86-video-tseng/template
+++ b/srcpkgs/xf86-video-tseng/template
@@ -4,6 +4,8 @@ version=1.2.4
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Tseng Labs video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for Tseng Labs video cards for the
  Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-v4l/template b/srcpkgs/xf86-video-v4l/template
index 7f5cf35821..34f821c086 100644
--- a/srcpkgs/xf86-video-v4l/template
+++ b/srcpkgs/xf86-video-v4l/template
@@ -4,6 +4,8 @@ version=0.2.0
 revision=4
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Video4Linux video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cbff9120fbad900cbdc7ac535d04984e7b491d69a8eb0b371e30ae07cb61925d
@@ -11,5 +13,3 @@ long_desc="
  This is the video driver for Video4Linux video cards for the
  Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template
index e651ead63e..ee8d1dad93 100644
--- a/srcpkgs/xf86-video-vesa/template
+++ b/srcpkgs/xf86-video-vesa/template
@@ -6,6 +6,8 @@ wrksrc="${pkgname}-${_gitrev}"
 distfiles="http://xbps.nopcode.org/distfiles/${pkgname}-${_gitrev}.tar.gz"
 #distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="xorg-server"
+makedepends="automake xorg-util-macros xorg-server-devel"
 short_desc="Xorg VESA video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=49cae114b0722eb7ae2ec961d9d7168b514e182725d009324e19aff6a5ebdf15
@@ -13,10 +15,6 @@ long_desc="
  This is the video driver for Generic VESA video cards for the 
  Xorg X11 server."
 
-Add_dependency run xorg-server
-Add_dependency build automake
-Add_dependency build xorg-util-macros
-Add_dependency build xorg-server-devel
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template
index 353c206e7c..70adf7ca5e 100644
--- a/srcpkgs/xf86-video-vmware/template
+++ b/srcpkgs/xf86-video-vmware/template
@@ -5,17 +5,10 @@ revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-vmwarectrl-client"
+depends="xorg-server MesaLib>=8.0.2_1"
+makedepends="pkg-config libdrm-devel MesaLib>=8.0.2_1 MesaLib-devel>=8.0.2_1 xorg-server-devel"
 short_desc="Modular Xorg VMware virtual video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 long_desc="
  This is the VMware virtual video driver for the modular Xorg server."
-
-shlib_depends="MesaLib>=8.0.2_1"
-
-Add_dependency run xorg-server
-Add_dependency build pkg-config
-Add_dependency build libdrm-devel
-Add_dependency build MesaLib	">=8.0.2_1"
-Add_dependency build MesaLib-devel ">=8.0.2_1"
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-voodoo/template b/srcpkgs/xf86-video-voodoo/template
index 4979f4d0f1..36690491e7 100644
--- a/srcpkgs/xf86-video-voodoo/template
+++ b/srcpkgs/xf86-video-voodoo/template
@@ -3,6 +3,8 @@ pkgname=xf86-video-voodoo
 version=1.2.4
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc xorg-server"
+makedepends="xorg-server-devel"
 short_desc="Xorg Voodoo 1/2 series video driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
@@ -10,6 +12,3 @@ long_desc="
  This is the video driver for Voodoo 1 and Voodoo 2 series video cards
  for the Xorg X11 server."
 
-Add_dependency run glibc
-Add_dependency run xorg-server
-Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 5b591b2e9f..daa8fdf077 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -3,6 +3,8 @@ pkgname=xfburn
 version=0.4.2
 distfiles="http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="intltool"
+fulldepends="libburn libisofs libxfcegui4 Thunar gst-plugins-base desktop-file-utils hicolor-icon-theme"
 short_desc="CD-burner application for Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b2b00665f8ed98c9df996ba2d0d73b3182c3b421f3927c9ab76c3424758f71b5
@@ -15,11 +17,3 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency full libburn
-Add_dependency full libisofs
-Add_dependency full libxfcegui4
-Add_dependency full Thunar
-Add_dependency full gst-plugins-base
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
-Add_dependency build intltool
diff --git a/srcpkgs/xfce-utils/template b/srcpkgs/xfce-utils/template
index 520738a9f9..6d234ca6fd 100644
--- a/srcpkgs/xfce-utils/template
+++ b/srcpkgs/xfce-utils/template
@@ -4,6 +4,8 @@ version=4.8.2
 distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config intltool libxfce4ui-devel libxfce4util-devel gtk+-devel dbus-glib-devel"
+fulldepends="xfconf-perl hicolor-icon-theme desktop-file-utils"
 short_desc="Utilities for the Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/"
@@ -15,14 +17,5 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4ui-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build gtk+-devel
-Add_dependency build dbus-glib-devel
 
 # xfconf-perl is required by the xfconf-migration script.
-Add_dependency full xfconf-perl
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index 16fe27c2ae..96cba36487 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -4,6 +4,8 @@ version=4.10.0
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel"
 short_desc="Appfinder for the Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,13 +15,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build garcon-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build xfconf-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/xfce4-mixer/template b/srcpkgs/xfce4-mixer/template
index 719c025355..51928b4c6e 100644
--- a/srcpkgs/xfce4-mixer/template
+++ b/srcpkgs/xfce4-mixer/template
@@ -4,6 +4,8 @@ version=4.8.0
 distfiles="http://archive.xfce.org/src/apps/$pkgname/4.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=3
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config intltool gtk+-devel gstreamer-devel gst-plugins-base-devel libxfce4util-devel libxfce4ui-devel xfconf-devel xfce4-panel-devel"
 short_desc="Sound mixer for the Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab
@@ -12,15 +14,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/xfce4-mixer/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build xfconf-devel
-Add_dependency build xfce4-panel-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 617e2c6561..bf87ff25ec 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -4,6 +4,8 @@ version=0.2.2
 revision=1
 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libxfce4util-devel libxfce4ui-devel xfconf-devel dbus-glib-devel gtk+-devel"
 short_desc="Simple, visually-appealing notification daemon for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168
@@ -18,13 +20,4 @@ build_requires=11
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build xfconf-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/xfce4-panel/depends b/srcpkgs/xfce4-panel/depends
deleted file mode 100644
index 171cfd569d..0000000000
--- a/srcpkgs/xfce4-panel/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.9.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 46528a3b46..7359d597b8 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -4,6 +4,8 @@ version=4.10.0
 distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libxfce4util-devel libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel>=2.30.6_1 garcon-devel exo-devel"
 short_desc="Next generation panel for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/"
@@ -15,16 +17,4 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4util-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build gtk+-devel
-Add_dependency build xfconf-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libwnck2-devel	">=2.30.6_1"
-Add_dependency build garcon-devel
-Add_dependency build exo-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/xfce4-panel/xfce4-panel-devel.template b/srcpkgs/xfce4-panel/xfce4-panel-devel.template
index 5de49880c1..ab112d65cd 100644
--- a/srcpkgs/xfce4-panel/xfce4-panel-devel.template
+++ b/srcpkgs/xfce4-panel/xfce4-panel-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'xfce4-panel-devel'.
 #
+depends="glib-devel gtk+-devel libxfce4util-devel xfce4-panel>=4.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run gtk+-devel
-Add_dependency run libxfce4util-devel
-Add_dependency run xfce4-panel ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index e6d56767da..7cb70ffff9 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -6,6 +6,8 @@ distfiles="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.2/$pkgname-$ve
 build_style=gnu-configure
 configure_args="--enable-polkit --enable-dpms
 --disable-debug --enable-network-manager --disable-static"
+depends="upower udisks hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libxfce4ui-devel libxfce4util-devel xfconf-devel libnotify-devel gtk+-devel libXrandr-devel dbus-glib-devel xfce4-panel-devel NetworkManager-devel"
 short_desc="Xfce power manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,19 +17,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4ui-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build xfconf-devel
-Add_dependency build libnotify-devel
-Add_dependency build gtk+-devel
-Add_dependency build libXrandr-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build xfce4-panel-devel
-Add_dependency build NetworkManager-devel
 
-Add_dependency run upower
-Add_dependency run udisks
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 10cbb48b2e..a99e0b69da 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -3,6 +3,8 @@ pkgname=xfce4-sensors-plugin
 version=1.0.0
 distfiles="http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="glibc libsensors libxfcegui4 libxfce4util atk glib pango cairo freetype fontconfig xfce4-panel libnotify dbus-glib dbus-libs"
+makedepends="pkg-config intltool libsensors-devel libxfcegui4-devel gtk+-devel libxfce4util-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel glibc-devel xfce4-panel-devel libnotify-devel dbus-glib-devel dbus-devel"
 short_desc="XFCE sensors plugin"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c0b1f8b63982b25c0a043f2efa0e358f9727c6eb3a55d93ff74efd76992aeae9
@@ -14,34 +16,3 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency run glibc
-Add_dependency run libsensors
-Add_dependency run libxfcegui4
-Add_dependency run libxfce4util
-Add_dependency run atk
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run xfce4-panel
-Add_dependency run libnotify
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libsensors-devel
-Add_dependency build libxfcegui4-devel
-Add_dependency build gtk+-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build glibc-devel
-Add_dependency build xfce4-panel-devel
-Add_dependency build libnotify-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
diff --git a/srcpkgs/xfce4-session/depends b/srcpkgs/xfce4-session/depends
deleted file mode 100644
index 79732def7d..0000000000
--- a/srcpkgs/xfce4-session/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.9.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 8e7e5973ab..8d3ad42eac 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -5,6 +5,8 @@ homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/xfce4-session/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static --enable-libgnome-keyring"
+depends="ConsoleKit-x11 upower udisks hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel xfce4-panel-devel ConsoleKit-devel libgnome-keyring-devel iceauth"
 short_desc="Xfce session manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,24 +19,8 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel" 
 make_dirs="/etc/polkit-1/localauthority 0700 root root"
 
-Add_dependency run ConsoleKit-x11
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4ui-devel
-Add_dependency build gtk+-devel
-Add_dependency build xfconf-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libwnck2-devel
-Add_dependency build xfce4-panel-devel
-Add_dependency build ConsoleKit-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build iceauth
 
-Add_dependency run upower
-Add_dependency run udisks
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
 post_install() {
 	install -dm755 ${DESTDIR}/etc/polkit-1/localauthority/50-local.d
diff --git a/srcpkgs/xfce4-session/xfce4-session-devel.template b/srcpkgs/xfce4-session/xfce4-session-devel.template
index 1f20a1704c..bc11622632 100644
--- a/srcpkgs/xfce4-session/xfce4-session-devel.template
+++ b/srcpkgs/xfce4-session/xfce4-session-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'xfce4-session-devel'.
 #
+depends="libxfce4ui-devel xfconf-devel xfce4-session>=4.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxfce4ui-devel
-Add_dependency run xfconf-devel
-Add_dependency run xfce4-session ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 02b167703a..ee00928cf2 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -6,6 +6,8 @@ homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/xfce4-settings/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-sound-settings --enable-pluggable-dialogs"
+depends="desktop-file-utils gnome-icon-theme"
+makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel xfconf-devel libXi-devel libXcursor-devel exo-devel libXrandr-devel libxklavier-devel libnotify-devel dbus-devel libcanberra-devel garcon-devel"
 short_desc="Xfce settings manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/"
@@ -16,20 +18,4 @@ long_desc="
 
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4ui-devel
-Add_dependency build gtk+-devel
-Add_dependency build xfconf-devel
-Add_dependency build libXi-devel
-Add_dependency build libXcursor-devel
-Add_dependency build exo-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libxklavier-devel
-Add_dependency build libnotify-devel
-Add_dependency build dbus-devel
-Add_dependency build libcanberra-devel
-Add_dependency build garcon-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run gnome-icon-theme
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 9efff8524a..0ff56b9900 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -4,6 +4,8 @@ version=0.7.2
 revision=3
 distfiles="http://archive.xfce.org/src/panel-plugins/$pkgname/0.7/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool xfce4-panel-devel libxfcegui4-devel libxfce4util-devel gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel libxml2-devel glibc-devel"
+fulldepends="hicolor-icon-theme"
 short_desc="XFCE panel plagin to show temperature and weather"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5b6cd44c7c04f32eaeeb725d4af75691f73575e02907e8e3b69bced8030151e6
@@ -13,19 +15,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build xfce4-panel-devel
-Add_dependency build libxfcegui4-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libxml2-devel
-Add_dependency build glibc-devel
 
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template
index 46a8d78aa5..e8ef4c43ef 100644
--- a/srcpkgs/xfce4/template
+++ b/srcpkgs/xfce4/template
@@ -3,6 +3,7 @@ pkgname=xfce4
 version=4.10.0
 build_style=meta-template
 homepage="http://xfce.org"
+depends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0 xfce4-session>=4.10.0 xfce4-settings>=4.10.0 xfconf>=4.10.0 xfdesktop>=4.10.0 xfwm4>=4.10.0 xfwm4-themes>=4.10.0 xfce4-power-manager>=1.2.0 Terminal>=0.4.8_4 Thunar>=1.4.0 thunar-volman>=0.8.0 exo>=0.8.0 orage>=4.8.3_1 ristretto>=0.6.0 gtk-xfce-engine>=3.0.0 notification-daemon>=0.2.2_1 tumbler>=0.1.25 xdg-utils xdg-user-dirs"
 short_desc="The XFCE desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1, BSD"
@@ -11,25 +12,4 @@ long_desc="
 
 noarch=yes
 
-Add_dependency run xfce4-appfinder	">=${version}"
-Add_dependency run xfce4-mixer		">=4.8.0_3"
-Add_dependency run xfce4-panel		">=${version}"
-Add_dependency run xfce4-session	">=${version}"
-Add_dependency run xfce4-settings	">=${version}"
-Add_dependency run xfconf		">=${version}"
-Add_dependency run xfdesktop		">=${version}"
-Add_dependency run xfwm4		">=${version}"
-Add_dependency run xfwm4-themes 	">=${version}"
-Add_dependency run xfce4-power-manager	">=1.2.0"
-Add_dependency run Terminal		">=0.4.8_4"
-Add_dependency run Thunar		">=1.4.0"
-Add_dependency run thunar-volman	">=0.8.0"
-Add_dependency run exo			">=0.8.0"
-Add_dependency run orage		">=4.8.3_1"
-Add_dependency run ristretto		">=0.6.0"
-Add_dependency run gtk-xfce-engine	">=3.0.0"
-Add_dependency run notification-daemon	">=0.2.2_1"
-Add_dependency run tumbler		">=0.1.25"
 
-Add_dependency run xdg-utils
-Add_dependency run xdg-user-dirs
diff --git a/srcpkgs/xfconf/depends b/srcpkgs/xfconf/depends
deleted file mode 100644
index 79732def7d..0000000000
--- a/srcpkgs/xfconf/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=4.9.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 73b84e1322..69ec10d623 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -4,6 +4,7 @@ version=4.10.0
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/xfconf/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib dbus-glib-devel libxfce4util-devel"
 short_desc="Xfce hierarchical (tree-like) configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -15,10 +16,3 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-perl"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build perl-ExtUtils-Depends
-Add_dependency build perl-ExtUtils-PkgConfig
-Add_dependency build perl-Glib
-Add_dependency build dbus-glib-devel
-Add_dependency build libxfce4util-devel
diff --git a/srcpkgs/xfconf/xfconf-devel.template b/srcpkgs/xfconf/xfconf-devel.template
index 60a5263649..ede5a0e327 100644
--- a/srcpkgs/xfconf/xfconf-devel.template
+++ b/srcpkgs/xfconf/xfconf-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'xfconf-devel'.
 #
+depends="glib-devel dbus-glib-devel xfconf>=4.10.0"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glib-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run xfconf ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xfconf/xfconf-perl.template b/srcpkgs/xfconf/xfconf-perl.template
index c239b44129..53e88c6bc4 100644
--- a/srcpkgs/xfconf/xfconf-perl.template
+++ b/srcpkgs/xfconf/xfconf-perl.template
@@ -1,11 +1,11 @@
 # Template file for 'xfconf-perl'.
 #
+depends="perl-Glib"
 short_desc="${short_desc} - perl bindings"
 long_desc="${long_desc}
 
  This package contains the Perl bindings."
 
-Add_dependency run perl-Glib
 
 do_install() {
 	vmove usr/lib/perl5 usr/lib
diff --git a/srcpkgs/xfd/template b/srcpkgs/xfd/template
index 38908535d6..0202c0ccc1 100644
--- a/srcpkgs/xfd/template
+++ b/srcpkgs/xfd/template
@@ -3,6 +3,8 @@ pkgname=xfd
 version=1.0.1
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config"
+fulldepends="glibc libXft libXaw"
 short_desc="Display all the characters in an X font"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
@@ -15,7 +17,3 @@ long_desc="
 
  This is the version of xfd maintained by Xorg."
  
-Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full libXft
-Add_dependency full libXaw
diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index 3f5ac54a09..96a0a09dba 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -4,6 +4,8 @@ version=4.10.0
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/xfdesktop/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool xfconf-devel libxfce4ui-devel exo-devel gtk+-devel libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel Thunar-devel dbus-glib-devel"
 short_desc="Desktop manager for the XFce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,18 +15,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build xfconf-devel
-Add_dependency build libxfce4ui-devel
-Add_dependency build exo-devel
-Add_dependency build gtk+-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build libnotify-devel
-Add_dependency build libwnck2-devel
-Add_dependency build garcon-devel
-Add_dependency build Thunar-devel
-Add_dependency build dbus-glib-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/xfontsel/template b/srcpkgs/xfontsel/template
index 4e4d05a7da..dcbf72fb0d 100644
--- a/srcpkgs/xfontsel/template
+++ b/srcpkgs/xfontsel/template
@@ -3,6 +3,8 @@ pkgname=xfontsel
 version=1.0.2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config"
+fulldepends="glibc libXaw"
 short_desc="X font selector"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7a66ba3910bd7e39d58f9d4a4a588f191a874b8607369fe2cc9203a7115006a9
@@ -12,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
  
-Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full libXaw
diff --git a/srcpkgs/xfsprogs/depends b/srcpkgs/xfsprogs/depends
deleted file mode 100644
index 17b58f07d2..0000000000
--- a/srcpkgs/xfsprogs/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=3.0.3"
-api_depends=">=3.1.7_2"
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 25ef736a5d..9d851ded52 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -3,6 +3,7 @@ pkgname=xfsprogs
 version=3.1.8
 homepage="http://oss.sgi.com/projects/xfs/"
 distfiles="ftp://ftp.archlinux.org/other/xfsprogs/$pkgname-$version.tar.gz"
+makedepends="libuuid-devel libblkid-devel readline-devel"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -21,9 +22,6 @@ replaces="xfsprogs-libs>=0"
 disable_parallel_build=yes
 subpackages="$pkgname-devel"
 
-Add_dependency build libuuid-devel
-Add_dependency build libblkid-devel
-Add_dependency build readline-devel
 
 do_build() {
 	export DEBUG=-DNDEBUG
diff --git a/srcpkgs/xfsprogs/xfsprogs-devel.template b/srcpkgs/xfsprogs/xfsprogs-devel.template
index 9f6125f748..e5bb1baf12 100644
--- a/srcpkgs/xfsprogs/xfsprogs-devel.template
+++ b/srcpkgs/xfsprogs/xfsprogs-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'xfsprogs-devel'.
 #
+depends="libuuid-devel xfsprogs>=3.1.8"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libuuid-devel
-Add_dependency run xfsprogs ">=${version}"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index dae7fb9a0b..24d2cd0247 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -4,6 +4,8 @@ version=4.10.0
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2"
 build_style=gnu-configure
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel libxfce4util-devel xfconf-devel startup-notification-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel libXrender-devel dbus-glib-devel libwnck2-devel"
 short_desc="Next generation window manager for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,20 +16,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libxfce4ui-devel
-Add_dependency build gtk+-devel
-Add_dependency build libxfce4util-devel
-Add_dependency build xfconf-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXrender-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libwnck2-devel
 
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
diff --git a/srcpkgs/xgamma/template b/srcpkgs/xgamma/template
index 55367068e4..9c41f00466 100644
--- a/srcpkgs/xgamma/template
+++ b/srcpkgs/xgamma/template
@@ -4,6 +4,7 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXxf86vm-devel"
 short_desc="Alter gamma correction"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16
@@ -13,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXxf86vm-devel
diff --git a/srcpkgs/xhost/template b/srcpkgs/xhost/template
index 0de8fe5c67..c68a6f5f78 100644
--- a/srcpkgs/xhost/template
+++ b/srcpkgs/xhost/template
@@ -4,6 +4,7 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXmu-devel"
 short_desc="Server access control program for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594
@@ -12,6 +13,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index cfb246169e..bf0b45b5bc 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -5,6 +5,7 @@ distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 make_build_args="XINITDIR=/etc/X11/xinit"
 make_install_args="XINITDIR=/etc/X11/xinit"
+makedepends="pkg-config libX11-devel"
 short_desc="X init program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
@@ -14,5 +15,3 @@ long_desc="
 
 conf_files="/etc/X11/xinit/xinitrc"
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xinput/template b/srcpkgs/xinput/template
index cc5ff0c6f5..4deca2c622 100644
--- a/srcpkgs/xinput/template
+++ b/srcpkgs/xinput/template
@@ -4,6 +4,7 @@ version=1.6.0
 homepage="http://www.x.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libXext-devel libXi-devel libXrandr-devel libXinerama-devel"
 short_desc="Utility to configure and test X input devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -12,8 +13,3 @@ long_desc="
  xinput is a utility to list available input devices, query information about
  a device and change input device settings."
  
-Add_dependency build pkg-config
-Add_dependency build libXext-devel
-Add_dependency build libXi-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXinerama-devel
diff --git a/srcpkgs/xkbcomp/template b/srcpkgs/xkbcomp/template
index 12dbfbe0ee..d5f4fa8f6c 100644
--- a/srcpkgs/xkbcomp/template
+++ b/srcpkgs/xkbcomp/template
@@ -4,6 +4,7 @@ version=1.2.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config bison libX11-devel libxkbfile-devel"
 short_desc="XKBD keymap compiler"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
@@ -13,10 +14,6 @@ long_desc="
  most importantly the compiled keymaps used by XKB-capable X servers."
 
 
-Add_dependency build pkg-config
-Add_dependency build bison
-Add_dependency build libX11-devel
-Add_dependency build libxkbfile-devel
 
 post_install()
 {
diff --git a/srcpkgs/xkbevd/template b/srcpkgs/xkbevd/template
index bdef5b5a6c..1a46158673 100644
--- a/srcpkgs/xkbevd/template
+++ b/srcpkgs/xkbevd/template
@@ -4,12 +4,10 @@ version=1.1.2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libxkbfile-devel"
 short_desc="XKBD Event Daemon"
 checksum=cd62946c9feb3eb2fe0baef1ce5c0f4ab14148099264ecbce6e039b17880eb63
 long_desc="
  $pkgname event daemon listens for specified XKB events and executes
  requested commands if they occur."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libxkbfile-devel
diff --git a/srcpkgs/xkbutils/template b/srcpkgs/xkbutils/template
index 9fae8e9073..5188521e2d 100644
--- a/srcpkgs/xkbutils/template
+++ b/srcpkgs/xkbutils/template
@@ -4,13 +4,10 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXaw-devel libXt-devel"
 short_desc="XKBD Utilities"
 checksum=e409af0730788aa94ee22711750792546465a8f4729a0084d31a32c3ef0849bd
 long_desc="
  The xkbutils package provides some XKB related utilities for
  XKB-capable X servers."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXaw-devel
-Add_dependency build libXt-devel
diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 5e89dde011..7a344cfce6 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -4,6 +4,8 @@ version=2.5.1
 distfiles="http://xorg.freedesktop.org/releases/individual/data/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
+makedepends="intltool libX11-devel"
+fulldepends="xkbcomp"
 short_desc="X Keyboard Configuration Database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
@@ -18,6 +20,3 @@ long_desc="
  X implementations. The project is targeted to XKB-based systems."
 
 noarch=yes
-Add_dependency full xkbcomp
-Add_dependency build intltool
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xkill/template b/srcpkgs/xkill/template
index 3bb03b1470..e3b585f15a 100644
--- a/srcpkgs/xkill/template
+++ b/srcpkgs/xkill/template
@@ -4,6 +4,7 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXmu-devel"
 short_desc="Kill a client by its X resource"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bd8307272a648ca76a266e5c1111384c8ed9367c6a8f1a5be844a5b5300881a9
@@ -12,6 +13,3 @@ long_desc="
  clients. This program is very dangerous, but is useful for aborting
  programs that have displayed undesired windows on a user's screen."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template
index 0a8f313f35..0ef88560d8 100644
--- a/srcpkgs/xlsatoms/template
+++ b/srcpkgs/xlsatoms/template
@@ -4,6 +4,7 @@ version=1.1.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libxcb-devel"
 short_desc="List interned atoms defined on the X server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4a017ada25140a71034fc0026500ebe24b81f2d185a4b2ef733de683b79dcb0d
@@ -12,5 +13,3 @@ long_desc="
  (the lowest atom value defined by the protocol) are listed until unknown
  atom is found."
 
-Add_dependency build pkg-config
-Add_dependency build libxcb-devel
diff --git a/srcpkgs/xlsclients/template b/srcpkgs/xlsclients/template
index 123a544bde..cb29fd5628 100644
--- a/srcpkgs/xlsclients/template
+++ b/srcpkgs/xlsclients/template
@@ -4,6 +4,7 @@ version=1.1.1
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config xcb-util-devel libxcb-devel"
 short_desc="X client listing utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=453b5e13a61d4b2a2a52ba75d529c5d761bbb65ecd65fe5b7b0121402a0be859
@@ -13,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build xcb-util-devel
-Add_dependency build libxcb-devel
diff --git a/srcpkgs/xlsfonts/template b/srcpkgs/xlsfonts/template
index 40f8db5d06..57d82766c5 100644
--- a/srcpkgs/xlsfonts/template
+++ b/srcpkgs/xlsfonts/template
@@ -3,12 +3,11 @@ pkgname=xlsfonts
 version=1.0.2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config"
+fulldepends="glibc libX11"
 short_desc="Server font list displayer for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c
 long_desc="
  Utility to list the fonts available on an X server."
 
-Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full libX11
diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template
index c8b31bb149..3d979c5450 100644
--- a/srcpkgs/xmlcatmgr/template
+++ b/srcpkgs/xmlcatmgr/template
@@ -4,6 +4,7 @@ version=2.2
 distfiles="$SOURCEFORGE_SITE/xmlcatmgr/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 revision=1
+fulldepends="glibc"
 short_desc="XML and SGML catalog manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ea1142b6aef40fbd624fc3e2130cf10cf081b5fa88e5229c92b8f515779d6fdc
@@ -24,7 +25,6 @@ conf_files="
 /usr/share/sgml/catalog
 /usr/share/xml/catalog"
 
-Add_dependency full glibc
 
 pre_install() {
 	# Create XML and SGML catalogs once built.
diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 9907f180a1..c6a9164375 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -4,6 +4,8 @@ version=0.6.10
 revision=2
 distfiles="http://ftp.logilab.org/pub/$pkgname/$pkgname-$version.tar.gz"
 build_style=python-module
+depends="libxslt openjade"
+makedepends="python-devel"
 short_desc="Python classes to diff XML files"
 homepage="http://www.logilab.org/project/xmldiff/"
 license="GPL-2"
@@ -14,9 +16,6 @@ long_desc="
 
 pycompile_module="${pkgname}"
 
-Add_dependency run libxslt
-Add_dependency run openjade
-Add_dependency build python-devel
 
 post_install()
 {
diff --git a/srcpkgs/xmlto/template b/srcpkgs/xmlto/template
index 1ca551bfe9..fac4f9ce4e 100644
--- a/srcpkgs/xmlto/template
+++ b/srcpkgs/xmlto/template
@@ -5,6 +5,7 @@ revision=1
 homepage="http://cyberelk.net/tim/software/xmlto/"
 distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2"
 build_style=gnu-configure
+fulldepends="libxslt docbook-xsl coreutils grep"
 short_desc="Tool to help transform XML documents into other formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,10 +15,6 @@ long_desc="
  stylesheet for the conversion you want and applies it using an
  external XSLT processor. It also performs any necessary post-processing."
 
-Add_dependency full libxslt
-Add_dependency full docbook-xsl
-Add_dependency full coreutils
-Add_dependency full grep
 
 post_install() {
 	# Requires bash!
diff --git a/srcpkgs/xmodmap/template b/srcpkgs/xmodmap/template
index ade766d82d..02b7f66165 100644
--- a/srcpkgs/xmodmap/template
+++ b/srcpkgs/xmodmap/template
@@ -3,6 +3,7 @@ pkgname=xmodmap
 version=1.0.7
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config libX11-devel"
 short_desc="X modmap program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5
@@ -11,5 +12,3 @@ long_desc="
 
  This is from modular Xorg X11."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xnoise/depends b/srcpkgs/xnoise/depends
deleted file mode 100644
index 68d74484ad..0000000000
--- a/srcpkgs/xnoise/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=0.1.29"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
index 0e58c66ce2..bdb665d636 100644
--- a/srcpkgs/xnoise/template
+++ b/srcpkgs/xnoise/template
@@ -4,6 +4,8 @@ version=0.1.31
 homepage="http://http://code.google.com/p/xnoise/"
 distfiles="http://xnoise.googlecode.com/files/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config intltool gtk+3-devel taglib-devel sqlite-devel libnotify-devel libsoup-devel gst-plugins-base-devel"
+fulldepends="desktop-file-utils hicolor-icon-theme"
 short_desc="Media player for GTK+ with a slick GUI"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,14 +20,4 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="libxnoise xnoise-devel"
 
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gtk+3-devel
-Add_dependency build taglib-devel
-Add_dependency build sqlite-devel
-Add_dependency build libnotify-devel
-Add_dependency build libsoup-devel
-Add_dependency build gst-plugins-base-devel
 
-Add_dependency full desktop-file-utils
-Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/xnoise/xnoise-devel.template b/srcpkgs/xnoise/xnoise-devel.template
index 19212c5460..b084a85962 100644
--- a/srcpkgs/xnoise/xnoise-devel.template
+++ b/srcpkgs/xnoise/xnoise-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'xnoise-devel'.
 #
+depends="libxnoise"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libxnoise
 
 do_install()
 {
diff --git a/srcpkgs/xonotic-data-low/template b/srcpkgs/xonotic-data-low/template
index 80ce469c18..254e7f4f1f 100644
--- a/srcpkgs/xonotic-data-low/template
+++ b/srcpkgs/xonotic-data-low/template
@@ -6,6 +6,7 @@ wrksrc="Xonotic"
 homepage="http://xonotic.org"
 license="GPL-2, GPL-3"
 distfiles="http://dl.xonotic.org/xonotic-${version}-low.zip"
+makedepends="unzip"
 short_desc="A free, fast-paced crossplatform FPS (LQ data files)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=66b94b28d5013d53f757db431c97e1e55d0ef55dc959f14dd2b82ed9613d16ef
@@ -21,7 +22,6 @@ long_desc="
 provides="xonotic-data-9999"
 replaces="xonotic-data>=0"
 
-Add_dependency build unzip
 
 do_install() {
 	vmkdir usr/share/xonotic
diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index 9d65e20ce0..a63367c73e 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -7,6 +7,7 @@ wrksrc="Xonotic"
 homepage="http://xonotic.org"
 license="GPL-2, GPL-3"
 distfiles="http://dl.xonotic.org/xonotic-${version}.zip"
+makedepends="unzip"
 short_desc="A free, fast-paced crossplatform first-person shooter (data files)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e8a7dbfdea1ba6250ddf363f01899411f22e518526fae4f0b4f90d622fab3819
@@ -17,7 +18,6 @@ long_desc="
 
 replaces="xonotic-data>=0"
 
-Add_dependency build unzip
 
 do_install() {
 	vmkdir usr/share/xonotic
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index 1ce3d231c4..2c5288e839 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -5,25 +5,15 @@ wrksrc="Xonotic"
 homepage="http://xonotic.org"
 license="GPL-2, GPL-3"
 distfiles="http://dl.xonotic.org/xonotic-${version}-source.zip"
+depends="desktop-file-utils xonotic-data>=0.6.0"
+makedepends="unzip gmp-devel MesaLib-devel SDL-devel libcurl-devel alsa-lib-devel libmodplug-devel libvorbis-devel libXpm-devel jpeg-devel"
 short_desc="A free, fast-paced crossplatform first-person shooter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5cdf60597631d126cb8f2b0dae086075152b553da11353463ea828cb0cce3c98
 long_desc="
  This is Xonotirc, $short_desc."
 
-Add_dependency build unzip
-Add_dependency build gmp-devel
-Add_dependency build MesaLib-devel
-Add_dependency build SDL-devel
-Add_dependency build libcurl-devel
-Add_dependency build alsa-lib-devel
-Add_dependency build libmodplug-devel
-Add_dependency build libvorbis-devel
-Add_dependency build libXpm-devel
-Add_dependency build jpeg-devel
 
-Add_dependency run desktop-file-utils
-Add_dependency run xonotic-data ">=${version}"
 
 do_build() {
 	make ${makejobs} -C source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" \
diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template
index 075f75848f..7de2316837 100644
--- a/srcpkgs/xorg-apps/template
+++ b/srcpkgs/xorg-apps/template
@@ -2,6 +2,7 @@
 pkgname=xorg-apps
 version=7.6
 build_style=meta-template
+fulldepends="iceauth>=1.0.4 sessreg>=1.0.6 setxkbmap>=1.2.0 smproxy>=1.0.4 x11perf>=1.5.2 xauth>=1.0.5 xbacklight>=1.1.2 xcmsdb>=1.0.3 xcursorgen>=1.0.4 xdpyinfo>=1.2.0 xdriinfo>=1.0.4 xev>=1.1.0 xgamma>=1.0.4 xhost>=1.0.4 xinput>=1.5.3 xkbcomp>=1.2.0 xkbevd>=1.1.2 xkbutils>=1.0.3 xkill>=1.0.3 xlsatoms>=1.1.0 xlsclients>=1.1.1 xmodmap>=1.0.5 xpr>=1.0.3 xprop>=1.2.0 xrandr>=1.3.4 xrdb>=1.0.7 xrefresh>=1.0.4 xset>=1.2.1 xsetroot>=1.1.0 xvinfo>=1.1.1 xwd>=1.0.4 xwininfo>=1.1.1 xwud>=1.0.3 xinit>=1.1.1"
 short_desc="X.org applications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -11,38 +12,4 @@ long_desc="
 replaces="xorg-server-utils>=0"
 noarch=yes
 
-Add_dependency full iceauth	">=1.0.4"
-Add_dependency full sessreg	">=1.0.6"
-Add_dependency full setxkbmap	">=1.2.0"
-Add_dependency full smproxy	">=1.0.4"
-Add_dependency full x11perf	">=1.5.2"
-Add_dependency full xauth	">=1.0.5"
-Add_dependency full xbacklight	">=1.1.2"
-Add_dependency full xcmsdb	">=1.0.3"
-Add_dependency full xcursorgen	">=1.0.4"
-Add_dependency full xdpyinfo	">=1.2.0"
-Add_dependency full xdriinfo	">=1.0.4"
-Add_dependency full xev		">=1.1.0"
-Add_dependency full xgamma	">=1.0.4"
-Add_dependency full xhost	">=1.0.4"
-Add_dependency full xinput	">=1.5.3"
-Add_dependency full xkbcomp	">=1.2.0"
-Add_dependency full xkbevd	">=1.1.2"
-Add_dependency full xkbutils	">=1.0.3"
-Add_dependency full xkill	">=1.0.3"
-Add_dependency full xlsatoms	">=1.1.0"
-Add_dependency full xlsclients	">=1.1.1"
-Add_dependency full xmodmap	">=1.0.5"
-Add_dependency full xpr		">=1.0.3"
-Add_dependency full xprop	">=1.2.0"
-Add_dependency full xrandr	">=1.3.4"
-Add_dependency full xrdb	">=1.0.7"
-Add_dependency full xrefresh	">=1.0.4"
-Add_dependency full xset	">=1.2.1"
-Add_dependency full xsetroot	">=1.1.0"
-Add_dependency full xvinfo	">=1.1.1"
-Add_dependency full xwd		">=1.0.4"
-Add_dependency full xwininfo	">=1.1.1"
-Add_dependency full xwud	">=1.0.3"
 # xinit is not in xorg-7.5 app directory?!!
-Add_dependency full xinit	">=1.1.1"
diff --git a/srcpkgs/xorg-fonts/template b/srcpkgs/xorg-fonts/template
index 764e4a62cc..8c299c6992 100644
--- a/srcpkgs/xorg-fonts/template
+++ b/srcpkgs/xorg-fonts/template
@@ -2,6 +2,7 @@
 pkgname=xorg-fonts
 version=7.6
 build_style=meta-template
+fulldepends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3 font-adobe-utopia-100dpi>=1.0.4 font-adobe-utopia-75dpi>=1.0.4 font-adobe-utopia-type1>=1.0.4 font-bh-100dpi>=1.0.3 font-bh-75dpi>=1.0.3 font-bh-lucidatypewriter-100dpi>=1.0.3 font-bh-lucidatypewriter-75dpi>=1.0.3 font-bh-ttf>=1.0.3 font-bh-type1>=1.0.3 font-bitstream-100dpi>=1.0.3 font-bitstream-75dpi>=1.0.3 font-bitstream-type1>=1.0.3 font-cursor-misc>=1.0.3 font-daewoo-misc>=1.0.3 font-dec-misc>=1.0.3 font-ibm-type1>=1.0.3 font-isas-misc>=1.0.3 font-jis-misc>=1.0.3 font-misc-misc>=1.1.2 font-mutt-misc>=1.0.3 dejavu-fonts-ttf"
 short_desc="Modular Xorg Fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -9,27 +10,3 @@ long_desc="
  font packages from the modular Xorg project."
 
 noarch=yes
-Add_dependency full encodings				">=1.0.4"
-Add_dependency full font-adobe-100dpi			">=1.0.3"
-Add_dependency full font-adobe-75dpi			">=1.0.3"
-Add_dependency full font-adobe-utopia-100dpi		">=1.0.4"
-Add_dependency full font-adobe-utopia-75dpi		">=1.0.4"
-Add_dependency full font-adobe-utopia-type1		">=1.0.4"
-Add_dependency full font-bh-100dpi			">=1.0.3"
-Add_dependency full font-bh-75dpi			">=1.0.3"
-Add_dependency full font-bh-lucidatypewriter-100dpi	">=1.0.3"
-Add_dependency full font-bh-lucidatypewriter-75dpi	">=1.0.3"
-Add_dependency full font-bh-ttf				">=1.0.3"
-Add_dependency full font-bh-type1			">=1.0.3"
-Add_dependency full font-bitstream-100dpi		">=1.0.3"
-Add_dependency full font-bitstream-75dpi		">=1.0.3"
-Add_dependency full font-bitstream-type1		">=1.0.3"
-Add_dependency full font-cursor-misc			">=1.0.3"
-Add_dependency full font-daewoo-misc			">=1.0.3"
-Add_dependency full font-dec-misc			">=1.0.3"
-Add_dependency full font-ibm-type1			">=1.0.3"
-Add_dependency full font-isas-misc			">=1.0.3"
-Add_dependency full font-jis-misc			">=1.0.3"
-Add_dependency full font-misc-misc			">=1.1.2"
-Add_dependency full font-mutt-misc			">=1.0.3"
-Add_dependency full dejavu-fonts-ttf
diff --git a/srcpkgs/xorg-input-drivers/template b/srcpkgs/xorg-input-drivers/template
index cbe5d10fde..a3dcc1a720 100644
--- a/srcpkgs/xorg-input-drivers/template
+++ b/srcpkgs/xorg-input-drivers/template
@@ -3,6 +3,7 @@ pkgname=xorg-input-drivers
 version=7.6
 revision=1
 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"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -12,10 +13,6 @@ long_desc="
 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-evdev		">=2.5.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"
-Add_dependency full xf86-input-synaptics	">=1.3.0"
-Add_dependency full xf86-input-vmmouse		">=12.6.10"
-Add_dependency full xf86-input-wacom		">=0.14.0"
diff --git a/srcpkgs/xorg-server/depends b/srcpkgs/xorg-server/depends
deleted file mode 100644
index ddac921f12..0000000000
--- a/srcpkgs/xorg-server/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.12.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index fbda2e5357..6f1ab44d43 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -11,6 +11,9 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
 --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
 --disable-dmx --disable-xfree86-utils --enable-dga
 --enable-install-setuid"
+depends="MesaLib"
+makedepends="pkg-config perl>=0 flex inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22 dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto resourceproto xineramaproto xcmiscproto bigreqsproto libudev-devel openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libxkbfile-devel libXxf86dga-devel pixman-devel MesaLib-devel"
+fulldepends="xkeyboard-config"
 short_desc="X11 server from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
@@ -23,46 +26,8 @@ conf_files="/etc/udev/rules.d/75-x11-input.rules"
 subpackages="$pkgname-devel"
 
 # Not a direct dependency, but it's required for DRI to work.
-Add_dependency run MesaLib
 
-Add_dependency build pkg-config
-Add_dependency build perl		">=0"
-Add_dependency build flex
-Add_dependency build inputproto		">=2.2"
-Add_dependency build glproto		">=1.4.15"
-Add_dependency build xproto		">=7.0.22"
-Add_dependency build dri2proto		">=2.1"
-Add_dependency build xf86driproto
-Add_dependency build randrproto
-Add_dependency build videoproto
-Add_dependency build compositeproto
-Add_dependency build scrnsaverproto
-Add_dependency build resourceproto
-Add_dependency build xineramaproto
-Add_dependency build xcmiscproto
-Add_dependency build bigreqsproto
-Add_dependency build libudev-devel
-Add_dependency build openssl-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libdmx-devel
-Add_dependency build libpciaccess-devel
-Add_dependency build libXfont-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXi-devel
-Add_dependency build libXaw-devel
-Add_dependency build libdrm-devel
-Add_dependency build libXtst-devel
-Add_dependency build libXres-devel
-Add_dependency build libxkbui-devel
-Add_dependency build libxkbfile-devel
-Add_dependency build libXxf86dga-devel
-Add_dependency build pixman-devel
-Add_dependency build MesaLib-devel
 
-Add_dependency full xkeyboard-config
 
 post_install() {
 	vinstall ${FILESDIR}/x11-input.rules 644 \
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index 24ae68a18f..37143dd5de 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -1,36 +1,11 @@
 # Template file for 'xorg-server-devel'.
 #
+depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto videoproto compositeproto scrnsaverproto resourceproto xineramaproto libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel libdrm-devel"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libudev-devel
-Add_dependency run dri2proto		">=2.1"
-Add_dependency run glproto
-Add_dependency run xf86driproto
-Add_dependency run randrproto
-Add_dependency run videoproto
-Add_dependency run compositeproto
-Add_dependency run scrnsaverproto
-Add_dependency run resourceproto
-Add_dependency run xineramaproto
-Add_dependency run libdmx-devel
-Add_dependency run libXext-devel
-Add_dependency run libX11-devel
-Add_dependency run libpciaccess-devel
-Add_dependency run libXfont-devel
-Add_dependency run libXau-devel
-Add_dependency run pixman-devel
-Add_dependency run libXdmcp-devel
-Add_dependency run libXmu-devel
-Add_dependency run libXrender-devel
-Add_dependency run libXfixes-devel
-Add_dependency run libXi-devel
-Add_dependency run libXaw-devel
-Add_dependency run libXt-devel
-Add_dependency run libXpm-devel
-Add_dependency run libdrm-devel
 
 noarch=yes
 
diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template
index 5a4424da0d..a415f0264c 100644
--- a/srcpkgs/xorg-util-macros/template
+++ b/srcpkgs/xorg-util-macros/template
@@ -4,6 +4,7 @@ version=1.15.0
 wrksrc="util-macros-${version}"
 distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2"
 build_style=gnu-configure
+makedepends="pkg-config"
 short_desc="Xorg autotool macros"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b31c6d39014e537ff95609661a4f8258f7c4a4f3b8bdfdad3d69bdd5cb80f40e
@@ -12,7 +13,6 @@ long_desc="
  modular Xorg components."
 
 noarch=yes
-Add_dependency build pkg-config
 
 post_install()
 {
diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template
index e422c6f93b..1c45d1420a 100644
--- a/srcpkgs/xorg-video-drivers/template
+++ b/srcpkgs/xorg-video-drivers/template
@@ -3,6 +3,7 @@ pkgname=xorg-video-drivers
 version=7.6
 revision=6
 build_style=meta-template
+fulldepends="xf86-video-ati>=6.12.4 xf86-video-intel>=2.9.1 xf86-video-openchrome>=0.2.906 xf86-video-sisusb>=0.9.3 xf86-video-vesa>=2.2.1 xf86-video-vmware>=10.16.8_2 xf86-video-qxl>=0.0.13 xf86-video-nouveau"
 short_desc="X.org video drivers meta-package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -17,7 +18,6 @@ long_desc="
 #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-ati		">=6.12.4"
 #Add_dependency full xf86-video-chips		">=1.2.2"
 
 # XXX currently broken with 1.12.0
@@ -28,24 +28,17 @@ Add_dependency full xf86-video-ati		">=6.12.4"
 #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-intel		">=2.9.1"
 #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-openchrome	">=0.2.906"
 #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-sisusb		">=0.9.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-vesa		">=2.2.1"
-Add_dependency full xf86-video-vmware		">=10.16.8_2"
 #Add_dependency full xf86-video-voodoo		">=1.2.3"
-Add_dependency full xf86-video-qxl		">=0.0.13"
-Add_dependency full xf86-video-nouveau
diff --git a/srcpkgs/xorg/template b/srcpkgs/xorg/template
index fd9b56c47a..7cd3161514 100644
--- a/srcpkgs/xorg/template
+++ b/srcpkgs/xorg/template
@@ -2,6 +2,7 @@
 pkgname=xorg
 version=7.6
 build_style=meta-template
+fulldepends="xorg-fonts>=7.6 xorg-server>=1.9.3 xorg-apps>=7.6 xorg-input-drivers>=7.6 xorg-video-drivers>=7.6"
 short_desc="X.org meta-package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -9,8 +10,3 @@ long_desc="
  meta-packages (server, clients, fonts, etc) from the X.org project."
 
 noarch=yes
-Add_dependency full xorg-fonts		">=$version"
-Add_dependency full xorg-server		">=1.9.3"
-Add_dependency full xorg-apps		">=$version"
-Add_dependency full xorg-input-drivers	">=$version"
-Add_dependency full xorg-video-drivers	">=$version"
diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 3d3440ae25..d0aa9aa2bc 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -5,6 +5,8 @@ revision=3
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 make_install_args="desktop-install"
+makedepends="pkg-config gtk+-devel libgnomecanvas-devel>=2.30.3_1 poppler-glib-devel"
+fulldepends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xournal: GPL Notetaking, sketching, and journal-keeping."
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://xournal.sourceforge.net/"
@@ -24,10 +26,4 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-Add_dependency build pkg-config
-Add_dependency build gtk+-devel
-Add_dependency build libgnomecanvas-devel ">=2.30.3_1"
-Add_dependency build poppler-glib-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/xpr/template b/srcpkgs/xpr/template
index 575e971c79..219bcaf348 100644
--- a/srcpkgs/xpr/template
+++ b/srcpkgs/xpr/template
@@ -4,6 +4,7 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXmu-devel"
 short_desc="Print an X window dump"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2878d6b04ef81ec415fa81313565bee521bf94132127615b9d717d5a489b937d
@@ -13,6 +14,3 @@ long_desc="
  PP3812 page printer, the HP LaserJet (or other PCL printers), or the HP
  PaintJet."
  
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
diff --git a/srcpkgs/xprop/template b/srcpkgs/xprop/template
index 0d64246e09..fae8136abf 100644
--- a/srcpkgs/xprop/template
+++ b/srcpkgs/xprop/template
@@ -4,6 +4,7 @@ version=1.2.1
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXmu-devel"
 short_desc="Property displayer for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="${XORG_HOME}"
@@ -13,6 +14,3 @@ long_desc="
  This package provides xprop, a property displayer for X.
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
diff --git a/srcpkgs/xrandr/template b/srcpkgs/xrandr/template
index 32699f550b..14b40be2ee 100644
--- a/srcpkgs/xrandr/template
+++ b/srcpkgs/xrandr/template
@@ -4,6 +4,8 @@ version=1.3.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="libXrender"
+makedepends="pkg-config libX11-devel libXrender-devel libXrandr-devel"
 short_desc="Primitive command line interface to RandR extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb
@@ -12,8 +14,3 @@ long_desc="
 
  This is from the modular Xorg X11 project."
 
-Add_dependency run libXrender
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXrandr-devel
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index 59cce057d5..6489da9862 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -4,6 +4,7 @@ version=1.0.9
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXmu-devel"
 short_desc="X server resource database utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7
@@ -12,6 +13,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template
index 4cf8f866fe..72a71a8810 100644
--- a/srcpkgs/xrefresh/template
+++ b/srcpkgs/xrefresh/template
@@ -4,6 +4,8 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="libX11"
+makedepends="pkg-config libX11-devel"
 short_desc="X refresher"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=069502eb485ea128a0bebf94302d5cbb271ad9d31ae51691abd6d64914ff9d7b
@@ -13,6 +15,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency run libX11 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template
index 897dddcf18..64ee93e5d6 100644
--- a/srcpkgs/xset/template
+++ b/srcpkgs/xset/template
@@ -4,6 +4,7 @@ version=1.2.2
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
+makedepends="pkg-config libXmu-devel libX11-devel libXext-devel libXxf86misc-devel libXfontcache-devel"
 short_desc="X11 user preferences utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -16,9 +17,3 @@ long_desc="
  keyboard autorepeat, and screen saver."
 
 
-Add_dependency build pkg-config
-Add_dependency build libXmu-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
-Add_dependency build libXxf86misc-devel
-Add_dependency build libXfontcache-devel
diff --git a/srcpkgs/xsetmode/template b/srcpkgs/xsetmode/template
index 32dfe30f88..5212ab0970 100644
--- a/srcpkgs/xsetmode/template
+++ b/srcpkgs/xsetmode/template
@@ -4,6 +4,7 @@ version=1.0.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXi-devel"
 short_desc="Switch mode of XInput devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
@@ -13,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libXi-devel
diff --git a/srcpkgs/xsetroot/template b/srcpkgs/xsetroot/template
index a3635ff3f3..845123548c 100644
--- a/srcpkgs/xsetroot/template
+++ b/srcpkgs/xsetroot/template
@@ -4,6 +4,7 @@ version=1.1.0
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config xbitmaps libXmu-devel libX11-devel libXcursor-devel"
 short_desc="X root window parameter setting program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=88f13e949e7aea126239e5c9b3fe7bb7c2ecf70c70774ae41218789d9cfe5fad
@@ -13,8 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build xbitmaps
-Add_dependency build libXmu-devel
-Add_dependency build libX11-devel
-Add_dependency build libXcursor-devel
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 3def60de07..605e199e74 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -11,6 +11,7 @@ configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
  --with-app-defaults=/usr/share/X11/app-defaults --enable-i18n
  --disable-full-tgetent --disable-imake --enable-doublechars
  --enable-freetype --enable-tcap-query --enable-logging --enable-dabbrev"
+makedepends="libXft-devel libXaw-devel ncurses-devel fontconfig-devel libX11-devel libXmu-devel libXt-devel libICE-devel"
 short_desc="X Terminal Emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=89191de41ff8dbf3c1db3ceeaebafbbdb60a22e19d607bf9da50f3adc8333820
@@ -23,11 +24,3 @@ long_desc="
  (i.e., background color erase). It also implements most of the control
  sequences for VT220."
 
-Add_dependency build libXft-devel
-Add_dependency build libXaw-devel
-Add_dependency build ncurses-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libX11-devel
-Add_dependency build libXmu-devel
-Add_dependency build libXt-devel
-Add_dependency build libICE-devel
diff --git a/srcpkgs/xvidcore/depends b/srcpkgs/xvidcore/depends
deleted file mode 100644
index b4422d83d2..0000000000
--- a/srcpkgs/xvidcore/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.2"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xvidcore/template b/srcpkgs/xvidcore/template
index 399ed37e86..f1111dd76f 100644
--- a/srcpkgs/xvidcore/template
+++ b/srcpkgs/xvidcore/template
@@ -6,6 +6,7 @@ distfiles="http://downloads.xvid.org/downloads/$pkgname-$version.tar.bz2"
 build_wrksrc="build/generic"
 build_style=gnu-configure
 revision=2
+makedepends="nasm"
 short_desc="ISO MPEG-4 compliant video codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=c51ae8449b04fd8c8d5e15546d5e7c022d72014df7849be2598b9dfa1c003d64
@@ -15,7 +16,6 @@ long_desc="
  people from all over the world."
 
 subpackages="$pkgname-devel"
-Add_dependency build nasm
 
 post_install()
 {
diff --git a/srcpkgs/xvidcore/xvidcore-devel.template b/srcpkgs/xvidcore/xvidcore-devel.template
index 8942238c6f..82374cc687 100644
--- a/srcpkgs/xvidcore/xvidcore-devel.template
+++ b/srcpkgs/xvidcore/xvidcore-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'xvidcore-devel'.
 #
+depends="glibc-devel xvidcore"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run xvidcore
 
 do_install()
 {
diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template
index cb746ab853..2253248494 100644
--- a/srcpkgs/xvinfo/template
+++ b/srcpkgs/xvinfo/template
@@ -4,6 +4,7 @@ version=1.1.1
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libXv-devel"
 short_desc="Query X-Video capabilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985
@@ -13,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel 
-Add_dependency build libXv-devel
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index 52fa017a88..06cbd65592 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -4,6 +4,8 @@ version=1.0.4
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="libX11"
+makedepends="pkg-config libX11-devel"
 short_desc="Dump an image of an X window"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b7a6c889911a0ab52f9f92a83658abb81e213969ad4e6c73c11c9274a438b01e
@@ -13,6 +15,3 @@ long_desc="
  then be read by various other X utilities for redisplay, printing, editing,
  formatting, archiving, image processing, etc."
 
-Add_dependency run libX11 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xwininfo/template b/srcpkgs/xwininfo/template
index f8a6b664c5..d0f5390b82 100644
--- a/srcpkgs/xwininfo/template
+++ b/srcpkgs/xwininfo/template
@@ -4,6 +4,7 @@ version=1.1.1
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+makedepends="pkg-config libX11-devel libxcb-devel"
 short_desc="Query information about X windows"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d
@@ -13,6 +14,3 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
-Add_dependency build libxcb-devel
diff --git a/srcpkgs/xwud/template b/srcpkgs/xwud/template
index a0c4540465..61d2fae8f0 100644
--- a/srcpkgs/xwud/template
+++ b/srcpkgs/xwud/template
@@ -4,6 +4,8 @@ version=1.0.3
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
+depends="libX11"
+makedepends="pkg-config libX11-devel"
 short_desc="Image displayer for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=88fdeae05cc3bcc35dfbf0df1606bc4ed4a420edb1abf96aececbc1bd7332c43
@@ -12,6 +14,3 @@ long_desc="
  to display in a window an image saved in a specially formatted dump file,
  such as produced by xwd(1)."
 
-Add_dependency run libX11 
-Add_dependency build pkg-config
-Add_dependency build libX11-devel
diff --git a/srcpkgs/xz/depends b/srcpkgs/xz/depends
deleted file mode 100644
index 2ec6a7bd46..0000000000
--- a/srcpkgs/xz/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=5.0.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/xz/liblzma-devel.template b/srcpkgs/xz/liblzma-devel.template
index e230922b58..85bb0c5fa4 100644
--- a/srcpkgs/xz/liblzma-devel.template
+++ b/srcpkgs/xz/liblzma-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'liblzma-devel'.
 #
+depends="glibc-devel liblzma"
 short_desc="XZ-format compression library - development files"
 long_desc="
  XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm compression
@@ -13,8 +14,6 @@ long_desc="
 
 replaces="xz-devel>=0"
 
-Add_dependency run glibc-devel
-Add_dependency run liblzma
 
 do_install()
 {
diff --git a/srcpkgs/yajl/depends b/srcpkgs/yajl/depends
deleted file mode 100644
index f5b81e443e..0000000000
--- a/srcpkgs/yajl/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.0.1"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/yajl/template b/srcpkgs/yajl/template
index dd55497d6a..db7785c49c 100644
--- a/srcpkgs/yajl/template
+++ b/srcpkgs/yajl/template
@@ -5,6 +5,7 @@ __extraversion=5b0e7df
 homepage="http://lloyd.github.com/yajl/"
 distfiles="https://github.com/lloyd/${pkgname}/tarball/${version}/${pkgname}-${version}.tar.gz"
 build_style=cmake
+makedepends="ruby cmake doxygen"
 short_desc="Yet Another JSON Library"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="ISC"
@@ -16,6 +17,3 @@ long_desc="
 wrksrc="lloyd-${pkgname}-${__extraversion}"
 subpackages="${pkgname}-devel"
 
-Add_dependency build ruby
-Add_dependency build cmake
-Add_dependency build doxygen
diff --git a/srcpkgs/yajl/yajl-devel.template b/srcpkgs/yajl/yajl-devel.template
index 3389352730..31a15fc6e0 100644
--- a/srcpkgs/yajl/yajl-devel.template
+++ b/srcpkgs/yajl/yajl-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'yajl-devel'.
 #
+depends="yajl"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run yajl
 
 do_install()
 {
diff --git a/srcpkgs/yasm/template b/srcpkgs/yasm/template
index 543daf45ee..6d0b319893 100644
--- a/srcpkgs/yasm/template
+++ b/srcpkgs/yasm/template
@@ -3,6 +3,7 @@ pkgname=yasm
 version=1.2.0
 distfiles="http://www.tortall.net/projects/yasm/releases/yasm-$version.tar.gz"
 build_style=gnu-configure
+makedepends="xmlto python>=0"
 short_desc="Complete rewrite of the NASM assembler with BSD license"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.tortall.net/projects/yasm/"
@@ -16,8 +17,6 @@ long_desc="
  GAS, etc.) in addition to multiple output object formats. Another primary
  module of the overall design is an optimizer module."
 
-Add_dependency build xmlto
-Add_dependency build python ">=0"
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index aba7b13ada..3ed4be1615 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -4,6 +4,7 @@ version=3.4.2
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+makedepends="pkg-config intltool itstool libxslt-devel"
 short_desc="Help browser for GNOME desktop - XSL and misc files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,7 +16,3 @@ long_desc="
  This package contains some XSL and misc files required by Yelp."
 
 noarch=yes
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build libxslt-devel
diff --git a/srcpkgs/yelp/depends b/srcpkgs/yelp/depends
deleted file mode 100644
index e7e77019f3..0000000000
--- a/srcpkgs/yelp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.91.90"
-api_depends=">=3.4.0"
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index ae2a75a4de..fd1fe4140d 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -4,6 +4,11 @@ version=3.4.2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
+subpackages="yelp-devel"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+depends="dconf hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.6.3"
+makedepends="pkg-config intltool itstool bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel libgcrypt-devel libxslt-devel libsoup-devel webkit-gtk3-devel"
+fulldepends="yelp-xsl"
 short_desc="Help browser for GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -12,24 +17,3 @@ checksum=33f573da4d0b766aba7ebfab14470694e3245dffb2b63153f34bf8240b13c3a3
 long_desc="
  Yelp is the help browser for GNOME. It lets you navigate through all
  installed documentation."
-
-shlib_depends="webkit-gtk3>=1.6.3"
-subpackages="yelp-devel"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build itstool
-Add_dependency build bzip2-devel
-Add_dependency build liblzma-devel
-Add_dependency build sqlite-devel
-Add_dependency build libgpg-error-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libxslt-devel
-Add_dependency build libsoup-devel
-Add_dependency build webkit-gtk3-devel
-
-Add_dependency run dconf
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
-Add_dependency full yelp-xsl
diff --git a/srcpkgs/yelp/yelp-devel.template b/srcpkgs/yelp/yelp-devel.template
index e07bff4c82..8f2c648937 100644
--- a/srcpkgs/yelp/yelp-devel.template
+++ b/srcpkgs/yelp/yelp-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'yelp-devel'.
 #
+depends="yelp>=3.4.2"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run yelp ">=${version}"
 
 noarch=yes
 
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index 6b0d906a4a..167825269f 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -4,6 +4,7 @@ version=3.4.0
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
+makedepends="which pkg-config intltool gnome-doc-utils gtk+3-devel libnotify-devel webkit-gtk3-devel"
 short_desc="Display GNOME dialogs from the command line"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf
@@ -13,10 +14,3 @@ long_desc="
  and shell scripts. If you understand, things are just as they
  are. If you don't understand, things are just as they are."
 
-Add_dependency build which
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gtk+3-devel
-Add_dependency build libnotify-devel
-Add_dependency build webkit-gtk3-devel
diff --git a/srcpkgs/zisofs-tools/template b/srcpkgs/zisofs-tools/template
index 0b7810556d..4a7dbe70ad 100644
--- a/srcpkgs/zisofs-tools/template
+++ b/srcpkgs/zisofs-tools/template
@@ -5,6 +5,7 @@ distfiles="${KERNEL_SITE}/utils/fs/zisofs/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version"
 revision=1
+makedepends="zlib-devel"
 short_desc="ISO9660 transparent compression tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3
@@ -16,4 +17,3 @@ long_desc="
  Non-compressed files on a zisofs file system are still accessible by legacy
  systems."
 
-Add_dependency build zlib-devel
diff --git a/srcpkgs/zlib/depends b/srcpkgs/zlib/depends
deleted file mode 100644
index e9b02ccc72..0000000000
--- a/srcpkgs/zlib/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=1.2.3"
-api_depends=">=1.2.5_2"
diff --git a/srcpkgs/zlib/zlib-devel.template b/srcpkgs/zlib/zlib-devel.template
index 84ee4ed021..cf8ea7dadc 100644
--- a/srcpkgs/zlib/zlib-devel.template
+++ b/srcpkgs/zlib/zlib-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'zlib-devel'.
 #
+depends="glibc-devel zlib"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run zlib
 
 do_install()
 {
diff --git a/srcpkgs/zlib32/template b/srcpkgs/zlib32/template
index 6a5123298b..afc1c90773 100644
--- a/srcpkgs/zlib32/template
+++ b/srcpkgs/zlib32/template
@@ -5,6 +5,8 @@ distfiles="
 http://xbps.goodluckwith.us/binpkgs/i686/zlib-${version}.i686.xbps
 http://xbps.goodluckwith.us/binpkgs/i686/zlib-devel-${version}.i686.xbps"
 revision=2
+depends="glibc32"
+makedepends="bsdtar"
 short_desc="A compression/decompression Library (32 bits)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
@@ -23,8 +25,6 @@ noextract=yes
 noverifyrdeps=yes
 only_for_archs=x86_64
 
-Add_dependency run glibc32
-Add_dependency build bsdtar
 
 do_install() {
 	for f in ${distfiles}; do
diff --git a/srcpkgs/zlib32/zlib32-devel.template b/srcpkgs/zlib32/zlib32-devel.template
index b241e55b51..930585ed47 100644
--- a/srcpkgs/zlib32/zlib32-devel.template
+++ b/srcpkgs/zlib32/zlib32-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'zlib32-devel'.
 #
+depends="glibc32-devel zlib32"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-Add_dependency run glibc32-devel
-Add_dependency run zlib32
 
 do_install()
 {
diff --git a/srcpkgs/zope.interface/template b/srcpkgs/zope.interface/template
index db3645d48f..1806eb08b8 100644
--- a/srcpkgs/zope.interface/template
+++ b/srcpkgs/zope.interface/template
@@ -4,6 +4,7 @@ version=3.5.3
 revision=1
 distfiles="http://pypi.python.org/packages/source/z/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=python-module
+fulldepends="python"
 short_desc="zope.interface package from Zope 3"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3ebd70b329733571110dd35b1c6d9f071661fcc21aa169bdd9642bfa1b2e5939
@@ -14,4 +15,3 @@ long_desc="
 pycompile_module="zope"
 noarch=yes
 
-Add_dependency full python
diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index 10536f970c..045c4d050d 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -14,6 +14,7 @@ configure_args="--enable-etcdir=/etc/zsh
 --enable-fndir=/usr/share/zsh/functions
 --enable-scriptdir=/usr/share/zsh/scripts
 --enable-pcre --enable-multibyte --enable-cap --with-tcsetpgrp"
+makedepends="gdbm-devel pcre-devel libcap-devel ncurses-devel"
 short_desc="Z SHell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.zsh.org"
@@ -26,10 +27,6 @@ long_desc="
 
 register_shell="/bin/zsh"
 
-Add_dependency build gdbm-devel
-Add_dependency build pcre-devel
-Add_dependency build libcap-devel
-Add_dependency build ncurses-devel
 
 post_install() {
 	vinstall LICENCE 644 usr/share/licenses/zsh