merge of '3562d52be2dd03372ae3c01837858e920fe1b216'

     and 'd791da1ae7aaac6a51195013e3c686e0c5172ad3'

8 files changed, 39 insertions, 199 deletions

diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb
index d0465b4d53..0b17aa6cb8 100644
--- a/packages/angstrom/angstrom-feed-configs.bb
+++ b/packages/angstrom/angstrom-feed-configs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r4"
+PR = "r5"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
@@ -9,37 +9,32 @@ FEED_BASEPATH ?= "unstable/feed/"
 IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}"
 
 do_compile() {
-        mkdir -p ${S}/${sysconfdir}/ipkg
+        mkdir -p ${S}/${sysconfdir}/opkg
 	for feed in base debug perl python gstreamer ; do
-          echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/ipkg/${feed}-feed.conf
+          echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
 	done
 
-        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf
-	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf
+        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf
+	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/opkg/noarch-feed.conf
         
 	# iwmmxt is a special case, add the iwmmxt feed for machine that have 'iwmmxt' in MACHINE_FEATURES
         if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then
-	  echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/ipkg/iwmmxt-feed.conf
+	  echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/opkg/iwmmxt-feed.conf
 	fi  
 }
 
 
 do_install () {
-        install -d ${D}${sysconfdir}/ipkg
-	install -m 0644  ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/
-        # opkg compat symlinks
         install -d ${D}${sysconfdir}/opkg
-        for feed in ${D}${sysconfdir}/ipkg/* ; do
-           ln -sf ${sysconfdir}/ipkg/$(basename $feed) ${D}${sysconfdir}/opkg/$(basename $feed)
-        done
+	install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
 }
 
-CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \
-                    ${sysconfdir}/ipkg/debug-feed.conf \
-                    ${sysconfdir}/ipkg/perl-feed.conf \
-                    ${sysconfdir}/ipkg/python-feed.conf \
-                    ${sysconfdir}/ipkg/gstreamer-feed.conf \
-                    ${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf \
-                    ${sysconfdir}/ipkg/noarch-feed.conf \
+CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
+                    ${sysconfdir}/opkg/debug-feed.conf \
+                    ${sysconfdir}/opkg/perl-feed.conf \
+                    ${sysconfdir}/opkg/python-feed.conf \
+                    ${sysconfdir}/opkg/gstreamer-feed.conf \
+                    ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
+                    ${sysconfdir}/opkg/noarch-feed.conf \
                    "
 
diff --git a/packages/gnome/libbonobo_2.14.0.bb b/packages/gnome/libbonobo.inc
index 7b4cbb08e7..9f3642b80b 100644
--- a/packages/gnome/libbonobo_2.14.0.bb
+++ b/packages/gnome/libbonobo.inc
@@ -1,14 +1,14 @@
+DESCRIPTION = "Bonobo CORBA interfaces library"
 LICENSE = "GPL"
-PR = "r1"
 SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
+DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
 
 inherit gnome
 
-SRC_URI += "file://configure-gthread.patch;patch=1 \
-            file://gtk-doc.m4 \
-            file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
+SRC_URI += "file://gtk-doc.m4 \
+            file://gtk-doc.make \
+           "
+
 ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb
index 91e81f98ba..c48e7d0753 100644
--- a/packages/gnome/libbonobo_2.10.0.bb
+++ b/packages/gnome/libbonobo_2.10.0.bb
@@ -1,59 +1,3 @@
-LICENSE = "GPL"
-PR = "r1"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}.tar.bz2 \
-           file://gtk-doc.m4 \
-           file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+require libbonobo.inc
 
-FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
-	${libdir}/bonobo-2.0/samples"
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
-	              bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- 		      bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- 		      bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
-	          bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
-	          bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
-		  bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
-		  bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
-		  bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
-	          bonobo-property-bag-client.h bonobo-shlib-factory.h  bonobo-storage.h \
-		  bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
-	          bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
-		  bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
-	for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
-	install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
-	for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
-	install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
-	install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
+PR = "r2"
diff --git a/packages/gnome/libbonobo_2.22.0.bb b/packages/gnome/libbonobo_2.22.0.bb
new file mode 100644
index 0000000000..feecaf590a
--- /dev/null
+++ b/packages/gnome/libbonobo_2.22.0.bb
@@ -0,0 +1,6 @@
+require libbonobo.inc
+
+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 d08b6bafd1..c071f38afe 100644
--- a/packages/gnome/libbonobo_2.6.0.bb
+++ b/packages/gnome/libbonobo_2.6.0.bb
@@ -1,52 +1,3 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
-           file://gtk-doc.m4 \
-           file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+require libbonobo.inc
 
-inherit autotools pkgconfig
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
-	              bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- 		      bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- 		      bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
-	          bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
-	          bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
-		  bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
-		  bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
-		  bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
-	          bonobo-property-bag-client.h bonobo-shlib-factory.h  bonobo-storage.h \
-		  bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
-	          bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
-		  bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
-	for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
-	install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
-	for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
-	install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
-	install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
+PR = "r1"
diff --git a/packages/gnome/libbonobo_2.6.2.bb b/packages/gnome/libbonobo_2.6.2.bb
index 2eee5fd6d8..c48e7d0753 100644
--- a/packages/gnome/libbonobo_2.6.2.bb
+++ b/packages/gnome/libbonobo_2.6.2.bb
@@ -1,59 +1,3 @@
-LICENSE = "GPL"
-PR = "r1"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
-           file://gtk-doc.m4 \
-           file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+require libbonobo.inc
 
-FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
-	${libdir}/bonobo-2.0/samples"
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
-	              bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- 		      bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- 		      bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
-	          bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
-	          bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
-		  bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
-		  bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
-		  bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
-	          bonobo-property-bag-client.h bonobo-shlib-factory.h  bonobo-storage.h \
-		  bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
-	          bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
-		  bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
-	for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
-	install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
-	for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
-	install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
-	install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
+PR = "r2"
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 3c92712dff..2bce56492c 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
-DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native"
 
 inherit sdk meta
 
@@ -9,8 +9,8 @@ SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
-IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
-IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
+IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
+IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
 
 TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
 TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare"
@@ -40,8 +40,8 @@ do_populate_sdk() {
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/.debug/
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share
-	mv ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
-	rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/
+	mv ${SDK_OUTPUT}/temp-target/usr/lib/opkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/opkg/
 	cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
 	cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
 	if [ -d ${SDK_OUTPUT}/temp-target/usr/lib/.debug ]; then
@@ -69,7 +69,7 @@ do_populate_sdk() {
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
+	mv ${SDK_OUTPUT}/usr/lib/opkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
 	rm -Rf ${SDK_OUTPUT}/usr/lib
 
 	# extract and store ipks, pkgdata and shlibs data
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 15835508aa..0607f709e6 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r63"
+PR = "r65"
 
 inherit task