public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2012-04-18 21:23 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2012-04-18 21:23 UTC (permalink / raw
  To: gentoo-commits

commit:     ffbf827ce41c9a995bb9e50d199e6cb1dcdfa6da
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Apr 18 21:23:01 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Apr 18 21:23:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ffbf827c

[net-libs/telepathy-qt] Add missing dep.

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index faa569b..4c007ab 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 		dev-libs/dbus-glib
 		dev-libs/glib
 		dev-python/dbus-python
+		x11-libs/qt-test:4
 	)
 "
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2012-04-19  9:14 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2012-04-19  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f46f7f5b99078be91ffc24b073da0825e5ce1cae
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 09:14:44 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 09:14:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f46f7f5b

[net-libs/telepathy-qt] Raise deps for farstream.

(Portage version: 2.2.0_alpha100/git/Linux i686, unsigned Manifest commit)

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 4c007ab..3343561 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 		net-libs/telepathy-farsight
 	)
 	farstream? (
-		net-libs/telepathy-farstream
+		>=net-libs/telepathy-farstream-0.2.2
 		>=net-libs/telepathy-glib-0.17.5
 	)
 	!net-libs/telepathy-qt4



^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2012-05-03  7:24 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2012-05-03  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     57597840398280bce0429a2c8caa643b1e9b70c7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 07:19:41 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May  3 07:19:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=57597840

[net-libs/telepathy-qt] Migrate to virtual/pkgconfig.

(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 3343561..f884a50 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	!net-libs/telepathy-qt4
 "
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	farsight? (
 		>=net-libs/telepathy-glib-0.17.5
 	)



^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2012-07-12 11:06 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2012-07-12 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     9c5fa1c956f7cb90938bec2f4a14e2773833f6e9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 11:05:55 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 11:05:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9c5fa1c9

[net-libs/telepathy-qt] Sync with portage.

(Portage version: 2.1.11.5/git/Linux x86_64, unsigned Manifest commit)

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 926b4f3..a03b3db 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -31,9 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	farsight? (
-		>=net-libs/telepathy-glib-0.17.5
-	)
 	test? (
 		dev-libs/dbus-glib
 		dev-libs/glib
@@ -53,10 +50,10 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with farsight)
-		$(cmake-utils_use_with farstream)
+		$(cmake-utils_use_enable farsight)
+		$(cmake-utils_use_enable farstream)
 		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-		$(cmake-utils_use_enable test)
+		$(cmake-utils_use_enable test TESTS)
 		-DENABLE_EXAMPLES=OFF
 	)
 	cmake-utils_src_configure



^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2012-09-11 23:23 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2012-09-11 23:23 UTC (permalink / raw
  To: gentoo-commits

commit:     fbd903aac3c5943d36eb6dc3ffd64cc5e91aa4db
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 23:22:39 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 23:22:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fbd903aa

[net-libs/telepathy-qt] Sync with tree.

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index a03b3db..32bdad3 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 PYTHON_DEPEND="2:2.5"
 EGIT_REPO_URI="git://anongit.freedesktop.org/telepathy/${PN}"
 
-inherit python base cmake-utils git-2
+inherit python base cmake-utils virtualx git-2
 
 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -25,7 +25,7 @@ RDEPEND="
 	)
 	farstream? (
 		>=net-libs/telepathy-farstream-0.2.2
-		>=net-libs/telepathy-glib-0.17.5
+		>=net-libs/telepathy-glib-0.18.0
 	)
 	!net-libs/telepathy-qt4
 "
