[oe-commits] org.oe.dev merge of 'c1a6bbd234dac78ecd896a3addf55c41902cacde'

[oe commit]

merge of 'c1a6bbd234dac78ecd896a3addf55c41902cacde'
     and 'e5d7ecec88debbf03a577850945143877b777c6a'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a65d192be1ce4202dcc0e3a9bb8d657210921ffe
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a65d192be1ce4202dcc0e3a9bb8d657210921ffe
Files:
1
packages/geoclue/geoclue_git.bb
classes/distutils.bbclass
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-emotion_cvs.bb
packages/python/python-evas_cvs.bb
Diffs:

#
# mt diff -rc1a6bbd234dac78ecd896a3addf55c41902cacde -ra65d192be1ce4202dcc0e3a9bb8d657210921ffe
#
# 
# 
# patch "packages/geoclue/geoclue_git.bb"
#  from [c5a3d2adf2b42eac3d326986a0d339213f41376e]
#    to [41a9cfe777c671fde4cfbf21bc73e65fffa0fb5a]
# 
============================================================
--- packages/geoclue/geoclue_git.bb	c5a3d2adf2b42eac3d326986a0d339213f41376e
+++ packages/geoclue/geoclue_git.bb	41a9cfe777c671fde4cfbf21bc73e65fffa0fb5a
@@ -1,10 +1,10 @@ PV = "0.0+git${SRCDATE}"
 DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application"
 HOMEPAGE = "http://live.gnome.org/GeoClue"
 
 DEPENDS = "libgpsmgr libgpsbt  gtk+ gpsd libxml2 gconf-dbus libsoup dbus-glib"
 
 PV = "0.0+git${SRCDATE}"
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 inherit autotools pkgconfig
@@ -16,7 +16,9 @@ LDFLAGS_append = " -lgthread-2.0 "
 
 LDFLAGS_append = " -lgthread-2.0 "
 
-EXTRA_OECONF = " --enable-applet=no "
+EXTRA_OECONF = " --enable-applet=no \
+                 --enable-gpsd \
+		 --enable-system-bus"
 
 do_install_append() {
 	mkdir -p ${D}/usr/share/


#
# mt diff -re5d7ecec88debbf03a577850945143877b777c6a -ra65d192be1ce4202dcc0e3a9bb8d657210921ffe
#
# 
# 
# patch "classes/distutils.bbclass"
#  from [b5fdf6a8a6b47377bbad57ef7d345783624e42be]
#    to [b9234bdc78eb218048032cb9c9a74cc125e1f7b0]
# 
# patch "packages/python/python-ecore_cvs.bb"
#  from [fe5b297e24b83dbf229b9b82e7dae5b298db6094]
#    to [8ae4047c69093053f4e143c210798f9df1ea20db]
# 
# patch "packages/python/python-edje_cvs.bb"
#  from [4341cf49e754ab2ea5a3da52a700d149d15bd85f]
#    to [4b7900f727ff503609272277e678a3a40f185bc1]
# 
# patch "packages/python/python-emotion_cvs.bb"
#  from [4ee831c347e68f89c519dce59308aca8cbb8015f]
#    to [030fd4a928e8e5fbe149bc2dce2976c52fe7ff85]
# 
# patch "packages/python/python-evas_cvs.bb"
#  from [95ca09f432a324ad0b1751de0270eb7d943c51b6]
#    to [bb7b8c9bb13d246c9bb4f67239195ed7596be3e9]
# 
============================================================
--- classes/distutils.bbclass	b5fdf6a8a6b47377bbad57ef7d345783624e42be
+++ classes/distutils.bbclass	b9234bdc78eb218048032cb9c9a74cc125e1f7b0
@@ -42,6 +42,7 @@ distutils_do_install() {
             done
         fi
 
+	rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
 }
 
 EXPORT_FUNCTIONS do_compile do_install
============================================================
--- packages/python/python-ecore_cvs.bb	fe5b297e24b83dbf229b9b82e7dae5b298db6094
+++ packages/python/python-ecore_cvs.bb	8ae4047c69093053f4e143c210798f9df1ea20db
@@ -1,3 +1,5 @@ require python-efl.inc
 require python-efl.inc
+DEPENDS += "ecore"
 
+PR = "r1"
+
-DEPENDS += "ecore"
============================================================
--- packages/python/python-edje_cvs.bb	4341cf49e754ab2ea5a3da52a700d149d15bd85f
+++ packages/python/python-edje_cvs.bb	4b7900f727ff503609272277e678a3a40f185bc1
@@ -1,4 +1,5 @@ require python-efl.inc
 require python-efl.inc
+DEPENDS += "edje python-evas"
 
-DEPENDS += "edje python-evas"
+PR = "r1"
 
============================================================
--- packages/python/python-emotion_cvs.bb	4ee831c347e68f89c519dce59308aca8cbb8015f
+++ packages/python/python-emotion_cvs.bb	030fd4a928e8e5fbe149bc2dce2976c52fe7ff85
@@ -1,4 +1,4 @@ require python-efl.inc
 require python-efl.inc
-
 DEPENDS += "emotion python-evas"
 
+PR = "r1"
============================================================
--- packages/python/python-evas_cvs.bb	95ca09f432a324ad0b1751de0270eb7d943c51b6
+++ packages/python/python-evas_cvs.bb	bb7b8c9bb13d246c9bb4f67239195ed7596be3e9
@@ -1,6 +1,7 @@ require python-efl.inc
 require python-efl.inc
+DEPENDS += "evas"
 
-DEPENDS += "evas"
+PR = "r1"
 
 do_stage() {
 	distutils_stage_all