6 files changed, 33 insertions, 80 deletions
diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb
index 9e10bc7dc4..f5f00518c5 100644
--- a/packages/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb
@@ -4,30 +4,16 @@ SECTION = "opie/fonts"
 PRIORITY = "optional"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
-PACKAGE_ARCH = "all"
+PR = "r1"
 
 SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/qpf-helvetica.tar.bz2"
 S = "${WORKDIR}/helvetica"
 
 do_install () { 
         install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        for font in *.qpf; do 
+                install -m 644 $font ${D}${palmqtdir}/lib/fonts/
         done 
 } 
 
-pkg_postinst () {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-PACKAGES = "qpf-helvetica-small qpf-helvetica-large"
-
-FILES_qpf-helvetica-small = "${palmqtdir}/lib/fonts/helvetica_80* \
-${palmqtdir}/lib/fonts/helvetica_100* ${palmqtdir}/lib/fonts/helvetica_120*"
-
-FILES_qpf-helvetica-large = "${palmqtdir}/lib/fonts/helvetica_140* \
-${palmqtdir}/lib/fonts/helvetica_180* ${palmqtdir}/lib/fonts/helvetica_240*"
+inherit qpf
diff --git a/packages/qpf-fonts/qpf-hunky_0.3.0.bb b/packages/qpf-fonts/qpf-hunky_0.3.0.bb
index e69de29bb2..6190825399 100644
--- a/packages/qpf-fonts/qpf-hunky_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunky_0.3.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hunky fonts - QPF Edition"
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+MAINTAINER = "Gints Polis <gints.polis@cc.lv>"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html"
+PACKAGE_ARCH = "all"
+PR = "r1"
+
+SRC_URI = "http://handhelds.org/~gints/hunkyfonts-${PV}.tar.gz"
+S = "${WORKDIR}/hunkyfonts-${PV}/QPF"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+        for i in *.qpf; do 
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+        done 
+} 
+
+inherit qpf
diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb
index 0ab77560bf..f130c5f253 100644
--- a/packages/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb
@@ -9,31 +9,10 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
 	   file://update-qtfontdir"
 S = "${WORKDIR}/qt-${PV}"
 
-do_configure() {
-	:
-}
-
-do_compile() {
-	:
-}
+inherit qpf
 
-pkg_postinst_fonts() {
-#!/bin/sh
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-python populate_packages_prepend() {
-	postinst = bb.data.getVar('pkg_postinst_fonts', d, 1)
-	postrm = postinst
-	pkgregex = "^([a-z]*_[0-9]*).*.qpf$"
-	pkgpattern = "qte-font-%s"
-
-        do_split_packages(d, root='/opt/QtPalmtop/lib/fonts', file_regex=pkgregex, output_pattern=pkgpattern, 
-			  description='Qt/E font %s', postinst=postinst, postrm=postrm, recursive=True, hook=None, 
-			  extra_depends='qte-font-common')
-}
+QPF_PKGPATTERN = "qte-font-%s"
+QPF_DESCRIPTION = "Qt/E font %s"
 
 do_install() {
 	install -d ${D}/${sbindir}/
diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb
index 5ab88e26dc..f5101f5b47 100644
--- a/packages/qpf-fonts/qpf-unifont_1.0.bb
+++ b/packages/qpf-fonts/qpf-unifont_1.0.bb
@@ -3,6 +3,7 @@ LICENSE = "GPL QPL"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
 PACKAGE_ARCH = "all"
+PR = "r1"
 
 SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2"
 S = "${WORKDIR}"
@@ -14,12 +15,4 @@ do_install () {
         done 
 } 
 
-pkg_postinst () {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-FILES_${PN} = "${palmqtdir}/lib/fonts"
+inherit qpf
diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb
index 315f086136..e40dd12483 100644
--- a/packages/qpf-fonts/qpf-utopia_1.0.bb
+++ b/packages/qpf-fonts/qpf-utopia_1.0.bb
@@ -5,6 +5,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL QPL"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
 PACKAGE_ARCH = "all"
+PR = "r1"
 
 SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/qpf-utopia.tar.bz2"
 S = "${WORKDIR}/utopia"
@@ -16,17 +17,4 @@ do_install () {
         done 
 } 
 
-pkg_postinst () {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
-
-PACKAGES = "qpf-utopia-small qpf-utopia-large"
-
-FILES_qpf-utopia-small = "${palmqtdir}/lib/fonts/utopia_100* ${palmqtdir}/lib/fonts/utopia_120*"
-
-FILES_qpf-utopia-large = "${palmqtdir}/lib/fonts/utopia_140* \
-${palmqtdir}/lib/fonts/utopia_180* ${palmqtdir}/lib/fonts/utopia_240*"
+inherit qpf
diff --git a/packages/qpf-fonts/terminus.bb b/packages/qpf-fonts/terminus.bb
index 68e569ea28..462794384d 100644
--- a/packages/qpf-fonts/terminus.bb
+++ b/packages/qpf-fonts/terminus.bb
@@ -4,28 +4,15 @@ SECTION = "opie/fonts"
 PRIORITY = "optional"
 MAINTAINER = "M&N Solutions GmbH <info@mn-solutions.de>"
 LICENSE = "GPL"
-RDEPENDS = "qte-fonts-common"
 PACKAGE_ARCH = "all"
-PV = "1.0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.mn-solutions.de/downloads/mnci/terminus-fonts.tar.bz2"
 S = ${WORKDIR}/terminus-fonts
 
-
 do_install() {
 	mkdir -p ${D}${palmqtdir}/lib/fonts
 	cp *.qpf ${D}${palmqtdir}/lib/fonts
 }
 
-PACKAGES = "qpf-terminus"
-FILES = ""
-FILES_qpf-terminus = "${palmqtdir}/lib/fonts"
-
-pkg_postinst() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-set -e
-. /etc/profile
-${sbindir}/update-qtfontdir
-}
+inherit qpf