bb files: Revert the introduction of FILE_PR

    This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The
    approach that was taken leads to disagreement and the change was pushed
    too early. DISTRO_PR is going to say and will be used inside the package
    creation. There will be more disucssion on the list about where to continue
    from here.

78 files changed, 78 insertions, 78 deletions

diff --git a/packages/gnome/epiphany_2.21.92.bb b/packages/gnome/epiphany_2.21.92.bb
index 8b92a8caa6..c13d8ea050 100644
--- a/packages/gnome/epiphany_2.21.92.bb
+++ b/packages/gnome/epiphany_2.21.92.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
 RDEPENDS = "gnome-vfs-plugin-http"
-FILE_PR ="r1"
+PR ="r1"
 
 inherit gnome
 
diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb
index 5939ac5be4..0324cb7a65 100644
--- a/packages/gnome/epiphany_2.22.1.bb
+++ b/packages/gnome/epiphany_2.22.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
 RDEPENDS = "gnome-vfs-plugin-http"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/epiphany_svn.bb b/packages/gnome/epiphany_svn.bb
index 472ee4591b..97fd82b653 100644
--- a/packages/gnome/epiphany_svn.bb
+++ b/packages/gnome/epiphany_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notif
 RDEPENDS = "gnome-vfs-plugin-http"
 
 PV = "2.20.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gail_1.20.0.bb b/packages/gnome/gail_1.20.0.bb
index 6e21eb7c65..58168a04d5 100644
--- a/packages/gnome/gail_1.20.0.bb
+++ b/packages/gnome/gail_1.20.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
 DEPENDS = "gtk+"
 
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 35e9fb3812..074b3015c2 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -6,7 +6,7 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 PV = "2.16.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb
index 9af413135c..9b9db4abb4 100644
--- a/packages/gnome/gconf_2.6.1.bb
+++ b/packages/gnome/gconf_2.6.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
 LICENSE = "LGPL"
 DEPENDS = "orbit2 glib-2.0  libxml2"
 ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/GConf-${PV}"
 
diff --git a/packages/gnome/gio-standalone_0.1.2.bb b/packages/gnome/gio-standalone_0.1.2.bb
index f89c5acf72..6e360b8237 100644
--- a/packages/gnome/gio-standalone_0.1.2.bb
+++ b/packages/gnome/gio-standalone_0.1.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gio is a platform independent file and I/O abstraction library"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-common_2.18.0.bb b/packages/gnome/gnome-common_2.18.0.bb
index baf7c047a3..41c25b69c2 100644
--- a/packages/gnome/gnome-common_2.18.0.bb
+++ b/packages/gnome/gnome-common_2.18.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "Common macros for building GNOME applications"
 inherit gnome
 
diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb
index baf7c047a3..41c25b69c2 100644
--- a/packages/gnome/gnome-common_2.20.0.bb
+++ b/packages/gnome/gnome-common_2.20.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "Common macros for building GNOME applications"
 inherit gnome
 
diff --git a/packages/gnome/gnome-cups-manager_0.31.bb b/packages/gnome/gnome-cups-manager_0.31.bb
index a04ff4b092..3b00d917cb 100644
--- a/packages/gnome/gnome-cups-manager_0.31.bb
+++ b/packages/gnome/gnome-cups-manager_0.31.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
-FILE_PR ="r0"
+PR ="r0"
 
 DEPENDS="glib-2.0 gtk+ pango libgnomecups"
 
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index 775f89e473..2bf249ddb6 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -1,5 +1,5 @@
 require gnome-desktop.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index a949d84a97..fb45b134ae 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -1,6 +1,6 @@
 require gnome-desktop.inc
 
-FILE_PR = "r2"
+PR = "r2"
 inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils"
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index 4613db3212..7b9a5932e1 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -1,6 +1,6 @@
 require gnome-desktop.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb
