Meta: Recipe Reogranization

This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.

A number of recipes were modified since dependencies need to be
corrected.

Signed-off-by: Saul Wold <Saul.Wold@intel.com>

5 files changed, 137 insertions, 0 deletions

diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
new file mode 100644
index 0000000000..13e7943da5
--- /dev/null
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
@@ -0,0 +1,39 @@
+---
+ Makefile.am      |    2 +-
+ configure.ac     |    1 -
+ help/Makefile.am |    1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+--- empathy-0.23.4.orig/Makefile.am
++++ empathy-0.23.4/Makefile.am
+@@ -1,6 +1,6 @@
+-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
++SUBDIRS = tools extensions po data libempathy libempathy-gtk src
+ 
+ if HAVE_MEGAPHONE
+ SUBDIRS += megaphone
+ endif
+ 
+--- empathy-0.23.4.orig/configure.ac
++++ empathy-0.23.4/configure.ac
+@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL
+ AM_PROG_MKDIR_P
+ AM_PATH_GLIB_2_0
+ AC_PATH_XTRA
+ IT_PROG_INTLTOOL([0.35.0])
+ GTK_DOC_CHECK([1.3])
+-GNOME_DOC_INIT
+ IDT_COMPILE_WARNINGS
+ AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AM_GCONF_SOURCE_2
+ GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
+--- empathy-0.23.4.orig/help/Makefile.am
++++ empathy-0.23.4/help/Makefile.am
+@@ -1,6 +1,5 @@
+-include $(top_srcdir)/gnome-doc-utils.make
+ 
+ DOC_MODULE = empathy
+ DOC_ENTITIES = legal.xml
+ DOC_FIGURES = \
+ 	figures/empathy-main-window.png \
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
new file mode 100644
index 0000000000..2e07b19c16
--- /dev/null
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
@@ -0,0 +1,29 @@
+SUMMARY = "a Telepathy based IM client"
+DESCRIPTION = "Instant messaging program supporting text, voice, video, file \
+transfers and interapplication communication over many different protocols, \
+include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \
+Gadu-Gadu, Groupwise, ICQ and QQ."
+HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
+LICENSE = "GPL"
+DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
+RDEPENDS = "telepathy-mission-control"
+RRECOMMENDS = "telepathy-gabble"
+PR = "r2"
+
+inherit gnome
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+PACKAGES =+ "empathy-scrollkeeper-junk"
+FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
+
+FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
+        ${datadir}/dbus-1/services/*.service \
+        ${datadir}/telepathy/managers/*.chandler \
+	${datadir}/icons \
+	${libdir}/python*"
+
+FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
+
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
new file mode 100644
index 0000000000..3e8d10fe50
--- /dev/null
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Telepathy fasrsight"
+DESCRIPTION = "Glue library for telepathy media signalling and the media \
+streaming capabilities of Farsight2."
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
+LICENSE = "LGPLv2"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \
+"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-python"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
new file mode 100644
index 0000000000..9000cd41cc
--- /dev/null
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
@@ -0,0 +1,33 @@
+
+[ConnectionManager]
+BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
+ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
+
+[Protocol jabber]
+param-account=s required register
+param-password=s required register
+param-server=s
+param-resource=s
+param-priority=n
+param-port=q
+param-old-ssl=b
+param-register=b
+param-low-bandwidth=b
+param-https-proxy-server=s
+param-https-proxy-port=q
+param-fallback-conference-server=s
+param-stun-server=s
+param-stun-port=q
+param-ignore-ssl-errors=b
+param-alias=s
+param-mac=s
+param-btid=s
+default-resource=Telepathy
+default-priority=0
+default-port=5222
+default-old-ssl=false
+default-register=false
+default-low-bandwidth=false
+default-https-proxy-port=443
+default-stun-port=3478
+default-ignore-ssl-errors=false
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
new file mode 100644
index 0000000000..ff49418540
--- /dev/null
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Telepathy Jabber/XMPP connection manager"
+DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols."
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
+LICENSE = "LGPL"
+
+# gabble.manager needs to get regenerated every release, so please don't copy it over blindly
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \
+           file://gabble.manager"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+      cp ${WORKDIR}/gabble.manager ${S}/data/
+}
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"