merge of '1cd7dafdf8101519f2632d4e3ab366da93dde56f'

     and 'a1094ef17e8382a220ee288571391469f133cdcf'

9 files changed, 38 insertions, 51 deletions

diff --git a/packages/gpe-beam/gpe-beam.inc b/packages/gpe-beam/gpe-beam.inc
new file mode 100644
index 0000000000..5ca6df0b03
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam.inc
@@ -0,0 +1,5 @@
+DESCRIPTION = "GPE infrared communication applet"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb
index b009b10372..e5861f069a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.3.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.3.bb
@@ -1,7 +1,5 @@
-inherit gpe pkgconfig
-LICENSE = "GPL"
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex"
+require ${PN}.inc
+
 RDEPENDS = "libopenobex-1.0-1"
-SECTION = "gpe"
-PRIORITY = "optional"
+
+inherit gpe pkgconfig
diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb
index 71af4db7e6..89f8e8230a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.6.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.6.bb
@@ -1,12 +1,8 @@
-PR = "r1"
-
-inherit gpe
+require ${PN}.inc
 
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI += "file://vcard-send.patch;patch=1;pnum=0"
+
+inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb
index 51b99fcfc6..f19b64d933 100644
--- a/packages/gpe-beam/gpe-beam_0.2.7.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.7.bb
@@ -1,12 +1,8 @@
-PR = "r1"
-
-inherit gpe
+require ${PN}.inc
 
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI += "file://decl.patch;patch=1;pnum=0"
+
+inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index f68b50341a..9795827aa8 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -1,12 +1,7 @@
-PR = "r0"
+require ${PN}.inc
 
-inherit gpe
-
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
 
 SRC_URI += "file://dbus-new-api.patch;patch=1"
+
+inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb
index 8275cf6c3a..b96bed4a2f 100644
--- a/packages/gpe-beam/gpe-beam_0.2.9.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.9.bb
@@ -1,9 +1,6 @@
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
+require ${PN}.inc
+
 RDEPENDS = "irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
 
 inherit gpe
 
diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index ee6c648e9b..c86ae1e892 100644
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
 	file://no-libwrap.patch;patch=1;pnum=0 \
 	file://portmap.init \
 	file://make.patch;patch=1"
@@ -18,6 +18,5 @@ do_compile() {
 }
 
 do_install() {
-	oe_runmake 'docdir=${datadir}/doc/portmap' \
-		   'DESTDIR=${D}' install
+	oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install
 }
diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc
index ad477828fb..e7e7673001 100644
--- a/packages/portmap/portmap.inc
+++ b/packages/portmap/portmap.inc
@@ -2,17 +2,13 @@ DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+	http://${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
 	file://no-libwrap.patch;patch=1;pnum=0 \
 	file://portmap.init \
 	file://make.patch;patch=1"
 S = "${WORKDIR}/portmap_5beta"
 
-PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
-FILES_${PN}-doc += "${docdir}"
-
 INITSCRIPT_NAME = "portmap"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
@@ -27,6 +23,9 @@ do_compile() {
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-	oe_runmake 'docdir=${docdir}/portmap' \
-		   'DESTDIR=${D}' install
+	oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
 }
+
+PACKAGES =+ "portmap-utils"
+FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
+FILES_${PN}-doc += "${docdir}"
diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb
index d1c4882d14..a51036155d 100644
--- a/packages/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb
@@ -1,16 +1,18 @@
+require ttf.inc
+
 DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts"
 DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font"
 DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font"
-LICENSE = "${PN}"
-SRC_DISTRIBUTE_LICENSES += "${PN}"
 AUTHOR = "Electronic Font Open Laboratory (/efont/)"
 HOMEPAGE = "http://sourceforge.jp/projects/efont/"
+LICENSE = "${PN}"
+SRC_DISTRIBUTE_LICENSES += "${PN}"
+RPROVIDES = "virtual/japanese-font"
+PR = "r1"
 
 SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2"
 S = "${WORKDIR}/sazanami-20040629"
 
-require ttf.inc
-
 PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
 FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \
 			     ${datadir}/doc/ttf-sazanami-gothic/README"