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

BKrev: 4199a2611jNNB6rZRguDijjOn9uXgw

7 files changed, 14 insertions, 14 deletions

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 () {