Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-02-27 17:28:32 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2011-02-27 17:28:32 +0000
commit22df36ddc31fa00a045e0b47eff32726284e1673 (patch)
tree1f3a7a8754b19191efda290de6fa17c6d33e11df /net-im
parentMask for net-im/empathy-2.33 and related. (diff)
downloadhistorical-22df36ddc31fa00a045e0b47eff32726284e1673.tar.gz
historical-22df36ddc31fa00a045e0b47eff32726284e1673.tar.bz2
historical-22df36ddc31fa00a045e0b47eff32726284e1673.zip
Add <folks-0.3 blocker for empathy-2.32. Bump to 2.33.2, uses new telepathy-logger and folks APIs.
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'net-im')
-rw-r--r--net-im/empathy/ChangeLog9
-rw-r--r--net-im/empathy/Manifest14
-rw-r--r--net-im/empathy/empathy-2.32.2.ebuild3
-rw-r--r--net-im/empathy/empathy-2.33.2.ebuild114
-rw-r--r--net-im/empathy/metadata.xml1
5 files changed, 133 insertions, 8 deletions
diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 8278cc9c084c..fe6f1d337254 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-im/empathy
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.76 2011/02/27 15:16:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.77 2011/02/27 17:28:32 eva Exp $
+
+*empathy-2.33.2 (27 Feb 2011)
+
+ 27 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> empathy-2.32.2.ebuild,
+ +empathy-2.33.2.ebuild, metadata.xml:
+ Add <folks-0.3 blocker for empathy-2.32. Bump to 2.33.2, uses new
+ telepathy-logger and folks APIs.
27 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> empathy-2.32.2.ebuild:
Pin libunique dependency to slot 1.
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index b8dd98fa55ae..0b031f073539 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -5,15 +5,17 @@ AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af7
DIST empathy-2.30.2.tar.bz2 2644286 RMD160 891f1b60b0b5087ef3e6f106676af1728aa4be18 SHA1 de8776cdbceb3895392dee467437e76f893c9194 SHA256 e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
DIST empathy-2.30.3.tar.bz2 2655910 RMD160 57d558c81b166b8e008ee236a258d592b3ac50a3 SHA1 1a438198469f623e7051a521ef2590f0da518075 SHA256 5965434fcc05f7ec3cd32d9128b03ac20e96624b0035d329abf72decd70c5def
DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
+DIST empathy-2.33.2.tar.bz2 3337406 RMD160 4f6b18d2999dc94602c1e4d38e2f918d948694ea SHA1 ae9f383c835cbc3995ab0944dddd64b21aaee1cc SHA256 55e359c6494a235079f8d0ecddb1e587c7d87989b8a7c7c4f75f4f38caf8c6d8
EBUILD empathy-2.30.2.ebuild 2655 RMD160 977a87b986f52a45892d73476314d303fa02470b SHA1 de6ba955e818fb233d92b1cf563fec6997a1a80a SHA256 6407e253f7c41141a559e9686c3fcf4c310dccd56f39b414e66ea9796ad1ded5
EBUILD empathy-2.30.3.ebuild 2848 RMD160 4a0cf916927ca27fddfc08b723ec6bc3689ae9a5 SHA1 6397d0db295f09cb7b450ff7bb78284da0e7bde1 SHA256 874ac230a937d553585b4b9f20f7eae1b2da46793fea8999e4d7df4cc9617df6
-EBUILD empathy-2.32.2.ebuild 3098 RMD160 5cc2ab449c3fe1bd148141a640b671d4d3e3ecf8 SHA1 25a5ee51c49e41ab759033cf14d56f5241378c08 SHA256 529e03a673c0f054bf14e3ba33f158876cd9504d4d7e99bc56355ac3d01239ea
-MISC ChangeLog 13422 RMD160 2e59d7abbd9092000b23da669f8e7380616ab029 SHA1 b9c5d9d21a8fa64f8cb9e775ff9d6dbe98d20a2f SHA256 164c222001cd984a2114943ec86f6c4ab3bc2b9d50b7337f5889835f1558fc2e
-MISC metadata.xml 845 RMD160 a67a7d4b8af2591502b6e4fedc35315cd0669432 SHA1 c81013e764ce5b611f337c9d6dd2607ff3253de5 SHA256 face01aab7819b2c771273d38a34c7d1cf2a4f74f752c0a6c3ff56f5ed2e33b9
+EBUILD empathy-2.32.2.ebuild 3119 RMD160 bbfc2020480e1fe213124cf8b9c7e21f2b3f2e77 SHA1 4644b4437ab14e62fd856fc0264a2d5fe11c48d2 SHA256 1d1c7f4f7fb7d437b8c6cac661fe5df9b4620ec44bb669b6f3f164a3f5e7040d
+EBUILD empathy-2.33.2.ebuild 3065 RMD160 1611576e7a934060e75a314226fb37d11134df55 SHA1 c4d372f7e2730e8331f744a4e9ef52a97b48ce18 SHA256 8f005cd463e7bb3dad4b46a8df2291d4e57fda1259da8c7e9f66447b3b01385c
+MISC ChangeLog 13674 RMD160 b7010cad0f84d5622029358e373dc3eb931ed934 SHA1 5d542f6933828c60f7b3691c93037eccc59df971 SHA256 3b2c67e14cd85023c67940a4206059eeb1029ea45c1d97444fc3ddb42e370d5f
+MISC metadata.xml 940 RMD160 4e41d99236e8d53fc36a72411432766f084ef526 SHA1 7b36c712b8f94fd2c2cca3133249bdbeea2d35b2 SHA256 88ab29a94d21a18761bba19eb92f07aac4f4577951b0153b71a78ea3db24a23f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1qatEACgkQ1fmVwcYIWAYASQCgm2jz6+g7Y6ru8+yv1qCprOhD
-6WkAn1eVuAZ+ITRwvLHFdN6i6RxLgzqv
-=wt97
+iEYEARECAAYFAk1qicYACgkQ1fmVwcYIWAZGqACg05mlsXwvp4sj8nHsGKGA6cOt
+yscAoNHC/f8Oe7IpJEQnrszl5l9iWuLm
+=r93Y
-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild
index b8aa5260cc1f..3872df47e32f 100644
--- a/net-im/empathy/empathy-2.32.2.ebuild
+++ b/net-im/empathy/empathy-2.32.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.10 2011/02/27 15:16:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.11 2011/02/27 17:28:32 eva Exp $
EAPI="3"
GCONF_DEBUG="yes"
@@ -29,6 +29,7 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
>=gnome-base/gnome-keyring-2.26
>=net-libs/gnutls-2.8.5
>=dev-libs/folks-0.1.15
+ <dev-libs/folks-0.3
>=dev-libs/libunique-1.1.6:1
net-libs/farsight2
diff --git a/net-im/empathy/empathy-2.33.2.ebuild b/net-im/empathy/empathy-2.33.2.ebuild
new file mode 100644
index 000000000000..36d9efec0258
--- /dev/null
+++ b/net-im/empathy/empathy-2.33.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild,v 1.1 2011/02/27 17:28:32 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2:2.4"
+
+inherit eutils gnome2 multilib python
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="eds map nautilus networkmanager spell test webkit"
+
+# FIXME: libnotify & libcanberra hard deps
+# gst-plugins-bad is required for the valve plugin. This should move to good
+# eventually at which point the dep can be dropped
+RDEPEND=">=dev-libs/glib-2.27.2:2
+ >=x11-libs/gtk+-2.22:2
+ >=dev-libs/dbus-glib-0.51
+ >=net-libs/telepathy-glib-0.13.12
+ >=media-libs/libcanberra-0.4[gtk]
+ >=x11-libs/libnotify-0.7
+ >=gnome-base/gnome-keyring-2.26
+ >=net-libs/gnutls-2.8.5
+ >=dev-libs/folks-0.3.5
+
+ >=dev-libs/libunique-1.1.6:1
+ net-libs/farsight2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10
+ media-libs/gst-plugins-bad
+ media-plugins/gst-plugins-gconf
+ >=net-libs/telepathy-farsight-0.0.14
+ dev-libs/libxml2
+ x11-libs/libX11
+ net-voip/telepathy-connection-managers
+ >=net-im/telepathy-logger-0.2.0
+
+ eds? ( >=gnome-extra/evolution-data-server-1.2 )
+ map? (
+ >=media-libs/libchamplain-0.7.1:0.8[gtk]
+ >=media-libs/clutter-gtk-0.10:0.10 )
+ 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 )
+ 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"
+
+pkg_setup() {
+ DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+
+ # call support needs unreleased telepathy-farstream
+ G2CONF="${G2CONF}
+ --enable-silent-rules
+ --disable-coding-style-checks
+ --disable-schemas-compile
+ --disable-static
+ --disable-call
+ --disable-location
+ --disable-control-center-embedding
+ --disable-Werror
+ $(use_enable debug)
+ $(use_with eds)
+ $(use_enable map)
+ $(use_enable nautilus nautilus-sendto)
+ $(use_with networkmanager connectivity nm)
+ $(use_enable spell)
+ $(use_enable webkit)"
+
+ # Build time python tools needs python2
+ python_set_active_version 2
+}
+
+src_prepare() {
+ gnome2_src_prepare
+ python_convert_shebangs -r 2 .
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ emake check || die "emake check failed."
+}
+
+src_install() {
+ gnome2_pkg_postinst
+ # nautilus-sendto plugin doesn't need this
+ find "${ED}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ 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-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 58ab9e78ec84..d79757bb6c01 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -4,6 +4,7 @@
<herd>net-im</herd>
<herd>gnome</herd>
<use>
+ <flag name="map">Enable world map support through <pkg>media-libs/libchamplain</pkg>.</flag>
<flag name="nautilus">Enable nautilus-sendto support</flag>
<flag name="webkit">Build support for Adium-style HTML-based conversation
window themes using <pkg>net-libs/webkit-gtk</pkg></flag>