Restrict tests in 0.8.0 to allow stabilization. Remove 0.9.0.

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

4 files changed, 9 insertions, 265 deletions

diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog
index f7233daa1b5b..2b56bf32bda3 100644
--- a/net-libs/telepathy-qt/ChangeLog
+++ b/net-libs/telepathy-qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/telepathy-qt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.7 2012/06/21 10:14:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.8 2012/06/24 14:11:16 pesa Exp $
+
+  24 Jun 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/telepathy-qt-0.9.0-automagicness.patch, -telepathy-qt-0.9.0.ebuild,
+  telepathy-qt-0.8.0.ebuild:
+  Restrict tests in 0.8.0 to allow stabilization. Remove 0.9.0.
 
   21 Jun 2012; Michael Palimaka <kensington@gentoo.org>
   +files/telepathy-qt-0.9.1-gcc-4.7.patch, telepathy-qt-0.9.1.ebuild:
@@ -85,4 +90,3 @@
   +telepathy-qt4-0.3.4.ebuild, +metadata.xml:
   Initial commit of telepathy-qt4. Moved from qting-edge overlay. Fixes bug
   #300397
-
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch
deleted file mode 100644
index 4b28be1722b1..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- telepathy-qt-0.9.0.orig/CMakeLists.txt	2011-12-20 21:33:46.000000000 +0100
-+++ telepathy-qt-0.9.0/CMakeLists.txt	2012-01-24 23:32:57.000000000 +0100
-@@ -73,6 +73,12 @@
- 
- 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)
-+option(WITH_Test "Enable test suite" ON)
-+
- # external dependencies
- 
- # Required dependencies
-@@ -108,31 +114,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 Qt 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;
--}"
--QT_GLIB_SUPPORT)
--macro_log_feature(QT_GLIB_SUPPORT "Qt 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)
-@@ -158,63 +142,100 @@
- 
- # 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-qt-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-qt-farsight and some additional examples"
--                  "http://www.gstreamer.net/" FALSE)
--
--# Build TelepathyQt-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)
-+if (WITH_Farsight)
-+    find_package(GLIB2)
-+    find_package(GObject)
-+    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-qt-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-qt-farsight and some additional examples"
-+		      "http://www.gstreamer.net/" FALSE)
-+
-+    # Build TelepathyQt-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 (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+endif(WITH_Farsight)
- 
- # Find telepathy-glib
--set(TELEPATHY_GLIB_MIN_VERSION 0.17.2)
--find_package(TelepathyGlib)
--macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
--                  "Glib bindings for Telepathy"
--                  "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
--                  "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 Qt has GLib support and Telepathy-glib was found
--if(QT_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(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+if(WITH_Glib)
-+    # Check for Qt Glib support
-+    include(CheckCXXSourceCompiles)
-+    set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
-+    set(CMAKE_REQUIRED_DEFINITIONS "")
-+    set(CMAKE_REQUIRED_FLAGS "")
-+
-+    CHECK_CXX_SOURCE_COMPILES("E_TP
-+    #include <QtCore/QtGlobal>
-+    int main()
-+    {
-+    #if defined(QT_NO_GLIB)
-+    #error \"Qt was compiled with Glib disabled\"
-+    #endif
-+    return 0;
-+    }"
-+    QT_GLIB_SUPPORT)
-+    macro_log_feature(QT_GLIB_SUPPORT "Qt 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)
-+
-+    # Find telepathy-glib
-+    set(TELEPATHY_GLIB_MIN_VERSION 0.17.2)
-+    find_package(TelepathyGlib)
-+    macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
-+		      "Glib bindings for Telepathy"
-+		      "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
-+		      "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 Qt has GLib support and Telepathy-glib was found
-+    if(QT_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(QT_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(QT_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(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+endif(WITH_Glib)
-+
- 
- # Add the source subdirectories
- add_subdirectory(TelepathyQt)
- add_subdirectory(examples)
--add_subdirectory(tests)
-+if(WITH_Test)
-+  add_subdirectory(tests)
-+endif(WITH_Test)
- add_subdirectory(tools)
- 
- # Generate config.h and config-version.h
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
index 345fa1e7d433..c9f0e8bbaee8 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # 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.8.0.ebuild,v 1.3 2012/05/05 02:54:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.4 2012/06/24 14:11:16 pesa Exp $
 
 EAPI=4
 
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug farsight glib test"
 
+RESTRICT="test" #423089
+
 RDEPEND="
 	dev-python/dbus-python
 	x11-libs/qt-core:4[glib?]
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild
deleted file mode 100644
index 5e733be77834..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.0.ebuild,v 1.3 2012/05/05 02:54:26 jdhore 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 glib test"
-
-RDEPEND="
-	dev-python/dbus-python
-	x11-libs/qt-core:4[glib?]
-	x11-libs/qt-dbus:4
-	farsight? (
-		dev-libs/dbus-glib
-		dev-libs/libxml2
-		media-libs/gstreamer
-		net-libs/telepathy-farsight
-	)
-	glib? (
-		dev-libs/glib:2
-		>=net-libs/telepathy-glib-0.17.2
-	)
-	!net-libs/telepathy-qt4
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( x11-libs/qt-test:4 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-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
-}
-
-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 test)
-	)
-	cmake-utils_src_configure
-}