Convert packages to the new template format (u).

srcpkgs/uboot-mkimage/template

@@ -22,3 +22,9 @@ do_install() {
 	vinstall tools/mkimage 755 usr/bin
 	vinstall doc/mkimage.1 644 usr/share/man/man1
 }
+
+uboot-mkimage_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/ucl/template

@@ -9,3 +9,9 @@ homepage="http://www.oberhumer.com/opensource/ucl/"
 license="GPL-2"
 distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz"
 checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
+
+ucl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/udis86/template

@@ -9,4 +9,18 @@ license="BSD"
 homepage="http://udis86.sourceforge.net/"
 distfiles=${SOURCEFORGE_SITE}/udis86/${pkgname}-${version}.tar.gz
 checksum=6128d266abcabed6077fdeebd2fbb7fb48eb599efbdae98922de2f6acd82ce3a
-subpackages="udis86-devel"
+
+udis86-devel_package() {
+	short_desc="${short_desc} - development files"
+	depends="${sourcepkg}>=${version}"
+	pkg_install() {
+        	vmove usr/include
+        	vmove usr/lib
+	}
+}
+
+udis86_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/udis86/udis86-devel.template

@@ -1,7 +0,0 @@
-short_desc="${short_desc} - development files"
-depends="${sourcepkg}>=${version}"
-
-do_install() {
-        vmove usr/include usr
-        vmove usr/lib usr
-}

srcpkgs/udisks/template

@@ -7,7 +7,6 @@ configure_args="--disable-static --enable-lvm2"
 makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel
  liblvm2app-devel libparted-devel libatasmart-devel polkit-devel
  dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
-make_dirs="/var/lib/udisks 0750 root root"
 short_desc="Disk Management Service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/udisks"
