Kill manual dependency on gettext-native in favor of inheriting the oeclass, in some packages.

BKrev: 4199a2611jNNB6rZRguDijjOn9uXgw

33 files changed, 126 insertions, 59 deletions

diff --git a/cvs/cvs_1.12.8.oe b/cvs/cvs_1.12.8.oe
index 3864525183..60cb9f4efd 100644
--- a/cvs/cvs_1.12.8.oe
+++ b/cvs/cvs_1.12.8.oe
@@ -1,12 +1,12 @@
 DESCRIPTION = "The Concurrent Versioning System (cvs) client - Feature Version "
 SECTION = "console/network"
 PRIORITY = "optional"
-DEPENDS = "gettext-native"
+DEPENDS = ""
 LICENSE = "GPL"
 
 SRC_URI = "https://cvs.cvshome.org/files/documents/19/170/cvs-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
 
-inherit autotools
+inherit autotools gettext gettext
 
 EXTRA_OECONF = "--with-krb4=no --with-gssapi=no"
diff --git a/cvs/cvs_1.12.9.oe b/cvs/cvs_1.12.9.oe
index 96ef719a64..2d7da24880 100644
--- a/cvs/cvs_1.12.9.oe
+++ b/cvs/cvs_1.12.9.oe
@@ -1,12 +1,12 @@
 DESCRIPTION = "The Concurrent Versioning System (cvs) client - Feature Version "
 SECTION = "console/network"
 PRIORITY = "optional"
-DEPENDS = "gettext-native"
+DEPENDS = ""
 LICENSE = "GPL"
 
 SRC_URI = "http://musthave.sunbase.org/progs/ccvs/cvs-${PV}/cvs-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
 
-inherit autotools
+inherit autotools gettext gettext
 
 EXTRA_OECONF = "--with-krb4=no --with-gssapi=no"
diff --git a/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe b/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
index 3fed926b63..45ed17b9e1 100644
--- a/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
+++ b/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 PR = "r3"
 
-DEPENDS = "gettext-native"
+DEPENDS = ""
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 	   file://ln.patch;patch=1 \
@@ -12,7 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 	   file://ldflags.patch;patch=1"
 S = "${WORKDIR}/e2fsprogs-1.35"
 
-inherit autotools
+inherit autotools gettext gettext
 
 EXTRA_OECONF = "--enable-dynamic-e2fsck"
 
diff --git a/gaim/gaim_0.78.oe b/gaim/gaim_0.78.oe
index 7d4617030f..82a0a11e7a 100644
--- a/gaim/gaim_0.78.oe
+++ b/gaim/gaim_0.78.oe
@@ -2,11 +2,11 @@ SECTION = "x11/network"
 DESCRIPTION = "multi-protocol instant messaging client"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
-DEPENDS = "gtk+ gettext-native"
+DEPENDS = "gtk+"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
 
 PREMIRRORS_prepend = "${SOURCEFORGE_MIRROR}   http://unc.dl.sourceforge.net/sourceforge"
 EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated"
 
-inherit autotools 
+inherit autotools  gettext gettext
diff --git a/gaim/gaim_0.79.oe b/gaim/gaim_0.79.oe
index 7d4617030f..82a0a11e7a 100644
--- a/gaim/gaim_0.79.oe
+++ b/gaim/gaim_0.79.oe
@@ -2,11 +2,11 @@ SECTION = "x11/network"
 DESCRIPTION = "multi-protocol instant messaging client"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
-DEPENDS = "gtk+ gettext-native"
+DEPENDS = "gtk+"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
 
 PREMIRRORS_prepend = "${SOURCEFORGE_MIRROR}   http://unc.dl.sourceforge.net/sourceforge"
 EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated"
 
-inherit autotools 
+inherit autotools  gettext gettext
diff --git a/gaim/gaim_0.80.oe b/gaim/gaim_0.80.oe
index 55647c6e79..10d74baca8 100644
--- a/gaim/gaim_0.80.oe
+++ b/gaim/gaim_0.80.oe
@@ -3,7 +3,7 @@ DESCRIPTION = "multi-protocol instant messaging client"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r1"
 
-DEPENDS = "gtk+ gettext-native"
+DEPENDS = "gtk+"
 RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
