diff --git a/srcpkgs/e2fsprogs/e2fsprogs-devel.template b/srcpkgs/e2fsprogs/e2fsprogs-devel.template
deleted file mode 100644
index 26b1987d8c..0000000000
--- a/srcpkgs/e2fsprogs/e2fsprogs-devel.template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'e2fsprogs-devel'.
-#
-noarch=yes
-depends="libuuid-devel libblkid-devel e2fsprogs-libs>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	for f in compile_et mk_cmds; do
-		vmove usr/bin/${f} usr/bin
-		vmove "usr/share/man/man1/${f}*" usr/share/man/man1
-	done
-	vmove usr/share/et usr/share
-	vmove usr/share/ss usr/share
-	vmove usr/share/man/man3 usr/share/man
-	vmove "usr/share/info/libext2fs.info*" usr/share/info
-}
diff --git a/srcpkgs/e2fsprogs/e2fsprogs-libs.template b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
deleted file mode 100644
index ab00a99f1e..0000000000
--- a/srcpkgs/e2fsprogs/e2fsprogs-libs.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'e2fsprogs-libs'.
-#
-short_desc="${short_desc} -- shared libraries"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 131b149fd4..3346b64492 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,7 +1,7 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
 version=1.42.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
  --enable-e2initrd-helper --disable-rpath --with-root-prefix=/usr
@@ -11,8 +11,6 @@ configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
 make_install_args="install-libs"
 hostmakedepends="pkg-config"
 makedepends="libuuid-devel libblkid-devel"
