12 files changed, 43 insertions, 11 deletions
diff --git a/packages/qpf-fonts/qpf-arabic_1.0.bb b/packages/qpf-fonts/qpf-arabic_1.0.bb
index 1d73f880c8..8a7a6549b5 100644
--- a/packages/qpf-fonts/qpf-arabic_1.0.bb
+++ b/packages/qpf-fonts/qpf-arabic_1.0.bb
@@ -15,4 +15,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-freemono_1.0.bb b/packages/qpf-fonts/qpf-freemono_1.0.bb
index d10fda6117..550bdd587d 100644
--- a/packages/qpf-fonts/qpf-freemono_1.0.bb
+++ b/packages/qpf-fonts/qpf-freemono_1.0.bb
@@ -16,4 +16,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-freeserif_1.0.bb b/packages/qpf-fonts/qpf-freeserif_1.0.bb
index 116c48d5d1..01d667c4cb 100644
--- a/packages/qpf-fonts/qpf-freeserif_1.0.bb
+++ b/packages/qpf-fonts/qpf-freeserif_1.0.bb
@@ -17,4 +17,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb
index 9607030393..2b5c767caa 100644
--- a/packages/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb
@@ -15,4 +15,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
index f4c50faf71..efdf913edb 100644
--- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
@@ -17,4 +17,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
index 8c1d8d02bc..22948c5475 100644
--- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
@@ -17,4 +17,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb
index 4d7d739f79..7cc4789c4a 100644
--- a/packages/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb
@@ -26,7 +26,7 @@ RPROVIDES_qte-font-japanese += "virtual/japanese-font"
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz"
 S = "${WORKDIR}/qt-${PV}"
 
-inherit qpf
+require qpf.inc
 
 QPF_PKGPATTERN = "qte-font-%s"
 QPF_DESCRIPTION = "Qt/E font %s"
diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb
index ec3a9de4ca..14a63783c2 100644
--- a/packages/qpf-fonts/qpf-unifont_1.0.bb
+++ b/packages/qpf-fonts/qpf-unifont_1.0.bb
@@ -16,4 +16,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
index 7dd724d306..62d84225ff 100644
--- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb
+++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
@@ -21,6 +21,6 @@ do_install () {
 	done
 }
 
-inherit qpf
+require qpf.inc
 
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb
index 87cb4d758b..148af3a758 100644
--- a/packages/qpf-fonts/qpf-utopia_1.0.bb
+++ b/packages/qpf-fonts/qpf-utopia_1.0.bb
@@ -16,4 +16,4 @@ do_install () {
         done
 }
 
-inherit qpf
+require qpf.inc
diff --git a/packages/qpf-fonts/qpf.inc b/packages/qpf-fonts/qpf.inc
new file mode 100644
index 0000000000..67761bd4be
--- /dev/null
+++ b/packages/qpf-fonts/qpf.inc
@@ -0,0 +1,32 @@
+PACKAGE_ARCH = "all"
+
+do_configure() {
+	:
+}
+
+do_compile() {
+	:
+}
+
+pkg_postinst_fonts() {
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+pkg_postrm_fonts() {
+. /etc/profile
+${sbindir}/update-qtfontdir -f
+}
+
+python populate_packages_prepend() {
+	postinst = bb.data.getVar('pkg_postinst_fonts', d, 1)
+	postrm   = bb.data.getVar('pkg_postrm_fonts', d, 1)
+	fontdir  = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts'
+	pkgregex = "^([a-z-]*_[0-9]*).*.qpf$"
+	pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s'
+	pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s'
+
+        do_split_packages(d, root=fontdir, file_regex=pkgregex, output_pattern=pkgpattern, 
+			  description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, 
+			  extra_depends='qpf-font-common')
+}
diff --git a/packages/qpf-fonts/terminus.bb b/packages/qpf-fonts/terminus.bb
index 6d2e4ab85f..868dd74e0d 100644
--- a/packages/qpf-fonts/terminus.bb
+++ b/packages/qpf-fonts/terminus.bb
@@ -15,4 +15,4 @@ do_install() {
 	cp *.qpf ${D}${palmqtdir}/lib/fonts
 }
 
-inherit qpf
+require qpf.inc