Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

5 files changed, 8 insertions, 211 deletions

diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog
index 676f752f439a..32aaf1701773 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.35 2015/03/25 14:05:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.36 2015/03/27 14:41:20 kensington Exp $
+
+  27 Mar 2015; Michael Palimaka <kensington@gentoo.org>
+  -files/telepathy-qt-0.9.3-avatar-duplication.patch,
+  -files/telepathy-qt-0.9.3-cmake-2.8.12.patch,
+  -files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch,
+  -telepathy-qt-0.9.3-r2.ebuild:
+  Remove old.
 
   25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> telepathy-qt-0.9.5.ebuild:
   Stable for x86, wrt bug #542094
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-avatar-duplication.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-avatar-duplication.patch
deleted file mode 100644
index 4dd9a38a810f..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-avatar-duplication.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8da9f7069929893bcee64dab22101134752fe618 Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Thu, 07 Feb 2013 12:37:49 +0000
-Subject: Fix storing avatars, so that they are not stored millions of times each
-
-The original problem lies in the fact that QFile::rename() does not overwrite
-existing files. Therefore it fails and the temporary file stays on the
-filesystem together with the already existing avatar file. Checking if the file
-exists before renaming solves this partially, but the problem is that this
-operation is not atomic. There can be many processes using tp-qt, fetching
-avatars at the same time from the server, and in this case we can still have
-a problem there. The final solution is to ignore a new avatar that has the same
-token as an avatar that is already on the filesystem. According to the spec,
-different avatars have different tokens, so if an avatar changes, the token
-changes as well.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=47647
-
-Reviewed-by: David Edmundson <kde@davidedmundson.co.uk>
----
-diff --git a/TelepathyQt/contact-manager.cpp b/TelepathyQt/contact-manager.cpp
-index a67e736..dfa28bc 100644
---- a/TelepathyQt/contact-manager.cpp
-+++ b/TelepathyQt/contact-manager.cpp
-@@ -1341,17 +1341,27 @@ void ContactManager::onAvatarRetrieved(uint handle, const QString &token,
-         debug() << "Filename:" << avatarFileName;
-         debug() << "MimeType:" << mimeType;
- 
--        QTemporaryFile mimeTypeFile(mimeTypeFileName);
--        mimeTypeFile.open();
--        mimeTypeFile.write(mimeType.toLatin1());
--        mimeTypeFile.setAutoRemove(false);
--        mimeTypeFile.rename(mimeTypeFileName);
--
--        QTemporaryFile avatarFile(avatarFileName);
--        avatarFile.open();
--        avatarFile.write(data);
--        avatarFile.setAutoRemove(false);
--        avatarFile.rename(avatarFileName);
-+        if (!QFile::exists(mimeTypeFileName)) {
-+            QTemporaryFile mimeTypeFile(mimeTypeFileName);
-+            if (mimeTypeFile.open()) {
-+                mimeTypeFile.write(mimeType.toLatin1());
-+                mimeTypeFile.setAutoRemove(false);
-+                if (!mimeTypeFile.rename(mimeTypeFileName)) {
-+                    mimeTypeFile.remove();
-+                }
-+            }
-+        }
-+
-+        if (!QFile::exists(avatarFileName)) {
-+            QTemporaryFile avatarFile(avatarFileName);
-+            if (avatarFile.open()) {
-+                avatarFile.write(data);
-+                avatarFile.setAutoRemove(false);
-+                if (!avatarFile.rename(avatarFileName)) {
-+                    avatarFile.remove();
-+                }
-+            }
-+        }
-     }
- 
-     ContactPtr contact = lookupContactByHandle(handle);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-cmake-2.8.12.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-cmake-2.8.12.patch
deleted file mode 100644
index d490bfc927e2..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-cmake-2.8.12.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 05fe3f4980bbc6b016e25dcf07e44afe29e377c0
-Author: David Edmundson <kde@davidedmundson.co.uk>
-Date:   Sun Sep 29 22:19:27 2013 +0000
-
-    Fix compilation on new versions of cmake
-    
-    Recent cmake has changed the argument count to
-    qt4_create_moc_command, we need to adjust accordingly
-    
-    Reviewed-by: Dario Freddi <dario.freddi@ispirata.com>
-
-diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
-index c2eac76..b3131f0 100644
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
- 
- MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-   IF(QT_VERSION_MAJOR MATCHES 4)
--    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-   ELSE(QT_VERSION_MAJOR MATCHES 4)
-     IF(QT_VERSION_MAJOR MATCHES 5)
--      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-     ENDIF(QT_VERSION_MAJOR MATCHES 5)
-   ENDIF(QT_VERSION_MAJOR MATCHES 4)
- ENDMACRO(QT_CREATE_MOC_COMMAND)
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch
deleted file mode 100644
index d53c7de0f2c6..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.3-tp-glib-0.18-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 145e58636b130502adf0bd0ad5d5551aae2e2932 Mon Sep 17 00:00:00 2001
-From: Dario Freddi <dario.freddi@collabora.com>
-Date: Mon, 27 Aug 2012 17:37:49 +0000
-Subject: Merge branch 'tp-glib-0.18'
-
-Reviewed-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
----
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 574cb60..2e52f27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,7 +185,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python"
- 
- if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT)
-     # Find telepathy-glib
--    set(TELEPATHY_GLIB_MIN_VERSION 0.17.5)
-+    set(TELEPATHY_GLIB_MIN_VERSION 0.18.0)
-     find_package(TelepathyGlib)
-     macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
-                       "Glib bindings for Telepathy"
-diff --git a/tests/lib/glib/util.c b/tests/lib/glib/util.c
-index 21d3855..f0bcd96 100644
---- a/tests/lib/glib/util.c
-+++ b/tests/lib/glib/util.c
-@@ -431,6 +431,9 @@ tp_tests_connection_assert_disconnect_succeeds (TpConnection *connection)
-   g_object_unref (result);
- }
- 
-+/* The following blocks require tp-glib 0.19 to compile. However, tp_tests_connection_run_until_contact_by_id
-+   is never used in our code, so we simply disable its compilation. */
-+#if 0
- static void
- one_contact_cb (GObject *object,
-     GAsyncResult *result,
-@@ -463,3 +466,4 @@ tp_tests_connection_run_until_contact_by_id (TpConnection *connection,
- 
-   return contact;
- }
-+#endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.3-r2.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.3-r2.ebuild
deleted file mode 100644
index 15cda5920f2a..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 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-r2.ebuild,v 1.2 2014/07/07 13:14:59 pacho Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit base python-any-r1 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 farstream test"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	farstream? (
-		>=net-libs/telepathy-farstream-0.2.2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-	!net-libs/telepathy-qt4
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? (
-		dev-libs/dbus-glib
-		dev-libs/glib
-		dev-python/dbus-python
-		dev-qt/qttest:4
-	)
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-tp-glib-0.18-tests.patch"
-	"${FILESDIR}/${P}-avatar-duplication.patch"
-	"${FILESDIR}/${P}-cmake-2.8.12.patch"
-)
-
-# test hangs, needs further investigation
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(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
-}