@@ -58,3 +58,9 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+src_test() {
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+	Xemake test || die "tests failed"
+	popd > /dev/null
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2013-11-09 15:06 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2013-11-09 15:06 UTC (permalink / raw
  To: gentoo-commits

commit:     215ab1d667afbdb08b5f35fe03a12f40ea079c04
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 15:05:52 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> 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 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name='farsight'>Enable support for farsight connection manager</flag>
 		<flag name='farstream'>Enable support for audio/video calls via farstream</flag>
 	</use>
 </pkgmetadata>

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
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2014-04-02 18:43 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2014-04-02 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a90e45cfa02d884f104db36db41305e7017869d5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  2 18:43:13 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr  2 18:43:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a90e45cf

[net-libs/telepathy-qt] Sync with kde overlay

Package-Manager: portage-2.2.10

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 72 ++++++++++++++++++++------
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index a9d72ae..4bf7d1d 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI=5
 
 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
+inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild
 
 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -14,15 +14,25 @@ HOMEPAGE="http://telepathy.freedesktop.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug farstream test"
+IUSE="debug farstream +qt4 qt5 test"
 
 RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
 	farstream? (
 		>=net-libs/telepathy-farstream-0.2.2
 		>=net-libs/telepathy-glib-0.18.0
 	)
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
 	!net-libs/telepathy-qt4
 "
 DEPEND="${RDEPEND}
@@ -32,7 +42,8 @@ DEPEND="${RDEPEND}
 		dev-libs/dbus-glib
 		dev-libs/glib
 		dev-python/dbus-python
-		dev-qt/qttest:4
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
 	)
 "
 
@@ -40,20 +51,49 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
 pkg_setup() {
 	python-any-r1_pkg_setup
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
 }
 
 src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable farstream)