@@ -38,3 +37,11 @@ pre_build() {
 post_install() {
 	vinstall ${FILESDIR}/udisks.service 644 usr/lib/systemd/system
 }
+
+udisks_package() {
+	make_dirs="/var/lib/udisks 0750 root root"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/udisks2/template

@@ -1,7 +1,7 @@
 # Template file for 'udisks2'
 pkgname=udisks2
 version=2.1.0
-revision=1
+revision=2
 wrksrc="udisks-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --with-udevdir=/usr/lib/udev
@@ -9,11 +9,28 @@ configure_args="--disable-static --with-udevdir=/usr/lib/udev
 makedepends="pkg-config intltool gobject-introspection libxslt docbook-xsl
  acl-devel device-mapper-devel liblvm2app-devel libparted-devel
  libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel systemd-devel"
-subpackages="udisks2-devel"
-make_dirs="/var/lib/udisks2 0750 root root"
 short_desc="Disk Management Service, version 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/udisks"
 license="GPL-2"
 distfiles="http://udisks.freedesktop.org/releases/udisks-${version}.tar.bz2"
 checksum=310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8
+
+udisks2-devel_package() {
+	depends="libglib-devel udisks2>=$version"
+	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
+	}
+}
+
+udisks2_package() {
+	make_dirs="/var/lib/udisks2 0750 root root"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/udisks2/udisks2-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'udisks2-devel'.
-#
-noarch=yes
-depends="glib-devel udisks2>=$version"
-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/ufw/template

@@ -3,7 +3,7 @@ pkgname=ufw
 version=0.33
 revision=1
 build_style=python-module
-fulldepends="iptables python"
+makedepends="iptables python"
 short_desc="Uncomplicated Firewall"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://launchpad.net/ufw"
@@ -15,11 +15,18 @@ long_desc="
  netfilter firewall. It provides a command line interface and ims to be
  uncomplicated and easy to use."
 
-noarch=yes
-pycompile_module="ufw"
-conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
-
 post_install() {
 	vinstall ${FILESDIR}/ufw.service 644 usr/lib/systemd/system
 	vmove "lib/*" usr/lib
 }
+
+ufw_package() {
+	depends="${makedepends}"
+	conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
+	noarch="yes"
+	pycompile_module="ufw"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/uml-utilities/template

@@ -3,13 +3,13 @@ pkgname=uml-utilities
 version=20070815
 revision=4
 wrksrc=tools-${version}
-distfiles="http://user-mode-linux.sourceforge.net/uml_utilities_${version}.tar.bz2"
 build_style=gnu-makefile
 makedepends="readline-devel fuse-devel"
 short_desc="User Mode Linux Utilities"
 homepage="http://user-mode-linux.sourceforge.net"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://user-mode-linux.sourceforge.net/uml_utilities_${version}.tar.bz2"
 checksum=f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e
 long_desc="
  User-mode Linux is a port of the Linux kernel to its own system call interface.
@@ -20,8 +20,12 @@ long_desc="
  This package contains userspace utilities for use with User-mode Linux,
  including uml_mconsole, uml_moo, uml_switch, uml_net and tunctl."
 
-
+pre_build() {
-pre_build()
-{
 	sed -i -e "s|lib64|lib|" Makefile
 }
+
+uml-utilities_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/unrar/template

@@ -1,11 +1,10 @@
 # Template file for 'unrar'
 pkgname=unrar
 version=4.2.1
+revision=1
 wrksrc=unrar
-nonfree=yes
 homepage="http://www.rarlab.com/rar"
 distfiles="${homepage}/unrarsrc-${version}.tar.gz"
-revision=1
 short_desc="Unarchiver for .rar files (non-free version)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="freeware - see /usr/share/licenses/unrar/license.txt"
@@ -23,3 +22,10 @@ do_install() {
 	vinstall unrar 755 usr/bin
 	vinstall license.txt 644 usr/share/licenses/unrar
 }
+
+unrar_package() {
+	nonfree="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/unzip/template

@@ -1,31 +1,37 @@
 # Template file for 'unzip'
 pkgname=unzip
 version=6.0
-homepage="http://infozip.sf.net/"
+revision=2
-license="BSD"
 makedepends="bzip2-devel"
 wrksrc=unzip60
-distfiles="${SOURCEFORGE_SITE}/infozip/${pkgname}60.tar.gz"
-revision=2
 short_desc="List, test and extract compressed files in a ZIP archive"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://infozip.sf.net/"
+license="BSD"
+distfiles="${SOURCEFORGE_SITE}/infozip/${pkgname}60.tar.gz"
 checksum=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
 
-CFLAGS="-D_FILE_OFFSET_BITS=64 -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT"
+do_build() {
-CFLAGS="${CFLAGS} -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE"
+	CFLAGS="-D_FILE_OFFSET_BITS=64 -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT \
-CFLAGS="${CFLAGS} -DNO_LCHMOD -DDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNATIVE"
+		-DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE \
+		-DNO_LCHMOD -LDDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNATIVE"
 
-do_build()
+	make ${makejobs} -f unix/Makefile LOCAL_UNZIP="$CFLAGS" \
-{
+		prefix=/usr LF2="" CC=$CC CFLAGS="$CFLAGS" \
-	cd ${wrksrc} && make ${makejobs} -f unix/Makefile LOCAL_UNZIP="$CFLAGS" \
+		D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips
-		prefix=/usr LF2="" CC=$CC D_USE_BZ2=-DUSE_BZIP2 \
-		L_BZ2=-lbz2 unzips || return 1
 }
 
-do_install()
+do_install() {
-{
+	cd ${wrksrc}
-	cd ${wrksrc} && make ${makejobs} -f unix/Makefile prefix=${DESTDIR}/usr \
+	make ${makejobs} -f unix/Makefile prefix=${DESTDIR}/usr \
-		LN='ln -fs' INSTALL_PROGRAM="install" install || return 1
+		LN='ln -fs' INSTALL_PROGRAM="install" install
-	mkdir -p ${DESTDIR}/usr/share && \
+
-		mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
+	vmkdir usr/share
+	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
+}
+
+unzip_package() {
+	pkg_install() {
+		vmove usr
+	}
 }

srcpkgs/upower/template

@@ -1,15 +1,13 @@
 # Template file for 'upower'
 pkgname=upower
 version=0.9.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-backend=linux --without-idevice
 --enable-systemd --with-systemdutildir=/usr/lib/systemd
 --with-systemdsystemunitdir=/usr/lib/systemd/system"
-conf_files="/etc/UPower/UPower.conf"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
-subpackages="upower-devel"
+makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel"
-makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection
- libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel"
 short_desc="Abstraction for enumerating power devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,3 +18,21 @@ checksum=6817237486561294b1004a9a50a01a4d69f17e8d708c6baf9d92104fe2e6e184
 pre_configure() {
 	sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 }
+
+upower-devel_package() {
+	depends="dbus-devel libglib-devel upower>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+	}
+}
+
+upower_package() {
+	conf_files="/etc/UPower/UPower.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/upower/upower-devel.template

@@ -1,11 +0,0 @@
-# Template file for 'upower-devel'.
-#
-noarch=yes
-depends="dbus-devel glib-devel upower>=$version"
-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
-}

srcpkgs/upx/template

@@ -20,3 +20,9 @@ do_install() {
 	vinstall src/upx.out 755 usr/bin upx
 	vinstall doc/upx.1 644 usr/share/man/man1
 }
+
+upx_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/urlgrabber/template

@@ -2,13 +2,13 @@
 pkgname=urlgrabber
 version=3.9.1
 revision=2
-distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz"
 build_style=python-module
-fulldepends="python>=0 pycurl"
+makedepends="python pycurl"
 short_desc="A high-level cross-protocol url-grabber and Python library"
 homepage="http://urlgrabber.baseurl.org/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz"
 checksum=4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0
 long_desc="
  urlgrabber is a pure python package that drastically simplifies the fetching
@@ -19,6 +19,11 @@ long_desc="
  those pesky file-fetching details, and lets you focus on whatever it is that
  your program is written to do!"
 
-noarch=yes
+urlgrabber_package() {
-pycompile_module="$pkgname"
+	depends="${makedepends}"
-
+	noarch="yes"
+	pycompile_module="urlgrabber"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/usbutils/template

@@ -2,14 +2,14 @@
 pkgname=usbutils
 version=006
 revision=1
+build_style=gnu-configure
+configure_args="--datadir=/usr/share/hwdata --disable-zlib"
+hostmakedepends="pkg-config which hwids"
+makedepends="libusb-devel"
 homepage="http://linux-usb.sourceforge.net/"
 short_desc="Linux USB utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-build_style=gnu-configure
-configure_args="--datadir=/usr/share/hwdata --disable-zlib"
-makedepends="pkg-config which libusb-devel"
-fulldepends="hwids"
 distfiles="${KERNEL_SITE}/utils/usb/$pkgname/${pkgname}-${version}.tar.xz"
 checksum=d9b5b5e7e5f797896e42efaa0a1f83089210bfed79312c1f04dd30b4f729ed0e
 long_desc="
@@ -24,3 +24,10 @@ post_install() {
 	# Remove update-usbids.sh - handled by hwids
 	rm -f ${DESTDIR}/usr/sbin/update-usbids.sh
 }
+
+usbutils_package() {
+	depends="hwids"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/uwsgi/template

@@ -1,9 +1,8 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=1.2.4
-revision=1
+revision=2
 build_style=python-module
-pycompile_dirs="."
 makedepends="sqlite-devel python-devel python-distribute libxml2-devel"
 short_desc="Fast, self-healing application container server"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -22,3 +21,10 @@ long_desc="
  It uses the uwsgi (all lowercase, already included by default in the Nginx
  and Cherokee releases) protocol for all the networking/interprocess communications,
  but it can speak other protocols as well (http, fastcgi, mongrel2...)"
+
+uwsgi_package() {
+	pycompile_module="uwsgidecorators.py"
+	pkg_install() {
+		vmove usr
+	}
+}