From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SKbaC-0005aC-OD for garchives@archives.gentoo.org; Wed, 18 Apr 2012 20:34:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E184DE0D0E; Wed, 18 Apr 2012 20:34:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A146CE0D0E for ; Wed, 18 Apr 2012 20:34:20 +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 79B411B4018 for ; Wed, 18 Apr 2012 20:34:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3BDB2E5403 for ; Wed, 18 Apr 2012 20:34:18 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1334781214.626425ea7d1255e8f6af15dabb84a940df00b5e0.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/ X-VCS-Repository: proj/kde X-VCS-Files: net-libs/telepathy-qt/files/telepathy-qt-9999-automagicness.patch net-libs/telepathy-qt/metadata.xml net-libs/telepathy-qt/telepathy-qt-9999.ebuild X-VCS-Directories: net-libs/telepathy-qt/ net-libs/telepathy-qt/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 626425ea7d1255e8f6af15dabb84a940df00b5e0 X-VCS-Branch: master Date: Wed, 18 Apr 2012 20:34:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 554b47dd-6311-4231-8c06-6e1e1380e725 X-Archives-Hash: b7abd8c412e355ade834ae95706c9d47 commit: 626425ea7d1255e8f6af15dabb84a940df00b5e0 Author: Michael Palimaka astralcloak net> AuthorDate: Wed Apr 18 20:33:34 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Wed Apr 18 20:33:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D626425ea [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) +=20 + include(MacroLogFeature) +=20 ++# 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 t= o stderr" ON) ++option(ENABLE_EXAMPLES "Enable building of examples" ON) ++option(ENABLE_TEST "Enable test suite" ON) ++ + # external dependencies +=20 + # Required dependencies +@@ -122,7 +129,6 @@ include_directories(${CMAKE_SOURCE_DIR} +=20 + add_definitions(-DQT_NO_CAST_FROM_ASCII) +=20 +-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support f= or 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") +=20 + # 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) +=20 +-# 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 conferencin= g protocols" +- "http://farsight.freedesktop.org/wiki/" FALSE "${TELE= PATHY_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 conferencin= g protocols" +- "http://www.freedesktop.org/wiki/Software/Farstream" = FALSE "${FARSTREAM_MIN_VERSION}" +- "Needed, together with GStreamer and Telepathy-Farstr= eam, 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 conferencin= g protocols" +- "http://telepathy.freedesktop.org/wiki/" FALSE "${TEL= EPATHY_FARSTREAM_MIN_VERSION}" +- "Needed, together with GStreamer and Farstream, to bu= ild 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 confere= ncing protocols" ++ "http://farsight.freedesktop.org/wiki/" FALSE "${= TELEPATHY_FARSIGHT_MIN_VERSION}" ++ "Needed, together with GStreamer, to build telepa= thy-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 confere= ncing protocols" ++ "http://www.freedesktop.org/wiki/Software/Farstre= am" FALSE "${FARSTREAM_MIN_VERSION}" ++ "Needed, together with GStreamer and Telepathy-Fa= rstream, 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 confere= ncing protocols" ++ "http://telepathy.freedesktop.org/wiki/" FALSE "$= {TELEPATHY_FARSTREAM_MIN_VERSION}" ++ "Needed, together with GStreamer and Farstream, t= o build telepathy-qt-farstream") ++endif(WITH_Farstream) +=20 + # Find GStreamer + find_package(GStreamer) +@@ -258,8 +270,12 @@ endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND G= LIB2_FOUND AND DBUS_FOUND) +=20 + # 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) +=20 + # Generate config.h and config-version.h diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/m= etadata.xml index 25afcbc..c971a11 100644 --- a/net-libs/telepathy-qt/metadata.xml +++ b/net-libs/telepathy-qt/metadata.xml @@ -3,7 +3,7 @@ qt - Enable support for various telepathy/glib related = packages Enable support for farsight connection manager= + Enable support for audio/video calls via fars= tream diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/te= lepathy-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=3D"http://telepathy.freedesktop.org/" LICENSE=3D"LGPL-2.1" SLOT=3D"0" KEYWORDS=3D"" -IUSE=3D"debug farsight glib" +IUSE=3D"debug farsight farstream test" =20 RDEPEND=3D" - 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 - >=3Dnet-libs/telepathy-glib-0.15.1 ) - glib? ( dev-libs/glib:2 ) + farstream? ( + net-libs/telepathy-farstream + >=3Dnet-libs/telepathy-glib-0.17.5 + ) !net-libs/telepathy-qt4 " DEPEND=3D"${RDEPEND} - dev-libs/libxslt dev-util/pkgconfig + farsight? ( + >=3Dnet-libs/telepathy-glib-0.17.5 + ) + test? ( + dev-libs/dbus-glib + dev-libs/glib + dev-python/dbus-python + ) " =20 +REQUIRED_USE=3D"farsight? ( !farstream )" + +PATCHES=3D( "${FILESDIR}/${P}-automagicness.patch" ) DOCS=3D( AUTHORS ChangeLog HACKING NEWS README ) =20 pkg_setup() { @@ -43,17 +51,13 @@ pkg_setup() { python_pkg_setup } =20 -src_prepare() { - base_src_prepare - - sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die -} - src_configure() { local mycmakeargs=3D( - $(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=3DOFF ) cmake-utils_src_configure }