From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70BBC139695 for ; Sun, 14 May 2017 10:13:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D63D1E0E57; Sun, 14 May 2017 10:13:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A043AE0E57 for ; Sun, 14 May 2017 10:13:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CC683416AA for ; Sun, 14 May 2017 10:13:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FA157448 for ; Sun, 14 May 2017 10:13:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1494756818.0f8be8520d3495bd57ed7638671d288c8855cea9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild X-VCS-Directories: kde-misc/kdiff3/ kde-misc/kdiff3/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0f8be8520d3495bd57ed7638671d288c8855cea9 X-VCS-Branch: master Date: Sun, 14 May 2017 10:13:49 +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: 3d3a9506-e388-44a2-861d-33cb890a137a X-Archives-Hash: 5d8e87e94b1e54c82a21663ffff32b0b commit: 0f8be8520d3495bd57ed7638671d288c8855cea9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 14 10:00:55 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 14 10:13:38 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8be852 kde-misc/kdiff3: Fix missing cli options Thanks-to: Peter Urbanec urbanec.net> Gentoo-bug: 546494 Package-Manager: Portage-2.3.5, Repoman-2.3.1 .../files/kdiff3-0.9.98_p20170219-cli-args.patch | 51 ++++++++++++++++++++++ kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 37 ++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch new file mode 100644 index 00000000000..3312b504e58 --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch @@ -0,0 +1,51 @@ +commit b849851d3317903a8ab7c040966921384d9e6508 +Author: Peter Urbanec +Date: Thu May 11 16:09:12 2017 +1000 + + Implement most of the missing command line options + + A number of command line options were missing, which caused kdiff3 from + failing to work properly when used as the mergetool in git. In particular, + git relies on the -L group of options and without those it would fail. + + Signed-off-by: Peter Urbanec + +diff --git a/src/main.cpp b/src/main.cpp +index 3549c92..fed486d 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -67,24 +67,23 @@ int main(int argc, char *argv[]) + parser.addOption(QCommandLineOption(QStringList()<show(); diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild new file mode 100644 index 00000000000..04a916f8c4b --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Frontend to diff3 based on Qt/KF5" +HOMEPAGE="http://kdiff3.sourceforge.net/ +https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5" +SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) +" +RDEPEND="${DEPEND} + !kde-misc/kdiff3:4 + sys-apps/diffutils +" + +PATCHES=( "${FILESDIR}/${P}-cli-args.patch" )