From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NliVQ-0005w7-7E for garchives@archives.gentoo.org; Sun, 28 Feb 2010 12:44:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7CDBE089A; Sun, 28 Feb 2010 12:44:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7CC9CE089A for ; Sun, 28 Feb 2010 12:44:19 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 20E621B418B for ; Sun, 28 Feb 2010 12:44:19 +0000 (UTC) Received: from nirbheek by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NliVO-0001Ju-Lv for gentoo-commits@lists.gentoo.org; Sun, 28 Feb 2010 12:44:18 +0000 From: "Nirbheek Chauhan (nirbheek)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nirbheek@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-im/empathy: empathy-2.28.2.ebuild ChangeLog empathy-2.28.2-r1.ebuild empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: empathy-2.28.2.ebuild ChangeLog empathy-2.28.2-r1.ebuild empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild X-VCS-Directories: net-im/empathy X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan Content-Type: text/plain; charset=utf8 Message-Id: Sender: Nirbheek Chauhan Date: Sun, 28 Feb 2010 12:44:18 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e76ee173-c223-493f-9c49-6fb519feb969 X-Archives-Hash: 5a2d79b5c2870999a408ffbad3edb2c0 nirbheek 10/02/28 12:44:18 Modified: empathy-2.28.2.ebuild ChangeLog Added: empathy-2.28.2-r1.ebuild Removed: empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild Log: Add patch to fix compilation with networkmanager-0.8 (causes dropping o= f keywords, bug 296548), fixes bug 306977 . Also remove old versions. (Portage version: 2.1.7.17/cvs/Linux i686) Revision Changes Path 1.4 net-im/empathy/empathy-2.28.2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/emp= athy-2.28.2.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/emp= athy-2.28.2.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/emp= athy-2.28.2.ebuild?r1=3D1.3&r2=3D1.4 Index: empathy-2.28.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- empathy-2.28.2.ebuild 19 Feb 2010 19:33:27 -0000 1.3 +++ empathy-2.28.2.ebuild 28 Feb 2010 12:44:17 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,= v 1.3 2010/02/19 19:33:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,= v 1.4 2010/02/28 12:44:17 nirbheek Exp $ =20 EAPI=3D"2" =20 @@ -36,7 +36,7 @@ net-voip/telepathy-connection-managers =20 applet? ( >=3Dgnome-base/gnome-panel-2.10 ) - networkmanager? ( >=3Dnet-misc/networkmanager-0.7 ) + networkmanager? ( =3Dnet-misc/networkmanager-0.7* ) python? ( >=3Ddev-lang/python-2.4.4-r5 >=3Ddev-python/pygtk-2 ) 1.51 net-im/empathy/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/Cha= ngeLog?rev=3D1.51&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/Cha= ngeLog?rev=3D1.51&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/Cha= ngeLog?r1=3D1.50&r2=3D1.51 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChangeLog 19 Feb 2010 19:33:27 -0000 1.50 +++ ChangeLog 28 Feb 2010 12:44:17 -0000 1.51 @@ -1,6 +1,15 @@ # ChangeLog for net-im/empathy # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.50 2010/= 02/19 19:33:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.51 2010/= 02/28 12:44:17 nirbheek Exp $ + +*empathy-2.28.2-r1 (28 Feb 2010) + + 28 Feb 2010; Nirbheek Chauhan + +files/empathy-2.28-networkmanager-0.8.patch, -empathy-2.28.1.1.ebuild= , + -empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild, + +empathy-2.28.2-r1.ebuild: + Add patch to fix compilation with networkmanager-0.8, fixes bug 306977= . + also remove old versions. =20 19 Feb 2010; Ra=C3=BAl Porcel empathy-2.26.2.ebui= ld, empathy-2.28.1.1.ebuild, empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuil= d: 1.1 net-im/empathy/empathy-2.28.2-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/emp= athy-2.28.2-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/emp= athy-2.28.2-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: empathy-2.28.2-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuil= d,v 1.1 2010/02/28 12:44:17 nirbheek Exp $ EAPI=3D"2" inherit autotools eutils gnome2 multilib DESCRIPTION=3D"Telepathy client and library using GTK+" HOMEPAGE=3D"http://live.gnome.org/Empathy" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" # FIXME: Add location support once geoclue stops being idiotic with autom= agic deps IUSE=3D"applet networkmanager python spell test webkit" # map # FIXME: libnotify & libcanberra hard deps RDEPEND=3D">=3Ddev-libs/glib-2.16.0 >=3Dx11-libs/gtk+-2.16.0 >=3Dgnome-base/gconf-2 >=3Ddev-libs/dbus-glib-0.51 >=3Dgnome-extra/evolution-data-server-1.2 >=3Dnet-libs/telepathy-glib-0.7.35 >=3Dmedia-libs/libcanberra-0.4[gtk] >=3Dx11-libs/libnotify-0.4.4 >=3Dgnome-base/gnome-keyring-2.22 dev-libs/libunique net-libs/farsight2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 net-libs/telepathy-farsight dev-libs/libxml2 x11-libs/libX11 net-voip/telepathy-connection-managers applet? ( >=3Dgnome-base/gnome-panel-2.10 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.8 ) python? ( >=3Ddev-lang/python-2.4.4-r5 >=3Ddev-python/pygtk-2 ) spell? ( app-text/enchant app-text/iso-codes ) webkit? ( >=3Dnet-libs/webkit-gtk-1.1.7 ) " # map? ( # >=3Dmedia-libs/libchamplain-0.4[gtk] # >=3Dmedia-libs/clutter-gtk-0.10:1.0 ) DEPEND=3D"${RDEPEND} app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.17.3 >=3Ddev-util/intltool-0.35.0 >=3Ddev-util/pkgconfig-0.16 test? ( sys-apps/grep >=3Ddev-libs/check-0.9.4 ) dev-libs/libxslt virtual/python " PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5" DOCS=3D"CONTRIBUTORS AUTHORS ChangeLog NEWS README" # FIXME: Highly broken with parallel make, mallard strike 2, see bug #286= 889 MAKEOPTS=3D"${MAKEOPTS} -j1" pkg_setup() { G2CONF=3D"${G2CONF} --disable-maintainer-mode --disable-static --disable-location --disable-gtk-doc --disable-map $(use_enable applet megaphone) $(use_enable applet nothere) $(use_enable debug) $(use_with networkmanager connectivity nm) $(use_enable python) $(use_enable spell) $(use_enable test coding-style-checks) $(use_enable webkit) " } src_prepare() { gnome2_src_prepare epatch "${FILESDIR}/empathy-2.28-networkmanager-0.8.patch" eautoreconf # Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687 sed -i "s:-Werror::g" configure || die "sed 1 failed" } src_test() { unset DBUS_SESSION_BUS_ADDRESS emake check || die "emake check failed." } pkg_preinst() { gnome2_pkg_preinst preserve_old_lib /usr/$(get_libdir)/libempathy.so.23 preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19 } pkg_postinst() { gnome2_pkg_postinst echo elog "Empathy needs telepathy's connection managers to use any IM protoc= ol." elog "See the USE flags on net-voip/telepathy-connection-managers" elog "to install them." preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23 preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19 }