index fca7cdf302..53b70245ca 100644
--- a/packages/gnome/gnome-desktop_2.7.90.bb
+++ b/packages/gnome/gnome-desktop_2.7.90.bb
@@ -1,6 +1,6 @@
 require gnome-desktop.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-doc-utils.inc b/packages/gnome/gnome-doc-utils.inc
index 6f5572f6ab..ff62257aa8 100644
--- a/packages/gnome/gnome-doc-utils.inc
+++ b/packages/gnome/gnome-doc-utils.inc
@@ -1,7 +1,7 @@
 LICENSE = "GPL LGPL"
 DEPENDS = "libxml2 libxslt libxslt-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb
index 5c43bb1898..cfb4788076 100644
--- a/packages/gnome/gnome-doc-utils_0.10.3.bb
+++ b/packages/gnome/gnome-doc-utils_0.10.3.bb
@@ -1,3 +1,3 @@
 require gnome-doc-utils.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
index 9c4f81704d..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -1,3 +1,3 @@
 require gnome-doc-utils.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 9c4f81704d..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -1,3 +1,3 @@
 require gnome-doc-utils.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb
index 01d62a8a87..c8e1c19da3 100644
--- a/packages/gnome/gnome-games_2.23.6.bb
+++ b/packages/gnome/gnome-games_2.23.6.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome distutils-base gconf
 
diff --git a/packages/gnome/gnome-games_2.24.0.bb b/packages/gnome/gnome-games_2.24.0.bb
index c6a003be6c..d4e58da4e7 100644
--- a/packages/gnome/gnome-games_2.24.0.bb
+++ b/packages/gnome/gnome-games_2.24.0.bb
@@ -3,7 +3,7 @@ DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui l
 
 inherit gnome distutils-base gconf
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
            "
diff --git a/packages/gnome/gnome-games_2.6.1.bb b/packages/gnome/gnome-games_2.6.1.bb
index fade8a0cb8..d1ac41b08a 100644
--- a/packages/gnome/gnome-games_2.6.1.bb
+++ b/packages/gnome/gnome-games_2.6.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-icon-theme_1.3.3.bb b/packages/gnome/gnome-icon-theme_1.3.3.bb
index 20c9b809d0..c601d2a5d0 100644
--- a/packages/gnome/gnome-icon-theme_1.3.3.bb
+++ b/packages/gnome/gnome-icon-theme_1.3.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "x11/gnome"
 SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2"
 DEPENDS = "glib-2.0 intltool-native"
-FILE_PR ="r1"
+PR ="r1"
 
 FILES_${PN} += "${datadir}/*"
 
diff --git a/packages/gnome/gnome-keyring_2.20.0.bb b/packages/gnome/gnome-keyring_2.20.0.bb
index 950caeae24..2f72c5dfb1 100644
--- a/packages/gnome/gnome-keyring_2.20.0.bb
+++ b/packages/gnome/gnome-keyring_2.20.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools gnome pkgconfig
 
diff --git a/packages/gnome/gnome-menus_2.16.1.bb b/packages/gnome/gnome-menus_2.16.1.bb
index 4bd0fc33cc..1307c026f2 100644
--- a/packages/gnome/gnome-menus_2.16.1.bb
+++ b/packages/gnome/gnome-menus_2.16.1.bb
@@ -1,7 +1,7 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-mime-data_2.4.1.bb b/packages/gnome/gnome-mime-data_2.4.1.bb
index 222c39934f..1a49ed8e72 100644
--- a/packages/gnome/gnome-mime-data_2.4.1.bb
+++ b/packages/gnome/gnome-mime-data_2.4.1.bb
@@ -2,4 +2,4 @@ LICENSE = "GPL"
 inherit gnome
 
 DEPENDS += "intltool-native"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/gnome-mime-data_2.4.2.bb b/packages/gnome/gnome-mime-data_2.4.2.bb
