intltool: move dependency on libxml-parser-perl-native to inc file

* introduce INC_PR while we're at it

diff --git a/recipes/intltool/intltool-native_0.30.bb b/recipes/intltool/intltool-native_0.30.bb
index 05f7efdda4e45b697afc2478e568781b0564707b..6801a670c1cc1d1910b748af0df878bd94e35209 100644 (file)
--- a/recipes/intltool/intltool-native_0.30.bb
+++ b/recipes/intltool/intltool-native_0.30.bb
@@ -1,4 +1,3 @@
 require intltool_${PV}.bb
 
 inherit native
-DEPENDS = "libxml-parser-perl-native"

diff --git a/recipes/intltool/intltool-native_0.31.bb b/recipes/intltool/intltool-native_0.31.bb
index 05f7efdda4e45b697afc2478e568781b0564707b..6801a670c1cc1d1910b748af0df878bd94e35209 100644 (file)
--- a/recipes/intltool/intltool-native_0.31.bb
+++ b/recipes/intltool/intltool-native_0.31.bb
@@ -1,4 +1,3 @@
 require intltool_${PV}.bb
 
 inherit native
-DEPENDS = "libxml-parser-perl-native"

diff --git a/recipes/intltool/intltool-native_0.34.bb b/recipes/intltool/intltool-native_0.34.bb
index 05f7efdda4e45b697afc2478e568781b0564707b..6801a670c1cc1d1910b748af0df878bd94e35209 100644 (file)
--- a/recipes/intltool/intltool-native_0.34.bb
+++ b/recipes/intltool/intltool-native_0.34.bb
@@ -1,4 +1,3 @@
 require intltool_${PV}.bb
 
 inherit native
-DEPENDS = "libxml-parser-perl-native"

diff --git a/recipes/intltool/intltool-native_0.35.0.bb b/recipes/intltool/intltool-native_0.35.0.bb
index bac537811351db362c81db1a7bbbb2a6374d3f6d..1d14d898f9187f8ff085c0c5b2d46c8d2cf22316 100644 (file)
--- a/recipes/intltool/intltool-native_0.35.0.bb
+++ b/recipes/intltool/intltool-native_0.35.0.bb
@@ -1,7 +1,6 @@
 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"

diff --git a/recipes/intltool/intltool-native_0.35.5.bb b/recipes/intltool/intltool-native_0.35.5.bb
index ba9b90c07acc662d49189fce8cb397a546870203..debef1cc995e9e2ebb6195bd81cc4a5b1b511d9c 100644 (file)
--- a/recipes/intltool/intltool-native_0.35.5.bb
+++ b/recipes/intltool/intltool-native_0.35.5.bb
@@ -1,7 +1,6 @@
 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"

diff --git a/recipes/intltool/intltool-native_0.37.1.bb b/recipes/intltool/intltool-native_0.37.1.bb
index bac537811351db362c81db1a7bbbb2a6374d3f6d..1d14d898f9187f8ff085c0c5b2d46c8d2cf22316 100644 (file)
--- a/recipes/intltool/intltool-native_0.37.1.bb
+++ b/recipes/intltool/intltool-native_0.37.1.bb
@@ -1,7 +1,6 @@
 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"

diff --git a/recipes/intltool/intltool-native_0.40.3.bb b/recipes/intltool/intltool-native_0.40.3.bb
index b9550cc9824949a47ecde88d8ac4c9d1eb594e36..37198a590454f71c6bb2f3bfdf5c6baeaef71332 100644 (file)
--- a/recipes/intltool/intltool-native_0.40.3.bb
+++ b/recipes/intltool/intltool-native_0.40.3.bb
@@ -1,9 +1,6 @@
 require intltool_${PV}.bb
 
-PR = "r2"
-
 inherit native
-DEPENDS = "libxml-parser-perl-native"
 
 EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/env perl'"
 

diff --git a/recipes/intltool/intltool.inc b/recipes/intltool/intltool.inc
index 410a89cfa3d71384c38d691214ffda5f6f2e83ff..1938407fd0a511561f02c69bb54866f3b7313aa4 100644 (file)
--- a/recipes/intltool/intltool.inc
+++ b/recipes/intltool/intltool.inc
@@ -2,6 +2,8 @@ DESCRIPTION = "Utility scripts for internationalizing XML"
 PRIORITY = "optional"
 SECTION = "devel"
 LICENSE = "GPL"
+DEPENDS += "libxml-parser-perl-native"
+INC_PR = "r2"
 
 URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
 SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"

