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 1Q92Qf-0003kd-HD for garchives@archives.gentoo.org; Sun, 10 Apr 2011 21:44:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC3B71C01E; Sun, 10 Apr 2011 21:44:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AD5281C01E for ; Sun, 10 Apr 2011 21:44:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22A9C1B40A0 for ; Sun, 10 Apr 2011 21:44:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 49BF580065 for ; Sun, 10 Apr 2011 21:44:12 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <45d118a48dfcd8979d3c300b68bc4b27e5eba17c.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/ X-VCS-Repository: proj/gnome X-VCS-Files: net-im/empathy/empathy-3.0.0.ebuild net-im/empathy/empathy-9999.ebuild X-VCS-Directories: net-im/empathy/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 45d118a48dfcd8979d3c300b68bc4b27e5eba17c Date: Sun, 10 Apr 2011 21:44:12 +0000 (UTC) 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: X-Archives-Hash: d1f6fb0a6cbe0b2deea6f70081ad74fc commit: 45d118a48dfcd8979d3c300b68bc4b27e5eba17c Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Apr 10 21:42:48 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 21:43:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D45d118a4 net-im/empathy: QAed * Sync with gentoo-x86 * Sort USE flags dependencies * Split pkg_setup and src_prepare again * Raise telepathy-mission-control and telepathy-logger per NEWS --- net-im/empathy/empathy-3.0.0.ebuild | 45 ++++++++++++++++++-----------= ----- net-im/empathy/empathy-9999.ebuild | 45 ++++++++++++++++++-----------= ----- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/net-im/empathy/empathy-3.0.0.ebuild b/net-im/empathy/empathy= -3.0.0.ebuild index dd302a4..dc3787e 100644 --- a/net-im/empathy/empathy-3.0.0.ebuild +++ b/net-im/empathy/empathy-3.0.0.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,= v 1.6 2011/02/05 17:10:33 ssuominen Exp $ =20 EAPI=3D"3" -GCONF_DEBUG=3D"yes" +GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.4" =20 @@ -17,13 +17,13 @@ HOMEPAGE=3D"http://live.gnome.org/Empathy" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -# FIXME: Add location support once geoclue stops being idiotic with auto= magic deps -IUSE=3D"+gnome eds +map +networkmanager sendto spell test webkit" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" fi +# FIXME: Add location support once geoclue stops being idiotic with auto= magic deps +IUSE=3D"debug eds +gnome +map +networkmanager sendto spell test webkit" =20 # FIXME: gst-plugins-bad is required for the valve plugin. This should m= ove to good # eventually at which point the dep can be dropped @@ -32,10 +32,10 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.2:2 >=3Ddev-libs/dbus-glib-0.51 >=3Dnet-libs/telepathy-glib-0.14.1 >=3Dmedia-libs/libcanberra-0.25[gtk3] - >=3Dx11-libs/libnotify-0.7.0 + >=3Dx11-libs/libnotify-0.7 >=3Dgnome-base/gnome-keyring-2.91.4-r300 >=3Dnet-libs/gnutls-2.8.5 - >=3Ddev-libs/folks-0.4.0 + >=3Ddev-libs/folks-0.4 =20 gnome-base/gsettings-desktop-schemas net-libs/farsight2 @@ -46,19 +46,20 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.2:2 dev-libs/libxml2:2 x11-libs/libX11 net-voip/telepathy-connection-managers - >=3Dnet-im/telepathy-logger-0.2.0 + >=3Dnet-im/telepathy-logger-0.2.8 =20 - gnome? ( >=3Dgnome-base/gnome-control-center-2.31.4 ) eds? ( >=3Dgnome-extra/evolution-data-server-1.2 ) - sendto? ( >=3Dgnome-extra/nautilus-sendto-2.90.0 ) + gnome? ( >=3Dgnome-base/gnome-control-center-2.31.4 ) + map? ( + media-libs/libchamplain:0.10[gtk] + media-libs/clutter-gtk:1.0 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.7 ) + sendto? ( >=3Dgnome-extra/nautilus-sendto-2.90.0 ) spell? ( >=3Dapp-text/enchant-1.2 >=3Dapp-text/iso-codes-0.35 ) webkit? ( >=3Dnet-libs/webkit-gtk-1.3.2:3 ) - map? ( - media-libs/libchamplain:0.10[gtk] - media-libs/clutter-gtk:1.0 )" +" DEPEND=3D"${RDEPEND} app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.17.3 @@ -67,36 +68,38 @@ DEPEND=3D"${RDEPEND} test? ( sys-apps/grep >=3Ddev-libs/check-0.9.4 ) - dev-libs/libxslt" -PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5" + dev-libs/libxslt +" +PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5.7.6" =20 pkg_setup() { - # Build time python tools needs python2 - python_set_active_version 2 -} - -src_prepare() { DOCS=3D"CONTRIBUTORS AUTHORS ChangeLog NEWS README" =20 # TODO: Re-add location support G2CONF=3D"${G2CONF} + --disable-coding-style-checks + --disable-schemas-compile --disable-static --disable-meego --disable-location --disable-Werror $(use_enable debug) - $(use_enable gnome control-center-embedding) $(use_with eds) + $(use_enable gnome control-center-embedding) $(use_enable map) $(use_with networkmanager connectivity nm) $(use_enable sendto nautilus-sendto) $(use_enable spell) - $(use_enable test coding-style-checks) $(use_enable webkit)" =20 - python_convert_shebangs -r 2 tools + # Build time python tools needs python2 + python_set_active_version 2 +} =20 +src_prepare() { gnome2_src_prepare + + python_convert_shebangs -r 2 tools } =20 src_test() { diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-= 9999.ebuild index dd302a4..dc3787e 100644 --- a/net-im/empathy/empathy-9999.ebuild +++ b/net-im/empathy/empathy-9999.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,= v 1.6 2011/02/05 17:10:33 ssuominen Exp $ =20 EAPI=3D"3" -GCONF_DEBUG=3D"yes" +GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.4" =20 @@ -17,13 +17,13 @@ HOMEPAGE=3D"http://live.gnome.org/Empathy" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -# FIXME: Add location support once geoclue stops being idiotic with auto= magic deps -IUSE=3D"+gnome eds +map +networkmanager sendto spell test webkit" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" fi +# FIXME: Add location support once geoclue stops being idiotic with auto= magic deps +IUSE=3D"debug eds +gnome +map +networkmanager sendto spell test webkit" =20 # FIXME: gst-plugins-bad is required for the valve plugin. This should m= ove to good # eventually at which point the dep can be dropped @@ -32,10 +32,10 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.2:2 >=3Ddev-libs/dbus-glib-0.51 >=3Dnet-libs/telepathy-glib-0.14.1 >=3Dmedia-libs/libcanberra-0.25[gtk3] - >=3Dx11-libs/libnotify-0.7.0 + >=3Dx11-libs/libnotify-0.7 >=3Dgnome-base/gnome-keyring-2.91.4-r300 >=3Dnet-libs/gnutls-2.8.5 - >=3Ddev-libs/folks-0.4.0 + >=3Ddev-libs/folks-0.4 =20 gnome-base/gsettings-desktop-schemas net-libs/farsight2 @@ -46,19 +46,20 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.2:2 dev-libs/libxml2:2 x11-libs/libX11 net-voip/telepathy-connection-managers - >=3Dnet-im/telepathy-logger-0.2.0 + >=3Dnet-im/telepathy-logger-0.2.8 =20 - gnome? ( >=3Dgnome-base/gnome-control-center-2.31.4 ) eds? ( >=3Dgnome-extra/evolution-data-server-1.2 ) - sendto? ( >=3Dgnome-extra/nautilus-sendto-2.90.0 ) + gnome? ( >=3Dgnome-base/gnome-control-center-2.31.4 ) + map? ( + media-libs/libchamplain:0.10[gtk] + media-libs/clutter-gtk:1.0 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.7 ) + sendto? ( >=3Dgnome-extra/nautilus-sendto-2.90.0 ) spell? ( >=3Dapp-text/enchant-1.2 >=3Dapp-text/iso-codes-0.35 ) webkit? ( >=3Dnet-libs/webkit-gtk-1.3.2:3 ) - map? ( - media-libs/libchamplain:0.10[gtk] - media-libs/clutter-gtk:1.0 )" +" DEPEND=3D"${RDEPEND} app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.17.3 @@ -67,36 +68,38 @@ DEPEND=3D"${RDEPEND} test? ( sys-apps/grep >=3Ddev-libs/check-0.9.4 ) - dev-libs/libxslt" -PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5" + dev-libs/libxslt +" +PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5.7.6" =20 pkg_setup() { - # Build time python tools needs python2 - python_set_active_version 2 -} - -src_prepare() { DOCS=3D"CONTRIBUTORS AUTHORS ChangeLog NEWS README" =20 # TODO: Re-add location support G2CONF=3D"${G2CONF} + --disable-coding-style-checks + --disable-schemas-compile --disable-static --disable-meego --disable-location --disable-Werror $(use_enable debug) - $(use_enable gnome control-center-embedding) $(use_with eds) + $(use_enable gnome control-center-embedding) $(use_enable map) $(use_with networkmanager connectivity nm) $(use_enable sendto nautilus-sendto) $(use_enable spell) - $(use_enable test coding-style-checks) $(use_enable webkit)" =20 - python_convert_shebangs -r 2 tools + # Build time python tools needs python2 + python_set_active_version 2 +} =20 +src_prepare() { gnome2_src_prepare + + python_convert_shebangs -r 2 tools } =20 src_test() {