index eb087659c1..c6bd2cefa0 100644
--- a/packages/gnome/gnome-mime-data_2.4.2.bb
+++ b/packages/gnome/gnome-mime-data_2.4.2.bb
@@ -4,4 +4,4 @@ inherit gnome
 DEPENDS += "libxml-parser-perl-native shared-mime-info intltool-native"
 RDEPENDS = "shared-mime-info"
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
index 435859394c..0192d863c5 100644
--- a/packages/gnome/gnome-panel_2.18.1.bb
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-power-manager_2.18.3.bb b/packages/gnome/gnome-power-manager_2.18.3.bb
index 8382a1ddf0..3963da3912 100644
--- a/packages/gnome/gnome-power-manager_2.18.3.bb
+++ b/packages/gnome/gnome-power-manager_2.18.3.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPLv2"
 DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " 
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-python-desktop_2.23.0.bb b/packages/gnome/gnome-python-desktop_2.23.0.bb
index 5ee9d875cd..45209b2923 100644
--- a/packages/gnome/gnome-python-desktop_2.23.0.bb
+++ b/packages/gnome/gnome-python-desktop_2.23.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL/LGPL"
 DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome distutils-base
 
diff --git a/packages/gnome/gnome-vfs-extras_0.99.13.bb b/packages/gnome/gnome-vfs-extras_0.99.13.bb
index a9cf297b27..d348def996 100644
--- a/packages/gnome/gnome-vfs-extras_0.99.13.bb
+++ b/packages/gnome/gnome-vfs-extras_0.99.13.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs-obexftp_0.4.bb b/packages/gnome/gnome-vfs-obexftp_0.4.bb
index 9c61e317f8..3035e8f020 100644
--- a/packages/gnome/gnome-vfs-obexftp_0.4.bb
+++ b/packages/gnome/gnome-vfs-obexftp_0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "obex plugin for gnome-vfs"
 LICENSE = "GPLv2"
 DEPENDS = "openobex gnome-vfs bluez-utils"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.12.0.bb b/packages/gnome/gnome-vfs_2.12.0.bb
index 6d226d453e..1c11f9841f 100644
--- a/packages/gnome/gnome-vfs_2.12.0.bb
+++ b/packages/gnome/gnome-vfs_2.12.0.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb
index dd2da7f712..b1f634c0e9 100644
--- a/packages/gnome/gnome-vfs_2.16.3.bb
+++ b/packages/gnome/gnome-vfs_2.16.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb
index 5477b8c5cb..8a3e460119 100644
--- a/packages/gnome/gnome-vfs_2.18.1.bb
+++ b/packages/gnome/gnome-vfs_2.18.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.20.0.bb b/packages/gnome/gnome-vfs_2.20.0.bb
index bcb7a07317..5631a9c960 100644
--- a/packages/gnome/gnome-vfs_2.20.0.bb
+++ b/packages/gnome/gnome-vfs_2.20.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.22.0.bb b/packages/gnome/gnome-vfs_2.22.0.bb
index bcb7a07317..5631a9c960 100644
--- a/packages/gnome/gnome-vfs_2.22.0.bb
+++ b/packages/gnome/gnome-vfs_2.22.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.6.0.bb b/packages/gnome/gnome-vfs_2.6.0.bb
index c1ecfaa346..c967c746d1 100644
--- a/packages/gnome/gnome-vfs_2.6.0.bb
+++ b/packages/gnome/gnome-vfs_2.6.0.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb
index c84a0b1784..e9a903f598 100644
--- a/packages/gnome/gnome-vfs_2.6.2.bb
+++ b/packages/gnome/gnome-vfs_2.6.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit gnome
 
diff --git a/packages/gnome/goffice_0.6.2.bb b/packages/gnome/goffice_0.6.2.bb
index 9963fd92b1..9a36af5425 100644
--- a/packages/gnome/goffice_0.6.2.bb
+++ b/packages/gnome/goffice_0.6.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Office Library"
 LICENSE="GPLv2"
