Convert packages to the new template format (y).

srcpkgs/yajl/template

@@ -16,4 +16,18 @@ long_desc="
  small validating JSON generator. YAJL is released under the ISC license."
 
 wrksrc="lloyd-${pkgname}-${__extraversion}"
-subpackages="${pkgname}-devel"
+
+yajl-devel_package() {
+	depends="yajl>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+	}
+}
+
+yajl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/yajl/yajl-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'yajl-devel'.
-#
-depends="yajl>=${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/lib/*.a" usr/lib
-	vmove usr/include usr
-}

srcpkgs/yasm/template

@@ -1,14 +1,14 @@
 # Template file for 'yasm'
 pkgname=yasm
 version=1.2.0
-distfiles="http://www.tortall.net/projects/yasm/releases/yasm-$version.tar.gz"
+revision=1
 build_style=gnu-configure
 makedepends="xmlto python>=0"
-revision=1
 short_desc="Complete rewrite of the NASM assembler with BSD license"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.tortall.net/projects/yasm/"
 license="BSD, Artistic, GPL-2, LGPL-2.1"
+distfiles="http://www.tortall.net/projects/yasm/releases/yasm-$version.tar.gz"
 checksum=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31
 long_desc="
  YASM is a complete rewrite of the NASM assembler under the new BSD License
@@ -18,8 +18,13 @@ long_desc="
  GAS, etc.) in addition to multiple output object formats. Another primary
  module of the overall design is an optimizer module."
 
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib
 	rm -rf ${DESTDIR}/usr/include
 }
+
+yasm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/yelp-xsl/template

@@ -2,7 +2,6 @@
 pkgname=yelp-xsl
 version=3.8.0
 revision=1
-noarch=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
 makedepends="libxslt-devel"
@@ -17,3 +16,10 @@ long_desc="
  installed documentation.
 
  This package contains some XSL and misc files required by Yelp."
+
+yelp-xsl_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/yelp/template

@@ -1,18 +1,31 @@
 # Template file for 'yelp'
 pkgname=yelp
 version=3.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
-subpackages="yelp-devel"
-depends="dconf>=0.16 hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.8.3"
 hostmakedepends="pkg-config intltool itstool"
 makedepends="bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel
- libgcrypt-devel libxslt-devel libsoup-devel webkitgtk-devel"
+ libgcrypt-devel libxslt-devel libsoup-devel webkitgtk-devel yelp-xsl>=${version}"
-fulldepends="yelp-xsl>=3.8.0"
 short_desc="Help browser for GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f
+
+yelp-devel_package() {
+	depends="yelp>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/gtk-doc
+	}
+}
+
+yelp_package() {
+	depends="dconf>=0.16 hicolor-icon-theme desktop-file-utils yelp-xsl>=${version}"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/yelp/yelp-devel.template

@@ -1,9 +0,0 @@
-# Template file for 'yelp-devel'.
-#
-depends="yelp>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share/gtk-doc usr/share
-}

srcpkgs/youtube-dl/template

@@ -2,20 +2,25 @@
 pkgname=youtube-dl
 version=2013.03.29
 revision=1
-depends="python"
+makedepends="python"
 short_desc="Tool to download youtube videos"
 maintainer="pancake <pancake@nopcode.org>"
 license="Public Domain"
-noextract=yes
-noarch=yes
 homepage="http://rg3.github.com/youtube-dl/"
 distfiles="http://youtube-dl.org/downloads/$version/$pkgname"
 checksum=d99205257e5ae0e96da78e2cf46f8aba93ce739388f866fb3f976ffdd892f312
 
-do_build() {
+noextract=yes
-	: # do nothing
+noarch=yes
-}
 
 do_install() {
 	vinstall ${XBPS_SRCDISTDIR}/youtube-dl 755 usr/bin
 }
+
+youtube-dl_package() {
+	noarch="yes"
+	depends="python"
+	pkg_install() {
+		vmove usr
+	}
+}