From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4F957138247 for ; Sat, 9 Nov 2013 15:06:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0AE3E09F7; Sat, 9 Nov 2013 15:06:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F5E1E09F7 for ; Sat, 9 Nov 2013 15:06:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2ABC733BE94 for ; Sat, 9 Nov 2013 15:06:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BFFC3E545C for ; Sat, 9 Nov 2013 15:06:00 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1384009552.215ab1d667afbdb08b5f35fe03a12f40ea079c04.johu@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/ X-VCS-Repository: proj/qt X-VCS-Files: net-libs/telepathy-qt/metadata.xml net-libs/telepathy-qt/telepathy-qt-9999.ebuild X-VCS-Directories: net-libs/telepathy-qt/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 215ab1d667afbdb08b5f35fe03a12f40ea079c04 X-VCS-Branch: master Date: Sat, 9 Nov 2013 15:06: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 X-Archives-Salt: 278e3aed-a2b7-445f-aea7-8d0121f2979c X-Archives-Hash: 571a07115dde2f35c922bdd1a97284fa commit: 215ab1d667afbdb08b5f35fe03a12f40ea079c04 Author: Johannes Huber gentoo org> AuthorDate: Sat Nov 9 15:05:52 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Nov 9 15:05:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=215ab1d6 [net-libs/telepathy-qt] Sync with kde overlay. Package-Manager: portage-2.2.7 --- net-libs/telepathy-qt/metadata.xml | 1 - net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 23 ++++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml index c971a11..5309391 100644 --- a/net-libs/telepathy-qt/metadata.xml +++ b/net-libs/telepathy-qt/metadata.xml @@ -3,7 +3,6 @@ qt - Enable support for farsight connection manager Enable support for audio/video calls via farstream diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index 58a9d95..a9d72ae 100644 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild @@ -2,12 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -PYTHON_DEPEND="2:2.5" -EGIT_REPO_URI="git://anongit.freedesktop.org/telepathy/${PN}" - -inherit python base cmake-utils virtualx git-2 +PYTHON_COMPAT=( python{2_6,2_7} ) +EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) +inherit base python-any-r1 cmake-utils virtualx git-r3 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol" HOMEPAGE="http://telepathy.freedesktop.org/" @@ -15,14 +14,11 @@ HOMEPAGE="http://telepathy.freedesktop.org/" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="debug farsight farstream test" +IUSE="debug farstream test" RDEPEND=" dev-qt/qtcore:4 dev-qt/qtdbus:4 - farsight? ( - net-libs/telepathy-farsight - ) farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 @@ -30,6 +26,7 @@ RDEPEND=" !net-libs/telepathy-qt4 " DEPEND="${RDEPEND} + ${PYTHON_DEPS} virtual/pkgconfig test? ( dev-libs/dbus-glib @@ -39,18 +36,14 @@ DEPEND="${RDEPEND} ) " -REQUIRED_USE="farsight? ( !farstream )" - DOCS=( AUTHORS ChangeLog HACKING NEWS README ) pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-any-r1_pkg_setup } src_configure() { local mycmakeargs=( - $(cmake-utils_use_enable farsight) $(cmake-utils_use_enable farstream) $(cmake-utils_use_enable debug DEBUG_OUTPUT) $(cmake-utils_use_enable test TESTS) @@ -60,7 +53,7 @@ src_configure() { } src_test() { - pushd "${CMAKE_BUILD_DIR}" > /dev/null + pushd "${BUILD_DIR}" > /dev/null Xemake test || die "tests failed" popd > /dev/null }