@@ -19,7 +19,7 @@ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
 	    ${libdir}/bonobo/servers"
 FILES_${PN}-dev += "${libdir}/gaim/*.la"
 
-inherit autotools 
+inherit autotools  gettext gettext
 
 python populate_packages_prepend () {
 	root = oe.data.expand('${libdir}/gaim', d)
diff --git a/gd/gd_2.0.21.oe b/gd/gd_2.0.21.oe
index f50948b1bf..f0f526495b 100644
--- a/gd/gd_2.0.21.oe
+++ b/gd/gd_2.0.21.oe
@@ -1,12 +1,12 @@
 SECTION = "libs"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "libpng jpeg zlib gettext-native"
+DEPENDS = "libpng jpeg zlib"
 
 SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
 S = "${WORKDIR}/gd-${PV}"
 
-inherit autotools
+inherit autotools gettext gettext
 
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
                   --with-png=${STAGING_LIBDIR}/.. \
diff --git a/gd/gd_2.0.22.oe b/gd/gd_2.0.22.oe
index f50948b1bf..f0f526495b 100644
--- a/gd/gd_2.0.22.oe
+++ b/gd/gd_2.0.22.oe
@@ -1,12 +1,12 @@
 SECTION = "libs"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "libpng jpeg zlib gettext-native"
+DEPENDS = "libpng jpeg zlib"
 
 SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
 S = "${WORKDIR}/gd-${PV}"
 
-inherit autotools
+inherit autotools gettext gettext
 
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
                   --with-png=${STAGING_LIBDIR}/.. \
diff --git a/gkdial/gkdial-gnomeless_1.8.1.oe b/gkdial/gkdial-gnomeless_1.8.1.oe
index e69de29bb2..1996b4ad7f 100644
--- a/gkdial/gkdial-gnomeless_1.8.1.oe
+++ b/gkdial/gkdial-gnomeless_1.8.1.oe
@@ -0,0 +1,21 @@
+PR = "r2"
+
+DESCRIPTION = "GTK PPP dialing tool"
+DEPENDS = "virtual/libc gconf gtk+ libglade gettext"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI = "http://www.kernelconcepts.de/~fuchs/gkdial-${PV}.tar.gz \
+	file://header.patch;patch=1 \
+	file://gkdial.desktop \
+	file://gkdial.png"
+ 
+inherit autotools pkgconfig gettext gettext
+
+do_install_append () {
+        mkdir -p  ${D}${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/gkdial.png ${D}${datadir}/pixmaps/gkdial.png
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/gkdial.desktop ${D}${datadir}/applications/gkdial.desktop
+}
diff --git a/gkdial/gkdial_1.8.1.oe b/gkdial/gkdial_1.8.1.oe
index 3011709691..c3d55b3d83 100644
--- a/gkdial/gkdial_1.8.1.oe
+++ b/gkdial/gkdial_1.8.1.oe
@@ -1,4 +1,4 @@
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext gettext
 
 PR = "r1"
 DESCRIPTION = "GTK PPP dialing tool"
diff --git a/glib-1.2/glib-1.2-native_1.2.10.oe b/glib-1.2/glib-1.2-native_1.2.10.oe
index e69de29bb2..5e9d515a5f 100644
--- a/glib-1.2/glib-1.2-native_1.2.10.oe
+++ b/glib-1.2/glib-1.2-native_1.2.10.oe
@@ -0,0 +1,46 @@
+PR = "r0"
+DESCRIPTION = "GLib 1.2 is a deprecated libray to \
+provide support for old glib 1.2 based applications"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = ""
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glib-1.2-${PV}"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
+           file://glibconfig-sysdefs.h \
+           file://depcomp \
+           file://glib-reconf-fix;patch=1 \
+           file://posix-conf-changes;patch=1 \
+           file://gcc-3.4-pretty_function;patch=1"
+
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig native gettext
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+	install -m 0644 ${WORKDIR}/depcomp .
+	rm -f ltconfig acinclude.m4 libtool ltmain.sh
+}
+
+
+do_stage () {
+	oe_libinstall -so libglib ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-1.2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-1.2 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-1.2
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-1.2/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
+}
+
+do_install () {
+	:
+}
diff --git a/glib-2.0/glib-2.0-native_2.4.1.oe b/glib-2.0/glib-2.0-native_2.4.1.oe
index d5e27ca4ac..bf338e9e85 100644
--- a/glib-2.0/glib-2.0-native_2.4.1.oe
+++ b/glib-2.0/glib-2.0-native_2.4.1.oe
@@ -6,7 +6,7 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gettext-native"
+DEPENDS = ""
 
 EXTRA_OECONF = "--disable-debug"
 
@@ -18,7 +18,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig native
+inherit autotools pkgconfig native gettext gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0-native_2.4.6.oe b/glib-2.0/glib-2.0-native_2.4.6.oe
index c71c44aa05..8d4e85773c 100644
--- a/glib-2.0/glib-2.0-native_2.4.6.oe
+++ b/glib-2.0/glib-2.0-native_2.4.6.oe
@@ -7,7 +7,7 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gettext-native gtk-doc-native"
+DEPENDS = "gtk-doc-native"
 
 EXTRA_OECONF = "--disable-debug"
 
@@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig native
+inherit autotools pkgconfig native gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe
index 03cc456d0b..dc1bd110cf 100644
--- a/glib-2.0/glib-2.0_2.2.3.oe
+++ b/glib-2.0/glib-2.0_2.2.3.oe
@@ -7,7 +7,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0-native"
-DEPENDS += "virtual/libiconv virtual/libintl gettext-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
            file://automake-lossage.patch;patch=1 \
@@ -15,7 +15,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools  pkgconfig
+inherit autotools  pkgconfig gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0_2.4.1.oe b/glib-2.0/glib-2.0_2.4.1.oe
index 9b3142029f..6e68ee4379 100644
--- a/glib-2.0/glib-2.0_2.4.1.oe
+++ b/glib-2.0/glib-2.0_2.4.1.oe
@@ -7,7 +7,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0-native"
-DEPENDS += "virtual/libiconv virtual/libintl gettext-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
 
 LEAD_SONAME = "libglib-2.0.*"
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0_2.4.4.oe b/glib-2.0/glib-2.0_2.4.4.oe
index 9b3142029f..6e68ee4379 100644
--- a/glib-2.0/glib-2.0_2.4.4.oe
+++ b/glib-2.0/glib-2.0_2.4.4.oe
@@ -7,7 +7,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0-native"
-DEPENDS += "virtual/libiconv virtual/libintl gettext-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
 
 LEAD_SONAME = "libglib-2.0.*"
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0_2.4.5.oe b/glib-2.0/glib-2.0_2.4.5.oe
index 9b3142029f..6e68ee4379 100644
--- a/glib-2.0/glib-2.0_2.4.5.oe
+++ b/glib-2.0/glib-2.0_2.4.5.oe
@@ -7,7 +7,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0-native"
-DEPENDS += "virtual/libiconv virtual/libintl gettext-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
 
 LEAD_SONAME = "libglib-2.0.*"
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/glib-2.0/glib-2.0_2.4.6.oe b/glib-2.0/glib-2.0_2.4.6.oe
index 01cc4aba95..cf56a6cbbe 100644
--- a/glib-2.0/glib-2.0_2.4.6.oe
+++ b/glib-2.0/glib-2.0_2.4.6.oe
@@ -8,7 +8,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
-DEPENDS += "virtual/libiconv virtual/libintl gettext-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
 
 LEAD_SONAME = "libglib-2.0.*"
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/glib-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 acpaths = ""
 do_configure_prepend () {
diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index 5e950668a4..7712d2a0e1 100644
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -2,7 +2,7 @@ SECTION = "x11/gnome"
 DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
 	   file://backends.patch;patch=1"
-DEPENDS = "orbit2 glib-2.0 gettext-native libxml2"
+DEPENDS = "orbit2 glib-2.0  libxml2"
 ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/GConf/*"
@@ -11,7 +11,7 @@ S = "${WORKDIR}/GConf-${PV}"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext gettext
 
 HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
 
diff --git a/gpdf/gpdf_2.7.90.oe b/gpdf/gpdf_2.7.90.oe
index 737d46b0b5..cec3b4d047 100644
--- a/gpdf/gpdf_2.7.90.oe
+++ b/gpdf/gpdf_2.7.90.oe
@@ -1,7 +1,7 @@
 SECTION = "x11/utils"
 PR = "r2"
 
-inherit gnome
+inherit gnome gettext gettext
 
 DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
 	libgnomeprint libgnomeprintui gnome-common"
diff --git a/gstreamer/gstreamer_0.8.0.oe b/gstreamer/gstreamer_0.8.0.oe
index dce1e5ca00..557926ece6 100644
--- a/gstreamer/gstreamer_0.8.0.oe
+++ b/gstreamer/gstreamer_0.8.0.oe
@@ -8,7 +8,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.8.0.tar.bz
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools  pkgconfig
+inherit autotools  pkgconfig gettext gettext
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/gstreamer/gstreamer_0.8.1.oe b/gstreamer/gstreamer_0.8.1.oe
index dfa5f39e2f..890da6321f 100644
--- a/gstreamer/gstreamer_0.8.1.oe
+++ b/gstreamer/gstreamer_0.8.1.oe
@@ -2,7 +2,7 @@ PR = "r1"
 
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+DEPENDS = "glib-2.0  libxml2 popt"
 SECTION = "x11/network"
 PRIORITY = "optional"
 
@@ -13,7 +13,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools  pkgconfig
+inherit autotools  pkgconfig gettext gettext
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/gstreamer/gstreamer_0.8.2.oe b/gstreamer/gstreamer_0.8.2.oe
index 6e03cceca2..c2f1376da3 100644
--- a/gstreamer/gstreamer_0.8.2.oe
+++ b/gstreamer/gstreamer_0.8.2.oe
@@ -2,7 +2,7 @@ PR = "r0"
 
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+DEPENDS = "glib-2.0  libxml2 popt"
 SECTION = "x11/network"
 PRIORITY = "optional"
 
@@ -14,7 +14,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext gettext
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/gstreamer/gstreamer_0.8.3.oe b/gstreamer/gstreamer_0.8.3.oe
index 4c1956970d..4ab93c2e2d 100644
--- a/gstreamer/gstreamer_0.8.3.oe
+++ b/gstreamer/gstreamer_0.8.3.oe
@@ -2,7 +2,7 @@ PR = "r1"
 
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+DEPENDS = "glib-2.0  libxml2 popt"
 SECTION = "x11/network"
 PRIORITY = "optional"
 
@@ -15,7 +15,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext gettext
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/gstreamer/gstreamer_0.8.5.oe b/gstreamer/gstreamer_0.8.5.oe
index 16ce7056dc..b548121490 100644
--- a/gstreamer/gstreamer_0.8.5.oe
+++ b/gstreamer/gstreamer_0.8.5.oe
@@ -2,7 +2,7 @@ PR = "r0"
 
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+DEPENDS = "glib-2.0  libxml2 popt"
 SECTION = "x11/network"
 PRIORITY = "optional"
 
@@ -15,7 +15,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext gettext
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/inkscape/inkscape_0.38.1.oe b/inkscape/inkscape_0.38.1.oe
index d4122587cb..03ae8f4e94 100644
--- a/inkscape/inkscape_0.38.1.oe
+++ b/inkscape/inkscape_0.38.1.oe
@@ -3,9 +3,9 @@ DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "gettext-native intltool-native gtk+ libart-lgpl libxml2 libsigc++ popt"
+DEPENDS = "intltool-native gtk+ libart-lgpl libxml2 libsigc++ popt"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2"
 S = "${WORKDIR}/inkscape-${PV}"
 
-inherit autotools
+inherit autotools gettext gettext
diff --git a/inkscape/inkscape_0.39.oe b/inkscape/inkscape_0.39.oe
index d4122587cb..03ae8f4e94 100644
--- a/inkscape/inkscape_0.39.oe
+++ b/inkscape/inkscape_0.39.oe
@@ -3,9 +3,9 @@ DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "gettext-native intltool-native gtk+ libart-lgpl libxml2 libsigc++ popt"
+DEPENDS = "intltool-native gtk+ libart-lgpl libxml2 libsigc++ popt"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2"
 S = "${WORKDIR}/inkscape-${PV}"
 
-inherit autotools
+inherit autotools gettext gettext
diff --git a/libetpan/libetpan_cvs.oe b/libetpan/libetpan_cvs.oe
index 9619a4a3a7..5a16f6a2fe 100644
--- a/libetpan/libetpan_cvs.oe
+++ b/libetpan/libetpan_cvs.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \
 SMTP, POP, IMAP and NNTP"
 SECTION = "libs"
-DEPENDS = "gettext-native openssl"
+DEPENDS = "openssl"
 PV = "0.33"
 PR = "r1"
 S = "${WORKDIR}/libetpan"
@@ -9,7 +9,7 @@ TAG="rel-0-33-b"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/libetpan;tag=${TAG};module=libetpan"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext gettext
 
 EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db"
 
diff --git a/libiconv/libiconv-native_1.9.2.oe b/libiconv/libiconv-native_1.9.2.oe
index 8c1f4336d6..fd976cc1a7 100644
--- a/libiconv/libiconv-native_1.9.2.oe
+++ b/libiconv/libiconv-native_1.9.2.oe
@@ -5,7 +5,7 @@ SECTION = "e/libs"
 PRIORITY = "optional"
 MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
 # FIXME: Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8
-DEPENDS = "gettext-native"
+DEPENDS = ""
 PR = "r1"
 PROVIDES = ""
 
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--disable-debug"
 
 S = "${WORKDIR}/libiconv-${PV}"
 
-inherit autotools native
+inherit autotools native gettext
 
 do_stage () {
 	oe_libinstall -so -C lib libiconv ${STAGING_LIBDIR}
diff --git a/lrzsz/lrzsz_0.12.20.oe b/lrzsz/lrzsz_0.12.20.oe
index 7595ca74d6..164c66e20a 100644
--- a/lrzsz/lrzsz_0.12.20.oe
+++ b/lrzsz/lrzsz_0.12.20.oe
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 PRIORITY = "standard"
 DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer"
-DEPENDS = "gettext-native"
+DEPENDS = ""
 PR = "r2"
 
 SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
@@ -9,7 +9,7 @@ SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
 	   file://gettext.patch;patch=1"
 
-inherit autotools
+inherit autotools gettext gettext
 
 do_install() {
 	install -d ${D}/${bindir}/
diff --git a/minicom/minicom_2.1.oe b/minicom/minicom_2.1.oe
index 46ed0ecdbe..706c8107b7 100644
--- a/minicom/minicom_2.1.oe
+++ b/minicom/minicom_2.1.oe
@@ -1,10 +1,10 @@
 SECTION = "console/network"
-DEPENDS = "ncurses gettext-native"
+DEPENDS = "ncurses"
 
 SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \
 	file://configure.patch;patch=1"
 
-inherit autotools
+inherit autotools gettext gettext
 
 do_install() {
 	for d in doc extras man intl lib src; do make -C $d DESTDIR=${D} install; done
diff --git a/psmisc/psmisc_20.2.oe b/psmisc/psmisc_20.2.oe
index f56329835e..897f088975 100644
--- a/psmisc/psmisc_20.2.oe
+++ b/psmisc/psmisc_20.2.oe
@@ -2,14 +2,14 @@ DESCRIPTION = "procfs tools"
 SECTION = "base"
 PRIORITY = "required"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "ncurses gettext-native"
+DEPENDS = "ncurses"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
 	   file://gettext.patch;patch=1"
 S = "${WORKDIR}/psmisc-${PV}"
 
-inherit autotools
+inherit autotools gettext
 
 ALLOW_EMPTY = "1"
 
diff --git a/wget/wget_1.9.1.oe b/wget/wget_1.9.1.oe
index d2b4e905cf..46feab23c8 100644
--- a/wget/wget_1.9.1.oe
+++ b/wget/wget_1.9.1.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
 SECTION = "console/network"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "gettext-native"
+DEPENDS = ""
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
@@ -9,7 +9,7 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
 	   file://autotools.patch;patch=1"
 S = "${WORKDIR}/wget-${PV}"
 
-inherit autotools
+inherit autotools gettext
 
 do_configure () {
 	if [ ! -e acinclude.m4 ]; then