Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

6 files changed, 24 insertions, 231 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/Manifest b/net-libs/telepathy-qt/Manifest
index e92feb7bc1d4..267f0e97e004 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX telepathy-qt-0.9.3-avatar-duplication.patch 2762 SHA256 67fa532ebc18acaffd1d0d73af2e5a147e01686f00fde79a0ab109c708a29eff SHA512 18e6b24ae829dd52f41e9331ced909b79c69cb79f45541bd031c29771a2ac1e29784aa0485cdbf8922d50a125d85f4f01068d1459649d80556d246db340b35c4 WHIRLPOOL 770bf58592f4f856f170c5a3b0b21c883dc67b1a04e82f6a07f5449990be5312ab9b96b8bccb67d4b14c69d1eb64d073e282aee6e352896f031b57421daa83e7
-AUX telepathy-qt-0.9.3-cmake-2.8.12.patch 1716 SHA256 b62e24035bacf2cd859e65f21125a35f0660aa79aca414014b6fc748ea8494e6 SHA512 8ee23ab379e3b9bfde33c8ad3cdeb6df2008aad3218b49cc60aafacec5f620d48b8f074c20251f00fbd0d5859cd6157b67aeedb139d8d6975eaf8019c47579ed WHIRLPOOL 63264a40f00b685ca48c4644741247701dbf5edeccc49f1ed0552f01767d5863809013d87b8dc15c8f327cc620edce5a397c047e59bbda68aff30efa1ace99e6
-AUX telepathy-qt-0.9.3-tp-glib-0.18-tests.patch 1456 SHA256 17d77ffe834908b6bd91fdce90d85fa0f5e6e33110c601509df729322aa0a46e SHA512 b28186c81f2c6a46c35bfa1f1f8ebcd1b47e85b0660bd53acd0df582ee1d90e9cfce6f1d5e6170ea7f4466cc08d3a42d10986f666523c5d3beef0077b9f7aaef WHIRLPOOL 85976481237eb43216e0a818f391fe5c0aed4579e2f50ec7bb5af04a926a8c07acd19503fbeb5ed8a6f7d279153454c908ff030d1a8aac9dc2115ef543229918
-DIST telepathy-qt-0.9.3.tar.gz 4414599 SHA256 c0ff57bea79b86ad343e184c16941d05f6d6d7dfd03876b44502f11935f44bf9 SHA512 46e370c9a2b8ee486cd99e5226a0098e8d04d2db105434097d617eda106e9f6f70b7de349646f46480792ed374984b8d3adff28b6d18f6ef6c979d4282902cb2 WHIRLPOOL d0bd45a772782dfaf2362a42265ee55ef47e4c80279b88d5ab2e2ef30dc9dc40b8423ff80ef451a33dc782253e53af9594f60d6e3299dadd8b073671200f0ed2
 DIST telepathy-qt-0.9.5.tar.gz 5862803 SHA256 93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e SHA512 2cc141037fbd2cc993f16e2ba52b3f6dda7841ff150f9d40d9e659eafdee67dd23563662954247f46bd8a34db7d87b7ec770da90725a19f634cd396a2d74e34b WHIRLPOOL cfef1a61725d0e07b65995155def64120d7d6993772511971eb7c8f7bcd956ed462544afbf52559cf2d5cc1825aeb1ce1f17371700d5a5e7f540b69da38d0709
-EBUILD telepathy-qt-0.9.3-r2.ebuild 1512 SHA256 1af5f53ed4e8b595b744bfb6a440c9a9ef3e0c8d7b6b8b7c899af4da1975dfff SHA512 342006f925db65463886edf2cc8fefcdb861baeb79dc0104b03536a6576b3f22480a147743dcfdfa644c19db4b3515da8803fa27d891b343d6cbc90389639be1 WHIRLPOOL 11b0de52ec91e39883fad401ce1463a0d921779d5a1eee276a793bbbe06951cc503e0a8835e49d5cd84d180cbb21b0ee027854a267e5b3e12a7bdfe869160176
 EBUILD telepathy-qt-0.9.5.ebuild 2029 SHA256 026d33f867da5edd4e8496ae919ccc1cea0606a35753a31acc13fb199f57a851 SHA512 98da0f6c642558b85d20a7ae37d388b8b99c7938e2666e72f76fd88a9734983a29cea27e4a01c87867246647b8fb2be19286ceff1df5100905d92dfa6890da5a WHIRLPOOL 81f329a83cd55d2de9aeafde27ccbecc1b3299154179bb10e20960ad8966a05d6495a9cd917f4f2836c053c63f3e53f624e4573efb57c8dda697204ec57d6555
