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 B6887138010 for ; Thu, 23 Aug 2012 07:56:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FE95E06BF; Thu, 23 Aug 2012 07:56:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6D1EDE06BF for ; Thu, 23 Aug 2012 07:56:50 +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 AB7A933DFA0 for ; Thu, 23 Aug 2012 07:56:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9A152E543D for ; Thu, 23 Aug 2012 07:56:47 +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: <1345708532.ba93db5b57a79a9b9c7a89feae4f118aef61828e.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: ba93db5b57a79a9b9c7a89feae4f118aef61828e X-VCS-Branch: master Date: Thu, 23 Aug 2012 07:56:47 +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: d20f72fb-6ba3-431a-bc4b-9c0a7f534aa1 X-Archives-Hash: 7ea9c0d16009627098b0aece6c405031 commit: ba93db5b57a79a9b9c7a89feae4f118aef61828e Author: Michael Palimaka gentoo org> AuthorDate: Thu Aug 23 07:55:32 2012 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Aug 23 07:55:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ba93db5b [kde-base/kdelibs] Fully remove calculator key patch. This is fixed upstream in 1c7ae18ef5d1b7adbb271c1164d0d899eb6d4ed8. (Portage version: 2.1.11.10/git/Linux x86_64, unsigned Manifest commit) --- .../files/kdelibs-4.8.2-calculator_key.patch | 11 ----------- kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 1 - kde-base/kdelibs/kdelibs-9999.ebuild | 1 - 3 files changed, 0 insertions(+), 13 deletions(-) diff --git a/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch b/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch deleted file mode 100644 index 4c481c6..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:53:49.480771132 -0200 -+++ kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:20:38.912403430 -0200 -@@ -355,7 +355,7 @@ - { Qt::Key_MediaRecord, XF86XK_AudioRecord }, - { Qt::Key_LaunchMail, XF86XK_Mail }, - { Qt::Key_Launch0, XF86XK_MyComputer }, -- { Qt::Key_Calculator, XF86XK_Calculator }, -+ { Qt::Key_Launch1, XF86XK_Calculator }, - { Qt::Key_Memo, XF86XK_Memo }, - { Qt::Key_ToDoList, XF86XK_ToDoList }, - { Qt::Key_Calendar, XF86XK_Calendar }, diff --git a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild index 0d599aa..f6d4261 100644 --- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild @@ -142,7 +142,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.8.2-calculator_key.patch" "${FILESDIR}/${PN}-4.8.4-bytecode.patch" ) diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index 0b55157..da90413 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -144,7 +144,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.8.1-norpath.patch" "${FILESDIR}/${PN}-4.8.4-bytecode.patch" ) -#"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" doesn't apply at all anymore pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then