4 files changed, 10 insertions, 57 deletions
diff --git a/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch b/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch
deleted file mode 100644
index 546db5f11..000000000
--- a/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- intltool-0.35.0/intltool-extract.in.in.orig	2006-06-16 15:49:14.000000000 -0600
-+++ intltool-0.35.0/intltool-extract.in.in	2006-06-16 15:49:18.000000000 -0600
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w 
-+#!@INTLTOOL_PERL@ 
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
---- intltool-0.35.0/intltool-merge.in.in.orig	2006-06-16 15:49:18.000000000 -0600
-+++ intltool-0.35.0/intltool-merge.in.in	2006-06-16 15:49:23.000000000 -0600
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
---- intltool-0.35.0/intltool-prepare.in.orig	2006-06-16 15:49:23.000000000 -0600
-+++ intltool-0.35.0/intltool-prepare.in	2006-06-16 15:49:26.000000000 -0600
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #  Intltool .desktop, .directory Prepare Tool
---- intltool-0.35.0/intltool-unicodify.in.orig	2006-06-16 15:49:26.000000000 -0600
-+++ intltool-0.35.0/intltool-unicodify.in	2006-06-16 15:49:30.000000000 -0600
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
-         
- #
- #  The i18n Unicode Encoding Utility
---- intltool-0.35.0/intltool-update.in.in.orig	2006-06-16 15:49:30.000000000 -0600
-+++ intltool-0.35.0/intltool-update.in.in	2006-06-16 15:49:35.000000000 -0600
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
diff --git a/meta/packages/intltool/intltool-native_0.40.5.bb b/meta/packages/intltool/intltool-native_0.40.5.bb
deleted file mode 100644
index d359be766..000000000
--- a/meta/packages/intltool/intltool-native_0.40.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require intltool_${PV}.bb
-
-PR = "r2"
-
-inherit native
-DEPENDS = "libxml-parser-perl-native"
-
-export PERL = "/usr/bin/env perl"
-SRC_URI_append = " file://intltool-nowarn-0.40.0.patch;patch=1"
-
-RRECOMMENDS = ""
diff --git a/meta/packages/intltool/intltool.inc b/meta/packages/intltool/intltool.inc
index 410a89cfa..a3057c61c 100644
--- a/meta/packages/intltool/intltool.inc
+++ b/meta/packages/intltool/intltool.inc
@@ -7,8 +7,17 @@ URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
 SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
 S = "${WORKDIR}/intltool-${PV}"
 
+PR = "r3"
+
+DEPENDS = "libxml-parser-perl-native"
+#RDEPENDS = "libxml-parser-perl"
+RRECOMMENDS = "perl-modules"
+
 inherit autotools  pkgconfig
 
 do_stage() {
 	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
 }
+
+export PERL_virtclass-native = "/usr/bin/env perl"
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/intltool/intltool_0.40.5.bb b/meta/packages/intltool/intltool_0.40.5.bb
index 6626ed54f..fe700f21e 100644
--- a/meta/packages/intltool/intltool_0.40.5.bb
+++ b/meta/packages/intltool/intltool_0.40.5.bb
@@ -1,8 +1,3 @@
 require intltool.inc
 
-DEPENDS = "libxml-parser-perl-native"
-#RDEPENDS = "libxml-parser-perl"
-
-PR = "r0"
-
-RRECOMMENDS = "perl-modules"
+SRC_URI_append = " file://intltool-nowarn-0.40.0.patch;patch=1"