diff --git a/recipes/intltool/intltool_0.30.bb b/recipes/intltool/intltool_0.30.bb
index e48262574b7ae1827c07a85ac0414d54636ef7a6..04bd71fd7137c4cd55bd363a6cc5702439784004 100644 (file)
--- a/recipes/intltool/intltool_0.30.bb
+++ b/recipes/intltool/intltool_0.30.bb
@@ -1 +1,4 @@
 require intltool.inc
+
+PR = "${INC_PR}.1"
+

diff --git a/recipes/intltool/intltool_0.31.bb b/recipes/intltool/intltool_0.31.bb
index e48262574b7ae1827c07a85ac0414d54636ef7a6..04bd71fd7137c4cd55bd363a6cc5702439784004 100644 (file)
--- a/recipes/intltool/intltool_0.31.bb
+++ b/recipes/intltool/intltool_0.31.bb
@@ -1 +1,4 @@
 require intltool.inc
+
+PR = "${INC_PR}.1"
+

diff --git a/recipes/intltool/intltool_0.34.bb b/recipes/intltool/intltool_0.34.bb
index e48262574b7ae1827c07a85ac0414d54636ef7a6..04bd71fd7137c4cd55bd363a6cc5702439784004 100644 (file)
--- a/recipes/intltool/intltool_0.34.bb
+++ b/recipes/intltool/intltool_0.34.bb
@@ -1 +1,4 @@
 require intltool.inc
+
+PR = "${INC_PR}.1"
+

diff --git a/recipes/intltool/intltool_0.35.0.bb b/recipes/intltool/intltool_0.35.0.bb
index 6dea51a5fc51a48510d0a5245d1203a6d83642ec..6da883212a346dbc7e5f2b474237b678d30a261c 100644 (file)
--- a/recipes/intltool/intltool_0.35.0.bb
+++ b/recipes/intltool/intltool_0.35.0.bb
@@ -1,8 +1,6 @@
 require intltool.inc
 
-DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS = "libxml-parser-perl"
-
-PR = "r1"
-
 RRECOMMENDS = "perl-modules"
+
+PR = "${INC_PR}.1"

diff --git a/recipes/intltool/intltool_0.35.2.bb b/recipes/intltool/intltool_0.35.2.bb
index 5e2f94eb4340f7cb196c920a5d13197b6bcdb895..a8e2cf890501e7a284441e807ea7a6818bf2b0a4 100644 (file)
--- a/recipes/intltool/intltool_0.35.2.bb
+++ b/recipes/intltool/intltool_0.35.2.bb
@@ -1,8 +1,7 @@
 require intltool.inc
 
-DEPENDS = "libxml-parser-perl-native"
 RDEPENDS = "perl-module-text-wrap perl-module-re"
+RRECOMMENDS = "perl-modules"
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
-RRECOMMENDS = "perl-modules"

diff --git a/recipes/intltool/intltool_0.35.5.bb b/recipes/intltool/intltool_0.35.5.bb
index 092689b24bbb9476d2e5d4be2208476e9cda9502..4cb7a794efc695fd7fdc63daa2338cfe531a58ea 100644 (file)
--- a/recipes/intltool/intltool_0.35.5.bb
+++ b/recipes/intltool/intltool_0.35.5.bb
@@ -1,12 +1,10 @@
 require intltool.inc
 
-DEPENDS = "libxml-parser-perl-native"
 RDEPENDS = "perl-module-text-wrap perl-module-re"
-
-PR = "r2"
-
 RRECOMMENDS = "perl-modules"
 
+PR = "${INC_PR}.1"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1"

diff --git a/recipes/intltool/intltool_0.37.1.bb b/recipes/intltool/intltool_0.37.1.bb
index e48262574b7ae1827c07a85ac0414d54636ef7a6..04bd71fd7137c4cd55bd363a6cc5702439784004 100644 (file)
--- a/recipes/intltool/intltool_0.37.1.bb
+++ b/recipes/intltool/intltool_0.37.1.bb
@@ -1 +1,4 @@
 require intltool.inc
+
+PR = "${INC_PR}.1"
+

diff --git a/recipes/intltool/intltool_0.40.3.bb b/recipes/intltool/intltool_0.40.3.bb
index b4000dc7c05d206dcc303cc2b1480735dcbfd805..ddd6f8956df6c2cf0008bb13a55ee51ea947aad3 100644 (file)
--- a/recipes/intltool/intltool_0.40.3.bb
+++ b/recipes/intltool/intltool_0.40.3.bb
@@ -1,6 +1,6 @@
 require intltool.inc
 
-PR = "r2"
+PR = "${INC_PR}.1"
 
 EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/perl'"