-FILE_PR ="r1"
+PR ="r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gnome/goffice_0.6.3.bb b/packages/gnome/goffice_0.6.3.bb
index 55803c606f..86f9f4e943 100644
--- a/packages/gnome/goffice_0.6.3.bb
+++ b/packages/gnome/goffice_0.6.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Office Library"
 LICENSE="GPLv2"
-FILE_PR ="r0"
+PR ="r0"
 
 DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl"
 
diff --git a/packages/gnome/gvfs_0.0.2.bb b/packages/gnome/gvfs_0.0.2.bb
index 9081d1f307..8c791ad680 100644
--- a/packages/gnome/gvfs_0.0.2.bb
+++ b/packages/gnome/gvfs_0.0.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gvfs is a userspace virtual filesystem"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gio-standalone fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gvfs_1.0.1.bb b/packages/gnome/gvfs_1.0.1.bb
index f22c808596..8e27d6d148 100644
--- a/packages/gnome/gvfs_1.0.1.bb
+++ b/packages/gnome/gvfs_1.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gvfs is a userspace virtual filesystem"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/libart-lgpl_2.3.16.bb b/packages/gnome/libart-lgpl_2.3.16.bb
index d858914db5..3605a384cd 100644
--- a/packages/gnome/libart-lgpl_2.3.16.bb
+++ b/packages/gnome/libart-lgpl_2.3.16.bb
@@ -1,3 +1,3 @@
 require libart-lgpl.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libart-lgpl_2.3.19.bb b/packages/gnome/libart-lgpl_2.3.19.bb
index d858914db5..3605a384cd 100644
--- a/packages/gnome/libart-lgpl_2.3.19.bb
+++ b/packages/gnome/libart-lgpl_2.3.19.bb
@@ -1,3 +1,3 @@
 require libart-lgpl.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb
index 41e4c08376..c48e7d0753 100644
--- a/packages/gnome/libbonobo_2.10.0.bb
+++ b/packages/gnome/libbonobo_2.10.0.bb
@@ -1,3 +1,3 @@
 require libbonobo.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libbonobo_2.22.0.bb b/packages/gnome/libbonobo_2.22.0.bb
index 3ca454713f..feecaf590a 100644
--- a/packages/gnome/libbonobo_2.22.0.bb
+++ b/packages/gnome/libbonobo_2.22.0.bb
@@ -1,6 +1,6 @@
 require libbonobo.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://configure-gthread.patch;patch=1"
 
diff --git a/packages/gnome/libbonobo_2.6.0.bb b/packages/gnome/libbonobo_2.6.0.bb
index 41b12a7b88..c071f38afe 100644
--- a/packages/gnome/libbonobo_2.6.0.bb
+++ b/packages/gnome/libbonobo_2.6.0.bb
@@ -1,3 +1,3 @@
 require libbonobo.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/libbonobo_2.6.2.bb b/packages/gnome/libbonobo_2.6.2.bb
index 41e4c08376..c48e7d0753 100644
--- a/packages/gnome/libbonobo_2.6.2.bb
+++ b/packages/gnome/libbonobo_2.6.2.bb
@@ -1,3 +1,3 @@
 require libbonobo.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb
