From 719de6735f6d14ad05f231df900795bbb19a2810 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Jun 2010 15:58:51 +0200 Subject: recipes: conform to OE packaging guidelines with RSUGGESTS/RPROVIDES/RCONFLICTS/RREPLACES * even worse than last RDEPENDS/RRECOMMENDS change, because now ie: opkg info coreutils-doc Provides: textutils, shellutils, fileutils Replaces: textutils, shellutils, fileutils Signed-off-by: Martin Jansa Acked-by: Khem Raj Acked-by: Roman I Khimov --- recipes/abiword/abiword-embedded_2.4.6.bb | 4 ++-- recipes/abiword/abiword-embedded_2.5.2.bb | 4 ++-- recipes/abiword/abiword-embedded_2.6.4.bb | 4 ++-- recipes/abiword/abiword-embedded_2.6.8.bb | 4 ++-- recipes/abiword/abiword_2.4.6.bb | 2 +- recipes/abiword/abiword_2.5.1.bb | 2 +- recipes/abiword/abiword_2.5.2.bb | 2 +- recipes/abiword/abiword_2.6.0.bb | 2 +- recipes/abiword/abiword_2.6.3.bb | 2 +- recipes/abiword/abiword_2.6.4.bb | 2 +- recipes/abiword/abiword_2.6.8.bb | 2 +- recipes/abiword/abiword_2.8.1.bb | 2 +- recipes/angstrom/epiphany-firefox-replacement.bb | 2 +- recipes/at/at_3.1.8.bb | 4 ++-- recipes/atd/atd_0.70.bb | 4 ++-- recipes/atd/atd_0.80.bb | 4 ++-- recipes/bluez/bluez-utils.inc | 2 +- recipes/bluez/bluez-utils3.inc | 2 +- recipes/bluez/bluez.inc | 2 +- recipes/boa/boa_0.94.13.bb | 2 +- recipes/cairo/cairo-directfb_1.4.8.bb | 4 ++-- recipes/cairo/cairo-directfb_1.6.4.bb | 4 ++-- recipes/classpath/classpath.inc | 2 +- recipes/coreutils/coreutils.inc | 4 ++-- recipes/dillo/dillo_0.8.6.bb | 2 +- recipes/dropbear/dropbear.inc | 2 +- recipes/emacs/emacs-x11_22.3.bb | 2 +- recipes/emacs/emacs-x11_23.1.bb | 2 +- recipes/emacs/emacs-x11_cvs.bb | 2 +- recipes/ffalarms/ffalarms_git.bb | 2 +- recipes/ffmpeg/ffmpeg.inc | 2 +- recipes/fftw/fftw.inc | 2 +- recipes/freesmartphone/fso-apm_git.bb | 2 +- recipes/freesmartphone/fso-gsm0710muxd_git.bb | 4 ++-- recipes/gnome/gnome-vfs_2.22.0.bb | 2 +- recipes/gnome/gnome-vfs_2.24.1.bb | 2 +- recipes/gpe-icons/gpe-theme-neo_git.bb | 2 +- recipes/gpe-scap/gpe-scap_1.2.bb | 2 +- recipes/gpe-scap/gpe-scap_1.3.bb | 2 +- recipes/gpe-scap/gpe-scap_1.4.bb | 2 +- recipes/gpe-scap/gpe-scap_svn.bb | 2 +- recipes/hotplug-ng/hotplug-ng_001.bb | 6 +++--- recipes/initscripts/initscripts-openprotium_1.0.bb | 2 +- recipes/initscripts/initscripts-slugos_1.0.bb | 2 +- recipes/irk/irk-belkin_0.11.bb | 4 ++-- recipes/irk/irk-targus_0.11.0.bb | 4 ++-- recipes/libgpepimc/libgpepimc-hildon_0.5.bb | 2 +- recipes/libgpepimc/libgpepimc.inc | 2 +- recipes/libgpepimc/libgpepimc_svn.bb | 2 +- recipes/libgpewidget/libgpewidget-hildon_0.102.bb | 2 +- recipes/links/links-x11_2.0+2.1pre30.bb | 2 +- recipes/links/links_2.0+2.1pre30.bb | 2 +- recipes/linux-hotplug/linux-hotplug_20040920.bb | 2 +- recipes/logrotate/logrotate_3.7.1.bb | 2 +- recipes/lyx/lyx_1.6.1.bb | 2 +- recipes/lyx/lyx_1.6.4.1.bb | 2 +- recipes/mamona/bash-noemu_3.2.bb | 4 ++-- recipes/mamona/binutils-noemu_2.17.50.0.5.bb | 4 ++-- recipes/mamona/binutils-noemu_2.18.bb | 4 ++-- recipes/mamona/gcc-noemu_4.1.1.bb | 4 ++-- recipes/mamona/gcc-noemu_4.1.2.bb | 4 ++-- recipes/matchbox-keyboard/matchbox-keyboard_svn.bb | 2 +- recipes/matchbox-sato/matchbox-sato_0.1.bb | 2 +- recipes/matchbox-session/matchbox-session.bb | 2 +- recipes/meta/external-toolchain-generic.bb | 2 +- recipes/meta/external-toolchain.bb | 2 +- recipes/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb | 2 +- recipes/midpath/midpath-backend-qte_0.2+0.3rc2.bb | 2 +- recipes/midpath/midpath-cldc_0.2+0.3rc2.bb | 2 +- recipes/midpath/midpath.inc | 2 +- recipes/misc-binary-only/prism-firmware.bb | 4 ++-- recipes/monotone/monotone-6_0.33.bb | 2 +- recipes/monotone/monotone-6_0.34.bb | 2 +- recipes/monotone/monotone-6_0.37.bb | 2 +- recipes/motion/motion_3.2.11.bb | 2 +- recipes/multitap-pad/multitap-pad_svn.bb | 2 +- recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb | 4 ++-- recipes/ntp/ntp.inc | 2 +- recipes/obsolete/ffalarms/ffalarms_0.2.2.bb | 2 +- recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb | 2 +- recipes/obsolete/shr/etk-theme-neo_git.bb | 2 +- recipes/obsolete/shr/libframeworkd-phonegui-efl-theme-neo_git.bb | 2 +- recipes/obsolete/tasks/task-bootstrap-unionroot.bb | 2 +- recipes/openmoko-projects/illume-theme-asu_svn.bb | 2 +- recipes/openmoko2/openmoko-sound-system2_0.1.0.bb | 4 ++-- recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb | 4 ++-- recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb | 4 ++-- recipes/openmoko2/openmoko-theme-standard2_svn.bb | 2 +- .../opie-mediaplayer2-skin-default-landscape_cvs.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb | 2 +- recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb | 2 +- recipes/opie-taskbar/opie-taskbar-images.inc | 2 +- recipes/pulseaudio/pulseaudio-esd-wrapper.bb | 4 ++-- recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb | 4 ++-- recipes/qpf-fonts/qpf-unifont_1.0.bb | 2 +- recipes/qpf-fonts/qpf-unismall_1.0.0.bb | 2 +- recipes/samba/samba-essential_3.0.20.bb | 2 +- recipes/sarg/sarg_2.2.7.1.bb | 2 +- recipes/sharp-binary-only/sharp-compat-libs_0.5.bb | 4 ++-- recipes/sharprom-toolchain/sharprom-toolchain-native_1.0.bb | 2 +- recipes/shr/e-wm-theme-illume-neo_git.bb | 2 +- recipes/shr/elementary-theme-neo_git.bb | 2 +- recipes/shr/elementary-theme-o2_git.bb | 2 +- recipes/shr/gtk-theme-neo_git.bb | 2 +- recipes/shr/icon-theme-neo_git.bb | 2 +- recipes/shr/phoneui-shr-theme-neo_git.bb | 2 +- recipes/shr/phoneui-shr-theme-o2_git.bb | 2 +- recipes/socketcan/canutils.inc | 2 +- recipes/socketcan/socketcan-utils-test_svn.bb | 2 +- recipes/swt/swt3.4-gtk_3.4.2.bb | 2 +- recipes/swt/swt3.5-gtk_3.5.1.bb | 2 +- recipes/tasks/task-mamona-sdk-noemu.bb | 4 ++-- recipes/tasks/task-mamona-sdk.bb | 4 ++-- recipes/ttf-fonts/ttf-arphic-uming_20080216.bb | 2 +- recipes/ttf-fonts/ttf-sazanami_20040629.bb | 2 +- recipes/vala-terminal/vala-terminal_git.bb | 4 ++-- recipes/vim/gvim_7.2.bb | 2 +- recipes/vnc/fbvncserver2_cvs.bb | 2 +- recipes/wpa-supplicant/wpa-supplicant-0.6.inc | 2 +- recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb | 2 +- recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb | 4 ++-- recipes/xfce-extras/orage_4.4.2.bb | 2 +- recipes/xfce-extras/orage_4.6.1.bb | 2 +- recipes/xorg-lib/libx11_git.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.1.2.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.1.3.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.2.0.bb | 2 +- recipes/zsafe/zsafe_2.1.3.bb | 2 +- recipes/zten/zten_1.6.2.bb | 2 +- 136 files changed, 168 insertions(+), 168 deletions(-) diff --git a/recipes/abiword/abiword-embedded_2.4.6.bb b/recipes/abiword/abiword-embedded_2.4.6.bb index 84bb8f1706..8ec952648f 100644 --- a/recipes/abiword/abiword-embedded_2.4.6.bb +++ b/recipes/abiword/abiword-embedded_2.4.6.bb @@ -2,8 +2,8 @@ require abiword.inc EXTRA_OECONF += "--enable-embedded" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" do_compile_prepend() { cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/ diff --git a/recipes/abiword/abiword-embedded_2.5.2.bb b/recipes/abiword/abiword-embedded_2.5.2.bb index 67f516e10a..459cc277ed 100644 --- a/recipes/abiword/abiword-embedded_2.5.2.bb +++ b/recipes/abiword/abiword-embedded_2.5.2.bb @@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" diff --git a/recipes/abiword/abiword-embedded_2.6.4.bb b/recipes/abiword/abiword-embedded_2.6.4.bb index 35808413cd..13951f862c 100644 --- a/recipes/abiword/abiword-embedded_2.6.4.bb +++ b/recipes/abiword/abiword-embedded_2.6.4.bb @@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" SRC_URI[md5sum] = "16748b2d6e318e0e2a25581005e1943a" SRC_URI[sha256sum] = "4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe" diff --git a/recipes/abiword/abiword-embedded_2.6.8.bb b/recipes/abiword/abiword-embedded_2.6.8.bb index fc6e2d504b..ca48d77fef 100644 --- a/recipes/abiword/abiword-embedded_2.6.8.bb +++ b/recipes/abiword/abiword-embedded_2.6.8.bb @@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" SRC_URI[md5sum] = "fab04d8ef999c303f720197adf261310" SRC_URI[sha256sum] = "b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93" diff --git a/recipes/abiword/abiword_2.4.6.bb b/recipes/abiword/abiword_2.4.6.bb index 7911571079..af0b5d4a58 100644 --- a/recipes/abiword/abiword_2.4.6.bb +++ b/recipes/abiword/abiword_2.4.6.bb @@ -1,6 +1,6 @@ require abiword.inc -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "30fbd0a9b539f15f54f90d3812a75266" diff --git a/recipes/abiword/abiword_2.5.1.bb b/recipes/abiword/abiword_2.5.1.bb index fdf8fc6be1..2f90f528ad 100644 --- a/recipes/abiword/abiword_2.5.1.bb +++ b/recipes/abiword/abiword_2.5.1.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "11d022458e0e090846b35ed4873c2e6e" SRC_URI[sha256sum] = "482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d" diff --git a/recipes/abiword/abiword_2.5.2.bb b/recipes/abiword/abiword_2.5.2.bb index a9e644db0c..35fd966437 100644 --- a/recipes/abiword/abiword_2.5.2.bb +++ b/recipes/abiword/abiword_2.5.2.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" PR = "r1" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/abiword/abiword_2.6.0.bb b/recipes/abiword/abiword_2.6.0.bb index 9e9e43b3ae..d017966577 100644 --- a/recipes/abiword/abiword_2.6.0.bb +++ b/recipes/abiword/abiword_2.6.0.bb @@ -1,6 +1,6 @@ require abiword-2.5.inc -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "d627a5d1061160c683f2257da498355b" SRC_URI[sha256sum] = "35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb" diff --git a/recipes/abiword/abiword_2.6.3.bb b/recipes/abiword/abiword_2.6.3.bb index 960ae979ae..576ca9c7b4 100644 --- a/recipes/abiword/abiword_2.6.3.bb +++ b/recipes/abiword/abiword_2.6.3.bb @@ -2,7 +2,7 @@ require abiword-2.5.inc PR = "r1" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${datadir}/mime-info" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/abiword/abiword_2.6.4.bb b/recipes/abiword/abiword_2.6.4.bb index 711074e798..e12b93d720 100644 --- a/recipes/abiword/abiword_2.6.4.bb +++ b/recipes/abiword/abiword_2.6.4.bb @@ -2,7 +2,7 @@ require abiword-2.5.inc PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${datadir}/mime-info" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/abiword/abiword_2.6.8.bb b/recipes/abiword/abiword_2.6.8.bb index f18bd430bb..4399371bc8 100644 --- a/recipes/abiword/abiword_2.6.8.bb +++ b/recipes/abiword/abiword_2.6.8.bb @@ -1,6 +1,6 @@ require abiword-2.5.inc -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${datadir}/mime-info" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb index 96bc03c17e..781e096cda 100644 --- a/recipes/abiword/abiword_2.8.1.bb +++ b/recipes/abiword/abiword_2.8.1.bb @@ -18,7 +18,7 @@ EXTRA_OECONF = " --disable-static \ --with-libwmf-config=${STAGING_DIR} \ " DEPENDS += " libwmf-native gtkmathview " -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/angstrom/epiphany-firefox-replacement.bb b/recipes/angstrom/epiphany-firefox-replacement.bb index 50de217f82..ca08cf348c 100644 --- a/recipes/angstrom/epiphany-firefox-replacement.bb +++ b/recipes/angstrom/epiphany-firefox-replacement.bb @@ -1,7 +1,7 @@ # This is a hack because $*#($*($# e17 doesn't check if firefox is present and puts it in the menu blindly RDEPENDS_${PN} = "epiphany" -RCONFLICTS = "firefox" +RCONFLICTS_${PN} = "firefox" do_install() { install -d ${D}/${bindir} diff --git a/recipes/at/at_3.1.8.bb b/recipes/at/at_3.1.8.bb index 79b8557b10..f7d692b4e6 100644 --- a/recipes/at/at_3.1.8.bb +++ b/recipes/at/at_3.1.8.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Delayed job execution and batch processing." SECTION = "base" LICENSE="BSD" DEPENDS = "flex-native" -RCONFLICTS = "atd" -RREPLACES = "atd" +RCONFLICTS_${PN} = "atd" +RREPLACES_${PN} = "atd" PR = "r2" diff --git a/recipes/atd/atd_0.70.bb b/recipes/atd/atd_0.70.bb index 5ffb3869f3..d912ad306b 100644 --- a/recipes/atd/atd_0.70.bb +++ b/recipes/atd/atd_0.70.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Lightweight At Daemon" SECTION = "base" LICENSE = "GPLv2" -RCONFLICTS = "at" -RREPLACES = "at" +RCONFLICTS_${PN} = "at" +RREPLACES_${PN} = "at" PR = "r5" diff --git a/recipes/atd/atd_0.80.bb b/recipes/atd/atd_0.80.bb index 6ec1928def..ab81b42143 100644 --- a/recipes/atd/atd_0.80.bb +++ b/recipes/atd/atd_0.80.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Lightweight At Daemon" SECTION = "base" LICENSE = "GPLv2" -RCONFLICTS = "at" -RREPLACES = "at" +RCONFLICTS_${PN} = "at" +RREPLACES_${PN} = "at" PR = "r1" diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc index 9933748eb6..dfe64c3bb5 100644 --- a/recipes/bluez/bluez-utils.inc +++ b/recipes/bluez/bluez-utils.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus cups" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" +RREPLACES_${PN} = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc index 16e5ede9bc..c3899dbb68 100644 --- a/recipes/bluez/bluez-utils3.inc +++ b/recipes/bluez/bluez-utils3.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus glib-2.0" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" +RREPLACES_${PN} = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" diff --git a/recipes/bluez/bluez.inc b/recipes/bluez/bluez.inc index 366b5f1022..3a1819a685 100644 --- a/recipes/bluez/bluez.inc +++ b/recipes/bluez/bluez.inc @@ -8,7 +8,7 @@ PR = "r0" DEPENDS = "gstreamer gst-plugins-base dbus glib-2.0" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" +RREPLACES_${PN} = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" FILESPATHPKG =. "bluez-utils-${PV}:bluez-utils:" diff --git a/recipes/boa/boa_0.94.13.bb b/recipes/boa/boa_0.94.13.bb index 1356529c11..94019c8b89 100644 --- a/recipes/boa/boa_0.94.13.bb +++ b/recipes/boa/boa_0.94.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Lightweight and High Performance WebServer" SECTION = "console/network" LICENSE = "GPL" RDEPENDS_${PN} = "mime-support" -RPROVIDES = "httpd" +RPROVIDES_${PN} = "httpd" PR = "r3" SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \ diff --git a/recipes/cairo/cairo-directfb_1.4.8.bb b/recipes/cairo/cairo-directfb_1.4.8.bb index d9d3715510..8315c62a7f 100644 --- a/recipes/cairo/cairo-directfb_1.4.8.bb +++ b/recipes/cairo/cairo-directfb_1.4.8.bb @@ -1,6 +1,6 @@ require cairo.inc -RCONFLICTS = "cairo" -RPROVIDES = "cairo-directfb" +RCONFLICTS_${PN} = "cairo" +RPROVIDES_${PN} = "cairo-directfb" DEPENDS = "directfb libsm libpng fontconfig" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://cairo_directfb_is_similar-typo.patch \ diff --git a/recipes/cairo/cairo-directfb_1.6.4.bb b/recipes/cairo/cairo-directfb_1.6.4.bb index 55064ce8c6..97c70cb3e7 100644 --- a/recipes/cairo/cairo-directfb_1.6.4.bb +++ b/recipes/cairo/cairo-directfb_1.6.4.bb @@ -1,6 +1,6 @@ require cairo.inc -RCONFLICTS = "cairo" -RPROVIDES = "cairo-directfb" +RCONFLICTS_${PN} = "cairo" +RPROVIDES_${PN} = "cairo-directfb" DEPENDS = "directfb pixman libsm libpng fontconfig" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch " diff --git a/recipes/classpath/classpath.inc b/recipes/classpath/classpath.inc index ab47635d78..41c7888702 100644 --- a/recipes/classpath/classpath.inc +++ b/recipes/classpath/classpath.inc @@ -6,7 +6,7 @@ LICENSE = "Classpath" PBN = "classpath" DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native" -RPROVIDES = "" +RPROVIDES_${PN} = "" RDEPENDS_${PN} = "${PBN}-common (>= ${PV})" RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt" diff --git a/recipes/coreutils/coreutils.inc b/recipes/coreutils/coreutils.inc index 38dbd1d4f2..9242c5196a 100644 --- a/recipes/coreutils/coreutils.inc +++ b/recipes/coreutils/coreutils.inc @@ -2,7 +2,7 @@ DESCRIPTION = "A collection of core GNU utilities." HOMEPAGE = "http://www.gnu.org/software/coreutils" LICENSE = "GPL" SECTION = "base" -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +RREPLACES_${PN} = "textutils shellutils fileutils" +RPROVIDES_${PN} = "textutils shellutils fileutils" inherit autotools diff --git a/recipes/dillo/dillo_0.8.6.bb b/recipes/dillo/dillo_0.8.6.bb index bcfb8ea308..3ceb77f375 100644 --- a/recipes/dillo/dillo_0.8.6.bb +++ b/recipes/dillo/dillo_0.8.6.bb @@ -4,7 +4,7 @@ SECTION = "x11/network" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+-1.2 libpng openssl" -RCONFLICTS = "dillo2" +RCONFLICTS_${PN} = "dillo2" PR = "r2" SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \ file://dillo-i18n.diff \ diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc index 5da00f284a..e3fee80355 100644 --- a/recipes/dropbear/dropbear.inc +++ b/recipes/dropbear/dropbear.inc @@ -4,7 +4,7 @@ SECTION = "console/network" LICENSE = "MIT" DEPENDS = "zlib" PROVIDES = "ssh sshd" -RPROVIDES = "ssh sshd" +RPROVIDES_${PN} = "ssh sshd" INC_PR = "r3" diff --git a/recipes/emacs/emacs-x11_22.3.bb b/recipes/emacs/emacs-x11_22.3.bb index f00b285157..c198a1fd94 100644 --- a/recipes/emacs/emacs-x11_22.3.bb +++ b/recipes/emacs/emacs-x11_22.3.bb @@ -5,7 +5,7 @@ DEPENDS += "gtk+ libungif" EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk" -RREPLACES = "emacs" +RREPLACES_${PN} = "emacs" FILESPATHPKG =. "emacs-${PV}:" SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \ diff --git a/recipes/emacs/emacs-x11_23.1.bb b/recipes/emacs/emacs-x11_23.1.bb index f060e8244a..72c412dcde 100644 --- a/recipes/emacs/emacs-x11_23.1.bb +++ b/recipes/emacs/emacs-x11_23.1.bb @@ -9,7 +9,7 @@ EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk" DEFAULT_PREFERENCE = "-1" -RREPLACES = "emacs" +RREPLACES_${PN} = "emacs" FILESPATHPKG =. "emacs-${PV}:" SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ diff --git a/recipes/emacs/emacs-x11_cvs.bb b/recipes/emacs/emacs-x11_cvs.bb index 809176a3c3..92dcce1a44 100644 --- a/recipes/emacs/emacs-x11_cvs.bb +++ b/recipes/emacs/emacs-x11_cvs.bb @@ -5,4 +5,4 @@ DEPENDS += "libx11" EXTRA_OECONF = "--without-sound" -RREPLACES = "emacs" +RREPLACES_${PN} = "emacs" diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index 07fe60f4aa..8580bc60f5 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "elementary libeflvala libical" RDEPENDS_${PN} = "atd alsa-utils-amixer ttf-dejavu-sans libical" -RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" +RSUGGESTS_${PN} = "mplayer alsa-utils-aplay frameworkd" PV = "0.4+gitr${SRCPV}" PR = "r2" diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 2b4d26e8f6..680a76e43b 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET = "arm" PE = "2" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" -RSUGGESTS = "mplayer" +RSUGGESTS_${PN} = "mplayer" INC_PR = "r13" diff --git a/recipes/fftw/fftw.inc b/recipes/fftw/fftw.inc index acd1b27f4b..19a9470776 100644 --- a/recipes/fftw/fftw.inc +++ b/recipes/fftw/fftw.inc @@ -2,7 +2,7 @@ DESCRIPTION = "FFTW" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -RPROVIDES += "libfftw3" +RPROVIDES_${PN} += "libfftw3" PR = "r1" diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb index 004786028e..3e02149a36 100644 --- a/recipes/freesmartphone/fso-apm_git.bb +++ b/recipes/freesmartphone/fso-apm_git.bb @@ -5,7 +5,7 @@ AUTHOR = "Michael 'Mickey' Lauer " SECTION = "console" LICENSE = "GPLv2" PE = "1" -RCONFLICTS = "apm" +RCONFLICTS_${PN} = "apm" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "2.0.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/fso-gsm0710muxd_git.bb b/recipes/freesmartphone/fso-gsm0710muxd_git.bb index 6fae6af421..befffe11af 100644 --- a/recipes/freesmartphone/fso-gsm0710muxd_git.bb +++ b/recipes/freesmartphone/fso-gsm0710muxd_git.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit autotools RDEPENDS_${PN} = "dbus dbus-glib" -RCONFLICTS = "gsm0710muxd" -RREPLACES = "gsm0710muxd" +RCONFLICTS_${PN} = "gsm0710muxd" +RREPLACES_${PN} = "gsm0710muxd" FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/recipes/gnome/gnome-vfs_2.22.0.bb b/recipes/gnome/gnome-vfs_2.22.0.bb index e0dc46fa15..3d4098367f 100644 --- a/recipes/gnome/gnome-vfs_2.22.0.bb +++ b/recipes/gnome/gnome-vfs_2.22.0.bb @@ -12,7 +12,7 @@ SRC_URI += "file://gconftool-lossage.patch \ # This is to provide compatibility with the gnome-vfs DBus fork PROVIDES = "gnome-vfs-plugin-dbus" -RREPLACES = "gnome-vfs-dbus" +RREPLACES_${PN} = "gnome-vfs-dbus" EXTRA_OECONF = " \ --disable-openssl \ diff --git a/recipes/gnome/gnome-vfs_2.24.1.bb b/recipes/gnome/gnome-vfs_2.24.1.bb index 19104d479a..206e723796 100644 --- a/recipes/gnome/gnome-vfs_2.24.1.bb +++ b/recipes/gnome/gnome-vfs_2.24.1.bb @@ -13,7 +13,7 @@ SRC_URI += "file://gconftool-lossage.patch \ # This is to provide compatibility with the gnome-vfs DBus fork PROVIDES = "gnome-vfs-plugin-dbus" -RREPLACES = "gnome-vfs-dbus" +RREPLACES_${PN} = "gnome-vfs-dbus" EXTRA_OECONF = " \ --disable-openssl \ diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb index 1de7fba702..cdec5e5301 100644 --- a/recipes/gpe-icons/gpe-theme-neo_git.bb +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud