bump empathy and friends

12 files changed, 235 insertions, 5 deletions

diff --git a/RELEASE-NEEDED b/RELEASE-NEEDED
index 78d1933c..7aa44065 100644
--- a/RELEASE-NEEDED
+++ b/RELEASE-NEEDED
@@ -1,3 +1 @@
 gnome-screensaver
-#temp patches
-clutter-gtk
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
new file mode 100644
index 00000000..b422c74a
--- /dev/null
+++ b/dev-libs/folks/Manifest
@@ -0,0 +1,2 @@
+EBUILD folks-0.3.1.ebuild 972 RMD160 ef8315cbd659f3327da5dd1febeba7feebb53fba SHA1 086f8e12aefe8ed4d5f3f51844164492ab6bfcb7 SHA256 fcb4f0e0940e036360024ae9828e4a854e7dc16e1da113a0c5b560daf80eb24a
+DIST folks-0.3.1.tar.bz2 475048 RMD160 122e67d68d1a75b9559c2778bf1a890eeaaa4087 SHA1 4e9c69aa0799dd2724bd680fa9a4f5e8aec00cce SHA256 d40dbfcb3552a81e8f310d2a2e84cc867b9f5b1d8061c269c55af2fa396870a3
diff --git a/dev-libs/folks/folks-0.3.1.ebuild b/dev-libs/folks/folks-0.3.1.ebuild
new file mode 100644
index 00000000..69d8542a
--- /dev/null
+++ b/dev-libs/folks/folks-0.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit gnome2
+
+DESCRIPTION="libfolks is a library that aggregates people from multiple sources"
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/Folks"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	>=net-libs/telepathy-glib-0.11.16[vala]
+	dev-libs/dbus-glib
+	<dev-libs/libgee-0.7
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.21
+	dev-lang/vala:0.10[vapigen]
+	>=dev-libs/gobject-introspection-0.9.6
+"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		VALAC=$(type -p valac-0.10)
+		VAPIGEN=$(type -p vapigen-0.10)
+		$(use_enable doc docs)
+		--enable-import-tool
+		--disable-Werror"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	sed 's/tests//' -i Makefile.am Makefile.in || die "sed failed"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+}
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
new file mode 100644
index 00000000..790114c1
--- /dev/null
+++ b/gnome-base/gnome-keyring/Manifest
@@ -0,0 +1,2 @@
+EBUILD gnome-keyring-2.91.1.ebuild 1325 RMD160 49a89e12489f4133d08c570fed308f8a742594f6 SHA1 93ede5975058bbd0b08ed40ef78ab8971ece1ac3 SHA256 794f47cf11b242fa0792afca54e39622c898ef0ef38ec5c969708712bfff49ec
+DIST gnome-keyring-2.91.1.tar.bz2 1702769 RMD160 b63a2d7a182ed3ff5c8208112dde6f14c3819a58 SHA1 a77bc18fcbe8ef96497361b3a31115c152f35133 SHA256 32ce27fe7692ba2bb9f32ab27b7881d5e8e79c05793e77315da0e03737f315e6
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.91.1.ebuild
new file mode 100644
index 00000000..c4ee6706
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.91.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit gnome2 pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc pam test"
+
+RDEPEND=">=dev-libs/glib-2.25.0
+	>=x11-libs/gtk+-2.91.1
+	gnome-base/gconf
+	>=sys-apps/dbus-1.0
+	pam? ( virtual/pam )
+	>=dev-libs/libgcrypt-1.2.2
+	>=dev-libs/libtasn1-1"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND="gnome-base/libgnome-keyring"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=/usr/share/ca-certificates/
+		--enable-acl-prompts
+		--enable-ssh-agent
+		--enable-gpg-agent
+		--with-gtk=3.0"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+		-i configure.in configure || die "sed failed"
+
+	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
+		-i configure.in configure || die "sed 2 failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "emake check failed!"
+}
diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest
index c84d771f..528cfe9f 100644
--- a/media-libs/clutter-gtk/Manifest
+++ b/media-libs/clutter-gtk/Manifest
@@ -1,3 +1,5 @@
 EBUILD clutter-gtk-0.10.8-r1.ebuild 977 RMD160 53cd214bcc87ac83c823455a51249df6f44fb215 SHA1 87758df4d7896437048cb4ee1c38deb38f6efc74 SHA256 b0a8995dd3f0f4d74e53e19da49314cc1ae1386be261dfb6f226913dee6eac8e
+EBUILD clutter-gtk-0.91.2.ebuild 663 RMD160 52f3cb8a695ab163fe75bea05b3f4b523bcbf821 SHA1 597347f6d2d42547f4e80ea30d5b31d94e393c11 SHA256 51007b97a9541f0ba539f0dcf6981cce1099abbf8c0e5ff1e4e8f4726560a13d
 AUX fix-introspection.patch 681 RMD160 54a5b7de513fdb9f93fd52ea2bb974a36497ed32 SHA1 5dd7273d93b90de1326b2dfb9d2d0d507ffacf5f SHA256 11b0ea2de6df050dbf569ead9f01c7ce5cfc88e1778f70e4095ac6c4bed80411
+DIST clutter-gtk-0.91.2.tar.bz2 338775 RMD160 e08eca7df7bc8db9fc51055d2722b8012f013a99 SHA1 6d408b76aec0a437945f9eef252ab6ebe999bcaf SHA256 ed1bf70934d5e6c7cf3f375661b6def0e70c22faad71be9a20c17d60f36012a0
 DIST clutter-gtk-0.10.8.tar.bz2 321316 RMD160 50050df319824b4966b145a368f5af2657460350 SHA1 783b7fa0e826a18ed22d4c2723ba83c740c3a8fa SHA256 7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.91.2.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.91.2.ebuild
new file mode 100644
index 00000000..c47b514c
--- /dev/null
+++ b/media-libs/clutter-gtk/clutter-gtk-0.91.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit gnome2 clutter
+
+DESCRIPTION="Clutter-GTK - GTK+ Integration library for Clutter"
+
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples +introspection"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.91.1:3[introspection?]
+	>=media-libs/clutter-1.2:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.14 )"
+EXAMPLES="examples/{*.c,redhand.png}"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-flavour=x11
+		--enable-maintainer-flags=no
+		$(use_enable introspection)"
+}
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index c32764a2..1cb9f81d 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,5 @@
 EBUILD empathy-2.32.0.1-r1.ebuild 2279 RMD160 bf01cf169c0dc67130de324e75f6bb4b94ced125 SHA1 dec93f84e553fe9656e219923a0fb347b04c22d2 SHA256 6a7383a09bbdc1bbcb82af11ec9b04c6eba9acb3d894b8322a1c55b56180c6fc
+EBUILD empathy-2.91.1.ebuild 2311 RMD160 dbdb2a1dd909852f4805243d1cc8003ff8e5ed86 SHA1 a62b8af301d62316b79612a7afc9c194acd5399c SHA256 c1fc9369e035b4f5717828bb50beecbdfac21042e7c1be376785d6c730823a38
 AUX allow-champlain-0.6.patch 682 RMD160 e88cc16b4bc42547d2b516e1ea6516482ea6dc31 SHA1 e5f5f664d14e7e48c2a959efd770ea1140f818f4 SHA256 255e767ddc963161e495f1621c038694138dab93e2f649a90193cfb1fa8ac981
+DIST empathy-2.91.1.tar.bz2 2976620 RMD160 4bae2f59b1cb748a214ebb887f45f22d28419905 SHA1 573776e3633389bb26ac359cd6ffad9997ae4fff SHA256 ea0f1cfbc9bccf7fe694ffca690f89532acb70020cf49abdc1f9ce99706182b2
 DIST empathy-2.32.0.1.tar.bz2 2916929 RMD160 407c36b94d7e722413066a729d6555d8ee0b798a SHA1 2d37cbb2b5bec7b22b9b840585a13ccc22a9251d SHA256 df92bfb65a5eec73488ad95180c6ce6baf979292df197bcbb20de79f54a5c90c
diff --git a/net-im/empathy/empathy-2.91.1.ebuild b/net-im/empathy/empathy-2.91.1.ebuild
new file mode 100644
index 00000000..c3bd0ffa
--- /dev/null
+++ b/net-im/empathy/empathy-2.91.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+PYTHON_DEPEND="2:2.4"
+inherit gnome2 multilib python
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eds map nautilus networkmanager spell test webkit" #webkit needs webkit-gtk3
+
+RDEPEND=">=dev-libs/glib-2.25.9:2
+	>=x11-libs/gtk+-2.91.1:3
+	>=dev-libs/dbus-glib-0.51
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	>=net-libs/telepathy-glib-0.13.2
+	>=media-libs/libcanberra-0.4[gtk]
+	>=x11-libs/libnotify-0.4.4
+	>=gnome-base/gnome-keyring-2.91.1
+	>=net-libs/gnutls-2.8.5
+	>=dev-libs/folks-0.3.1
+
+	net-libs/farsight2
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	>=net-libs/telepathy-farsight-0.0.14
+	dev-libs/libxml2
+	x11-libs/libX11
+	net-voip/telepathy-connection-managers
+	>=net-im/telepathy-logger-0.1.5
+
+	map? (
+		>=media-libs/clutter-gtk-0.10:1.0 
+		>=gnome-extra/geoclue-0.11.1 )
+	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35 )"
+#	>=media-libs/libchamplain-0.7.1[gtk] need gtk3
+#	webkit? ( >=net-libs/webkit-gtk-1.1.15 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.17.3
+	>=dev-util/intltool-0.35.0
+	>=dev-util/pkgconfig-0.16
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
+	dev-libs/libxslt
+"
+PDEPEND=">=net-im/telepathy-mission-control-5"
+
+DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-static
+		--disable-Werror
+		--disable-gtk3
+		$(use_enable debug)
+		$(use_with eds)
+		$(use_enable map location)
+		$(use_enable nautilus nautilus-sendto)
+		$(use_with networkmanager connectivity nm)
+		$(use_enable spell)
+		$(use_enable test coding-style-checks)
+		$(use_enable webkit)"
+		#$(use_enable map) needs champlain-gtk3
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "emake check failed."
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	echo
+	elog "Empathy needs telepathy's connection managers to use any IM protocol."
+	elog "See the USE flags on net-voip/telepathy-connection-managers"
+	elog "to install them."
+}
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index a95ebe71..91fba366 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,2 +1,2 @@
-EBUILD telepathy-glib-0.13.1-r1.ebuild 1150 RMD160 ee641835e1483b61b5cd56fb91657b3ae0feab6e SHA1 b71296f817e0c08a21131ecb3bc90bcc844b423b SHA256 86429c583ccf2626008e1b237d9576e3b00ba95dff79fc6001fbde043a94d591
-DIST telepathy-glib-0.13.1.tar.gz 2673395 RMD160 0eaee74e8cff4a1795ee1ee399c6df90830b5744 SHA1 4285964a7b8de3c3f6a179d94c8cfdaf94ce7dc4 SHA256 29ff30175109364f397636b3f7c6dc33ca9a225f6938de6b7c13599bd89c7f0c
+EBUILD telepathy-glib-0.13.2.ebuild 1150 RMD160 ee641835e1483b61b5cd56fb91657b3ae0feab6e SHA1 b71296f817e0c08a21131ecb3bc90bcc844b423b SHA256 86429c583ccf2626008e1b237d9576e3b00ba95dff79fc6001fbde043a94d591
+DIST telepathy-glib-0.13.2.tar.gz 2744012 RMD160 20ce30dae2a2ac2dd5fa7e962601b45e3f6a2792 SHA1 cf514c314d7893e0b0fe596a5372d605c50d2be7 SHA256 79c22885391c14af16c25f0ec5f0aa7ac92cd4522712b352e625cb64bd4413c8
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.13.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.13.2.ebuild
index b7b02fb3..b7b02fb3 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.13.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.13.2.ebuild
diff --git a/profiles/package.mask b/profiles/package.mask
index bc9f0aa1..31e07d6a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -18,14 +18,17 @@
 
 # Mask Gnome 2.9x
 =app-editors/gedit-2.91*
+=dev-libs/folks-0.3*
 =dev-libs/gjs-0.7*
 =dev-libs/glib-2.27*
 =gnome-base/gnome-control-center-2.91*
 =gnome-base/gnome-desktop-2.91*
+=gnome-base/gnome-keyring-2.91*
 =gnome-base/gnome-settings-daemon-2.91*
 =gnome-base/gnome-shell-2.91*
 =gnome-base/libgnomekbd-2.91*
-=net-libs/folks-0.3.0
+=media-libs/clutter-gtk-0.91*
+=net-im/emapthy-2.91*
 =x11-libs/gtksourceview-2.91*
 =x11-libs/libnotify-0.7*
 =x11-themes/gtk-engines-2.91*