merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

12 files changed, 45 insertions, 65 deletions

diff --git a/packages/intltool/intltool-native_0.30.bb b/packages/intltool/intltool-native_0.30.bb
index 7cf3c4e11f..05f7efdda4 100644
--- a/packages/intltool/intltool-native_0.30.bb
+++ b/packages/intltool/intltool-native_0.30.bb
@@ -1,4 +1,4 @@
-SECTION = "devel"
 require intltool_${PV}.bb
+
 inherit native
 DEPENDS = "libxml-parser-perl-native"
diff --git a/packages/intltool/intltool-native_0.31.bb b/packages/intltool/intltool-native_0.31.bb
index 7cf3c4e11f..05f7efdda4 100644
--- a/packages/intltool/intltool-native_0.31.bb
+++ b/packages/intltool/intltool-native_0.31.bb
@@ -1,4 +1,4 @@
-SECTION = "devel"
 require intltool_${PV}.bb
+
 inherit native
 DEPENDS = "libxml-parser-perl-native"
diff --git a/packages/intltool/intltool-native_0.34.bb b/packages/intltool/intltool-native_0.34.bb
index 7cf3c4e11f..05f7efdda4 100644
--- a/packages/intltool/intltool-native_0.34.bb
+++ b/packages/intltool/intltool-native_0.34.bb
@@ -1,4 +1,4 @@
-SECTION = "devel"
 require intltool_${PV}.bb
+
 inherit native
 DEPENDS = "libxml-parser-perl-native"
diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb
index fdd2652e11..bac5378113 100644
--- a/packages/intltool/intltool-native_0.35.0.bb
+++ b/packages/intltool/intltool-native_0.35.0.bb
@@ -1,7 +1,7 @@
-SECTION = "devel"
 require intltool_${PV}.bb
+
 inherit native
 DEPENDS = "libxml-parser-perl-native"
 
-export PERL="/usr/bin/env perl"
+export PERL = "/usr/bin/env perl"
 SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/packages/intltool/intltool-native_0.35.5.bb b/packages/intltool/intltool-native_0.35.5.bb
new file mode 100644
index 0000000000..ba9b90c07a
--- /dev/null
+++ b/packages/intltool/intltool-native_0.35.5.bb
@@ -0,0 +1,9 @@
+require intltool_${PV}.bb
+
+inherit native
+DEPENDS = "libxml-parser-perl-native"
+
+export PERL = "/usr/bin/env perl"
+SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/intltool/intltool.inc b/packages/intltool/intltool.inc
new file mode 100644
index 0000000000..410a89cfa3
--- /dev/null
+++ b/packages/intltool/intltool.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Utility scripts for internationalizing XML"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "GPL"
+
+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}"
+
+inherit autotools  pkgconfig
+
+do_stage() {
+	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/intltool/intltool_0.30.bb b/packages/intltool/intltool_0.30.bb
index f1660e7262..e48262574b 100644
--- a/packages/intltool/intltool_0.30.bb
+++ b/packages/intltool/intltool_0.30.bb
@@ -1,12 +1 @@
-SECTION = "devel"
-DESCRIPTION = "Utility scripts for internationalizing XML"
-LICENSE = "GPL"
-
-SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2"
-S = "${WORKDIR}/intltool-${PV}"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
-}
+require intltool.inc
diff --git a/packages/intltool/intltool_0.31.bb b/packages/intltool/intltool_0.31.bb
index f1660e7262..e48262574b 100644
--- a/packages/intltool/intltool_0.31.bb
+++ b/packages/intltool/intltool_0.31.bb
@@ -1,12 +1 @@
-SECTION = "devel"
-DESCRIPTION = "Utility scripts for internationalizing XML"
-LICENSE = "GPL"
-
-SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2"
-S = "${WORKDIR}/intltool-${PV}"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
-}
+require intltool.inc
diff --git a/packages/intltool/intltool_0.34.bb b/packages/intltool/intltool_0.34.bb
index f1660e7262..e48262574b 100644
--- a/packages/intltool/intltool_0.34.bb
+++ b/packages/intltool/intltool_0.34.bb
@@ -1,12 +1 @@
-SECTION = "devel"
-DESCRIPTION = "Utility scripts for internationalizing XML"
-LICENSE = "GPL"
-
-SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2"
-S = "${WORKDIR}/intltool-${PV}"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
-}
+require intltool.inc
diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb
index de8705ccf0..6dea51a5fc 100644
--- a/packages/intltool/intltool_0.35.0.bb
+++ b/packages/intltool/intltool_0.35.0.bb
@@ -1,18 +1,8 @@
-SECTION = "devel"
-DESCRIPTION = "Utility scripts for internationalizing XML"
-LICENSE = "GPL"
+require intltool.inc
+
 DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS = "libxml-parser-perl"
 
 PR = "r1"
 
 RRECOMMENDS = "perl-modules"
-
-SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2"
-S = "${WORKDIR}/intltool-${PV}"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/intltool/intltool_0.35.2.bb b/packages/intltool/intltool_0.35.2.bb
index daba37a9da..6626ed54fe 100644
--- a/packages/intltool/intltool_0.35.2.bb
+++ b/packages/intltool/intltool_0.35.2.bb
@@ -1,18 +1,8 @@
-SECTION = "devel"
-DESCRIPTION = "Utility scripts for internationalizing XML"
-LICENSE = "GPL"
+require intltool.inc
+
 DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS = "libxml-parser-perl"
 
 PR = "r0"
 
 RRECOMMENDS = "perl-modules"
-
-SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2"
-S = "${WORKDIR}/intltool-${PV}"
-
-inherit autotools  pkgconfig
-
-do_stage() {
-	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb
new file mode 100644
index 0000000000..e13e376f12
--- /dev/null
+++ b/packages/intltool/intltool_0.35.5.bb
@@ -0,0 +1,10 @@
+require intltool.inc
+
+DEPENDS = "libxml-parser-perl-native"
+#RDEPENDS = "libxml-parser-perl"
+
+PR = "r0"
+
+RRECOMMENDS = "perl-modules"
+
+DEFAULT_PREFERENCE = "-1"