-subpackages="$pkgname-devel $pkgname-libs"
-conf_files="/etc/mke2fs.conf"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -34,3 +32,35 @@ post_install() {
 	# Remove static libs.
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
+
+e2fsprogs-devel_package() {
+	depends="libuuid-devel libblkid-devel e2fsprogs-libs>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		for f in compile_et mk_cmds; do
+			vmove usr/bin/${f}
+			vmove "usr/share/man/man1/${f}*"
+		done
+		vmove usr/share/et
+		vmove usr/share/ss
+		vmove usr/share/man/man3
+		vmove "usr/share/info/libext2fs.info*"
+	}
+}
+
+e2fsprogs-libs_package() {
+	short_desc="${short_desc} -- shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+e2fsprogs_package() {
+	conf_files="/etc/mke2fs.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/e_dbus/e_dbus-devel.template b/srcpkgs/e_dbus/e_dbus-devel.template
deleted file mode 100644
index d9307d7b72..0000000000
--- a/srcpkgs/e_dbus/e_dbus-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'eet-devel'.
-#
-noarch=yes
-depends="dbus-devel ecore-devel>=1.7.4_1 ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/e_dbus/template b/srcpkgs/e_dbus/template
index c954e31265..e017179b86 100644
--- a/srcpkgs/e_dbus/template
+++ b/srcpkgs/e_dbus/template
@@ -1,8 +1,7 @@
 # Template file for 'e_dbus'
 pkgname=e_dbus
 version=1.7.5
-revision=1
-subpackages="${pkgname}-devel"
+revision=2
 makedepends="pkg-config dbus-devel ecore-devel>=1.7.5"
 build_style=gnu-configure
 configure_args="--disable-static --disable-ebluez --disable-econnman0_7x
@@ -17,3 +16,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=b5c67b0bcadadd59d5611652260b97af57b6b5a6890ebca1839d953dff22c862
+
+e_dbus-devel_package() {
+	depends="dbus-devel ecore-devel>=1.7.4_1 ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+e_dbus_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ecore/ecore-devel.template b/srcpkgs/ecore/ecore-devel.template
deleted file mode 100644
index ed35a49a1f..0000000000
--- a/srcpkgs/ecore/ecore-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'ecore-devel'.
-#
-noarch=yes
-depends="eina-devel glib-devel openssl-devel libcurl-devel libXtst-devel
- libXScrnSaver-devel libXrandr-devel libXinerama-devel libXcomposite-devel
- libXdamage-devel libXi-devel libXcursor-devel ecore>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/ecore/template b/srcpkgs/ecore/template
index 3cfad9076b..8e47ce8b93 100644
--- a/srcpkgs/ecore/template
+++ b/srcpkgs/ecore/template
@@ -1,7 +1,7 @@
 # Template file for 'ecore'
 pkgname=ecore
 version=1.7.5
-revision=1
+revision=2
 subpackages="ecore-devel"
 build_style=gnu-configure
 configure_args="--disable-static --enable-inotify --enable-ecore-imf
@@ -17,3 +17,20 @@ checksum=71618e58564b19705f9d02cf69d0459400e15d6b2a55baf53784c5dc5ec89c42
 makedepends="pkg-config evas-devel>=1.7.5 glib-devel libcurl-devel
  libXtst-devel libXcomposite-devel libXrandr-devel libXinerama-devel
  libXcursor-devel libXdamage-devel libXScrnSaver-devel libICE-devel"
+
+ecore-devel_package() {
+	depends="eina-devel glib-devel openssl-devel libcurl-devel libXtst-devel
+		libXScrnSaver-devel libXrandr-devel libXinerama-devel libXcomposite-devel
+		libXdamage-devel libXi-devel libXcursor-devel ecore>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+ecore_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ecryptfs-utils/ecryptfs-utils-python.template b/srcpkgs/ecryptfs-utils/ecryptfs-utils-python.template
deleted file mode 100644
index 1a02eda490..0000000000
--- a/srcpkgs/ecryptfs-utils/ecryptfs-utils-python.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'ecryptfs-utils-python'.
-#
-depends="python"
-short_desc="ecryptfs cryptographic filesystem (python binding)"
-long_desc="
-  eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic filesystem for Linux.
- 
-  This package contains the Python library binding."
-
-do_install() {
-	vmove usr/lib/python2.7 usr/lib
-}
diff --git a/srcpkgs/ecryptfs-utils/libecryptfs-devel.template b/srcpkgs/ecryptfs-utils/libecryptfs-devel.template
deleted file mode 100644
index bf40187ae1..0000000000
--- a/srcpkgs/ecryptfs-utils/libecryptfs-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'libecryptfs-devel'.
-#
-noarch=yes
-depends="keyutils-devel libecryptfs>=${version}_${revision}"
-short_desc="ecryptfs cryptographic filesystem (development)"
-long_desc="
- eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic
- filesystem for Linux.
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/ecryptfs-utils/libecryptfs.template b/srcpkgs/ecryptfs-utils/libecryptfs.template
deleted file mode 100644
index 924f5f846b..0000000000
--- a/srcpkgs/ecryptfs-utils/libecryptfs.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libecryptfs'.
-#
-short_desc="ecryptfs cryptographic filesystem (library)"
-long_desc="
-  eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic filesystem for Linux.
- 
-  This package contains the library."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 1a7ce36765..4f4faabc4a 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,9 +1,8 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=101
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="libecryptfs libecryptfs-devel ${pkgname}-python"
 configure_args="--with-pamdir=/usr/lib/security --enable-gpg --enable-gui"
 makedepends="pkg-config intltool python-devel pam-devel nss-devel
  swig openssl-devel keyutils-devel gpgme-devel gtk+-devel"
@@ -39,3 +38,33 @@ post_install() {
 	echo "ecryptfs" > ${DESTDIR}/usr/lib/modules-load.d/ecryptfs.conf
 	chmod 644 ${DESTDIR}/usr/lib/modules-load.d/ecryptfs.conf
 }
+
+libecryptfs_package() {
+	short_desc="ecryptfs cryptographic filesystem (library)"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libecryptfs-devel_package() {
+	depends="keyutils-devel libecryptfs>=${version}_${revision}"
+	short_desc="ecryptfs cryptographic filesystem (development)"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+ecryptfs-utils-python_package() {
+	depends="python"
+	short_desc="ecryptfs cryptographic filesystem (python binding)"
+	pkg_install() {
+		vmove usr/lib/python2.7
+	}
+}
+
+ecryptfs-utils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ed/template b/srcpkgs/ed/template
index 8ed0c561cf..bde38b4b33 100644
--- a/srcpkgs/ed/template
+++ b/srcpkgs/ed/template
@@ -15,3 +15,9 @@ long_desc="
  A restricted version of ed, red, can only edit files in the current directory
  and cannot execute shell commands. Ed is the standard text editor in the
  sense that it is the original editor for Unix, and thus widely available."
+
+ed_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/edje/edje-devel.template b/srcpkgs/edje/edje-devel.template
deleted file mode 100644
index 01ec8a506e..0000000000
--- a/srcpkgs/edje/edje-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'edje-devel'.
-#
-noarch=yes
-depends="lua-devel evas-devel eio-devel embryo-devel edje>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/edje usr/share
-}
diff --git a/srcpkgs/edje/template b/srcpkgs/edje/template
index 2effdd59e9..c110a3bbd1 100644
--- a/srcpkgs/edje/template
+++ b/srcpkgs/edje/template
@@ -1,8 +1,7 @@
 # Template file for 'edje'
 pkgname=edje
 version=1.7.5
-revision=1
-subpackages="${pkgname}-devel"
+revision=2
 makedepends="pkg-config eio-devel>=1.7.5 embryo-devel>=1.7.5
  evas-devel>=1.7.5 lua-devel"
 build_style=gnu-configure
@@ -13,3 +12,19 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=66c871a877ead4131fea82bab60018ef721b911df3208961eb967d45342bf23a
+
+edje-devel_package() {
+	depends="lua-devel evas-devel eio-devel embryo-devel edje>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/edje
+	}
+}
+
+edje_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/eet/eet-devel.template b/srcpkgs/eet/eet-devel.template
deleted file mode 100644
index 80def1e5fc..0000000000
--- a/srcpkgs/eet/eet-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'eet-devel'.
-#
-noarch=yes
-depends="zlib-devel openssl-devel eina-devel libjpeg-turbo-devel eet>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/eet/template b/srcpkgs/eet/template
index 9968485a3b..754b678fb1 100644
--- a/srcpkgs/eet/template
+++ b/srcpkgs/eet/template
@@ -1,8 +1,7 @@
 # Template file for 'eet'
 pkgname=eet
 version=1.7.5
-revision=2
-subpackages="eet-devel"
+revision=3
 makedepends="pkg-config eina-devel>=1.7.5 libjpeg-turbo-devel openssl-devel"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -12,3 +11,19 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/eet-${version}.tar.gz"
 checksum=2012a49b1acea2cd33d0cd8086615ceb4f881f868817bfdef88d3a0a837a1e0b
+
+eet-devel_package() {
+	depends="zlib-devel openssl-devel eina-devel libjpeg-turbo-devel eet>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+eet_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/eeze/eeze-devel.template b/srcpkgs/eeze/eeze-devel.template
deleted file mode 100644
index 1db3c33b9e..0000000000
--- a/srcpkgs/eeze/eeze-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'eeze-devel'.
-#
-noarch=yes
-depends="libudev-devel ecore-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/eeze/template b/srcpkgs/eeze/template
index 73a83528d2..5000d766a4 100644
--- a/srcpkgs/eeze/template
+++ b/srcpkgs/eeze/template
@@ -1,7 +1,7 @@
 # Template file for 'eeze'
 pkgname=eeze
 version=1.7.5
-revision=1
+revision=2
 subpackages="${pkgname}-devel"
 makedepends="pkg-config eet-devel>=1.7.5 ecore-devel>=1.7.5
  libmount-devel libudev-devel"
@@ -13,3 +13,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=3bd2796f11f33c2b0a2078694b2e4805b44d03f971f1e78c8da99944ae7e7af0
+
+eeze-devel_package() {
+	depends="libudev-devel ecore-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+eeze_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index b8b93c62a4..0442622d50 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -23,3 +23,9 @@ do_install() {
 	vinstall src/efibootmgr/efibootmgr 755 usr/sbin
 	vinstall src/man/man8/efibootmgr.8 644 usr/share/man/man8
 }
+
+efibootmgr_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/efreet/efreet-devel.template b/srcpkgs/efreet/efreet-devel.template
deleted file mode 100644
index 961d4073ed..0000000000
--- a/srcpkgs/efreet/efreet-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'efreet-devel'.
-#
-noarch=yes
-depends="eet-devel ecore-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/efreet/test usr/share/efreet
-}
diff --git a/srcpkgs/efreet/template b/srcpkgs/efreet/template
index a51226af6b..3305635562 100644
--- a/srcpkgs/efreet/template
+++ b/srcpkgs/efreet/template
@@ -1,8 +1,7 @@
 # Template file for 'efreet'
 pkgname=efreet
 version=1.7.5
-revision=1
-subpackages="${pkgname}-devel"
+revision=2
 makedepends="pkg-config eet-devel>=1.7.5 ecore-devel>=1.7.5 e_dbus-devel>=1.7.5"
 build_style=gnu-configure
 configure_args="--disable-static --disable-tests"
@@ -17,3 +16,19 @@ post_install() {
 	# Remove test programs.
 	rm -f ${DESTDIR}/usr/bin/*test
 }
+
+efreet-devel_package() {
+	depends="eet-devel ecore-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/efreet/test
+	}
+}
+
+efreet_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/eina/eina-devel.template b/srcpkgs/eina/eina-devel.template
deleted file mode 100644
index 80b0873996..0000000000
--- a/srcpkgs/eina/eina-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'eina-devel'.
-#
-noarch=yes
-depends="eina>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/eina/template b/srcpkgs/eina/template
index a3800efd6f..ba560a10a3 100644
--- a/srcpkgs/eina/template
+++ b/srcpkgs/eina/template
@@ -1,7 +1,7 @@
 # Template file for 'eina'
 pkgname=eina
 version=1.7.5
-revision=1
+revision=2
 subpackages="eina-devel"
 build_style=gnu-configure
 configure_args="--enable-default-mempool --enable-mempool-chained-pool
@@ -12,3 +12,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 distfiles="http://download.enlightenment.org/releases/eina-${version}.tar.gz"
 checksum=294f2ee7c63a03ad84072d7f5b1aa7bc974afbb95e30748387bd812e20dc1952
+
+eina-devel_package() {
+	depends="eina>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+eina_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/eio/eio-devel.template b/srcpkgs/eio/eio-devel.template
deleted file mode 100644
index 6d92b00064..0000000000
--- a/srcpkgs/eio/eio-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'eet-devel'.
-#
-noarch=yes
-depends="eet-devel ecore-devel>=1.7.4_1 eio>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/eio/template b/srcpkgs/eio/template
index d4c1177bfa..6b3c7c6657 100644
--- a/srcpkgs/eio/template
+++ b/srcpkgs/eio/template
@@ -1,8 +1,7 @@
 # Template file for 'eio'
 pkgname=eio
 version=1.7.5
-revision=1
-subpackages="eio-devel"
+revision=2
 makedepends="pkg-config eet-devel>=1.7.5 ecore-devel>=1.7.5"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -12,3 +11,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/eio-${version}.tar.gz"
 checksum=e5b0c72fe9f6ea9db5c3c6966338fe718cf53c4a4b7d9b7a900a20e7341cf05a
+
+eio-devel_package() {
+	depends="eet-devel ecore-devel>=1.7.4_1 eio>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+eio_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/elementary/elementary-devel.template b/srcpkgs/elementary/elementary-devel.template
deleted file mode 100644
index e667643ff6..0000000000
--- a/srcpkgs/elementary/elementary-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'elementary-devel'.
-#
-noarch=yes
-depends="ethumb-devel efreet-devel ecore-devel edje-devel
- evas-devel dbus-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/elementary/template b/srcpkgs/elementary/template
index 8694719778..dd448f0e9c 100644
--- a/srcpkgs/elementary/template
+++ b/srcpkgs/elementary/template
@@ -1,8 +1,7 @@
 # Template file for 'elementary'
 pkgname=elementary
 version=1.7.5
-revision=1
-subpackages="${pkgname}-devel"
+revision=2
 depends="desktop-file-utils"
 makedepends="pkg-config edje-devel>=1.7.5 e_dbus-devel>=1.7.5
  efreet-devel>=1.7.5 ethumb-devel>=1.7.5 eio-devel>=1.7.5"
@@ -15,3 +14,19 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=2798763a125792f4cd28b01a68799c7d7d113d4df12da60a13954e68108c7566
+
+elementary-devel_package() {
+	depends="ethumb-devel efreet-devel ecore-devel edje-devel
+		evas-devel dbus-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+elementary_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/elfutils/elfutils-devel.template b/srcpkgs/elfutils/elfutils-devel.template
deleted file mode 100644
index 37d26031d5..0000000000
--- a/srcpkgs/elfutils/elfutils-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'elfutils-devel'.
-#
-replaces="libelf-devel>=0"
-depends="libelf-${version}_${revision}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/elfutils/libelf.template b/srcpkgs/elfutils/libelf.template
deleted file mode 100644
index 8f65f711ec..0000000000
--- a/srcpkgs/elfutils/libelf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'isl-devel'.
-#
-short_desc="${short_desc} -- runtime library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove usr/lib/elfutils usr/lib
-}
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index e2cc4f3a34..b4fe399901 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -2,7 +2,6 @@
 pkgname=elfutils
 version=0.155
 revision=2
-subpackages="libelf ${pkgname}-devel"
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 makedepends="liblzma-devel"
@@ -12,3 +11,27 @@ license="GPL-3"
 homepage="https://fedorahosted.org/elfutils/"
 distfiles="https://fedorahosted.org/releases/e/l/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=68444a4526416ffd68852ec3c6a40ceddcca46538297322405319884c5d30ed8
+
+libelf_package() {
+	short_desc="${short_desc} -- runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove usr/lib/elfutils
+	}
+}
+
+elfutils-devel_package() {
+	replaces="libelf-devel>=0"
+	depends="libelf-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+elfutils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/embryo/embryo-devel.template b/srcpkgs/embryo/embryo-devel.template
deleted file mode 100644
index 6b36741a32..0000000000
--- a/srcpkgs/embryo/embryo-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'embryo-devel'.
-#
-noarch=yes
-depends="eina-devel embryo>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/embryo/template b/srcpkgs/embryo/template
index 2422a87eb6..f541d5946e 100644
--- a/srcpkgs/embryo/template
+++ b/srcpkgs/embryo/template
@@ -1,8 +1,7 @@
 # Template file for 'embryo'
 pkgname=embryo
 version=1.7.5
-revision=1
-subpackages="${pkgname}-devel"
+revision=2
 makedepends="pkg-config eina-devel>=1.7.5"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -12,3 +11,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=e6270573104af01bf377755f3cc292a27171a74be7cbe8de889aa3b5e811c279
+
+embryo-devel_package() {
+	depends="eina-devel embryo>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+embryo_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/emotion/emotion-devel.template b/srcpkgs/emotion/emotion-devel.template
deleted file mode 100644
index fcbe63f7cf..0000000000
--- a/srcpkgs/emotion/emotion-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'emotion-devel'.
-#
-noarch=yes
-depends="eet-devel evas-devel ecore-devel eeze-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/emotion/template b/srcpkgs/emotion/template
index a8c19660b0..cf7c0f09d7 100644
--- a/srcpkgs/emotion/template
+++ b/srcpkgs/emotion/template
@@ -1,7 +1,7 @@
 # Template file for 'emotion'
 pkgname=emotion
 version=1.7.5
-revision=1
+revision=2
 subpackages="${pkgname}-devel"
 makedepends="pkg-config edje-devel>=1.7.5 eeze-devel>=1.7.5
  gst-plugins-base-devel"
@@ -15,3 +15,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=7d99fdd5c944a4df5ee635a4f4ca774f5887b02689de62fa4dabdf4bf76ec813
+
+emotion-devel_package() {
+	depends="eet-devel evas-devel ecore-devel eeze-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+emotion_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index a514796104..b1be05d140 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -4,7 +4,6 @@ version=3.8.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-gst-1.0=yes --disable-schemas-compile --disable-static"
-depends="gsettings-desktop-schemas>=3.8"
 hostmakedepends="pkg-config intltool gnome-doc-utils itstool
  gobject-introspection"
 makedepends="telepathy-glib-devel>=0.19.9 telepathy-logger-devel>=0.8
@@ -14,11 +13,17 @@ makedepends="telepathy-glib-devel>=0.19.9 telepathy-logger-devel>=0.8
  clutter-gst-devel>=2.0.2 webkitgtk-devel libgudev-devel pulseaudio-devel
  cheese-devel>=3.8 enchant-devel NetworkManager-devel
  libchamplain-devel>=0.12.3_3 gnutls-devel>=3.1.5
- gsettings-desktop-schemas-devel>=3.6.0"
-fulldepends="iso-codes"
+ gsettings-desktop-schemas-devel>=3.6.0 iso-codes"
 short_desc="GNOME instant messaging client using the Telepathy framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Empathy"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=3b2fe5fd41ceadeeda08735ecbccfc344b5d6c7009e40e289d175bc7cac69069
+
+empathy_package() {
+	depends="gsettings-desktop-schemas>=3.8 iso-codes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/enca/enca-devel.template b/srcpkgs/enca/enca-devel.template
deleted file mode 100644
index 5319580115..0000000000
--- a/srcpkgs/enca/enca-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'recode-devel'.
-#
-depends="recode-devel libenca>=${version}"
-short_desc="${short_desc} - development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/enca/libenca.template b/srcpkgs/enca/libenca.template
deleted file mode 100644
index b1fae388a2..0000000000
--- a/srcpkgs/enca/libenca.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libenca'.
-#
-short_desc="${short_desc} - shared library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/enca/template b/srcpkgs/enca/template
index 788735a350..84a8354e64 100644
--- a/srcpkgs/enca/template
+++ b/srcpkgs/enca/template
@@ -1,8 +1,7 @@
 # Template file for 'enca'
 pkgname=enca
 version=1.14
-revision=1
-subpackages="libenca enca-devel"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-external --disable-static"
 makedepends="pkg-config recode-devel"
@@ -12,3 +11,26 @@ homepage="http://cihar.com/software/enca/"
 license="GPL-2"
 distfiles="http://dl.cihar.com/enca/enca-${version}.tar.bz2"
 checksum=7f33e3953fbbdac8ed144b31bbab1bb3bf181150db6ba4cd812fd958ce5f4b58
+
+libenca_package() {
+	short_desc="${short_desc} - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+enca-devel_package() {
+	depends="recode-devel libenca>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+	}
+}
+
+enca_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 2463dd5105..1aff5f5c36 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -10,3 +10,9 @@ license="GPL-3"
 homepage="http://www.arg0.net/encfs"
 distfiles="http://encfs.googlecode.com/files/${pkgname}-${version}.tgz"
 checksum=282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8
+
+encfs_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/enchant/enchant-devel.template b/srcpkgs/enchant/enchant-devel.template
deleted file mode 100644
index 33a98d29ff..0000000000
--- a/srcpkgs/enchant/enchant-devel.template
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/enchant
-	mkdir -p ${DESTDIR}/usr/share/man
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/enchant/*.*a ${DESTDIR}/usr/lib/enchant
-}
diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template
index 5b8d46f909..f910de917a 100644
--- a/srcpkgs/enchant/template
+++ b/srcpkgs/enchant/template
@@ -1,8 +1,7 @@
 # Template file for 'enchant'
 pkgname=enchant
 version=1.4.2
-revision=5
-distfiles="http://www.abisource.com/downloads/enchant/$version/enchant-$version.tar.gz"
+revision=6
 build_style=gnu-configure
 configure_args="--disable-zemberek --disable-ispell"
 makedepends="pkg-config libstdc++-devel glib-devel aspell-devel hunspell-devel"
@@ -10,6 +9,7 @@ short_desc="Generic spell checking library"
 homepage="http://www.abisource.com/projects/enchant/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.abisource.com/downloads/enchant/$version/enchant-$version.tar.gz"
 checksum=95c8dd998c8fb436329d204e0edde4400b889e4e26d3f8cb888c408c9a9acc6a
 long_desc="
  The project aims to provide an efficient extensible abstraction
@@ -35,4 +35,19 @@ long_desc="
  shouldn't even need to know this information itself. To accomplish
  this, all of Enchant's providers are DLLs."
  
-subpackages="$pkgname-devel"
+enchant-devel_package() {
+	depends="glib-devel aspell-devel hunspell-devel enchant"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/enchant/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+enchant_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index 2aacf43105..5e793d1099 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -2,10 +2,8 @@
 pkgname=encodings
 version=1.0.4
 revision=3
-noarch=yes
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-fulldepends="font-util"
+hostmakedepends="pkg-config font-utils"
 short_desc="X11 Font Index Generator"
 homepage="http://xorg.freedesktop.org"
 license="Public domain"
@@ -25,3 +23,11 @@ post_install() {
 	# encodings.dir are generated at pkg post-install time.
 	find ${DESTDIR} -name encodings.dir -delete
 }
+
+encodings_package() {
+	depends="font-util"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/enlightenment/enlightenment-devel.template b/srcpkgs/enlightenment/enlightenment-devel.template
deleted file mode 100644
index 053e9d523b..0000000000
--- a/srcpkgs/enlightenment/enlightenment-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'enlightenment-devel'.
-#
-noarch=yes
-depends="efreet-devel ecore-devel edje-devel evas-devel
- e_dbus-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index 13da0b3ff0..0cb09f45b0 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -1,7 +1,7 @@
 # Template file for 'enlightenment'
 pkgname=enlightenment
 version=0.17.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-pam --disable-device-hal
  --enable-device-udev --disable-mount-hal --enable-mount-udisks
@@ -16,11 +16,6 @@ license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=2d9327158b1bdf4301d898a1dca7d94d3e480f6e595dee05809dc66969df5dd3
 
-subpackages="${pkgname}-devel"
-conf_files="/etc/enlightenment/sysactions.conf"
-provides="notification-daemon-0"
-
-depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders"
 makedepends="pkg-config alsa-lib-devel pam-devel e_dbus-devel edje-devel
  eeze-devel efreet-devel elementary-devel xcb-util-keysyms-devel"
 
@@ -32,3 +27,23 @@ post_install() {
 
 	rm -rf ${DESTDIR}/usr/share/${pkgname}/doc
 }
+
+enlightenment-devel_package() {
+	depends="efreet-devel ecore-devel edje-devel evas-devel
+		e_dbus-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+enlightenment_package() {
+	conf_files="/etc/enlightenment/sysactions.conf"
+	provides="notification-daemon-0"
+	depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/enscript/template b/srcpkgs/enscript/template
index 50414838ad..f6d4975d74 100644
--- a/srcpkgs/enscript/template
+++ b/srcpkgs/enscript/template
@@ -1,11 +1,11 @@
 # Template file for 'enscript'
 pkgname=enscript
 version=1.6.5.2
+revision=1
 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"
-revision=1
 short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,5 +19,10 @@ long_desc="
  wide range of programming languages. New rules can be added using an awk-like
  stateful scripting language."
 
-conf_files="/etc/enscript.cfg"
-
+enscript_package() {
+	conf_files="/etc/enscript.cfg"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 5a06823499..d0bc669ee1 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -3,15 +3,21 @@ pkgname=eog-plugins
 version=3.8.0
 revision=1
 build_style=gnu-configure
-depends="eog>=${version} gsettings-desktop-schemas>=3.8.0"
 hostmakedepends="pkg-config intltool"
 makedepends="eog-devel>=3.8.0 libgdata-devel>=0.13
  libchamplain-devel>=0.12.3_2 libpeas-devel libexif-devel
  gsettings-desktop-schemas-devel>=3.6.0"
-pycompile_dirs="usr/lib/eog/plugins"
 short_desc="Eye of GNOME plugins"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=a7e4822c46654f67ef25cbc82e4c955ee84ecae92cf356e15a136032cff35e78
+
+eog-plugins_package() {
+	pycompile_dirs="usr/lib/eog/plugins"
+	depends="eog>=${version} gsettings-desktop-schemas>=3.8.0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/eog/eog-devel.template b/srcpkgs/eog/eog-devel.template
deleted file mode 100644
index 4d2bebff2c..0000000000
--- a/srcpkgs/eog/eog-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'eog-devel'.
-#
-depends="gtk+3-devel"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/eog/gir-1.0 usr/share/eog
-}
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 8d88b1dac4..883e6f0f6c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -3,12 +3,9 @@ pkgname=eog
 version=3.8.0
 revision=1
 build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
 hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection"
 makedepends="gnome-desktop-devel>=3.8.0 libpeas-devel lcms2-devel exempi-devel
- libexif-devel librsvg-devel"
-fulldepends="gnome-icon-theme shared-mime-info"
-subpackages="eog-devel"
+ libexif-devel librsvg-devel gnome-icon-theme shared-mime-info"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -20,3 +17,22 @@ long_desc="
  which uses the gdk-pixbuf library. It can deal with large images, and zoom
  and scroll with constant memory usage. Its goals are simplicity and
  standards compliance."
+
+eog-devel_package() {
+	depends="gtk+3-devel"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+		vmove usr/share/eog/gir-1.0
+	}
+}
+
+eog_package() {
+	depends="hicolor-icon-theme desktop-file-utils
+		gnome-icon-theme shared-mime-info"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 49d2ef0596..66fd6dcb3c 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -4,7 +4,6 @@ version=0.1.8
 revision=4
 build_style=gnu-configure
 makedepends="pkg-config glib-devel>=2.32 gtk+-devel poppler-glib-devel>=0.20"
-depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Lightweight PDF viewer using Poppler and GTK+"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.emma-soft.com/projects/epdfview/"
@@ -18,11 +17,16 @@ long_desc="
  The aim of ePDFView is to make a simple PDF document viewer, in the lines
  of Evince but without using the Gnome libraries."
 
-
-
 post_install() {
 	for f in 24 32 48; do
 		vinstall data/icon_${pkgname}-${f}.png 644 \
 			usr/share/icons/hicolor/${f}x${f}/apps ${pkgname}.png
 	done
 }
+
+epdfview_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/epiphany-extensions/template b/srcpkgs/epiphany-extensions/template
index b6e6ce5ce7..ec6a0b75a6 100644
--- a/srcpkgs/epiphany-extensions/template
+++ b/srcpkgs/epiphany-extensions/template
@@ -5,9 +5,8 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper
 --disable-debug"
-depends="epiphany>=3.6.0 webkit-gtk3>=1.10.0"
 makedepends="which pkg-config intltool gnome-doc-utils dbus-glib-devel
-webkit-gtk3-devel epiphany-devel>=3.6.0 opensp-devel"
+ webkit-gtk3-devel epiphany-devel>=3.6.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/"
@@ -25,3 +24,10 @@ long_desc="
  integration with the GNOME desktop.
 
  This package contains some extensions for use with Epiphany."
+
+epiphany-extensions_package() {
+	depends="epiphany>=3.6.0 webkit-gtk3>=1.10.0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index b45a4c7c10..3e6f6df758 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,14 +4,11 @@ version=3.8.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-tests"
-depends="gsettings-desktop-schemas>=3.8.0 ca-certificates
- hicolor-icon-theme desktop-file-utils"
 hostmakedepends="which pkg-config intltool gnome-doc-utils gobject-introspection"
 makedepends="nss-devel libsoup-gnome-devel>=2.40 libnotify-devel
  webkitgtk-devel sqlite-devel libxslt-devel avahi-glib-libs-devel
  startup-notification-devel NetworkManager-devel gcr-devel>=3.8.0
- gnome-desktop-devel>=3.8.0 libsecret-devel libwnck-devel"
-fulldepends="iso-codes"
+ gnome-desktop-devel>=3.8.0 libsecret-devel libwnck-devel iso-codes"
 short_desc="Intuitive GNOME web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/epiphany/"
@@ -27,3 +24,11 @@ long_desc="
  side by using the WebKitGTK+ rendering engine; and on the user interface side
  by closely following the GNOME Human Interface Guidelines (HIG) and by close
  integration with the GNOME desktop."
+
+epiphany_package() {
+	depends="gsettings-desktop-schemas>=3.8.0 ca-certificates
+		hicolor-icon-theme desktop-file-utils iso-codes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/epson-inkjet-printer-escpr/template b/srcpkgs/epson-inkjet-printer-escpr/template
index 9bc63889fb..9af5af6189 100644
--- a/srcpkgs/epson-inkjet-printer-escpr/template
+++ b/srcpkgs/epson-inkjet-printer-escpr/template
@@ -3,16 +3,16 @@ pkgname=epson-inkjet-printer-escpr
 _distver=1.1.1
 _lsbver=1lsb3.2
 version=${_distver}
+revision=1
 wrksrc="${pkgname}-${_distver}"
 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"
-revision=1
 short_desc="Epson Inkjet Printer Driver (ESC/P-R)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+distfiles="http://linux.avasys.jp/drivers/lsb/epson-inkjet/escpr/src/$pkgname-${_distver}-${_lsbver}.tar.gz"
 checksum=9a818ca37c92fef1a7dd7ecac28e9e8c714894b930b149661c261c58d1ea3633
 long_desc="
  This software is a filter program used with the Common UNIX Printing
@@ -21,8 +21,13 @@ long_desc="
 
  This product can only be used with printers that support the Epson ESC/P-R language."
 
-
 post_install() {
 	# gzip ppd files.
 	find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
 }
+
+epson-inkjet-printer-escpr_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index ad1ffabac6..d2b8e7793d 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -9,3 +9,9 @@ homepage="http://www.kernel.org/pub/software/network/ethtool/"
 license="GPL-2"
 distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=9ab2e1debfb608c54ca1215d26b194b014e246821ab0fd72a4bf5e960b4201fe
+
+ethtool_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ethumb/ethumb-devel.template b/srcpkgs/ethumb/ethumb-devel.template
deleted file mode 100644
index 92db71f3fb..0000000000
--- a/srcpkgs/ethumb/ethumb-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'ethumb-devel'.
-#
-noarch=yes
-depends="eet-devel ecore-devel evas-devel edje-devel emotion-devel
- libexif-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/ethumb/template b/srcpkgs/ethumb/template
index deb23efa53..09aaabd25a 100644
--- a/srcpkgs/ethumb/template
+++ b/srcpkgs/ethumb/template
@@ -1,7 +1,7 @@
 # Template file for 'ethumb'
 pkgname=ethumb
 version=1.7.5
-revision=1
+revision=2
 subpackages="${pkgname}-devel"
 makedepends="pkg-config edje-devel>=1.7.5 e_dbus-devel>=1.7.5
  emotion-devel>=1.7.5 libexif-devel"
@@ -13,3 +13,19 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=decb90a98ef94b1f52150c5e55e87c736824e24b01316486e9954760daac4cf5
+
+ethumb-devel_package() {
+	depends="eet-devel ecore-devel evas-devel edje-devel emotion-devel
+		libexif-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+ethumb_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/evas/evas-devel.template b/srcpkgs/evas/evas-devel.template
deleted file mode 100644
index f054611fb6..0000000000
--- a/srcpkgs/evas/evas-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'evas-devel'.
-#
-noarch=yes
-depends="eet-devel pixman-devel fribidi-devel harfbuzz-devel
- fontconfig-devel evas>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/evas/template b/srcpkgs/evas/template
index a8c5fef7e7..95069bdc04 100644
--- a/srcpkgs/evas/template
+++ b/srcpkgs/evas/template
@@ -18,3 +18,19 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/evas-${version}.tar.gz"
 checksum=a5de7921dadc8ed5726a16aca18fba48b43348556fde5b9454ef9b3468a21c6a
+
+evas-devel_package() {
+	depends="eet-devel pixman-devel fribidi-devel harfbuzz-devel
+		fontconfig-devel evas>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+evas_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/evas_generic_loaders/template b/srcpkgs/evas_generic_loaders/template
index 0aaabc87a6..fa0fe45e42 100644
--- a/srcpkgs/evas_generic_loaders/template
+++ b/srcpkgs/evas_generic_loaders/template
@@ -13,3 +13,9 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.gz"
 checksum=c50005246219668f2d7f0e00f4632c7e20f5eddb73d2de18c66d1a729dc569af
+
+evas_generic_loaders_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/evieext/template b/srcpkgs/evieext/template
index 032100f2ed..7975842089 100644
--- a/srcpkgs/evieext/template
+++ b/srcpkgs/evieext/template
@@ -1,16 +1,21 @@
 # Template build file for 'evieext'.
 pkgname=evieext
 version=1.0.2
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="EvIE extension headers"
 homepage="http://xorg.freedesktop.org"
 license="MIT/X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
 long_desc="
  This package provides the X11 Event Interception extension (EvIE)
  headers from modular X.org."
 
-noarch=yes
+evieext_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/evince/evince-devel.template b/srcpkgs/evince/evince-devel.template
deleted file mode 100644
index 3f5efafc98..0000000000
--- a/srcpkgs/evince/evince-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'evince-devel'.
-#
-depends="gtk+3-devel libevince-${version}_${revision}"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/evince/libevince.template b/srcpkgs/evince/libevince.template
deleted file mode 100644
index 1b2af0e1c8..0000000000
--- a/srcpkgs/evince/libevince.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libevince'.
-#
-short_desc="${short_desc} - runtime libraries"
-long_desc="${long_desc}
-
- This package contains the runtime libraries."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove usr/lib/girepository-1.0 usr/lib
-}
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 92e4f3c8d1..bb856d0ef0 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.8.0
-revision=1
+revision=2
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/evince/"
@@ -19,22 +19,42 @@ long_desc="
   * SyncTex support with gedit
   * comics books (cbr,cbz,cb7 and cbt)"
 
-subpackages="lib${pkgname} ${pkgname}-devel"
-
 build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile
  --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib
  --disable-tests --disable-static"
 
-# XXX missing packages for DVI  backend.
-depends="desktop-file-utils hicolor-icon-theme"
-
 hostmakedepends="which pkg-config intltool itstool
  gnome-doc-utils gobject-introspection"
 
 makedepends="tiff-devel libarchive-devel nautilus-devel>=3.8.0
  poppler-glib-devel libxml2-devel djvulibre-devel libgxps-devel
  libICE-devel libspectre-devel libsecret-devel
- gsettings-desktop-schemas-devel>=3.8.0"
+ gsettings-desktop-schemas-devel>=3.8.0 gnome-icon-theme"
 
-fulldepends="gnome-icon-theme"
+libevince_package() {
+	short_desc="${short_desc} - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+
+evince-devel_package() {
+	depends="gtk+3-devel libevince-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/gtk-doc
+	}
+}
+
+evince_package() {
+	# XXX missing packages for DVI backend.
+	depends="desktop-file-utils hicolor-icon-theme gnome-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
deleted file mode 100644
index 09744287cc..0000000000
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'evolution-data-server-devel'.
-#
-depends="sqlite-devel mit-krb5-devel nss-devel libical-devel
- libldap-devel libgdata-devel libsecret-devel
- gnome-online-accounts-devel>=3.8.0 ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gir-1.0 usr/share
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/vala usr/share
-}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index ed8983fc1d..3880438162 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -10,10 +10,30 @@ hostmakedepends="pkg-config intltool flex gperf gobject-introspection"
 makedepends="sqlite-devel mit-krb5-devel nss-devel libical-devel libsecret-devel
  libsoup-gnome-devel>=2.40 gcr-devel>=3.8.0 libldap-devel libgdata-devel
  vala-devel>=0.20 libgweather-devel>=3.8.0"
-subpackages="$pkgname-devel"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=fff7dca02abc52caa62ddbd93a9135c15da3f21c36c25774f3399fb7a6c1d41e
+
+evolution-data-server-devel_package() {
+	depends="sqlite-devel mit-krb5-devel nss-devel libical-devel
+		libldap-devel libgdata-devel libsecret-devel
+		gnome-online-accounts-devel>=3.8.0
+		${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/gtk-doc
+		vmove usr/share/vala
+	}
+}
+
+evolution-data-server_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index d5c8a0fd53..4c14cd0292 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -12,9 +12,7 @@ makedepends="libgdata-devel>=0.13 webkitgtk-devel evolution-data-server-devel>=3
  GConf-devel clutter-gtk-devel>=1.4.4 libcanberra-devel
  gtkhtml-devel>=4.6.0 libsoup-gnome-devel gnome-desktop-devel>=3.8
  libnotify-devel gstreamer1-devel libgweather-devel>=3.8
- NetworkManager-devel enchant-devel"
-depends="hicolor-icon-theme desktop-file-utils"
-fulldepends="iso-codes"
+ NetworkManager-devel enchant-devel iso-codes"
 short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -28,3 +26,10 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
 	rm -rf ${DESTDIR}/usr/share/gtk-doc
 }
+
+evolution_package() {
+	depends="hicolor-icon-theme desktop-file-utils iso-codes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/exempi/exempi-devel.template b/srcpkgs/exempi/exempi-devel.template
deleted file mode 100644
index 929ad2a603..0000000000
--- a/srcpkgs/exempi/exempi-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libnl-devel'.
-#
-noarch=yes
-depends="zlib-devel expat-devel exempi-${version}_${revision}"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template
index 47aad9b633..5f6f91fdff 100644
--- a/srcpkgs/exempi/template
+++ b/srcpkgs/exempi/template
@@ -1,10 +1,9 @@
 # Template file for 'exempi'
 pkgname=exempi
 version=2.2.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-subpackages="$pkgname-devel"
 makedepends="zlib-devel expat-devel boost-devel"
 short_desc="Library for applications dealing with netlink sockets"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -20,3 +19,18 @@ long_desc="
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/exempi
 }
+
+exempi-devel_package() {
+	depends="zlib-devel expat-devel exempi-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+exempi_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/exfat-utils/template b/srcpkgs/exfat-utils/template
index 022e42406e..1567d612fd 100644
--- a/srcpkgs/exfat-utils/template
+++ b/srcpkgs/exfat-utils/template
@@ -18,3 +18,9 @@ do_install() {
 	install -m444 {dump,fsck,mkfs,label}/*.8 \
 		${DESTDIR}/usr/share/man/man8
 }
+
+exfat-utils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/exiv2/exiv2-devel.template b/srcpkgs/exiv2/exiv2-devel.template
deleted file mode 100644
index b0e40d9335..0000000000
--- a/srcpkgs/exiv2/exiv2-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template
index 6e8117ac58..b89ac9dcbf 100644
--- a/srcpkgs/exiv2/template
+++ b/srcpkgs/exiv2/template
@@ -1,10 +1,10 @@
 # Template file for 'exiv2'
 pkgname=exiv2
 version=0.22
+revision=2
 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>"
@@ -14,5 +14,18 @@ long_desc="
  Exiv2 comprises a C++ library and a command line utility to access
  image metadata (EXIF, IPTC, MakerNotes)."
 
-subpackages="exiv2-devel"
+exiv2-devel_package() {
+	depends="zlib-devel expat-devel libstdc++-devel exiv2"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
 
+exiv2_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/exo/exo-devel.template b/srcpkgs/exo/exo-devel.template
deleted file mode 100644
index a32d3455d0..0000000000
--- a/srcpkgs/exo/exo-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'exo-devel'.
-#
-depends="gtk+-devel libxfce4util-devel exo-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/bin/exo-csource usr/bin
-	vmove usr/share/man/man1/exo-csource.1 usr/share/man/man1
-	vmove "usr/share/*doc" usr/share
-}
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index a00041d2ed..aaacdb7208 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -4,9 +4,7 @@ version=0.10.2
 revision=1
 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"
+makedepends="pkg-config intltool gtk+-devel libxfce4util-devel libxfce4ui-devel perl-URI"
 short_desc="Application library for the Xfce desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -14,5 +12,23 @@ homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/xfce/exo/0.10/exo-${version}.tar.bz2"
 checksum=b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce
 
-conf_files="/etc/xdg/xfce4/helpers.rc"
-subpackages="exo-devel"
+exo-devel_package() {
+	depends="gtk+-devel libxfce4util-devel exo-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/bin/exo-csource
+		vmove usr/share/man/man1/exo-csource.1
+		vmove "usr/share/*doc"
+	}
+}
+
+exo_package() {
+	depends="hicolor-icon-theme desktop-file-utils perl-URI"
+	conf_files="/etc/xdg/xfce4/helpers.rc"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/extundelete/template b/srcpkgs/extundelete/template
index 4b28fea6a5..8302fd5715 100644
--- a/srcpkgs/extundelete/template
+++ b/srcpkgs/extundelete/template
@@ -10,3 +10,9 @@ homepage="http://extundelete.sourceforge.net"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4
+
+extundelete_package() {
+	pkg_install() {
+		vmove usr
+	}
+}