From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 66993138247 for ; Thu, 21 Nov 2013 17:56:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9B97E09B6; Thu, 21 Nov 2013 17:56:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81C4BE09B6 for ; Thu, 21 Nov 2013 17:56:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E70633F04B for ; Thu, 21 Nov 2013 17:56:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 409CDE5459 for ; Thu, 21 Nov 2013 17:56:51 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1385056364.db503d1a9b52fcad0a1244f0f919a76ad37dfa1e.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kpty/files/, kde-frameworks/kpty/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kpty/files/kpty-cmake.patch kde-frameworks/kpty/kpty-9999.ebuild X-VCS-Directories: kde-frameworks/kpty/files/ kde-frameworks/kpty/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: db503d1a9b52fcad0a1244f0f919a76ad37dfa1e X-VCS-Branch: master Date: Thu, 21 Nov 2013 17:56:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b0bdc3cb-08e3-4d11-abe0-1014128b3dfa X-Archives-Hash: 072b86e58cca0f218a87e885994fe7b9 commit: db503d1a9b52fcad0a1244f0f919a76ad37dfa1e Author: Michael Palimaka gentoo org> AuthorDate: Thu Nov 21 17:52:44 2013 +0000 Commit: Michael Palimaka gentoo 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 -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" )