Version bump by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug #409847.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

5 files changed, 194 insertions, 10 deletions

diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog
index 010072661894..3441bb6cbc0b 100644
--- a/net-libs/telepathy-qt/ChangeLog
+++ b/net-libs/telepathy-qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/telepathy-qt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.4 2012/04/04 08:54:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.5 2012/04/19 09:44:46 johu Exp $
+
+*telepathy-qt-0.9.1 (19 Apr 2012)
+
+  19 Apr 2012; Johannes Huber <johu@gentoo.org>
+  +files/telepathy-qt-0.9.1-automagicness.patch, +telepathy-qt-0.9.1.ebuild,
+  metadata.xml:
+  Version bump by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug
+  #409847.
 
   04 Apr 2012; Johannes Huber <johu@gentoo.org> telepathy-qt-0.9.0.ebuild:
   Raise dep.
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 0c81b7b0a7ea..7c65b236c813 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -3,20 +3,23 @@ Hash: SHA512
 
 AUX telepathy-qt-0.8.0-automagicness.patch 7516 RMD160 71daeee234927121c817a61e8f1acc1e50efaf8d SHA1 d5bd2b1b6db98b49db44d84ec409c39a322a662f SHA256 c37d92e8fe846a914a652c4db170ddbd5a9dd2f6899bc240cb89eed4797c182b
 AUX telepathy-qt-0.9.0-automagicness.patch 7761 RMD160 7c9fc4fc0d97ebaaace5fa3c14dd07b039870ec7 SHA1 a2dfedcd76d9ce688e24cac0c2f7be24e6f1048d SHA256 5f29287e0755e1dda72042ffb4809e90b05e5e8297564e7884237128ff0c315c
+AUX telepathy-qt-0.9.1-automagicness.patch 4801 RMD160 9c1c5568af469055a366a90024928257a228962c SHA1 a262bdec2fa0daaefacf1205f6a802ebbfe6af71 SHA256 e1c931affeb6bd8b9118b605866c067f48bfc9ecc611c2bd92b9d37d627ba353
 DIST telepathy-qt-0.9.0.tar.gz 4120044 RMD160 f9cf24c8ab0043f404f39ed46cdff54a9d5ec75d SHA1 6d977a76b9854ceec933444507c6a11a0333af39 SHA256 cf2ae8d2cf75c1cf40a3faff263d3f36b88d637eddfec0724a5fcc51ffb6706c
+DIST telepathy-qt-0.9.1.tar.gz 4624632 RMD160 85e844bd99484b92b0ce7488e7f23ace25b5beba SHA1 c2a8e6d36f75b871919b08688cc10c5567d6c103 SHA256 d097b49a3912fed0e9ef0f295740b4002aedf2c1013cbdeb20d91063a6ec9e67
 DIST telepathy-qt4-0.8.0.tar.gz 4014194 RMD160 e6850de7d57c8c6bab57f381667209bfac4d3ea7 SHA1 ba34bf78b7e1b6d7bb087780d8e1709a3cf4775b SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc
 EBUILD telepathy-qt-0.8.0.ebuild 1520 RMD160 d9106467bca463094455693df8e2f24146db32db SHA1 08f746ac2030c6ec4eaeb25e28b805c17e0a6335 SHA256 7bfbb5080ae5614c2a0b03f5e463ccaadd681e6701acac1187148ed5dc2aba81
 EBUILD telepathy-qt-0.9.0.ebuild 1407 RMD160 218acf5428e18201c52721e81f9c518670bd7717 SHA1 31fa98c24860259401c826f22fb7ce935976586f SHA256 8e74f523f958eec6cc99ca1e64b7a3f0698e787513d644fb7442b1b257099030