index 8aba96c4a2..3a41ef731d 100644
--- a/packages/gnome/libbonoboui_2.10.0.bb
+++ b/packages/gnome/libbonoboui_2.10.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libbonoboui_2.14.0.bb b/packages/gnome/libbonoboui_2.14.0.bb
index 1b1dd9b032..53380c6fa0 100644
--- a/packages/gnome/libbonoboui_2.14.0.bb
+++ b/packages/gnome/libbonoboui_2.14.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libbonoboui_2.18.0.bb b/packages/gnome/libbonoboui_2.18.0.bb
index 1b1dd9b032..53380c6fa0 100644
--- a/packages/gnome/libbonoboui_2.18.0.bb
+++ b/packages/gnome/libbonoboui_2.18.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libbonoboui_2.6.1.bb b/packages/gnome/libbonoboui_2.6.1.bb
index ac7cb09ec9..34f10c60d6 100644
--- a/packages/gnome/libbonoboui_2.6.1.bb
+++ b/packages/gnome/libbonoboui_2.6.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libgnome_2.10.1.bb b/packages/gnome/libgnome_2.10.1.bb
index cfd55845dc..0866b426c0 100644
--- a/packages/gnome/libgnome_2.10.1.bb
+++ b/packages/gnome/libgnome_2.10.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.12.0.1.bb b/packages/gnome/libgnome_2.12.0.1.bb
index 30b0701a33..f11aeacd37 100644
--- a/packages/gnome/libgnome_2.12.0.1.bb
+++ b/packages/gnome/libgnome_2.12.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.14.1.bb b/packages/gnome/libgnome_2.14.1.bb
index 7e4d98b341..d6c64ee7be 100644
--- a/packages/gnome/libgnome_2.14.1.bb
+++ b/packages/gnome/libgnome_2.14.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.16.0.bb b/packages/gnome/libgnome_2.16.0.bb
index 7e4d98b341..d6c64ee7be 100644
--- a/packages/gnome/libgnome_2.16.0.bb
+++ b/packages/gnome/libgnome_2.16.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.18.0.bb b/packages/gnome/libgnome_2.18.0.bb
index de6220deab..5eaa9a084e 100644
--- a/packages/gnome/libgnome_2.18.0.bb
+++ b/packages/gnome/libgnome_2.18.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome lib_package
 
diff --git a/packages/gnome/libgnome_2.24.0.bb b/packages/gnome/libgnome_2.24.0.bb
index f0ead37c32..549cda2855 100644
--- a/packages/gnome/libgnome_2.24.0.bb
+++ b/packages/gnome/libgnome_2.24.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome lib_package
 
diff --git a/packages/gnome/libgnome_2.6.1.1.bb b/packages/gnome/libgnome_2.6.1.1.bb
index c86f2cc187..06b85b7775 100644
--- a/packages/gnome/libgnome_2.6.1.1.bb
+++ b/packages/gnome/libgnome_2.6.1.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb
index 9544196ab1..3c1b36ecd4 100644
--- a/packages/gnome/libgnomecanvas_2.10.2.bb
+++ b/packages/gnome/libgnomecanvas_2.10.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
diff --git a/packages/gnome/libgnomecanvas_2.12.0.bb b/packages/gnome/libgnomecanvas_2.12.0.bb
index 9544196ab1..3c1b36ecd4 100644
--- a/packages/gnome/libgnomecanvas_2.12.0.bb
+++ b/packages/gnome/libgnomecanvas_2.12.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
diff --git a/packages/gnome/libgnomecanvas_2.6.1.1.bb b/packages/gnome/libgnomecanvas_2.6.1.1.bb
index 8165fd1c45..5c716855e7 100644
--- a/packages/gnome/libgnomecanvas_2.6.1.1.bb
+++ b/packages/gnome/libgnomecanvas_2.6.1.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb
index 4c81f9dff2..166161fdcd 100644
--- a/packages/gnome/libgnomecups_0.2.2.bb
+++ b/packages/gnome/libgnomecups_0.2.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
-FILE_PR ="r0"
+PR ="r0"
 
 DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
 