-		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-		$(cmake-utils_use_enable test TESTS)
-		-DENABLE_EXAMPLES=OFF
-	)
-	cmake-utils_src_configure
+	myconfigure() {
+		local mycmakeargs=(
+			$(cmake-utils_use_enable farstream)
+			$(cmake-utils_use_enable debug DEBUG_OUTPUT)
+			$(cmake-utils_use_enable test TESTS)
+			-DENABLE_EXAMPLES=OFF
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DDESIRED_QT_VERSION=4)
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DDESIRED_QT_VERSION=5)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
 }
 
 src_test() {
-	pushd "${BUILD_DIR}" > /dev/null
-	Xemake test || die "tests failed"
-	popd > /dev/null
+	mytest() {
+		pushd "${BUILD_DIR}" > /dev/null
+		Xemake test || die "tests failed"
+		popd > /dev/null
+	}
+
+	multibuild_foreach_variant mytest
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2014-05-05 23:52 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2014-05-05 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     18a31650f88fc339051768e18877384477ccd466
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon May  5 23:52:31 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon May  5 23:52:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=18a31650

[net-libs/telepathy-qt] Sync with kde overlay

Package-Manager: portage-2.2.10

---
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 4bf7d1d..113c765 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
 inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2014-05-28 21:40 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2014-05-28 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     904a9c02390318916211a6dbefb9aebeab4d52f7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 28 21:39:46 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 28 21:39:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=904a9c02

[net-libs/telepathy-qt] Sync with kde overlay

https://github.com/gentoo/kde/pull/34

Package-Manager: portage-2.2.10

---
 net-libs/telepathy-qt/metadata.xml             | 1 +
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index 5309391..4b181c1 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>qt</herd>
 	<use>
 		<flag name='farstream'>Enable support for audio/video calls via farstream</flag>
+		<flag name='experimental'>Enable compilation of experimental and unstable service side bindings</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 113c765..08a17f7 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://telepathy.freedesktop.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug farstream +qt4 qt5 test"
+IUSE="debug experimental farstream +qt4 qt5 test"
 
 RDEPEND="
 	farstream? (
@@ -63,8 +63,9 @@ pkg_setup() {
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=(
-			$(cmake-utils_use_enable farstream)
 			$(cmake-utils_use_enable debug DEBUG_OUTPUT)
+			$(cmake-utils_use_enable experimental EXPERIMENTAL_SERVICE_SUPPORT)
+			$(cmake-utils_use_enable farstream)
 			$(cmake-utils_use_enable test TESTS)
 			-DENABLE_EXAMPLES=OFF
 		)


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2014-09-15 16:49 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2014-09-15 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f2368a850a8c41cb227cd531fa23b77932e91fe9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 15 16:49:00 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Sep 15 16:49:00 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f2368a85

[net-libs/telepathy-qt] Sync with tree

Package-Manager: portage-2.2.12

---
 net-libs/telepathy-qt/metadata.xml             | 2 +-
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index 4b181c1..1e6e071 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<herd>kde</herd>
 	<use>
 		<flag name='farstream'>Enable support for audio/video calls via farstream</flag>
-		<flag name='experimental'>Enable compilation of experimental and unstable service side bindings</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 08a17f7..b883748 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://telepathy.freedesktop.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug experimental farstream +qt4 qt5 test"
+IUSE="debug farstream +qt4 qt5 test"
 
 RDEPEND="
 	farstream? (
@@ -30,7 +30,6 @@ RDEPEND="
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 	)
 	!net-libs/telepathy-qt4
@@ -64,10 +63,10 @@ src_configure() {
 	myconfigure() {
 		local mycmakeargs=(
 			$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-			$(cmake-utils_use_enable experimental EXPERIMENTAL_SERVICE_SUPPORT)
 			$(cmake-utils_use_enable farstream)
 			$(cmake-utils_use_enable test TESTS)
 			-DENABLE_EXAMPLES=OFF
+			-ENABLE_SERVICE_SUPPORT=ON
 		)
 		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
 			mycmakeargs+=(-DDESIRED_QT_VERSION=4)


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2015-03-04 13:22 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2015-03-04 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     b6a004f73824f6876cb02ff31b5cc86b8334a3ad
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 13:21:59 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 13:21:59 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b6a004f7

[net-libs/telepathy-qt] Sync with main tree.

Package-Manager: portage-2.2.17

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 0fb8e9c..202d2b6 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
-inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild
+inherit python-any-r1 cmake-utils virtualx git-r3 multibuild
 
 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -50,13 +50,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
 pkg_setup() {
 	python-any-r1_pkg_setup
-	MULTIBUILD_VARIANTS=()
-	if use qt4; then
-		MULTIBUILD_VARIANTS+=(qt4)
-	fi
-	if use qt5; then
-		MULTIBUILD_VARIANTS+=(qt5)
-	fi
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_configure() {
@@ -84,16 +78,16 @@ src_compile() {
 	multibuild_foreach_variant cmake-utils_src_compile
 }
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
-
 src_test() {
 	mytest() {
 		pushd "${BUILD_DIR}" > /dev/null
-		Xemake test || die "tests failed"
+		VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
 		popd > /dev/null
 	}
 
 	multibuild_foreach_variant mytest
 }
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2015-03-04 13:22 git@oystercatcher mirror+tproxy
  0 siblings, 0 replies; 20+ messages in thread
From: git@oystercatcher mirror+tproxy @ 2015-03-04 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     b6a004f73824f6876cb02ff31b5cc86b8334a3ad
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 13:21:59 2015 +0000
Commit:     git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT> gentoo <DOT> org>
CommitDate: Wed Mar  4 13:21:59 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b6a004f7

[net-libs/telepathy-qt] Sync with main tree.

Package-Manager: portage-2.2.17

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 0fb8e9c..202d2b6 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
-inherit base python-any-r1 cmake-utils virtualx git-r3 multibuild
+inherit python-any-r1 cmake-utils virtualx git-r3 multibuild
 
 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -50,13 +50,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
 pkg_setup() {
 	python-any-r1_pkg_setup
-	MULTIBUILD_VARIANTS=()
-	if use qt4; then
-		MULTIBUILD_VARIANTS+=(qt4)
-	fi
-	if use qt5; then
-		MULTIBUILD_VARIANTS+=(qt5)
-	fi
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_configure() {
@@ -84,16 +78,16 @@ src_compile() {
 	multibuild_foreach_variant cmake-utils_src_compile
 }
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
-
 src_test() {
 	mytest() {
 		pushd "${BUILD_DIR}" > /dev/null
-		Xemake test || die "tests failed"
+		VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
 		popd > /dev/null
 	}
 
 	multibuild_foreach_variant mytest
 }
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2015-05-14 14:48 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-05-14 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     273c65183d569328a799ff5fe8e6488979077ff2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 14:48:35 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 14 14:48:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=273c6518

[net-libs/telepathy-qt] Sync.

Package-Manager: portage-2.2.18

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 202d2b6..5dd4c17 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -5,17 +5,19 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
-inherit python-any-r1 cmake-utils virtualx git-r3 multibuild
+inherit python-any-r1 cmake-utils virtualx multibuild git-r3
 
-DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
+EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug farstream +qt4 qt5 test"
 
+REQUIRED_USE="|| ( qt4 qt5 )"
+
 RDEPEND="
 	farstream? (
 		>=net-libs/telepathy-farstream-0.2.2


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2015-05-14 16:19 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-05-14 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bd3ef623e078c086f4818027edbf129c2a57fab0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 16:19:27 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 14 16:19:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bd3ef623

[net-libs/telepathy-qt] Specify glib SLOT.

Package-Manager: portage-2.2.18

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 5dd4c17..cd86768 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-libs/dbus-glib
-		dev-libs/glib
+		dev-libs/glib:2
 		dev-python/dbus-python
 		qt4? ( dev-qt/qttest:4 )
 		qt5? ( dev-qt/qttest:5 )


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2015-10-12 16:47 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2015-10-12 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     889b58ae40fa561215e15fe9e8a616ad102ba118
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 16:45:39 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 16:47:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=889b58ae

net-libs/telepathy-qt: nitpicks

Package-Manager: portage-2.2.20.1

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index fd396c2..4565a67 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -65,10 +65,10 @@ src_configure() {
 			-ENABLE_SERVICE_SUPPORT=ON
 		)
 		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DDESIRED_QT_VERSION=4)
+			mycmakeargs+=( -DDESIRED_QT_VERSION=4 )
 		fi
 		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DDESIRED_QT_VERSION=5)
+			mycmakeargs+=( -DDESIRED_QT_VERSION=5 )
 		fi
 		cmake-utils_src_configure
 	}
@@ -82,9 +82,9 @@ src_compile() {
 
 src_test() {
 	mytest() {
-		pushd "${BUILD_DIR}" > /dev/null
+		pushd "${BUILD_DIR}" > /dev/null || die
 		VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
-		popd > /dev/null
+		popd > /dev/null || die
 	}
 
 	multibuild_foreach_variant mytest


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2016-10-28 16:12 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2016-10-28 16:12 UTC (permalink / raw
  To: gentoo-commits

commit:     973bc57a485ec814e52f83476e88ea507661c1b0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 15:34:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 16:12:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=973bc57a

net-libs/telepathy-qt: sync with kde

Package-Manager: portage-2.3.2

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 6cc904c..cdbb11a 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils virtualx multibuild git-r3
+EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
+inherit python-any-r1 cmake-utils virtualx git-r3 multibuild
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
-EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -58,9 +58,9 @@ pkg_setup() {
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=(
-			$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-			$(cmake-utils_use_enable farstream)
-			$(cmake-utils_use_enable test TESTS)
+			-DENABLE_DEBUG_OUTPUT=$(usex debug)
+			-DENABLE_FARSTREAM=$(usex farstream)
+			-DENABLE_TESTS=$(usex test)
 			-DENABLE_EXAMPLES=OFF
 			-ENABLE_SERVICE_SUPPORT=ON
 		)


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2018-03-19 20:33 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2018-03-19 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e23410c88fe07d5203586559dd2cf716fc1c7970
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:31:20 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 20:31:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e23410c8

net-libs/telepathy-qt: Sync /w kde overlay

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 78 +++++++++-----------------
 1 file changed, 25 insertions(+), 53 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index ed5f8203..699f4ab1 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,39 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
-inherit python-any-r1 cmake-utils virtualx git-r3 multibuild
+inherit python-any-r1 cmake-utils virtualx git-r3
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="http://telepathy.freedesktop.org/"
+HOMEPAGE="https://telepathy.freedesktop.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug farstream +qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="debug farstream test"
 
 RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
 	farstream? (
 		>=net-libs/telepathy-farstream-0.2.2
 		>=net-libs/telepathy-glib-0.18.0
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtxml:5
-	)
-	!net-libs/telepathy-qt4
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -42,53 +33,34 @@ DEPEND="${RDEPEND}
 		dev-libs/dbus-glib
 		dev-libs/glib:2
 		dev-python/dbus-python
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
+		dev-qt/qttest:5
 	)
 "
 
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+# bug 549448 - last checked with 0.9.7
+RESTRICT="test"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DENABLE_DEBUG_OUTPUT=$(usex debug)
-			-DENABLE_FARSTREAM=$(usex farstream)
-			-DENABLE_TESTS=$(usex test)
-			-DENABLE_EXAMPLES=OFF
-			-ENABLE_SERVICE_SUPPORT=ON
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=( -DDESIRED_QT_VERSION=4 )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=( -DDESIRED_QT_VERSION=5 )
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	local mycmakeargs=(
+		-DDESIRED_QT_VERSION=5
+		-DENABLE_DEBUG_OUTPUT=$(usex debug)
+		-DENABLE_FARSTREAM=$(usex farstream)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_EXAMPLES=OFF
+	)
+	cmake-utils_src_configure
 }
 
 src_test() {
-	mytest() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-		VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
-		popd > /dev/null || die
+	_test_runner() {
+		ctest -E '(CallChannel)'
 	}
 
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	pushd "${BUILD_DIR}" > /dev/null || die
+	virtx _test_runner
+	popd > /dev/null || die
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2019-11-20 21:18 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-11-20 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     a35fa34b32f5870fbfb1ad4c4f29f2db422db48c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 12:38:33 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 21:17:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a35fa34b

net-libs/telepathy-qt: Move binary-only test depends to BDEPEND

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 64f32659..336bc77a 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -29,17 +29,18 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-libs/dbus-glib
-		dev-libs/glib:2
 		dev-qt/qttest:5
+	)
+"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
 		$(python_gen_any_dep '
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 "
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
 RESTRICT="!test? ( test )"
 
 python_check_deps() {


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2019-11-20 21:18 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-11-20 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     c5587b0c674d4eaa3037fe4e2e6f6a484b65ccd9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 12:45:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 21:17:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5587b0c

net-libs/telepathy-qt: Disable failing tests trying to access D-Bus

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 336bc77a..a477c450 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -62,6 +62,10 @@ src_configure() {
 }
 
 src_test() {
+	# some tests require D-Bus
+	local myctestargs=(
+		-E "(BaseConnectionManager|BaseProtocol)"
+	)
 	pushd "${BUILD_DIR}" > /dev/null || die
 	virtx cmake-utils_src_test
 	popd > /dev/null || die


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/
@ 2019-12-31 16:44 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-12-31 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     87bd00235988ac0c56126d166b5533b4589a5030
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 16:18:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 16:18:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=87bd0023

net-libs/telepathy-qt: Drop outdated live ebuild, moved to Gentoo repo

This was co-maintained with kde proj all the time, has a copy in kde overlay,
and actually has an active proxied maintainer since 2016 commit 0d7d20fc -
it makes much more sense to share maintenance of the live ebuild in gentoo.git.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/telepathy-qt/metadata.xml             | 15 ------
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild | 72 --------------------------
 2 files changed, 87 deletions(-)

diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
deleted file mode 100644
index d62898aa..00000000
--- a/net-libs/telepathy-qt/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="farstream">Enable support for audio/video calls via farstream</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
deleted file mode 100644
index a477c450..00000000
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-EGIT_REPO_URI=( "git://anongit.freedesktop.org/telepathy/${PN}" )
-inherit python-any-r1 cmake-utils git-r3 virtualx
-
-DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug farstream test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-	farstream? (
-		>=net-libs/telepathy-farstream-0.2.2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/dbus-glib
-		dev-qt/qttest:5
-	)
-"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEBUG_OUTPUT=$(usex debug)
-		-DENABLE_FARSTREAM=$(usex farstream)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_EXAMPLES=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# some tests require D-Bus
-	local myctestargs=(
-		-E "(BaseConnectionManager|BaseProtocol)"
-	)
-	pushd "${BUILD_DIR}" > /dev/null || die
-	virtx cmake-utils_src_test
-	popd > /dev/null || die
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2019-12-31 16:44 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-18 21:23 [gentoo-commits] proj/qt:master commit in: net-libs/telepathy-qt/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2012-04-19  9:14 Johannes Huber
2012-05-03  7:24 Johannes Huber
2012-07-12 11:06 Michael Palimaka
2012-09-11 23:23 Johannes Huber
2013-11-09 15:06 Johannes Huber
2014-04-02 18:43 Johannes Huber
2014-05-05 23:52 Johannes Huber
2014-05-28 21:40 Johannes Huber
2014-09-15 16:49 Johannes Huber
2015-03-04 13:22 Michael Palimaka
2015-03-04 13:22 git@oystercatcher mirror+tproxy
2015-05-14 14:48 Davide Pesavento
2015-05-14 16:19 Davide Pesavento
2015-10-12 16:47 Michael Palimaka
2016-10-28 16:12 Michael Palimaka
2018-03-19 20:33 Johannes Huber
2019-11-20 21:18 Andreas Sturmlechner
2019-11-20 21:18 Andreas Sturmlechner
2019-12-31 16:44 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox