[gentoo-commits] proj/kde:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/

["Michael Palimaka" <kensington@astralcloak.net>]

commit:     626425ea7d1255e8f6af15dabb84a940df00b5e0
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Apr 18 20:33:34 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Apr 18 20:33:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=626425ea

[net-libs/telepathy-qt] Avoid automagic dependencies. Remove dependencies that are not directly used by this package.

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

---
 .../files/telepathy-qt-9999-automagicness.patch    |  109 ++++++++++++++++++++
 net-libs/telepathy-qt/metadata.xml                 |    2 +-
 net-libs/telepathy-qt/telepathy-qt-9999.ebuild     |   38 ++++---
 3 files changed, 131 insertions(+), 18 deletions(-)

diff --git a/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch
new file mode 100644
index 0000000..b34adb3
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-9999-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 25afcbc..c971a11 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<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-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 86e3db8..faa569b 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -15,27 +15,35 @@ HOMEPAGE="http://telepathy.freedesktop.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug farsight glib"
+IUSE="debug farsight farstream test"
 
 RDEPEND="
-	dev-python/dbus-python
-	x11-libs/qt-core:4[glib?]
+	x11-libs/qt-core:4
 	x11-libs/qt-dbus:4
 	farsight? (
-		dev-libs/dbus-glib
-		dev-libs/libxml2
-		media-libs/gstreamer
 		net-libs/telepathy-farsight
-		>=net-libs/telepathy-glib-0.15.1
 	)
-	glib? ( dev-libs/glib:2 )
+	farstream? (
+		net-libs/telepathy-farstream
+		>=net-libs/telepathy-glib-0.17.5
+	)
 	!net-libs/telepathy-qt4
 "
 DEPEND="${RDEPEND}
-	dev-libs/libxslt
 	dev-util/pkgconfig
+	farsight? (
+		>=net-libs/telepathy-glib-0.17.5
+	)
+	test? (
+		dev-libs/dbus-glib
+		dev-libs/glib
+		dev-python/dbus-python
+	)
 "
 
+REQUIRED_USE="farsight? ( !farstream )"
+
+PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
 pkg_setup() {
@@ -43,17 +51,13 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-src_prepare() {
-	base_src_prepare
-
-	sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-		$(cmake-utils_use_with glib)
 		$(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
 }