Convert packages to the new template format (h).

srcpkgs/hamster-applet/template

@@ -14,9 +14,6 @@ long_desc="
  on how much time you have spent during the day on activities you choose to
  track."
 
-noarch=yes
-pycompile_module="hamster"
-depends="pygtk dbus-python python-gconf notify-python"
 makedepends="pkg-config intltool gnome-doc-utils glib-devel dbus-glib-devel
  docbook2x python-devel gnome-control-center"
 
@@ -27,3 +24,11 @@ post_install() {
 	rm -r ${DESTDIR}/usr/lib/{bonobo,hamster-applet,python2.7/site-packages/hamster/applet.py}
 }
 
+hamster-applet_package() {
+	noarch="yes"
+	pycompile_module="hamster"
+	depends="pygtk dbus-python python-gconf notify-python"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/harfbuzz/harfbuzz-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'pango-devel'.
-#
-noarch=yes
-depends="libharfbuzz-${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
-}

srcpkgs/harfbuzz/libharfbuzz.template

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

srcpkgs/harfbuzz/template

@@ -1,14 +1,35 @@
 # Template build file for 'harfbuzz'.
 pkgname=harfbuzz
 version=0.9.12
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX graphite2 support
 makedepends="pkg-config glib-devel icu-devel freetype-devel cairo-devel"
-subpackages="lib${pkgname} ${pkgname}-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
 license="LGPL-2.1"
 distfiles="http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${version}.tar.bz2"
 checksum=c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5
