Convert packages to the new template format (r).

srcpkgs/r2-bindings-git/template

@@ -2,14 +2,6 @@
 pkgname=r2-bindings-git
 version="$(date -u +%Y%m%d)"
 revision=1
-nofetch=yes
-noextract=yes
-noverifyrdeps=yes
-depends="radare2-git>=${version} python>=2.7.3"
-makedepends="pkg-config swig>=2.0.7 valabind-git>=${version}
- python-devel radare2-devel-git>=${version}"
-provides="r2-bindings-9999"
-replaces="r2-bindings>=0"
 short_desc="Advanced command line debugger and hexadecimal editor (bindings, git snapshot)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-3"
@@ -22,7 +14,11 @@ long_desc="
 
  This package contains the radare2 bindings for multiple languages."
 
-pycompile_module="r2"
+nofetch=yes
+noextract=yes
+
+makedepends="pkg-config swig>=2.0.7 valabind-git>=${version}
+ python-devel radare2-devel-git>=${version}"
 
 do_fetch() {
         local url="git://github.com/radare/radare2"
@@ -36,10 +32,23 @@ do_configure() {
 }
 
 do_build() {
-	cd r2-bindings && make ${makejobs}
+	cd r2-bindings
+	make ${makejobs}
 }
 
 do_install() {
-	cd r2-bindings && make DESTDIR=${DESTDIR} install
+	cd r2-bindings
+	make DESTDIR=${DESTDIR} install
 }
 
+
+r2-bindings-git_package() {
+	replaces="r2-bindings>=0"
+	provides="r2-bindings-9999"
+	depends="radare2-git>=${version} python>=2.7.3"
+	pycompile_module="r2"
+	noverifyrdeps=yes
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/r2-bindings/template

@@ -3,12 +3,8 @@ pkgname=r2-bindings
 version=0.9.4
 revision=1
 wrksrc="radare2-${version}"
-makedepends="pkg-config swig>=2.0.7 valabind>=0.7.2
- python-devel radare2-devel>=${version}"
 short_desc="Advanced command line debugger and hexadecimal editor (bindings)"
 maintainer="pancake <pancake@nopcode.org>"
-depends="radare2-devel-${version}*"
-noverifyrdeps=1
 license="LGPL-3"
 homepage="http://www.radare.org"
 distfiles="${homepage}/get/radare2-${version}.tar.gz"
@@ -21,7 +17,8 @@ long_desc="
 
  This package contains the radare2 bindings for multiple languages."
 
-pycompile_module="r2"
+makedepends="pkg-config swig>=2.0.7 valabind>=0.7.2
+ python-devel radare2-devel>=${version}"
 
 do_configure() {
 	cd r2-bindings
@@ -29,9 +26,20 @@ do_configure() {
 }
 
 do_build() {
-	cd r2-bindings && make ${makejobs}
+	cd r2-bindings
+	make ${makejobs}
 }
 
 do_install() {
-	cd r2-bindings && make DESTDIR=${DESTDIR} install
+	cd r2-bindings
+	make DESTDIR=${DESTDIR} install
+}
+
+r2-bindings_package() {
+	pycompile_module="r2"
+	depends="radare2-devel-${version}*"
+	noverifyrdeps=1
+	pkg_install() {
+		vmove usr
+	}
 }

srcpkgs/radare2-git/radare2-devel-git.template

@@ -1,15 +0,0 @@
-# Template file for 'radare2-devel-git'.
-#
-replaces="radare2-devel>=0"
-provides="radare2-devel-9999"
-depends="radare2-git>=$version"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/radare2-git/template

@@ -3,14 +3,11 @@ pkgname=radare2-git
 version="$(date -u +%Y%m%d)"
 revision=2
 build_style=gnu-configure
-makedepends="git"
-provides="radare2-9999"
-replaces="radare2>=0"
-subpackages="radare2-devel-git"
 short_desc="Advanced command line debugger and hexadecimal editor (git snapshot)"
 maintainer="pancake <pancake@nopcode.org>"
 license="LGPL-3"
 homepage="http://radare.org"
+
 nofetch=yes
 noextract=yes
 
@@ -19,3 +16,21 @@ do_fetch() {
         msg_normal "Fetching source from $url ...\n"
         git clone ${url} ${pkgname}-${version}
 }
+
+radare2-devel-git_package() {
+	replaces="radare2-devel>=0"
+	provides="radare2-devel-9999"
+	depends="radare2-git>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+radare2-git_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/radare2/radare2-devel.template

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

srcpkgs/radare2/template

@@ -1,8 +1,7 @@
 # Template file for 'radare2'
 pkgname=radare2
 version=0.9.4
-revision=1
+revision=2
-subpackages="${pkgname}-devel"
 build_style=gnu-configure
 short_desc="Advanced command line debugger and hexadecimal editor"
 maintainer="pancake <pancake@nopcode.org>"
@@ -10,3 +9,18 @@ license="LGPL-3"
 homepage="http://www.radare.org"
 distfiles="${homepage}/get/${pkgname}-${version}.tar.gz"
 checksum=7af3413f736b979dbf5db3688e9bc3052879a28428ac4f10086fa7f93cba5de0
+
+radare2-devel_package() {
+	depends="radare2>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+radare2_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/randrproto/template

@@ -2,7 +2,6 @@
 pkgname=randrproto
 version=1.4.0
 revision=2
-noarch=yes
 build_style=gnu-configure
 short_desc="Randr extension headers from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,3 +11,10 @@ distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
 long_desc="
  This provides the Randr extension headers from X.org X11 project."
+
+randrproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/raptor/libraptor.template

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

srcpkgs/raptor/raptor-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'aubio-devel'.
-#
-noarch=yes
-depends="libxml2-devel zlib-devel libraptor-${version}_${revision}"
-short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-        vmove usr/include usr
-        vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/man/man3 usr/share/man
-}

srcpkgs/raptor/template

@@ -1,9 +1,8 @@
 # Template file for 'raptor'
 pkgname=raptor
 version=2.0.6
-revision=2
+revision=3
 wrksrc="raptor2-${version}"
-subpackages="lib${pkgname} ${pkgname}-devel"
 build_style=gnu-configure
 configure_args="--disable-static --with-yajl=no"
 makedepends="pkg-config libcurl-devel libxml2-devel libxslt-devel"
@@ -22,3 +21,27 @@ long_desc="
  and microformats for HTML, XHTML and XML and RDFa. The serializing syntaxes
  are RDF/XML (regular, and abbreviated), Atom 1.0, GraphViz, JSON, N-Quads,
  N-Triples, RSS 1.0 and XMP."
+
+libraptor_package() {
+	short_desc="${short_desc} - Runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+raptor-devel_package() {
+	depends="libxml2-devel zlib-devel libraptor-${version}_${revision}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+        	vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+		vmove usr/share/man/man3
+	}
+}
+
+raptor_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rarian/rarian-devel.template

@@ -1,17 +0,0 @@
-# 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."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}

srcpkgs/rarian/template

@@ -1,24 +1,37 @@
 # Template file for 'rarian'
 pkgname=rarian
 version=0.8.1
-distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-revision=3
+revision=4
-depends="bash"
+hostmakedepends="pkg-config libxslt"
-makedepends="libstdc++-devel pkg-config libxslt"
 short_desc="Documentation metadata library"
 homepage="http://rarian.freedesktop.org/"
 license="LGPL-2.1"
+distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577
 long_desc="
  Rarian is a documentation metadata library based on the proposed
  Freedesktop.org spec."
 
-subpackages="rarian-devel"
+post_install() {
-
-
-post_install()
-{
 	touch -f ${DESTDIR}/var/lib/rarian/.empty_on_purpose
 }
+
+rarian-devel_package() {
+	depends="rarian>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+rarian_package() {
+	depends="bash"
+	pkg_install() {
+		vmove usr
+		vmove var
+	}
+}

srcpkgs/raul/raul-devel.template

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

srcpkgs/raul/template

@@ -1,9 +1,8 @@
 # Template file for 'raul'
 pkgname=raul
 version=0.8.0
-revision=2
+revision=3
 build_style=waf
-subpackages="$pkgname-devel"
 makedepends="pkg-config python glib-devel boost-devel"
 short_desc="C++ utility library primarily aimed at audio/musical applications."
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -14,3 +13,18 @@ checksum=0b35cd7bb6fb0b1ca0340be07678a2561888572c96cf4e4da4d8f4c03a20ba26
 long_desc="
  Raul (Realtime Audio Utility Library) is a C++ utility library primarily aimed
  at audio/musical applications."
+
+raul-devel_package() {
+	depends="libglib-devel raul>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+        	vmove usr/lib/pkgconfig
+	}
+}
+
+raul_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rawtherapee/template

@@ -3,7 +3,6 @@ pkgname=rawtherapee
 version=4.0.9
 revision=2
 build_style=cmake
-depends="desktop-file-utils hicolor-icon-theme"
 makedepends="cmake pkg-config libpng-devel>=1.5.10 gtkmm2-devel
  lcms2-devel libiptcdata-devel libgomp-devel mercurial"
 short_desc="Free RAW converter and digital photo processing software"
@@ -23,3 +22,10 @@ long_desc="
  processing is done in 16 bit/channel mode. Different to other RAW converters it
  can use EAHD as demosaicing algorithm. The raw loading engine of RawTherapee is
  based on dcraw."
+
+rawtherapee_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/razor-qt/razor-qt-devel.template

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

srcpkgs/razor-qt/template

@@ -1,11 +1,10 @@
 # Template file for 'razor-qt'
 pkgname=razor-qt
 version=0.5.1
-revision=1
+revision=2
 wrksrc="razorqt-${version}"
 build_style=cmake
 configure_args="-DLIB_SUFFIX="
-depends="openbox upower udisks oxygen-icons"
 short_desc="The free and open source lightweight desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,17 +17,30 @@ long_desc="
  and an intuitive interface. Unlike most desktop environments, Razor-qt also
  works fine with weak machines."
 
-subpackages="${pkgname}-devel"
-
 makedepends="cmake pkg-config qt-devel polkit-qt-devel>=0.103.0_2
  libudev-devel libXrender-devel libXcomposite-devel libXcursor-devel
  libXdamage-devel libstatgrab-devel libsensors-devel pulseaudio-devel
- alsa-lib-devel lightdm-devel"
+ alsa-lib-devel lightdm-devel openbox upower udisks oxygen-icons"
 
-conf_files="
+razor-qt-devel_package() {
-/etc/razor/session.conf
+	short_desc="${short_desc} -- development files"
-/etc/razor/razor.conf
+	pkg_install() {
-/etc/razor/windowmanagers.conf
+		vmove usr/include
-/etc/razor/razor-panel
+		vmove usr/lib/pkgconfig
-/etc/razor/razor-panel/panel.conf
+	}
-/etc/razor/desktop.conf"
+}
+
+razor-qt_package() {
+	conf_files="
+		/etc/razor/session.conf
+		/etc/razor/razor.conf
+		/etc/razor/windowmanagers.conf
+		/etc/razor/razor-panel
+		/etc/razor/razor-panel/panel.conf
+		/etc/razor/desktop.conf"
+	depends="openbox upower udisks oxygen-icons"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/rdesktop/template

@@ -12,3 +12,9 @@ license="GPL-3"
 homepage="http://www.rdesktop.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479
+
+rdesktop_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rdis-git/template

@@ -24,3 +24,9 @@ do_build() {
 do_install() {
 	vinstall src/rdis 755 usr/bin
 }
+
+rdis-git_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/recode/librecode.template

@@ -1,13 +0,0 @@
-# Template file for 'librecode'.
-#
-short_desc="${short_desc} - shared library"
-long_desc="${long_desc}
-
- This package contains the shared library."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
-}

srcpkgs/recode/recode-devel.template

@@ -1,16 +0,0 @@
-# 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."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-}

srcpkgs/recode/template

@@ -1,16 +1,16 @@
 # Template file for 'recode'
 pkgname=recode
 version=3.6
+revision=4
 patch_args="-Np1"
-distfiles="${DEBIAN_SITE}/main/r/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 build_style=gnu-configure
 configure_args="--without-included-gettext"
-revision=3
+hostmakedepends="automake libtool"
-makedepends="automake libtool"
 short_desc="Character set conversion utility"
 homepage="http://recode.progiciels-bpi.ca/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${DEBIAN_SITE}/main/r/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
 long_desc="
  Free recode converts files between character sets and usages. When exact
@@ -20,11 +20,31 @@ long_desc="
  files between almost any pair. Most RFC 1345 character sets, and all
  libiconv character sets, are supported."
 
-subpackages="librecode $pkgname-devel"
-
 pre_configure() {
 	sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.in
 	sed -i -e "/^AM_C_PROTOTYPES.*/d" configure.in
 	sed -i -e "s/ansi2knr//" src/Makefile.am
 	rm -f acinclude.m4 && autoreconf -fi && libtoolize
 }
+
+librecode_package() {
+	short_desc="${short_desc} - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+recode-devel_package() {
+	depends="libglib-devel librecode>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+recode_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/recordproto/template

@@ -1,16 +1,21 @@
 # Template build file for 'recordproto'.
 pkgname=recordproto
 version=1.14
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="Record extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067
 long_desc="
  This provides the Record extension headers from modular X.org X11
  project."
 
-noarch=yes
+recordproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/renderproto/template

@@ -9,4 +9,10 @@ homepage="http://xorg.freedesktop.org"
 license="MIT"
 distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537
-noarch=yes
+
+renderproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/resourceproto/template

@@ -2,7 +2,6 @@
 pkgname=resourceproto
 version=1.2.0
 revision=2
-noarch=yes
 build_style=gnu-configure
 short_desc="Resource extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
@@ -12,3 +11,10 @@ distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818
 long_desc="
  This provides the Resource extension headers from X.org."
+
+resourceproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rest/rest-devel.template

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

srcpkgs/rest/template

@@ -1,12 +1,11 @@
 # Template file for 'rest'
 pkgname=rest
 version=0.7.12
-revision=3
+revision=4
-subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config gobject-introspection glib-devel libsoup-devel
+hostmakedepends="pkg-config gobject-introspection
- libsoup-gnome-devel libxml2-devel"
+makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
 short_desc="RESTful library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,3 +18,19 @@ long_desc="
  on Wikipedia [1]. However a reasonable description is that a RESTful service
  should have urls that represent remote objects which methods can then be
  called on."
+
+rest-devel_package() {
+	depends="libglib-devel libsoup-devel libxml2-devel rest-${version}_${revision}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include 
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+rest_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rfkill/template

@@ -9,3 +9,9 @@ license="Public domain"
 homepage="http://wireless.kernel.org/en/users/Documentation/rfkill"
 distfiles="http://wireless.kernel.org/download/rfkill/$pkgname-$version.tar.bz2"
 checksum=ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1
+
+rfkill_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rgb/template

@@ -1,18 +1,19 @@
 # Template build file for 'rgb'.
 pkgname=rgb
 version=1.0.3
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
+hostmakedepends="pkg-config"
-makedepends="pkg-config xproto"
+makedepends="xproto"
-fulldepends="glibc"
+short_desc="RGB color database for X11"
-short_desc="RGB color database"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95
-long_desc="
- This package contains the RGB color database for X11.
 
- This is from the modular X.org X11 project."
+rgb_package() {
- 
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rhythmbox/librhythmbox.template

@@ -1,7 +0,0 @@
-# Template file for 'librhythmbox'.
-#
-short_desc="${short_desc} - shared library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/rhythmbox/rhythmbox-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'rhythmbox-devel'.
-#
-depends="gtk+3-devel librhythmbox-${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
-}

srcpkgs/rhythmbox/template

@@ -5,8 +5,6 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --with-webkit --with-gudev --without-hal --enable-vala"
-subpackages="lib${pkgname} ${pkgname}-devel"
-fulldepends="desktop-file-utils hicolor-icon-theme"
 hostmakedepends="which pkg-config intltool gnome-doc-utils
  itstool gobject-introspection"
 makedepends="gtk+3-devel totem-pl-parser-devel libsoup-gnome-devel
@@ -14,7 +12,7 @@ makedepends="gtk+3-devel totem-pl-parser-devel libsoup-gnome-devel
  libmtp-devel>=1.1.4 avahi-glib-libs-devel libpeas-devel brasero-devel
  libnotify-devel tdb-devel>=1.2.6 libsecret-devel pygobject-devel
  gst-plugins-base1-devel webkitgtk-devel grilo-devel clutter-gst-devel
- mx-devel"
+ mx-devel desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME integrated music management application, inspired by Apple's iTunes"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -39,3 +37,28 @@ long_desc="
  * Play, rip, and burn audio CDs
  * Automatically download audio podcasts
  * Browse, preview, and download albums from Magnatune and Jamendo"
+
+librhythmbox_package() {
+	short_desc="${short_desc} - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+rhythmbox-devel_package() {
+	depends="gtk+3-devel librhythmbox-${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
+	}
+}
+
+rhythmbox_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/ristretto/template

@@ -3,10 +3,9 @@ pkgname=ristretto
 version=0.6.3
 revision=1
 build_style=gnu-configure
-
+hostmakedepends="pkg-config intltool"
-depends="hicolor-icon-theme desktop-file-utils"
+makedepends="gtk+-devel libexif-devel xfconf-devel
-makedepends="pkg-config intltool gtk+-devel libexif-devel xfconf-devel
+ dbus-glib-devel libxfce4ui-devel exo-devel"
-dbus-glib-devel libxfce4ui-devel exo-devel"
 short_desc="Picture-viewer for the Xfce desktop environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,3 +15,10 @@ checksum=2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79
 long_desc="
  Ristretto is a fast and lightweight picture-viewer for the Xfce desktop
  environment."
+
+ristretto_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rpcbind/template

@@ -17,11 +17,6 @@ long_desc="
  universal address. It must be running on the host to be able to make
  RPC calls on a server on that machine."
 
-systemd_services="${pkgname}.socket on"
-system_accounts="rpc"
-rpc_homedir="/var/lib/rpcbind"
-make_dirs="/var/lib/rpcbind 0700 rpc rpc"
-
 post_install() {
 	vinstall man/rpcbind.8 644 usr/share/man/man8
 	vinstall man/rpcinfo.8 644 usr/share/man/man8
@@ -29,3 +24,14 @@ post_install() {
 	install -m644 ${FILESDIR}/*.{service,socket} \
 		${DESTDIR}/usr/lib/systemd/system
 }
+
+rpcbind_package() {
+	depends="shadow"
+	systemd_services="${pkgname}.socket on"
+	system_accounts="rpc"
+	rpc_homedir="/var/lib/rpcbind"
+	make_dirs="/var/lib/rpcbind 0700 rpc rpc"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rpi-firmware/template

@@ -11,8 +11,6 @@ noarch=yes
 nofetch=yes
 noextract=yes
 
-conf_files="/boot/cmdline.txt /boot/config.txt"
-
 do_fetch() {
 	local url="git://github.com/raspberrypi/firmware.git"
 	# Latest commit from 20130401 is 5b72baa0a2
@@ -40,3 +38,13 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 }
+
+rpi-firmware_package() {
+	conf_files="/boot/cmdline.txt /boot/config.txt"
+	noarch="yes"
+	pkg_install() {
+		vmove boot
+		vmove opt
+		vmove usr
+	}
+}

srcpkgs/rsync/template

@@ -21,3 +21,9 @@ long_desc="
  sets of files are present at one of the ends of the link beforehand.  At
  first glance this may seem impossible because the calculation of diffs
  between two files normally requires local access to both files."
+
+rsync_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rsyslog/rsyslog-docs.template

@@ -1,14 +0,0 @@
-# Template file for 'rsyslog-docs'.
-#
-short_desc="${sourcepkg} HTML documentation"
-long_desc="${long_desc}
-
- This package contains the included HTML documentation."
-
-noarch=yes
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
-}

srcpkgs/rsyslog/rsyslog-gnutls.template

@@ -1,14 +0,0 @@
-# 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."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/rsyslog
-	mv ${SRCPKGDESTDIR}/usr/lib/rsyslog/*gtls* ${DESTDIR}/usr/lib/rsyslog
-}

srcpkgs/rsyslog/rsyslog-gssapi.template

@@ -1,15 +0,0 @@
-# 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."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/rsyslog
-	mv ${SRCPKGDESTDIR}/usr/lib/rsyslog/*gss*.so \
-		${DESTDIR}/usr/lib/rsyslog
-}

srcpkgs/rsyslog/rsyslog-mysql.template

@@ -1,14 +0,0 @@
-# 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."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/rsyslog
-	mv ${SRCPKGDESTDIR}/usr/lib/rsyslog/ommysql.so ${DESTDIR}/usr/lib/rsyslog
-}

srcpkgs/rsyslog/rsyslog-postgresql.template

@@ -1,14 +0,0 @@
-# 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."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/rsyslog
-	mv ${SRCPKGDESTDIR}/usr/lib/rsyslog/ompgsql.so ${DESTDIR}/usr/lib/rsyslog
-}

srcpkgs/rsyslog/template

@@ -10,7 +10,6 @@ configure_args="--enable-gnutls --enable-mysql --enable-pgsql
  --enable-impstats --enable-omprog --enable-omstdout
  --enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom
  --enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock"
-depends="libee>=0.4.0 systemd>=186"
 makedepends="pkg-config gnutls-devel>=3.1.5 postgresql-libs-devel
  libmysqlclient-devel>=5.5.27 mit-krb5-devel libee-devel>=0.4.0"
 short_desc="An Enhanced multi-threaded syslog daemon"
@@ -24,13 +23,6 @@ long_desc="
  others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists,
  filtering on any message part, and fine grain output format control."
 
-subpackages="rsyslog-docs rsyslog-gssapi rsyslog-gnutls rsyslog-mysql rsyslog-postgresql"
-conf_files="/etc/rsyslog.conf"
-systemd_services="rsyslog.service on"
-provides="syslog-daemon-0"
-replaces="syslog-daemon>=0"
-make_dirs="/etc/rsyslog.d 0755 root root"
-
 post_configure() {
 	echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile
 }
@@ -43,3 +35,56 @@ post_install() {
 	install -m644 ${wrksrc}/doc/*.{html,png} \
 		${DESTDIR}/usr/share/doc/rsyslog/html
 }
+
+rsyslog-docs_package() {
+	short_desc="${sourcepkg} HTML documentation"
+	noarch=yes
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
+rsyslog-gssapi_package() {
+	depends="rsyslog"
+	short_desc="${sourcepkg} Kerberos5 GSSAPI add-on"
+	pkg_install() {
+		vmove "usr/lib/rsyslog/*gss*.so"
+	}
+}
+
+rsyslog-gnutls_package() {
+	depends="rsyslog"
+	short_desc="${sourcepkg} GnuTLS add-on"
+	pkg_install() {
+		vmove "usr/lib/rsyslog/*gtls*"
+	}
+}
+
+rsyslog-mysql_package() {
+	depends="rsyslog"
+	short_desc="${sourcepkg} MySQL add-on"
+	pkg_install() {
+		vmove usr/lib/rsyslog/ommysql.so
+	}
+}
+
+rsyslog-postgresql_package() {
+	depends="rsyslog"
+	short_desc="${sourcepkg} PostgreSQL add-on"
+	pkg_install() {
+		vmove usr/lib/rsyslog/ompgsql.so
+	}
+}
+
+rsyslog_package() {
+	depends="libee>=0.4.0 systemd>=186"
+	conf_files="/etc/rsyslog.conf"
+	systemd_services="rsyslog.service on"
+	provides="syslog-daemon-0"
+	replaces="syslog-daemon>=0"
+	make_dirs="/etc/rsyslog.d 0755 root root"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/rtmpdump/librtmp-devel.template

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

srcpkgs/rtmpdump/librtmp.template

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

srcpkgs/rtmpdump/template

@@ -3,7 +3,6 @@ pkgname=rtmpdump
 version=2.4
 revision=2
 makedepends="openssl-devel"
-subpackages="librtmp librtmp-devel"
 short_desc="Toolkit for RTMP streams"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://rtmpdump.mplayerhq.hu/"
@@ -22,3 +21,26 @@ do_install() {
 	vmkdir usr/lib
 	make prefix=/usr mandir=/usr/share/man DESTDIR=$DESTDIR install
 }
+
+librtmp_package() {
+	short_desc="${short_desc} -- shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+librtmp-devel_package() {
+	depends="openssl-devel librtmp>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+rtmpdump_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rtorrent/template

@@ -4,7 +4,6 @@ version=0.9.2
 revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
-depends="libtorrent>=0.13.2"
 hostmakedepends="automake pkg-config"
 makedepends="libcurl-devel libsigc++-devel libtorrent-devel>=0.13.2 ncurses-devel"
 short_desc="Ncurses BitTorrent client based on libTorrent"
@@ -23,3 +22,10 @@ pre_configure() {
 	sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
 	autoreconf -fi
 }
+
+rtorrent_package() {
+	depends="libtorrent>=0.13.2"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rubberband/librubberband.template

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

srcpkgs/rubberband/rubberband-devel.template

@@ -1,15 +0,0 @@
-# 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."
-
-
-do_install()
-{
-        vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-        vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/rubberband/template

@@ -1,15 +1,14 @@
 # Template file for 'rubberband'
 pkgname=rubberband
 version=1.6.0
-homepage="http://www.breakfastquay.com/rubberband/"
+revision=3
-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"
+homepage="http://www.breakfastquay.com/rubberband/"
+distfiles="http://code.breakfastquay.com/attachments/download/16/${pkgname}-${version}.tar.bz2"
 checksum=5bd339e3a64c7ba428f99d8890cee1de5c7165d963d085edb2e7ad357a39c896
 long_desc="
  Rubber Band Library is a high quality software library for audio
@@ -17,6 +16,28 @@ long_desc="
  and pitch of an audio stream or recording dynamically and independently
  of one another."
 
-subpackages="lib${pkgname} ${pkgname}-devel"
+librubberband_package() {
+	short_desc="${short_desc} - Runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove usr/lib/vamp
+		vmove usr/lib/ladspa
+	}
+}
 
+rubberband-devel_package() {
+	depends="librubberband>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+		vmove "usr/lib/*.a"
+        	vmove usr/lib/pkgconfig
+	}
+}
 
+rubberband_package() {
+	depends="libvamp-plugin-sdk"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/ruby/ruby-devel.template

@@ -1,16 +0,0 @@
-# Template file for 'ruby-devel'.
-#
-depends="ruby-${version}_${revision}"
-short_desc="ruby development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install()
-{
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/ruby/1.9.1/mkmf.rb usr/lib/ruby/1.9.1
-	vmove usr/share/doc usr/share
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/ruby/ruby-gems.template

@@ -1,24 +0,0 @@
-# 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.
- RubyGems provides the ability to manage concurrent versions of libraries
- and dependencies between those libraries. Using RubyGems, you can:
-
-  * download and install Ruby libraries easily
-  * not worry about libraries A and B depending on different versions of
-    library C
-  * easily remove libraries you no longer use
-
- This package provides RubyGems with Ruby 1.9.1."
-
-noarch=yes
-
-
-do_install()
-{
-	vmove usr/bin/gem usr/bin
-	vmove usr/lib/ruby/gems usr/lib/ruby
-}

srcpkgs/ruby/ruby-irb.template

@@ -1,25 +0,0 @@
-# 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
- the terminal.
-
- This package provides the irb which uses Ruby 1.9.1."
-
-noarch=yes
- 
-
-do_install()
-{
-	local libdir=/usr/lib/ruby/1.9.1
-
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/${libdir} \
-		${DESTDIR}/usr/share/man/man1
-
-	mv ${SRCPKGDESTDIR}/usr/bin/irb ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/${libdir}/irb ${DESTDIR}/${libdir}
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/irb* \
-		${DESTDIR}/usr/share/man/man1
-}

srcpkgs/ruby/ruby-rdoc.template

@@ -1,30 +0,0 @@
-# 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:
-
- * Generates structured HTML and XML documentation from Ruby source
-   and C extensions.
- * Automatically extracts class, module, method, and attribute
-   definitions.  These can be annotated using inline comments.
- * Analyzes method visibility.
- * Handles aliasing.
- * Uses non-intrusive and implicit markup in the comments. Readers of
-   the original source needn't know that it is marked up at all.
-
- This package provides the RDoc tool which uses Ruby ${version}."
-
-noarch=yes
- 
-
-do_install()
-{
-	local libdir=/usr/lib/ruby/1.9.1
-
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/${libdir}
-
-	mv ${SRCPKGDESTDIR}/usr/bin/rdoc ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/${libdir}/rdoc ${DESTDIR}/${libdir}
-}

srcpkgs/ruby/ruby-ri.template

@@ -1,24 +0,0 @@
-# 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
- methods, classes, and modules. For methods, it shows you the calling
- sequence and a description. For classes and modules, it shows a synopsis
- along with a list of the methods the class or module implements.
-
- This package provides ri command and descriptions about Ruby 1.9.1."
-
-noarch=yes
- 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
-
-	mv ${SRCPKGDESTDIR}/usr/bin/ri ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/ri ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/ri* \
-		${DESTDIR}/usr/share/man/man1
-}

srcpkgs/ruby/template

@@ -23,4 +23,62 @@ long_desc="
  do system management tasks (as in Perl). It is simple, straight-forward
  and extensible."
 
-subpackages="ruby-devel ruby-gems ruby-irb ruby-rdoc ruby-ri"
+ruby-devel_package() {
+	depends="ruby-${version}_${revision}"
+	short_desc="ruby development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/ruby/1.9.1/mkmf.rb
+		vmove usr/share/doc
+		vmove usr/lib/pkgconfig
+	}
+}
+
+ruby-gems_package() {
+	depends="ruby-rdoc ruby"
+	short_desc="Package management framework for Ruby libraries/applications"
+	noarch=yes
+	pkg_install() {
+		vmove usr/bin/gem
+		vmove usr/lib/ruby/gems
+	}
+}
+
+ruby-irb_package() {
+	depends="ruby"
+	short_desc="Interactive Ruby"
+	noarch=yes
+	pkg_install() {
+		vmove usr/bin/irb
+		vmove usr/lib/ruby/1.9.1/irb
+		vmove "usr/share/man/man1/irb*"
+	}
+}
+
+ruby-rdoc_package() {
+	depends="ruby-irb ruby"
+	short_desc="Generate documentation from Ruby source files"
+	noarch=yes
+	pkg_install() {
+		vmove usr/bin/rdoc
+		vmove usr/lib/ruby/1.9.1/rdoc
+	}
+}
+
+ruby-ri_package() {
+	depends="ruby-rdoc ruby"
+	short_desc="Ruby Interactive reference"
+	noarch=yes
+	pkg_install() {
+		vmove usr/bin/ri
+		vmove usr/share/ri
+		vmove "usr/share/man/man1/ri*"
+	}
+}
+
+ruby_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/run-parts/template

@@ -1,8 +1,8 @@
 # Template file for 'run-parts'
 pkgname=run-parts
 version=4.3.2
-wrksrc="debianutils-${version}"
 revision=2
+wrksrc="debianutils-${version}"
 short_desc="Run scripts or programs in a directory"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://packages.qa.debian.org/d/debianutils.html"
@@ -19,3 +19,9 @@ do_install() {
 	vinstall run-parts 755 usr/bin
 	vinstall run-parts.8 644 usr/share/man/man8
 }
+
+run-parts_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rust/template

@@ -29,3 +29,9 @@ do_install() {
 		chrpath -r /usr/lib/rustc/${XBPS_MACHINE}-unknown-linux-gnu/lib ${DESTDIR}/usr/bin/${f}
 	done
 }
+
+rust_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rxvt-unicode/template

@@ -27,3 +27,9 @@ post_install() {
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 	vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
 }
+
+rxvt-unicode_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/rygel/librygel.template

@@ -1,7 +0,0 @@
-# Template file for 'librygel'.
-#
-short_desc="${short_desc} - runtime libraries"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/rygel/rygel-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'rygel-devel'.
-#
-depends="libgee08-devel gupnp-av-devel gstreamer-devel libuuid-devel
- glib-devel librygel-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/vala usr/share
-	vmove usr/share/gtk-doc usr/share
-}

srcpkgs/rygel/template

@@ -4,16 +4,41 @@ version=0.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-gst-launch-plugin"
-depends="hicolor-icon-theme desktop-file-utils"
 hostmakedepends="pkg-config intltool"
 makedepends="sqlite-devel vala-devel>=0.20 gtk+3-devel>=3.8
  libsoup-devel libgee08-devel>=0.10 gupnp-av-devel>=0.12.1
  gupnp-dlna-devel>=0.10 tracker-devel>=0.16"
-conf_files="/etc/rygel.conf"
-subpackages="${pkgname}-devel librygel"
 short_desc="GNOME home media solution"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/${pkgname}/0.18/${pkgname}-${version}.tar.xz"
 checksum=13df00a0e09f6c2e88c8de7cbbd3a80f429fb0efca16ead0c318a18c6f950330
+
+rygel-devel_package() {
+	depends="libgee08-devel gupnp-av-devel gstreamer-devel libuuid-devel
+		glib-devel librygel-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/vala
+		vmove usr/share/gtk-doc
+	}
+}
+
+librygel_package() {
+	short_desc="${short_desc} - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+rygel_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	conf_files="/etc/rygel.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}