| 1 |
commit: 215ab1d667afbdb08b5f35fe03a12f40ea079c04 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 9 15:05:52 2013 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 9 15:05:52 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=215ab1d6 |
| 7 |
|
| 8 |
[net-libs/telepathy-qt] Sync with kde overlay. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
net-libs/telepathy-qt/metadata.xml | 1 - |
| 14 |
net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 23 ++++++++--------------- |
| 15 |
2 files changed, 8 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml |
| 18 |
index c971a11..5309391 100644 |
| 19 |
--- a/net-libs/telepathy-qt/metadata.xml |
| 20 |
+++ b/net-libs/telepathy-qt/metadata.xml |
| 21 |
@@ -3,7 +3,6 @@ |
| 22 |
<pkgmetadata> |
| 23 |
<herd>qt</herd> |
| 24 |
<use> |
| 25 |
- <flag name='farsight'>Enable support for farsight connection manager</flag> |
| 26 |
<flag name='farstream'>Enable support for audio/video calls via farstream</flag> |
| 27 |
</use> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
| 31 |
index 58a9d95..a9d72ae 100644 |
| 32 |
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
| 33 |
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild |
| 34 |
@@ -2,12 +2,11 @@ |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
# $Header: $ |
| 37 |
|
| 38 |
-EAPI=4 |
| 39 |
+EAPI=5 |
| 40 |
|
| 41 |
-PYTHON_DEPEND="2:2.5" |
| 42 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/telepathy/${PN}" |
| 43 |
- |
| 44 |
-inherit python base cmake-utils virtualx git-2 |
| 45 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
| 46 |
+EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" ) |
| 47 |
+inherit base python-any-r1 cmake-utils virtualx git-r3 |
| 48 |
|
| 49 |
DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol" |
| 50 |
HOMEPAGE="http://telepathy.freedesktop.org/" |
| 51 |
@@ -15,14 +14,11 @@ HOMEPAGE="http://telepathy.freedesktop.org/" |
| 52 |
LICENSE="LGPL-2.1" |
| 53 |
SLOT="0" |
| 54 |
KEYWORDS="" |
| 55 |
-IUSE="debug farsight farstream test" |
| 56 |
+IUSE="debug farstream test" |
| 57 |
|
| 58 |
RDEPEND=" |
| 59 |
dev-qt/qtcore:4 |
| 60 |
dev-qt/qtdbus:4 |
| 61 |
- farsight? ( |
| 62 |
- net-libs/telepathy-farsight |
| 63 |
- ) |
| 64 |
farstream? ( |
| 65 |
>=net-libs/telepathy-farstream-0.2.2 |
| 66 |
>=net-libs/telepathy-glib-0.18.0 |
| 67 |
@@ -30,6 +26,7 @@ RDEPEND=" |
| 68 |
!net-libs/telepathy-qt4 |
| 69 |
" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
+ ${PYTHON_DEPS} |
| 72 |
virtual/pkgconfig |
| 73 |
test? ( |
| 74 |
dev-libs/dbus-glib |
| 75 |
@@ -39,18 +36,14 @@ DEPEND="${RDEPEND} |
| 76 |
) |
| 77 |
" |
| 78 |
|
| 79 |
-REQUIRED_USE="farsight? ( !farstream )" |
| 80 |
- |
| 81 |
DOCS=( AUTHORS ChangeLog HACKING NEWS README ) |
| 82 |
|
| 83 |
pkg_setup() { |
| 84 |
- python_set_active_version 2 |
| 85 |
- python_pkg_setup |
| 86 |
+ python-any-r1_pkg_setup |
| 87 |
} |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
local mycmakeargs=( |
| 91 |
- $(cmake-utils_use_enable farsight) |
| 92 |
$(cmake-utils_use_enable farstream) |
| 93 |
$(cmake-utils_use_enable debug DEBUG_OUTPUT) |
| 94 |
$(cmake-utils_use_enable test TESTS) |
| 95 |
@@ -60,7 +53,7 @@ src_configure() { |
| 96 |
} |
| 97 |
|
| 98 |
src_test() { |
| 99 |
- pushd "${CMAKE_BUILD_DIR}" > /dev/null |
| 100 |
+ pushd "${BUILD_DIR}" > /dev/null |
| 101 |
Xemake test || die "tests failed" |
| 102 |
popd > /dev/null |
| 103 |
} |
Archives