-MISC ChangeLog 2455 RMD160 2b3cdae9314f2ea9471b88affde79ff1eb4e9154 SHA1 24d725b88ba2b4e534a41e4963eda43f4f10beee SHA256 dd37fe60338d3fd52758b6d49ee2a0d8842bb636f0714c6fd740f44f595459f7
-MISC metadata.xml 335 RMD160 e68f892510261f37859207aab171783893e86e1f SHA1 756c52f911aa8c3c5487a53500828106ee6554d9 SHA256 f43ecaefe6736cbcadb34db002b505ec454ab7d0328de46c9a6795ff3c212970
+EBUILD telepathy-qt-0.9.1.ebuild 1408 RMD160 fea2ca73dc9ceb2e42c3d83939ff2e46ffeb9af3 SHA1 b1b3c9bbc3bad483d369750411d093fd670b08a6 SHA256 73e1b37ca33787e28d6d173edff765a8b2b89c5ac051f1fe250d04fff6d2ff16
+MISC ChangeLog 2719 RMD160 1c395c11a6eafdd5602f3a30ea7230a10c56551e SHA1 4fc36539e5eaa1e529048930b494a3dd54beda87 SHA256 dbb8f6038379a1f4e7a7f916810d181215190058d08951ad89f6cb35df864160
+MISC metadata.xml 418 RMD160 4767efe25f1d430755febab2b6a1e886093cc94c SHA1 1d2f5fc8e87759256ae9da31123e24ec0d98d54a SHA256 4e95653da793f24fb505bbd1cc5a92debccf6876a9b285857e8e278c38916f5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfAxjAAoJEO+t9ga+3I3aR5gH/AnLKhc/AHRUQtanvL1noO4w
-rs6exlmKgRjtEWktosLod4E3XvoQalVNaU+9gNA+qOyLPVREw4shzgfHz8wcxYT/
-6yCHCGfWNICGee4HZJQI1RfXhAfbOXGgXPsKcBFwJM7+L0ttJY7NvKozkgfud74K
-Di3RTNNpMrU+XqT28Cr3bsmIQC3SWdKkxuNYqf7TiXBY9uHqe7VXF+bMsfbLaTSl
-/QyrJJMkeh08GpKBIuDzRYXC9Ibc7Y6EJBCDbERfCWA9s3BrTk9+GJ4m+rGnVtL2
-hwjHvPyeP6ap9mx6PRlRD3/H5sBs2RqdlOKG0Z0htRn56A08k9mje8zgMkEeds8=
-=qKc1
+iQEcBAEBCgAGBQJPj97JAAoJEO+t9ga+3I3aM6UIAI83JCFx4l1wUszFDedVihPu
+SAxlRykGhuNbFa0RrR3QOfv+aawy+M6w7C5mrLdZkBDDmyLwJ1+TbgIG+07ixTe5
+2xCyFlgoQG7ezbuO6AhQODPZJffdH/agrbmSFajNeDxdVWYi3V5FEq/gcGITuc1O
+W8xSLwD1OTzKl94MmJzKAzwAPQeN4fOW+Mz0rx35LpXGRhs7C5eZp8ZeZDnhG8Z3
+FAJhJqyXozq5/gYYK66VsFvsDtDjchDL5WdQ3jbzTADL+G4Th2nIQpLz2fpdLNrn
+G4h537bp79NnuJfwnts9TjzxxpmmcVrfEkSJ0Z7Tg3BKMm0JKUG+Q/ALLVvzsyU=
+=B+G/
 -----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch
new file mode 100644
index 000000000000..b34adb3fc971
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch
@@ -0,0 +1,109 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b61c12f..7110d51 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,6 +73,13 @@ include(TpQtMacros)
+ 
+ include(MacroLogFeature)
+ 
++# options
++option(WITH_Farsight "Enable building with farsight features" ON)
++option(WITH_Farstream "Enable building with farstream features" ON)
++option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
++option(ENABLE_EXAMPLES "Enable building of examples" ON)
++option(ENABLE_TEST "Enable test suite" ON)
++
+ # external dependencies
+ 
+ # Required dependencies
+@@ -122,7 +129,6 @@ include_directories(${CMAKE_SOURCE_DIR}
+ 
+ add_definitions(-DQT_NO_CAST_FROM_ASCII)
+ 
+-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
+ if (ENABLE_DEBUG_OUTPUT)
+     add_definitions(-DENABLE_DEBUG)
+ endif (ENABLE_DEBUG_OUTPUT)
+@@ -176,7 +182,9 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python"
+                   "Needed to build some additional unit tests")
+ 
+ # Find GLib2, GObject, DBus and LibXml2
+-# Those are needed for the insane include dir dependency hell
++# These packages are not actually required by telepathy-qt
++# Rather, we call these macros to get the include dir required
++# to compile the dependencies of our actual dependencies
+ find_package(GLIB2)
+ find_package(GObject)
+ find_package(GIO)
+@@ -185,29 +193,33 @@ find_package(DBus)
+ find_package(DBusGLib)
+ find_package(LibXml2)
+ 
+-# Find tp-farsight
+-set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
+-find_package(TelepathyFarsight)
+-macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
+-                  "A Framework for dealing with audio/video conferencing protocols"
+-                  "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
+-                  "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
+-
+-# Find tp-farsight
+-set(FARSTREAM_MIN_VERSION "0.1.0")
+-find_package(Farstream)
+-macro_log_feature(FARSTREAM_FOUND "Farstream"
+-                  "A Framework for dealing with audio/video conferencing protocols"
+-                  "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
+-                  "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
+-
+-# Find tp-farsight
+-set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
+-find_package(TelepathyFarstream)
+-macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
+-                  "A Framework for dealing with audio/video conferencing protocols"
+-                  "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
+-                  "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
++if(WITH_Farsight)
++    # Find tp-farsight
++    set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
++    find_package(TelepathyFarsight)
++    macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
++                      "A Framework for dealing with audio/video conferencing protocols"
++                      "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
++                      "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
++endif(WITH_Farsight)
++
++if(WITH_Farstream)
++    # Find farstream
++    set(FARSTREAM_MIN_VERSION "0.1.0")
++    find_package(Farstream)
++    macro_log_feature(FARSTREAM_FOUND "Farstream"
++                      "A Framework for dealing with audio/video conferencing protocols"
++                      "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
++                      "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
++
++    # Find tp-farstream
++    set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
++    find_package(TelepathyFarstream)
++    macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
++                      "A Framework for dealing with audio/video conferencing protocols"
++                      "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
++                      "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
++endif(WITH_Farstream)
+ 
+ # Find GStreamer
+ find_package(GStreamer)
+@@ -258,8 +270,12 @@ endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+ 
+ # Add the source subdirectories
+ add_subdirectory(TelepathyQt)
+-add_subdirectory(examples)
+-add_subdirectory(tests)
++if(ENABLE_EXAMPLES)
++    add_subdirectory(examples)
++endif(ENABLE_EXAMPLES)
++if(ENABLE_TEST)
++    add_subdirectory(tests)
++endif(ENABLE_TEST)
+ add_subdirectory(tools)
+ 
+ # Generate config.h and config-version.h
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index 25afcbce2d8c..5d2ed019f35a 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -5,5 +5,6 @@
 	<use>
 		<flag name='glib'>Enable support for various telepathy/glib related packages</flag>
 		<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-0.9.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.1.ebuild
new file mode 100644
index 000000000000..e12b984e36ea
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.1.ebuild,v 1.1 2012/04/19 09:44:46 johu Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+inherit python base cmake-utils
+
+DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug farsight farstream test"
+
+RDEPEND="
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	farsight? (
+		net-libs/telepathy-farsight
+	)
+	farstream? (
+		>=net-libs/telepathy-farstream-0.2.2
+		>=net-libs/telepathy-glib-0.17.5
+	)
+	!net-libs/telepathy-qt4
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	farsight? (
+		>=net-libs/telepathy-glib-0.17.5
+	)
+	test? (
+		dev-libs/dbus-glib
+		dev-libs/glib
+		dev-python/dbus-python
+		x11-libs/qt-test:4
+	)
+"
+
+REQUIRED_USE="farsight? ( !farstream )"
+
+PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with farsight)
+		$(cmake-utils_use_with farstream)
+		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
+		$(cmake-utils_use_enable test)
+		-DENABLE_EXAMPLES=OFF
+	)
+	cmake-utils_src_configure
+}