diff options
author | Johannes Huber <johu@gentoo.org> | 2014-04-13 16:06:40 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2014-04-13 16:06:40 +0000 |
commit | ed78ff1cbb9599ba3c8f5c56f5b7f25d8b042886 (patch) | |
tree | 8581d8478d7d75490e065e83837b02a7178ee53a /net-libs | |
parent | amd64/x86 stable, bug #489220 (diff) | |
download | gentoo-2-ed78ff1cbb9599ba3c8f5c56f5b7f25d8b042886.tar.gz gentoo-2-ed78ff1cbb9599ba3c8f5c56f5b7f25d8b042886.tar.bz2 gentoo-2-ed78ff1cbb9599ba3c8f5c56f5b7f25d8b042886.zip |
Remove old.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/telepathy-qt/ChangeLog | 9 | ||||
-rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch | 190 | ||||
-rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch | 109 | ||||
-rw-r--r-- | net-libs/telepathy-qt/files/telepathy-qt-0.9.1-gcc-4.7.patch | 52 | ||||
-rw-r--r-- | net-libs/telepathy-qt/metadata.xml | 1 | ||||
-rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild | 70 | ||||
-rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild | 59 | ||||
-rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild | 67 |
8 files changed, 8 insertions, 549 deletions
diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog index 24a0505c9b44..b43019278720 100644 --- a/net-libs/telepathy-qt/ChangeLog +++ b/net-libs/telepathy-qt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/telepathy-qt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.25 2014/04/13 16:03:18 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.26 2014/04/13 16:06:40 johu Exp $ + + 13 Apr 2014; Johannes Huber <johu@gentoo.org> + -files/telepathy-qt-0.8.0-automagicness.patch, + -files/telepathy-qt-0.9.1-automagicness.patch, + -files/telepathy-qt-0.9.1-gcc-4.7.patch, -telepathy-qt-0.8.0.ebuild, + -telepathy-qt-0.9.2.ebuild, -telepathy-qt-0.9.3.ebuild, metadata.xml: + Remove old. 13 Apr 2014; Johannes Huber <johu@gentoo.org> telepathy-qt-0.9.3-r1.ebuild: amd64/x86 stable, bug #489220 diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch deleted file mode 100644 index bac928d43e8e..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.8.0-automagicness.patch +++ /dev/null @@ -1,190 +0,0 @@ ---- telepathy-qt4-0.8.0.orig/CMakeLists.txt 2011-12-03 19:26:01.265996011 +0100 -+++ telepathy-qt4-0.8.0/CMakeLists.txt 2011-12-03 19:54:29.233643477 +0100 -@@ -84,6 +84,11 @@ - - include(MacroLogFeature) - -+# options -+option(WITH_Glib "Enable building with glib features" ON) -+option(WITH_Farsight "Enable building with farsight features" ON) -+option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON) -+ - # external dependencies - - # Required dependencies -@@ -100,31 +105,9 @@ - - 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) -+if(ENABLE_DEBUG_OUTPUT) - add_definitions(-DENABLE_DEBUG) --endif (ENABLE_DEBUG_OUTPUT) -- --# Check for Qt4 Glib support --include(CheckCXXSourceCompiles) --set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES}) --set(CMAKE_REQUIRED_DEFINITIONS "") --set(CMAKE_REQUIRED_FLAGS "") -- --CHECK_CXX_SOURCE_COMPILES(" --#include <QtCore/QtGlobal> --int main() --{ --#if defined(QT_NO_GLIB) --#error \"Qt was compiled with Glib disabled\" --#endif --return 0; --}" --QT4_GLIB_SUPPORT) --macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support" -- "QtCore library using Glib's main event loop" -- "http://qt.nokia.com/" FALSE "" -- "Needed, together with Telepathy-Glib, to build most of the unit tests") -+endif(ENABLE_DEBUG_OUTPUT) - - # Find python version >= 2.5 - find_package(PythonLibrary REQUIRED) -@@ -150,58 +133,91 @@ - - # Find GLib2, GObject, DBus and LibXml2 - # Those are needed for the insane include dir dependency hell --find_package(GLIB2) --find_package(GObject) --find_package(GIO) --find_package(GIOUnix) --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 "0.0.4" -- "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples") -- --# Find GStreamer --find_package(GStreamer) --macro_log_feature(GSTREAMER_FOUND "GStreamer" -- "An open source multimedia framework" -- "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples" -- "http://www.gstreamer.net/" FALSE) -- --# Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found --if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -- set (FARSIGHT_COMPONENTS_FOUND 1) --else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -- set (FARSIGHT_COMPONENTS_FOUND 0) --endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+if(WITH_Farsight) -+ find_package(GLIB2 REQUIRED) -+ find_package(GObject REQUIRED) -+ find_package(DBus REQUIRED) -+ find_package(DBusGLib REQUIRED) -+ find_package(LibXml2 REQUIRED) -+ -+ # Find tp-farsight -+ set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4") -+ find_package(TelepathyFarsight REQUIRED) -+ macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight" -+ "A Framework for dealing with audio/video conferencing protocols" -+ "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4" -+ "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples") -+ -+ # Find GStreamer -+ find_package(GStreamer REQUIRED) -+ macro_log_feature(GSTREAMER_FOUND "GStreamer" -+ "An open source multimedia framework" -+ "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples" -+ "http://www.gstreamer.net/" FALSE) -+ -+ # Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found -+ if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+ set (FARSIGHT_COMPONENTS_FOUND 1) -+ else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+ set (FARSIGHT_COMPONENTS_FOUND 0) -+ endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) -+else(WITH_Farsight) -+ set(FARSIGHT_COMPONENTS_FOUND 0) -+endif(WITH_Farsight) - - # Find telepathy-glib --set(TELEPATHY_GLIB_MIN_VERSION 0.15.1) --find_package(TelepathyGlib) --macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" -- "Glib bindings for Telepathy" -- "http://telepathy.freedesktop.org/" FALSE "0.15.1" -- "Needed, together with Qt Glib integration, to build most of the unit tests") -- --find_program(GLIB_GENMARSHAL glib-genmarshal) -- --# Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found --if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -- set(ENABLE_TP_GLIB_TESTS 1) -- if(GIO_FOUND AND GIOUNIX_FOUND) -- set(ENABLE_TP_GLIB_GIO_TESTS 1) -- else(GIO_FOUND AND GIOUNIX_FOUND) -- set(ENABLE_TP_GLIB_GIO_TESTS 0) -- endif(GIO_FOUND AND GIOUNIX_FOUND) --else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -- set(ENABLE_TP_GLIB_TESTS 0) -- set(ENABLE_TP_GLIB_GIO_TESTS 0) --endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+if(WITH_Glib) -+ # Check for Qt4 Glib support -+ include(CheckCXXSourceCompiles) -+ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES}) -+ set(CMAKE_REQUIRED_DEFINITIONS "") -+ set(CMAKE_REQUIRED_FLAGS "") -+ -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include <QtCore/QtGlobal> -+ int main() -+ { -+ #if defined(QT_NO_GLIB) -+ #error \"Qt was compiled with Glib disabled\" -+ #endif -+ return 0; -+ }" -+ QT4_GLIB_SUPPORT) -+ macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support" -+ "QtCore library using Glib's main event loop" -+ "http://qt.nokia.com/" FALSE "" -+ "Needed, together with Telepathy-Glib, to build most of the unit tests") -+ -+ find_package(GLIB2 REQUIRED) -+ find_package(GIO) -+ find_package(GIOUnix) -+ find_package(DBus REQUIRED) -+ -+ set(TELEPATHY_GLIB_MIN_VERSION 0.15.1) -+ find_package(TelepathyGlib REQUIRED) -+ macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" -+ "Glib bindings for Telepathy" -+ "http://telepathy.freedesktop.org/" FALSE "0.15.1" -+ "Needed, together with Qt Glib integration, to build most of the unit tests") -+ -+ find_program(GLIB_GENMARSHAL glib-genmarshal) -+ # Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found -+ if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+ set(ENABLE_TP_GLIB_TESTS 1) -+ if(GIO_FOUND AND GIOUNIX_FOUND) -+ set(ENABLE_TP_GLIB_GIO_TESTS 1) -+ else(GIO_FOUND AND GIOUNIX_FOUND) -+ set(ENABLE_TP_GLIB_GIO_TESTS 0) -+ endif(GIO_FOUND AND GIOUNIX_FOUND) -+ else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+ set(ENABLE_TP_GLIB_TESTS 0) -+ set(ENABLE_TP_GLIB_GIO_TESTS 0) -+ endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) -+else(WITH_Glib) -+ set(ENABLE_TP_GLIB_TESTS 0) -+ set(ENABLE_TP_GLIB_GIO_TESTS 0) -+endif(WITH_Glib) -+ - - # Add the source subdirectories - add_subdirectory(TelepathyQt4) 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 deleted file mode 100644 index b34adb3fc971..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-automagicness.patch +++ /dev/null @@ -1,109 +0,0 @@ -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/files/telepathy-qt-0.9.1-gcc-4.7.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-gcc-4.7.patch deleted file mode 100644 index 248e0d5a0d88..000000000000 --- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.1-gcc-4.7.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b2632998374b45af488b6c3a5a6fe330d23bb799 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Wed, 02 May 2012 14:34:47 +0000 -Subject: Use quintptr instead of intptr_t. - -This fixes FTBFS with gcc-4.7, which requires <stdint.h> to be -included for intptr_t to be available. However, since stdint.h -is not part of the C++03 standard, it is better to use Qt's types. - -Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> - -diff --git a/TelepathyQt/client-registrar.cpp b/TelepathyQt/client-registrar.cpp -index 1b6c1e4..6ed9932 100644 ---- a/TelepathyQt/client-registrar.cpp -+++ b/TelepathyQt/client-registrar.cpp -@@ -888,7 +888,7 @@ bool ClientRegistrar::registerClient(const AbstractClientPtr &client, - .arg(mPriv->bus.baseService() - .replace(QLatin1String(":"), QLatin1String("_")) - .replace(QLatin1String("."), QLatin1String("_"))) -- .arg((intptr_t) client.data(), 0, 16)); -+ .arg((quintptr) client.data(), 0, 16)); - } - - if (mPriv->services.contains(busName) || -diff --git a/TelepathyQt/stream-tube-client.cpp b/TelepathyQt/stream-tube-client.cpp -index f22384c..9716a34 100644 ---- a/TelepathyQt/stream-tube-client.cpp -+++ b/TelepathyQt/stream-tube-client.cpp -@@ -211,7 +211,7 @@ struct TP_QT_NO_EXPORT StreamTubeClient::Private - .arg(registrar->dbusConnection().baseService() - .replace(QLatin1Char(':'), QLatin1Char('_')) - .replace(QLatin1Char('.'), QLatin1Char('_'))) -- .arg((intptr_t) this, 0, 16); -+ .arg((quintptr) this, 0, 16); - } - } - -diff --git a/TelepathyQt/stream-tube-server.cpp b/TelepathyQt/stream-tube-server.cpp -index e1791df..8aaaff4 100644 ---- a/TelepathyQt/stream-tube-server.cpp -+++ b/TelepathyQt/stream-tube-server.cpp -@@ -307,7 +307,7 @@ struct StreamTubeServer::Private - .arg(registrar->dbusConnection().baseService() - .replace(QLatin1Char(':'), QLatin1Char('_')) - .replace(QLatin1Char('.'), QLatin1Char('_'))) -- .arg((intptr_t) this, 0, 16); -+ .arg((quintptr) this, 0, 16); - } - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml index 5041aecd4fbd..dabc844f3d48 100644 --- a/net-libs/telepathy-qt/metadata.xml +++ b/net-libs/telepathy-qt/metadata.xml @@ -4,7 +4,6 @@ <herd>qt</herd> <herd>kde</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> diff --git a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild deleted file mode 100644 index 6ce19432d245..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 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.8.0.ebuild,v 1.9 2013/03/02 22:58:30 hwoarang Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.5" -MY_PN=${PN}4 -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/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug farsight glib test" - -RESTRICT="test" #423089 - -RDEPEND=" - dev-python/dbus-python - dev-qt/qtcore:4[glib?] - dev-qt/qtdbus:4 - farsight? ( - dev-libs/dbus-glib - dev-libs/libxml2 - media-libs/gstreamer - >=net-libs/telepathy-glib-0.15.1 - net-libs/telepathy-farsight - ) - glib? ( dev-libs/glib:2 ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - dev-libs/libxslt - virtual/pkgconfig - test? ( dev-qt/qttest:4 ) -" - -PATCHES=( "${FILESDIR}/${P}-automagicness.patch" ) - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -S=${WORKDIR}/${MY_PN}-${PV} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - base_src_prepare - - sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die - - if ! use test ; then - sed -i -e '/^add_subdirectory(tests)$/d' CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable debug DEBUG_OUTPUT) - $(cmake-utils_use_with glib) - $(cmake-utils_use_with farsight) - ) - cmake-utils_src_configure -} diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild deleted file mode 100644 index 5bef72bccc87..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 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.2.ebuild,v 1.3 2013/03/02 22:58:30 hwoarang 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=" - 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.17.5 - ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib - dev-python/dbus-python - dev-qt/qttest:4 - ) -" - -REQUIRED_USE="farsight? ( !farstream )" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -pkg_setup() { - python_set_active_version 2 - python_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) - -DENABLE_EXAMPLES=OFF - ) - cmake-utils_src_configure -} diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild deleted file mode 100644 index 2f60b05339f2..000000000000 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2013 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.3.ebuild,v 1.6 2013/03/02 22:58:30 hwoarang Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.5" -inherit python base cmake-utils virtualx - -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 ~arm x86" -IUSE="debug farsight 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 - ) - !net-libs/telepathy-qt4 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - dev-libs/dbus-glib - dev-libs/glib - dev-python/dbus-python - dev-qt/qttest:4 - ) -" - -REQUIRED_USE="farsight? ( !farstream )" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -PATCHES=( "${FILESDIR}/${P}-tp-glib-0.18-tests.patch" ) - -pkg_setup() { - python_set_active_version 2 - python_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) - -DENABLE_EXAMPLES=OFF - ) - cmake-utils_src_configure -} - -src_test() { - pushd "${CMAKE_BUILD_DIR}" > /dev/null - Xemake test || die "tests failed" - popd > /dev/null -} |