[gentoo-commits] proj/kde:master commit in: kde-frameworks/kpty/files/, kde-frameworks/kpty/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     db503d1a9b52fcad0a1244f0f919a76ad37dfa1e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 21 17:52:44 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 17:52:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=db503d1a

[kde-frameworks/kpty] Remove patch merged upstream.

Package-Manager: portage-2.2.7

---
 kde-frameworks/kpty/files/kpty-cmake.patch | 40 ------------------------------
 kde-frameworks/kpty/kpty-9999.ebuild       |  2 --
 2 files changed, 42 deletions(-)

diff --git a/kde-frameworks/kpty/files/kpty-cmake.patch b/kde-frameworks/kpty/files/kpty-cmake.patch
deleted file mode 100644
index 9681a54..0000000
--- a/kde-frameworks/kpty/files/kpty-cmake.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8af58e5c5171acff24cf14d79295a0d95deda083 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Wed, 20 Nov 2013 23:36:17 +0100
-Subject: [PATCH] Improve dependency specifications
-
-Depends only on Qt5 core for src. Move Qt test dependency spec to
-subdir.
----
- tier3/kpty/CMakeLists.txt           | 2 +-
- tier3/kpty/autotests/CMakeLists.txt | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tier3/kpty/CMakeLists.txt b/tier3/kpty/CMakeLists.txt
-index 12d977e..fc28e03 100644
---- a/tier3/kpty/CMakeLists.txt
-+++ b/tier3/kpty/CMakeLists.txt
-@@ -10,7 +10,7 @@ set(KF5_VERSION "5.0.0")
- include(KDEInstallDirs)
- include(KDECompilerSettings)
- include(KDECMakeSettings)
--find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Test)
-+find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core)
- 
- if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-   find_package(KCoreAddons ${KF5_VERSION} REQUIRED)
-diff --git a/tier3/kpty/autotests/CMakeLists.txt b/tier3/kpty/autotests/CMakeLists.txt
-index aa28cfc..4f0a164 100644
---- a/tier3/kpty/autotests/CMakeLists.txt
-+++ b/tier3/kpty/autotests/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include(ECMMarkAsTest)
- 
-+find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Test)
-+
- remove_definitions(-DQT_NO_CAST_FROM_ASCII)
- 
- add_executable(kptyprocesstest kptyprocesstest.cpp)
--- 
-1.8.4.3
-

diff --git a/kde-frameworks/kpty/kpty-9999.ebuild b/kde-frameworks/kpty/kpty-9999.ebuild
index 410649d..c648bf5 100644
--- a/kde-frameworks/kpty/kpty-9999.ebuild
+++ b/kde-frameworks/kpty/kpty-9999.ebuild
@@ -18,5 +18,3 @@ DEPEND="
 	sys-libs/libutempter
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )