ttf-fonts: some clean-up and PR bumping after introduction of font-update-common.

7 files changed, 21 insertions, 29 deletions

diff --git a/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 871bc1d37c..6ddfa7aac0 100644
--- a/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -1,10 +1,8 @@
+require ttf.inc
+
 DESCRIPTION = "The Bitstream Vera fonts - TTF Edition"
-SECTION = "x11/fonts"
-PRIORITY = "optional"
 LICENSE = "Bitstream Vera"
-PACKAGE_ARCH = "all"
-PR = "r3"
-RDEPENDS = "fontconfig-utils"
+PR = "r4"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
 
@@ -25,10 +23,4 @@ do_install () {
         done
 }
 
-pkg_postinst () {
-#!/bin/sh
-fc-cache
-}
-
-
 FILES_${PN} = "/etc ${datadir}/fonts"
diff --git a/packages/ttf-fonts/ttf-dejavu_2.18.bb b/packages/ttf-fonts/ttf-dejavu_2.18.bb
index cd8c8e2655..6f05cef5d6 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.18.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.18.bb
@@ -1,15 +1,15 @@
+require ttf.inc
+
 DESCRIPTION = "DejaVu font - TTF Edition"
+HOMEPAGE = "http://dejavu.sourceforge.net/wiki/"
 LICENSE = "Bitstream Vera"
-HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
 RDEPENDS = "ttf-dejavu-common"
 RDEPENDS_ttf-dejavu-common = ""
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
            file://30-dejavu-aliases.conf"
 
-require ttf.inc
-
 S = "${WORKDIR}/dejavu-ttf-${PV}"
 
 do_install_append () { 
diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb
index e6c0a0c464..bf2a416e08 100644
--- a/packages/ttf-fonts/ttf-gentium_1.02.bb
+++ b/packages/ttf-fonts/ttf-gentium_1.02.bb
@@ -1,13 +1,14 @@
+require ttf.inc
+
 DESCRIPTION = "Gentium fonts - TTF Version"
-LICENSE = "SIL Open Font License"
 HOMEPAGE = "http://scripts.sil.org/gentium"
+LICENSE = "SIL Open Font License"
 LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \
            file://OFL.gz"
 
-require ttf.inc
-
 S = "${WORKDIR}/ttf-sil-gentium-${PV}"
 
 do_install_append() {
@@ -20,7 +21,6 @@ do_install_append() {
 
 }
 
-
 PACKAGES = "${PN}-dbg ${PN} ${PN}-alt"
 
 FILES_ttf-gentium-alt = "${datadir}/fonts/truetype/GenAI*.ttf \
diff --git a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
index 72ec432f45..2964d7a7d8 100644
--- a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
+++ b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
@@ -1,15 +1,14 @@
+require ttf.inc
+
 DESCRIPTION = "Hunky fonts - TTF Version"
-LICENSE = "LGPL"
 HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts"
-PR = "r0"
+LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2"
 
 S = "${WORKDIR}/hunkyfonts-${PV}/TTF/"
 
-require ttf.inc
-
 PACKAGES = "${PN}-dbg ttf-hunky-sans ttf-hunky-serif"
-
 FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf"
 FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf"
diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb
index 09a909c4b6..08d450e2ab 100644
--- a/packages/ttf-fonts/ttf-liberation_0.2.bb
+++ b/packages/ttf-fonts/ttf-liberation_0.2.bb
@@ -1,8 +1,9 @@
+require ttf.inc
+
 DESCRIPTION = "Liberation fonts - TTF Version"
-LICENSE = "Liberation"
 HOMEPAGE = "https://www.redhat.com/promo/fonts/"
-
-require ttf.inc
+LICENSE = "Liberation"
+PR = "r1"
 
 SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz"
 S = "${WORKDIR}/liberation-fonts-${PV}"
diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb
index a48c54c9ad..ef65d40b6b 100644
--- a/packages/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://sourceforge.jp/projects/efont/"
 LICENSE = "${PN}"
 SRC_DISTRIBUTE_LICENSES += "${PN}"
 RPROVIDES = "virtual/japanese-font"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2"
 S = "${WORKDIR}/sazanami-20040629"
diff --git a/packages/ttf-fonts/ttf.inc b/packages/ttf-fonts/ttf.inc
index 69561e8506..00363c565f 100644
--- a/packages/ttf-fonts/ttf.inc
+++ b/packages/ttf-fonts/ttf.inc
@@ -1,6 +1,6 @@
 SECTION = "fonts"
 PRIORITY = "optional"
-RDEPENDS += "font-update-common"
+RRECOMMENDS += "font-update-common"
 
 do_install() {
     install -d ${D}${datadir}/fonts/truetype/