diff --git a/packages/gnome/libgnomeprint_2.6.2.bb b/packages/gnome/libgnomeprint_2.6.2.bb
index c5ece2bc6d..ae9d6cc70b 100644
--- a/packages/gnome/libgnomeprint_2.6.2.bb
+++ b/packages/gnome/libgnomeprint_2.6.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
diff --git a/packages/gnome/libgnomeprint_2.8.2.bb b/packages/gnome/libgnomeprint_2.8.2.bb
index aae93d71e0..a7db775e22 100644
--- a/packages/gnome/libgnomeprint_2.8.2.bb
+++ b/packages/gnome/libgnomeprint_2.8.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
diff --git a/packages/gnome/libgnomeprintui_2.6.2.bb b/packages/gnome/libgnomeprintui_2.6.2.bb
index 2ec4d0471d..5a37a78514 100644
--- a/packages/gnome/libgnomeprintui_2.6.2.bb
+++ b/packages/gnome/libgnomeprintui_2.6.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/libgnomeprintui_2.8.2.bb b/packages/gnome/libgnomeprintui_2.8.2.bb
index 2ec4d0471d..5a37a78514 100644
--- a/packages/gnome/libgnomeprintui_2.8.2.bb
+++ b/packages/gnome/libgnomeprintui_2.8.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/libgnomeui_2.12.0.bb b/packages/gnome/libgnomeui_2.12.0.bb
index d9859c3b83..9324676cec 100644
--- a/packages/gnome/libgnomeui_2.12.0.bb
+++ b/packages/gnome/libgnomeui_2.12.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r3"
+PR = "r3"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgnomeui_2.15.2.bb b/packages/gnome/libgnomeui_2.15.2.bb
index 3e822dc7db..a6700434c3 100644
--- a/packages/gnome/libgnomeui_2.15.2.bb
+++ b/packages/gnome/libgnomeui_2.15.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb
index 4e3d3ddaec..ca299d8cac 100644
--- a/packages/gnome/libgnomeui_2.16.1.bb
+++ b/packages/gnome/libgnomeui_2.16.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgnomeui_2.6.1.1.bb b/packages/gnome/libgnomeui_2.6.1.1.bb
index a2be070902..844d91b1fd 100644
--- a/packages/gnome/libgnomeui_2.6.1.1.bb
+++ b/packages/gnome/libgnomeui_2.6.1.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgweather_2.24.0.bb b/packages/gnome/libgweather_2.24.0.bb
index 58037835e6..f8da526b2b 100644
--- a/packages/gnome/libgweather_2.24.0.bb
+++ b/packages/gnome/libgweather_2.24.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 DEPENDS = "libgnome libsoup-2.4 gtk+"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/libsoup-2.4_2.4.1.bb b/packages/gnome/libsoup-2.4_2.4.1.bb
index bc1fd295d9..24de169e6f 100644
--- a/packages/gnome/libsoup-2.4_2.4.1.bb
+++ b/packages/gnome/libsoup-2.4_2.4.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gnutls libxml2"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2"
 S = "${WORKDIR}/libsoup-${PV}"
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index 33178c9aa1..d69a985627 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An HTTP library implementation in C"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gnutls libxml2"
 
diff --git a/packages/gnome/orbit2-native_2.14.12.bb b/packages/gnome/orbit2-native_2.14.12.bb
index 12f896b4d6..009974ade3 100644
--- a/packages/gnome/orbit2-native_2.14.12.bb
+++ b/packages/gnome/orbit2-native_2.14.12.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "CORBA ORB"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnome/orbit2_2.10.2.bb b/packages/gnome/orbit2_2.10.2.bb
index e1d9550293..4ac4129414 100644
--- a/packages/gnome/orbit2_2.10.2.bb
+++ b/packages/gnome/orbit2_2.10.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnome/orbit2_2.13.2.bb b/packages/gnome/orbit2_2.13.2.bb
index 9b79dd193a..e4d83408b1 100644
--- a/packages/gnome/orbit2_2.13.2.bb
+++ b/packages/gnome/orbit2_2.13.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnome/orbit2_2.14.12.bb b/packages/gnome/orbit2_2.14.12.bb
index 275dbbc96f..140776114d 100644
--- a/packages/gnome/orbit2_2.14.12.bb
+++ b/packages/gnome/orbit2_2.14.12.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \