From 9e94c4e22a7598d8192337fa22f561f6cc603c6e Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 18 Aug 2011 06:22:13 +0000 Subject: [PATCH] Bump to 3.0.2, from gnome overlay for GNOME 3 Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- net-im/empathy/ChangeLog | 8 +- net-im/empathy/Manifest | 22 ++++-- net-im/empathy/empathy-3.0.2.ebuild | 112 ++++++++++++++++++++++++++++ net-im/empathy/metadata.xml | 35 +++++---- 4 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 net-im/empathy/empathy-3.0.2.ebuild diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog index 816a84b58ac6..8d88749ecf55 100644 --- a/net-im/empathy/ChangeLog +++ b/net-im/empathy/ChangeLog @@ -1,6 +1,12 @@ # 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.89 2011/08/06 11:35:50 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.90 2011/08/18 06:22:13 nirbheek Exp $ + +*empathy-3.0.2 (18 Aug 2011) + + 18 Aug 2011; Nirbheek Chauhan +empathy-3.0.2.ebuild, + metadata.xml: + Bump to 3.0.2, from gnome overlay for GNOME 3 06 Aug 2011; Zac Medico empathy-2.34.0-r1.ebuild: Add ~x86-linux keyword. diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest index 4b701d72b5c7..e01026ed2fef 100644 --- a/net-im/empathy/Manifest +++ b/net-im/empathy/Manifest @@ -5,14 +5,26 @@ AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af7 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 RMD160 97ea8bb28e5673baaca8d437158202d9b40019d1 SHA1 ab18d8759a46da7e34b0f2261c7c3b802688663a SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861 DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 +DIST empathy-3.0.2.tar.bz2 3319921 RMD160 52e8356b7d6e7aa21b72f0c3b217f8d85ec1d1f3 SHA1 593eb0db1a221fdd1466bb6ecc96e0f69d23d287 SHA256 8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2 EBUILD empathy-2.32.2.ebuild 3129 RMD160 432ea4a9ea354ff8c031a6e91b77f460f853f568 SHA1 02c8374d7368e1485f992df349441b316b12fcc9 SHA256 8c784893206ce642837dec44e29cfbbaa7ca6a57b55a65d847d02b5883fdbdad EBUILD empathy-2.34.0-r1.ebuild 3133 RMD160 bf5ee1044300b8bf62b7923e4b9a22dc6fa64d5f SHA1 1a16c403650342e09ad97581c44d6c9ee55955ab SHA256 99278f352cc03328909b0463719117d3d0979e111827c1266f5ca1d4527f55d7 -MISC ChangeLog 15314 RMD160 21307ca0b504e3dbb87dfde0a00fc0592e2d198e SHA1 24f9ae96bd6c49ea76c1137a43dd49f1c1426e5d SHA256 959ccd8d6e9f95a7b1ad189ddec7ddeadb92053023eacc2646a5330aa0804e9e -MISC metadata.xml 940 RMD160 4e41d99236e8d53fc36a72411432766f084ef526 SHA1 7b36c712b8f94fd2c2cca3133249bdbeea2d35b2 SHA256 88ab29a94d21a18761bba19eb92f07aac4f4577951b0153b71a78ea3db24a23f +EBUILD empathy-3.0.2.ebuild 3147 RMD160 eb64ad778aa75120fb9c467de8fd6d5417a0d774 SHA1 617d0289039b842425bdff2a4bd4676a35798fca SHA256 9a3dd7a0ba15f18002e2c7bc61fe41d691bf609814241488b3afbb06601902d5 +MISC ChangeLog 15487 RMD160 98a7fb11abf7f3268417cd856e45ef55fed1b358 SHA1 a29e336d5170429efb2f5972a5440ed57e14f566 SHA256 60adfc57cfceea51555888f35378d6118cac0a49c0b1ff4f7daa2f5e868e644e +MISC metadata.xml 1153 RMD160 f6baad498121aff0cc361fc11a9446469d701039 SHA1 bdb24dbb700b86545343c8448b83ec42243fe2c1 SHA256 ffaffc06bc4e5417d9c7c4a41db312506f1aa1a0d54501c7f776124817b08919 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk49Jx0ACgkQ/ejvha5XGaP11gCgy6VX6HGPjiW3FZGBNUkDclk5 -4i0AoIoC9WG5OcYTu/NApJJw8F/3sIyR -=SYtY +iQIcBAEBAgAGBQJOTK+bAAoJEO/kOhxWD91kGrwP/1rUNu4lzadTrYaoj5ZlIe76 +IYHWZi6Nhi2JYSiieMC487cak2AmyruVAaIP1UeO1GNc2msked1rCGuz2BbM6pi9 ++BfUQhH/QtRXkvK0toxzrTwTUfMRmI1kCyqEGY0cWJ3BubEb1DiI+jj7prjPKcpN +hWtrY6tNwhN5iVXMRBcMLODooU0XDvwB8ppAs+MRShMdmBQBGwc15rRmqAjkeuY2 +23nCa7gnfDfH//Wj4EIzJZbgXEsb91pPyfvA42lnF4HeaEYOvShX9dn+cu0BZHOm +qYQGgDF14/nvE5snCl2J3mGKTHYZp2ibgbbnLSqTbnzAL//UlXgpxs6WTAIHn7dP +awFYJl6l4fpcxXELPGgQgZ2KjnwusS82ZnAyh66OXJ/aX37GJ85xJ7TJFisgN2UB +7a/xNFLd/Ro4zKwPAr/3M4T2YVfhSf2swX5GkTQE1E8HtjH+YoAYAsccCIgEcJAy +4lfN0JiMMhd9mMifcVkH9IndSEh55Fj8RVnIOmHlrTiQAHDZUJWNd3lPJTSfYTX1 +fzHVYAqblKhUjVQogmuknLGBUeZfU6Ioxcs4TfSGyIZSilxWf/I2nOfmas2hHnGU +uJD8jKSBLKmWRJQe8gb+17J9eylpMz0OHFhx0XxPWXKcvL8EBIJNQ9fWLhnLw2jL +A+e9mj+bA9S2VJylEV7x +=x90U -----END PGP SIGNATURE----- diff --git a/net-im/empathy/empathy-3.0.2.ebuild b/net-im/empathy/empathy-3.0.2.ebuild new file mode 100644 index 000000000000..b6b9f86f100f --- /dev/null +++ b/net-im/empathy/empathy-3.0.2.ebuild @@ -0,0 +1,112 @@ +# 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-3.0.2.ebuild,v 1.1 2011/08/18 06:22:13 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="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="~amd64 ~x86 ~x86-linux" +# FIXME: Add location support once geoclue stops being idiotic with automagic deps +IUSE="debug eds +gnome +map +geoloc +networkmanager sendto spell test webkit" + +# FIXME: 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+-3.0.2:3 + >=dev-libs/dbus-glib-0.51 + >=net-libs/telepathy-glib-0.14.1 + >=media-libs/libcanberra-0.25[gtk3] + >=x11-libs/libnotify-0.7 + >=gnome-base/gnome-keyring-2.91.4-r300 + >=net-libs/gnutls-2.8.5 + >=dev-libs/folks-0.4 + + gnome-base/gsettings-desktop-schemas + net-libs/farsight2 + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 + media-libs/gst-plugins-bad + >=net-libs/telepathy-farsight-0.0.14 + dev-libs/libxml2:2 + x11-libs/libX11 + net-voip/telepathy-connection-managers + >=net-im/telepathy-logger-0.2.8 + + eds? ( >=gnome-extra/evolution-data-server-1.2 ) + geoloc? ( >=app-misc/geoclue-0.11 ) + gnome? ( >=gnome-base/gnome-control-center-3.0.0 ) + map? ( + media-libs/libchamplain:0.10[gtk] + media-libs/clutter-gtk:1.0 ) + networkmanager? ( >=net-misc/networkmanager-0.7 ) + sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) + spell? ( + >=app-text/enchant-1.2 + >=app-text/iso-codes-0.35 ) + webkit? ( >=net-libs/webkit-gtk-1.3.2:3 ) +" +# Will not build with gnome-control-center-3.1.4 due to removed headers, +# but should (probably) continue to run +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=app-text/gnome-doc-utils-0.17.3 + >=dev-util/intltool-0.35.0 + >=dev-util/pkgconfig-0.16 + gnome? ( =dev-libs/check-0.9.4 ) + dev-libs/libxslt +" +PDEPEND=">=net-im/telepathy-mission-control-5.7.6" + +pkg_setup() { + DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" + + # TODO: Re-add location support + G2CONF="${G2CONF} + --disable-coding-style-checks + --disable-schemas-compile + --disable-static + --disable-meego + --disable-Werror + $(use_enable debug) + $(use_with eds) + $(use_enable geoloc location) + $(use_enable gnome control-center-embedding) + $(use_enable map) + $(use_with networkmanager connectivity nm) + $(use_enable sendto nautilus-sendto) + $(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 tools +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + emake check || die "emake check failed." +} + +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 d79757bb6c01..8ea9ff10b13d 100644 --- a/net-im/empathy/metadata.xml +++ b/net-im/empathy/metadata.xml @@ -1,18 +1,25 @@ -net-im -gnome - - Enable world map support through media-libs/libchamplain. - Enable nautilus-sendto support - Build support for Adium-style HTML-based conversation - window themes using net-libs/webkit-gtk - - Empathy consists of a rich set of reusable instant messaging - widgets, and a GNOME client using those widgets. It uses Telepathy and Nokia's - Mission Control, and reuses Gossip's UI. The main goal is to permit desktop - integration by providing libempathy and libempathy-gtk libraries. - libempathy-gtk is a set of powerful widgets that can be embeded into any GNOME - application. A client application is provided. + net-im + gnome + + Enable geolocation support through + app-misc/geoclue + Enable world map support through + media-libs/libchamplain + Enable nautilus-sendto support + Enable support for sending files to various devices + using gnome-extra/nautilus-sendto + Build support for Adium-style HTML-based conversation + window themes using net-libs/webkit-gtk + + + Empathy consists of a rich set of reusable instant messaging widgets, + and a GNOME client using those widgets. It uses Telepathy and Nokia's + Mission Control. The main goal is to permit desktop integration by + providing libempathy and libempathy-gtk libraries. libempathy-gtk is a + set of powerful widgets that can be embeded into any GNOME application. + A client application is provided. + -- 2.26.2