From 87ea2d664245f96e6c24af262563edf77f7ea142 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 12 Apr 2013 15:42:53 +0200 Subject: [PATCH] Convert packages to the new template format (h). --- srcpkgs/hamster-applet/template | 11 ++++++--- srcpkgs/harfbuzz/harfbuzz-devel.template | 13 ---------- srcpkgs/harfbuzz/libharfbuzz.template | 10 -------- srcpkgs/harfbuzz/template | 25 ++++++++++++++++++-- srcpkgs/hdparm/template | 6 +++++ srcpkgs/hg-git/template | 13 +++++++--- srcpkgs/hicolor-icon-theme/template | 11 ++++++--- srcpkgs/hostapd/template | 30 ++++++++++++++---------- srcpkgs/hplip/template | 14 +++++++---- srcpkgs/htop/template | 6 +++++ srcpkgs/hunspell/hunspell-devel.template | 20 ---------------- srcpkgs/hunspell/template | 21 ++++++++++++++--- srcpkgs/hwids/template | 9 ++++++- srcpkgs/hydrogen/template | 8 ++++++- 14 files changed, 122 insertions(+), 75 deletions(-) delete mode 100644 srcpkgs/harfbuzz/harfbuzz-devel.template delete mode 100644 srcpkgs/harfbuzz/libharfbuzz.template delete mode 100644 srcpkgs/hunspell/hunspell-devel.template diff --git a/srcpkgs/hamster-applet/template b/srcpkgs/hamster-applet/template index 7fa21a4cc0c..fd5a6a95d6a 100644 --- a/srcpkgs/hamster-applet/template +++ b/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 + } +} diff --git a/srcpkgs/harfbuzz/harfbuzz-devel.template b/srcpkgs/harfbuzz/harfbuzz-devel.template deleted file mode 100644 index ff74d885c4b..00000000000 --- a/srcpkgs/harfbuzz/harfbuzz-devel.template +++ /dev/null @@ -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 -} diff --git a/srcpkgs/harfbuzz/libharfbuzz.template b/srcpkgs/harfbuzz/libharfbuzz.template deleted file mode 100644 index ad7f093d2a0..00000000000 --- a/srcpkgs/harfbuzz/libharfbuzz.template +++ /dev/null @@ -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 -} diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 48a5500bb56..abc1ac0aea2 100644 --- a/srcpkgs/harfbuzz/template +++ b/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 " 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 + } +} diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template index d083ca34cd3..dfd3025bd44 100644 --- a/srcpkgs/hdparm/template +++ b/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 + } +} diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template index 4c03d7b86f8..ce7f3022c6d 100644 --- a/srcpkgs/hg-git/template +++ b/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" -fulldepends="python python-dulwich" +makedepends="python python-dulwich" short_desc="Hg-Git plugin for Mercurial, adding the ability to push and pull to/from Git" maintainer="Juan RP " 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 + } +} diff --git a/srcpkgs/hicolor-icon-theme/template b/srcpkgs/hicolor-icon-theme/template index 546a9248a7d..d7f8cebad01 100644 --- a/srcpkgs/hicolor-icon-theme/template +++ b/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 " +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 + } +} diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index 98c492f6d78..a96ce067379 100644 --- a/srcpkgs/hostapd/template +++ b/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 + } +} diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 2239a25822c..d5ae75af4d0 100644 --- a/srcpkgs/hplip/template +++ b/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" -fulldepends="python foomatic-db foomatic-db-engine desktop-file-utils" + dbus-devel polkit-devel 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 + } +} diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template index a0e9a6733f2..041c7a2626f 100644 --- a/srcpkgs/htop/template +++ b/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 + } +} diff --git a/srcpkgs/hunspell/hunspell-devel.template b/srcpkgs/hunspell/hunspell-devel.template deleted file mode 100644 index fdb839e24de..00000000000 --- a/srcpkgs/hunspell/hunspell-devel.template +++ /dev/null @@ -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 -} diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template index 1455cde6cc7..73daa4d7634 100644 --- a/srcpkgs/hunspell/template +++ b/srcpkgs/hunspell/template @@ -1,13 +1,13 @@ # Template file for 'hunspell' pkgname=hunspell version=1.2.8 -revision=5 -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" +revision=6 build_style=gnu-configure configure_args="--with-ui" makedepends="pkg-config bison libstdc++-devel ncurses-devel" short_desc="Improved spellchecker" maintainer="Juan RP " +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 + } +} diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index 2e5c6b640ec..66e1ad3efc4 100644 --- a/srcpkgs/hwids/template +++ b/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 + } +} diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template index c1372576595..75d8fe3eced 100644 --- a/srcpkgs/hydrogen/template +++ b/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 " 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 + } +}