+
+libharfbuzz_package() {
+	short_desc+=" -- runtime library" 
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+harfbuzz-devel_package() {
+	depends="libharfbuzz-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+harfbuzz_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hdparm/template

@@ -13,3 +13,9 @@ checksum=2bbe92274971182192901ab220e94bd2e4896f924fa6b225d0cffd7d8c16b52a
 long_desc="
  Get/set device parameters for Linux SATA/IDE drives. Primary use is for
  enabling irq-unmasking and IDE multiplemode."
+
+hdparm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hg-git/template

@@ -3,13 +3,20 @@ pkgname=hg-git
 version=0.3.4
 revision=1
 wrksrc="durin42-hg-git-586b7aa96466"
-noarch=yes
 build_style=python-module
-pycompile_module="hggit"
+makedepends="python python-dulwich"
-fulldepends="python python-dulwich"
 short_desc="Hg-Git plugin for Mercurial, adding the ability to push and pull to/from Git" 
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="https://bitbucket.org/durin42/hg-git/"
 distfiles="https://bitbucket.org/durin42/hg-git/get/${version}.tar.bz2"
 checksum=7931101afe1ae13b0b2196487fe79c5d8ad8f51f08b073ec2fa72ed548b62628
+
+hg-git_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pycompile_module="hggit"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hicolor-icon-theme/template

@@ -2,18 +2,16 @@
 pkgname=hicolor-icon-theme
 version=0.12
 revision=3
-distfiles="http://icon-theme.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="Standard icon theme called hicolor"
 homepage="http://icon-theme.freedesktop.org/wiki/HicolorTheme"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://icon-theme.freedesktop.org/releases/$pkgname-$version.tar.gz"
 checksum=9edca690617eaa19054951ca53501c802180262be8880ed84754ac46c93bec73
 long_desc="
  Default icon theme called hicolor, from freedesktop.org."
 
-noarch=yes
-
 post_install() {
 	dest=usr/share/icons/hicolor
 	# Own all required run time directories.
@@ -31,3 +29,10 @@ post_install() {
 		done
 	done
 }
+
+hicolor-icon-theme_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hostapd/template

@@ -11,18 +11,6 @@ homepage="http://w1.fi/hostapd/"
 distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz"
 checksum=262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35
 
-conf_files="
-/etc/hostapd/hostapd.conf
-/etc/hostapd/hlr_auc_gw.milenage_db
-/etc/hostapd/hostapd.accept
-/etc/hostapd/hostapd.deny
-/etc/hostapd/hostapd.eap_user
-/etc/hostapd/hostapd.radius_clients
-/etc/hostapd/hostapd.sim_db
-/etc/hostapd/hostapd.vlan
-/etc/hostapd/hostapd.wpa_psk
-/etc/hostapd/wired.conf"
-
 do_build() {
 	cp -f ${FILESDIR}/config .config
 	sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
@@ -44,3 +32,21 @@ do_install() {
 	vinstall hostapd.8 644 usr/share/man/man8
 	vinstall hostapd_cli.1 644 usr/share/man/man1
 }
+
+hostapd_package() {
+	conf_files="
+		/etc/hostapd/hostapd.conf
+		/etc/hostapd/hlr_auc_gw.milenage_db
+		/etc/hostapd/hostapd.accept
+		/etc/hostapd/hostapd.deny
+		/etc/hostapd/hostapd.eap_user
+		/etc/hostapd/hostapd.radius_clients
+		/etc/hostapd/hostapd.sim_db
+		/etc/hostapd/hostapd.vlan
+		/etc/hostapd/hostapd.wpa_psk
+		/etc/hostapd/wired.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/hplip/template

@@ -9,13 +9,10 @@ license="GPL-2"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
 checksum=c5b81167b21aa4ee6bdf3f5c120bfa050d0c794608da8bcc32e2580234919ffa
 
-conf_files="/etc/hp/hplip.conf"
-
 #XXX: pyqt pkgs for python gui
 makedepends="pkg-config automake libtool python-devel libxml2-python cups-devel
  sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel
- dbus-devel polkit-devel"
+ dbus-devel polkit-devel python foomatic-db foomatic-db-engine desktop-file-utils"
-fulldepends="python foomatic-db foomatic-db-engine desktop-file-utils"
 
 do_configure() {
 	# https://bugs.archlinux.org/task/30085 - hack found in Gentoo
@@ -53,3 +50,12 @@ do_install() {
 	# remove HAL .fdi file because HAL is no longer used
 	rm -rf ${DESTDIR}/usr/share/hal
 }
+
+hplip_package() {
+	depends="python foomatic-db foomatic-db-engine desktop-file-utils"
+	conf_files="/etc/hp/hplip.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/htop/template

@@ -14,3 +14,9 @@ checksum=ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1
 long_desc="
  htop is an interactive process viewer for Linux. It is a text-mode terminal
  application (for console or X terminals) and requires ncurses."
+
+htop_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hunspell/hunspell-devel.template

@@ -1,20 +0,0 @@
-# Template file for 'hunspelll-devel'.
-#
-depends="libstdc++-devel ncurses-devel hunspell"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	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/share/man/man3 ${DESTDIR}/usr/share/man
-}

srcpkgs/hunspell/template

@@ -1,13 +1,13 @@
 # Template file for 'hunspell'
 pkgname=hunspell
 version=1.2.8
-revision=5
+revision=6
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-ui"
 makedepends="pkg-config bison libstdc++-devel ncurses-devel"
 short_desc="Improved spellchecker"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=af563e13646620e608052b46974e10d0fc3e4d48b1b996f9771cbfac6dfc3c38
 homepage="http://hunspell.sourceforge.net"
 license="GPL-2, LGPL, MPL"
@@ -24,4 +24,19 @@ long_desc="
   * Hunspell is based on MySpell and works also with MySpell dictionaries.
   * GPL/LGPL/MPL tri-license."
 
-subpackages="$pkgname-devel" 
+hunspell-devel_package() {
+	depends="libstdc++-devel ncurses-devel hunspell>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
+	}
+}
+
+hunspell_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hwids/template

@@ -14,7 +14,6 @@ long_desc="
  to require them, without having to bring in either pciutils or usbutils, that
  might be unnecessary for most installs."
 
-noarch=yes
 noextract=yes
 create_wrksrc=yes
 
@@ -28,3 +27,11 @@ do_install() {
 	vmkdir usr/share/hwdata
 	install -m644 *.ids ${DESTDIR}/usr/share/hwdata
 }
+
+hwids_package() {
+	noarch="yes"
+	replaces="pciutils<3.1.9_1 usbutils<005_1"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/hydrogen/template

@@ -4,7 +4,6 @@ version=0.9.5.1
 revision=1
 makedepends="pkg-config scons libsndfile-devel libtar-devel
  libarchive-devel>=3.1.2 jack-devel qt-devel"
-depends="desktop-file-utils"
 short_desc="Advanced drum machine"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -21,3 +20,10 @@ do_build() {
 do_install() {
 	scons DESTDIR=${DESTDIR} install
 }
+
+hydrogen_package() {
+	depends="desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}