-MISC ChangeLog 7394 SHA256 2711bc6dbc7573ab0633d6704df6f343af56cd840ab1df3ac99c395fd0914e3d SHA512 b5d7160f8342ef30feef3ac1e73c96b071da5406008781b0d3bb6d14e4ff0a38c9d7627984f540b10bedf4af9879443ea17521c650224750baf6d3e7b6c72b99 WHIRLPOOL e46ac3f90414b07479c172946271ed0590cfad3dfc3b4c871bef4869ea054e4b7e6ba06eccda1bb3ef21202c975668fd15187d49a549a93ae6b95a05d99a433b
+MISC ChangeLog 7661 SHA256 9dbbef03d1ea0be4da4ffbff0c47d7dc3fcc583914336d33a040815a30c00772 SHA512 812eac921d0c341364d2a1239f19877814a6b31f83c7b28a82f4d8b4efb66a8f1770cb79d20215dbebb8b40396368e60577870eebf9d9f4929487214c13da0bb WHIRLPOOL 14ef71e3ff7fa2815d1e1ce400e5afbaef4d96d13b76f467ceb83840b4aa10b91bb9358b7c6d78e02eae12ffba96f26e2e44efbdb71b7601de19d7e6f853ac3c
 MISC metadata.xml 272 SHA256 b1a0e608561c47e26b774c17f9118677de0d6b6dfd4897d65e08f6e063507f8e SHA512 66e6bb81db3c838e6a94dfb614c9b2075c3055fdf8f0d7254d104276b8385ee9bc2dbb27e543db4fa58958485c0d250f5963c5d77257d5398be1603974e9c2e9 WHIRLPOOL e9a05ecba5716465fa88e392aeeb0c9d0b2f9e3ced219d0487718d08685dbd1057e25b27ce3a881b4d17c80168e259631d9508a8ee1cb2ee7813a5a5673913f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVEsCRAAoJELp701BxlEWfTxEP/0+4/DmzNWnOkRXcpPWCyC3N
-06opXyU+hwL/0paJEa6nVRwSzFYQB36FyOxc0TPCEg+BZHnMHk8mi/7J2pEZknDn
-EU05BVpHzxkh5DoTgHdV+6KPqZ9ux2fGAY59J28KpwWXRBurHD6yutNImkv7rCNG
-7is2fzA1ak59bjaTSTDB620lc7u2+jkotJWd+M5CJjW2R3Fsv+bdfR41nomPtLUW
-kJz/GM1QMa9xiKbk8d6v9t4QOg8BF1Hs9cYjBtWwdToTR6JvA9wntU3b7d8cFo4C
-8YLFcm89Tw8C64HsonioGPcskB65p476Eij0IEaXSeZco+cRADSYrnqwz/WPVWEy
-RHGXAieY9FWdOwje1mOcMpcX2BL3KXMTrZM1aGbAcSFDTEEuS3wewOpdkiY5k+mg
-9pbJAlsuwh0eZJ54aBELym3xz8GbO354JC1w1atQCwKMv7J7uHqG16Lksg/PJMrN
-lpyQnmQPY2h1aGfYp+xZiiIKSer8MHQuKxBg6+DJRbAVTViVdqKLSJpm9LXtWn6j
-teAs8ycbhypg60g7M87iT3jE1PZQ3fEj2gJAnwQyX64/Q9S5UNqYaJpQj+hBCETB
-PE4JeSTAm+L9DTyMMQMKfNkZO1ejTLj2cmeX61k98hafhCmSGOyETbIMiUd1pl6m
-SQLf3p05LoaMJP3O4CTa
-=DSKu
+iQJiBAEBCABMBQJVFWwYRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7M/1D/9wf9BszTUpAFfu2fv4MdsGBQiGKRetPwWLNXV4vLTrtDuDqi66QdME//jy
+ZLqICza6Yuy28yzSu30Q+RZpOOAAdDvy5n3A0f5K8UwIpczxm7JEt4h4xyEZZyen
+AaIb5YCjLyobR9EN50CFLIBMuzIGHDHUNLW0YM5241AudglLzO8Z8td65ml8zAIq
+SxLGcGbs06LOkoACTYB8vz/uLf3vYm+wijAumZwEM4jSj5HMod1nrWQmS1A1Qv6k
+ysLXa45yFuTe4duFD91+UAdcymmzIjkcDpLm9mVWPaZ8QqITEdQz/a4ee+oPCQV9
+W7FNzyJ4C957iQRQwxJIMhvmpH/IHTupifwCO6viLDsIub0Ykut698WvUfzm4OSK
+wm01o78HvzTg/3W5EMya60EkWJ1boEdV9LXJPZrQEWYcJKwO1gfdyKQVNPCGM9eG
+sTyHZZzbQK/DwnkcOJ3E/I9HXhhlbKrv6QLg9SeB49XKrK5JH2ovpnDDxWJdvEAo
+j2ygKm64vH5nQgenQFWMWymB0C6G2emiJfvTcLkJdOnL8ISH1GjLja/gtuNjuLIN
+HSSz0b42uHMcWZs0iPIKrYEA5YW4+efsGixDdf0Tg1r9k7/0rxAD+pgbUrcUHxVy
+lAJ2fxqKSE8dp51smtnEWZAP6rhNSC4ZsoLYweDK7XaM0MUkjA==
+=GKMI
 -----END PGP SIGNATURE-----
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
-}