commit: 2f28ec399e41bf4239e92d8ff36073823a01c796 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun May 19 22:00:38 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 19 22:01:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f28ec39
kde-misc/kdiff3: Drop 0.9.98_p20170219-r1 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/kdiff3/Manifest | 1 - .../files/kdiff3-0.9.98_p20170219-cli-args.patch | 51 ---------------------- kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 37 ---------------- 3 files changed, 89 deletions(-) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index d62ce74d89f..8bdceb71985 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1 @@ -DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64 DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720 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 deleted file mode 100644 index 3312b504e58..00000000000 --- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit b849851d3317903a8ab7c040966921384d9e6508 -Author: Peter Urbanec <[email protected]> -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 <[email protected]> - -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()<<QStringLiteral("b")<<QStringLiteral("base"),i18n("Explicit base file. For compatibility with certain tools."),QStringLiteral("file"))); - parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("o")<<QStringLiteral("out")<<QStringLiteral("output"),i18n("Output file. Implies -m."),QStringLiteral("file"))); - parser.addOption(QCommandLineOption(QStringLiteral("auto"),i18n("No GUI if all conflicts are auto-solvable. Needs -o file."))); -+ parser.addOption(QCommandLineOption(QStringLiteral("qall"),i18n("Don't solve conflicts automatically."))); -+ parser.addOption(QCommandLineOption(QStringLiteral("L1"),i18n("Visible name replacement for input file 1 (base)."),QStringLiteral("alias1"))); -+ parser.addOption(QCommandLineOption(QStringLiteral("L2"),i18n("Visible name replacement for input file 2."),QStringLiteral("alias2"))); -+ parser.addOption(QCommandLineOption(QStringLiteral("L3"),i18n("Visible name replacement for input file 3."),QStringLiteral("alias3"))); -+ parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("L")<<QStringLiteral("fname"),i18n("Alternative visible name replacement. Supply this once for every input."),QStringLiteral("alias"))); -+ parser.addOption(QCommandLineOption(QStringLiteral("cs"),i18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""),QStringLiteral("string"))); -+ parser.addOption(QCommandLineOption(QStringLiteral("confighelp"),i18n("Show list of config settings and current values."))); - parser.addPositionalArgument(QStringLiteral("file1"), i18n("File1 to open (base, if not specified via --base).")); - parser.addPositionalArgument(QStringLiteral("file2"), i18n("File2 to open.")); - parser.addPositionalArgument(QStringLiteral("file3"), i18n("File3 to open (optional).")); - -- aboutData.setupCommandLine(&parser); -- parser.process(app); -- aboutData.processCommandLine(&parser); -- - // TODO KF5 --// options.add( "qall", ki18n("Don't solve conflicts automatically.") ); --// options.add( "L1 alias1", ki18n("Visible name replacement for input file 1 (base).") ); --// options.add( "L2 alias2", ki18n("Visible name replacement for input file 2.") ); --// options.add( "L3 alias3", ki18n("Visible name replacement for input file 3.") ); --// options.add( "L" ).add( "fname alias", ki18n("Alternative visible name replacement. Supply this once for every input.") ); --// options.add( "cs string", ki18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"") ); --// options.add( "confighelp", ki18n("Show list of config settings and current values.") ); - // options.add( "config file", ki18n("Use a different config file.") ); - -+ aboutData.setupCommandLine(&parser); -+ parser.process(app); -+ aboutData.processCommandLine(&parser); - - KDiff3Shell *p = new KDiff3Shell(&parser); - p->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 deleted file mode 100644 index 3e8593f0cfe..00000000000 --- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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="https://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" )
