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 1RMC4a-0006LK-W7 for garchives@archives.gentoo.org; Fri, 04 Nov 2011 05:12:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A94BA21C02E; Fri, 4 Nov 2011 05:12:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5CB4E21C02E for ; Fri, 4 Nov 2011 05:12:02 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 735E81B4019 for ; Fri, 4 Nov 2011 05:12:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8F7DC80042 for ; Fri, 4 Nov 2011 05:12:00 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/ X-VCS-Repository: proj/gnome X-VCS-Files: net-im/empathy/empathy-3.2.1.1.ebuild net-im/empathy/empathy-9999.ebuild X-VCS-Directories: net-im/empathy/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: e6d6e1d3a709d7f5afe0604001f0281141a2a448 Date: Fri, 4 Nov 2011 05:12:00 +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: d62c84b0-1d33-4927-a4c8-d150cf0efc48 X-Archives-Hash: 46338c5c6d82b4cd9a1db5a3b116ac75 commit: e6d6e1d3a709d7f5afe0604001f0281141a2a448 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Nov 4 04:59:40 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Nov 4 05:02:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De6d6e1d3 net-im/empathy: qa + rename video flag to v4l Move to EAPI4, drop unused eclasses, remove obsolete comments, add missing dependencies, sync keywords with gx86. Also, rename the video USE flag to v4l to better describe what it does. --- net-im/empathy/empathy-3.2.1.1.ebuild | 29 +++++++++++----------------= -- net-im/empathy/empathy-9999.ebuild | 29 +++++++++++----------------= -- 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/net-im/empathy/empathy-3.2.1.1.ebuild b/net-im/empathy/empat= hy-3.2.1.1.ebuild index 4a160b1..4bc195d 100644 --- a/net-im/empathy/empathy-3.2.1.1.ebuild +++ b/net-im/empathy/empathy-3.2.1.1.ebuild @@ -2,13 +2,12 @@ # 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.6 2011/02/05 17:10:33 ssuominen Exp $ =20 -EAPI=3D"3" +EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" -GNOME_TARBALL_SUFFIX=3D"xz" PYTHON_DEPEND=3D"2:2.4" =20 -inherit eutils gnome2 multilib python +inherit gnome2 python if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -21,10 +20,9 @@ SLOT=3D"0" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" + KEYWORDS=3D"~amd64 ~x86 ~x86-linux" fi -# FIXME: Add location support once geoclue stops being idiotic with auto= magic deps -IUSE=3D"call debug eds +map +geoloc gnome-online-accounts +networkmanage= r sendto spell test +video" +IUSE=3D"call debug eds +map +geoloc gnome-online-accounts +networkmanage= r sendto spell test +v4l" =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 @@ -73,8 +71,9 @@ RDEPEND=3D">=3Ddev-libs/glib-2.28:2 spell? ( >=3Dapp-text/enchant-1.2 >=3Dapp-text/iso-codes-0.35 ) - video? ( + v4l? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) + media-plugins/gst-plugins-v4l2:0.10 >=3Dmedia-video/cheese-2.91.91.1 ) " DEPEND=3D"${RDEPEND} @@ -92,7 +91,6 @@ PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5.7.6" =20 pkg_setup() { DOCS=3D"CONTRIBUTORS AUTHORS ChangeLog NEWS README" - # TODO: Re-add location support G2CONF=3D"${G2CONF} --disable-coding-style-checks --disable-schemas-compile @@ -108,22 +106,17 @@ pkg_setup() { $(use_with networkmanager connectivity nm) $(use_enable sendto nautilus-sendto) $(use_enable spell) - $(use_with video cheese) - $(use_enable video gudev)" + $(use_with v4l cheese) + $(use_enable v4l gudev)" =20 - # Build time python tools needs python2 + # Build time python tools need python2 python_set_active_version 2 -} - -src_prepare() { - gnome2_src_prepare - - python_convert_shebangs -r 2 tools + python_pkg_setup } =20 src_test() { unset DBUS_SESSION_BUS_ADDRESS - emake check || die "emake check failed." + emake check } =20 pkg_postinst() { diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-= 9999.ebuild index 4a160b1..4bc195d 100644 --- a/net-im/empathy/empathy-9999.ebuild +++ b/net-im/empathy/empathy-9999.ebuild @@ -2,13 +2,12 @@ # 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.6 2011/02/05 17:10:33 ssuominen Exp $ =20 -EAPI=3D"3" +EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" -GNOME_TARBALL_SUFFIX=3D"xz" PYTHON_DEPEND=3D"2:2.4" =20 -inherit eutils gnome2 multilib python +inherit gnome2 python if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -21,10 +20,9 @@ SLOT=3D"0" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" + KEYWORDS=3D"~amd64 ~x86 ~x86-linux" fi -# FIXME: Add location support once geoclue stops being idiotic with auto= magic deps -IUSE=3D"call debug eds +map +geoloc gnome-online-accounts +networkmanage= r sendto spell test +video" +IUSE=3D"call debug eds +map +geoloc gnome-online-accounts +networkmanage= r sendto spell test +v4l" =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 @@ -73,8 +71,9 @@ RDEPEND=3D">=3Ddev-libs/glib-2.28:2 spell? ( >=3Dapp-text/enchant-1.2 >=3Dapp-text/iso-codes-0.35 ) - video? ( + v4l? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) + media-plugins/gst-plugins-v4l2:0.10 >=3Dmedia-video/cheese-2.91.91.1 ) " DEPEND=3D"${RDEPEND} @@ -92,7 +91,6 @@ PDEPEND=3D">=3Dnet-im/telepathy-mission-control-5.7.6" =20 pkg_setup() { DOCS=3D"CONTRIBUTORS AUTHORS ChangeLog NEWS README" - # TODO: Re-add location support G2CONF=3D"${G2CONF} --disable-coding-style-checks --disable-schemas-compile @@ -108,22 +106,17 @@ pkg_setup() { $(use_with networkmanager connectivity nm) $(use_enable sendto nautilus-sendto) $(use_enable spell) - $(use_with video cheese) - $(use_enable video gudev)" + $(use_with v4l cheese) + $(use_enable v4l gudev)" =20 - # Build time python tools needs python2 + # Build time python tools need python2 python_set_active_version 2 -} - -src_prepare() { - gnome2_src_prepare - - python_convert_shebangs -r 2 tools + python_pkg_setup } =20 src_test() { unset DBUS_SESSION_BUS_ADDRESS - emake check || die "emake check failed." + emake check } =20 pkg_postinst() {