From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 9 Oct 2017 18:53:29 +0100
Subject: reinit the tree, so we can have metadata

---
 kde-misc/kdiff3/Manifest                           |  6 +++
 .../files/kdiff3-0.9.98_p20170219-cli-args.patch   | 51 ++++++++++++++++++++++
 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild  | 37 ++++++++++++++++
 kde-misc/kdiff3/metadata.xml                       | 11 +++++
 4 files changed, 105 insertions(+)
 create mode 100644 kde-misc/kdiff3/Manifest
 create mode 100644 kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
 create mode 100644 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
 create mode 100644 kde-misc/kdiff3/metadata.xml

(limited to 'kde-misc/kdiff3')

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
new file mode 100644
index 000000000000..2db1c3bc1cec
--- /dev/null
+++ b/kde-misc/kdiff3/Manifest
@@ -0,0 +1,6 @@
+AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 SHA256 bc2852171ae2734ab123bfb90032d68379dce9c4fa25ee30627508d371852f51 SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41 WHIRLPOOL 9b8be8d9fe82c15ed66b96941c90409591388413c701e9624aefb1e2f00efba7643862d2cb4052b0263c4666d8608e74428b1dd1e549cf3da133b821f3c92874
+DIST kdiff3-0.9.98_p20170219.tar.xz 798588 SHA256 ed764a5380818424b629e6474eb24e7c4dd2d8af3b443caeb15761908918e97e SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64 WHIRLPOOL 1916fe160b98659dac3b9e9962aba3fdfe9f46a602c3eaa56be59bda9caac572ad612fbac4106b07f6bdb288a4b2ba95e0d53e48431d63beb6bbcd2fb5358472
+EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 SHA256 1c3cb86fc501ea138981fbadf83c66b51084cfa3d4858867cb7a006cd00d2b59 SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c WHIRLPOOL 14544a1ee8740e16b4e9c798efccafaa979dbcc50d2ee5c6d93f049f49290e6a10fcb68315bb2e695276fb736a7792c27cecd3021814529e33d5da3e7eb827c9
+MISC ChangeLog 4073 SHA256 ae24694af500e66969eff260629005095893f01c5d3902d517e99d74cb97f658 SHA512 49858a17e45772777aefe55548740c599ae561712d5a30c44402c73a9dc575bbb1857bf2c4486c96094814f1a6eab386540ce04c579ed043c8a596106b1052d2 WHIRLPOOL dfe2d443a77248e6ea7651a8e643d3c5abf0251184ead9f9bc0ecbc5e3eae53315135f18fa17d700947d43c74e4ac0be7fb5d8f63e69eddaa70f844aee9bdc91
+MISC ChangeLog-2015 12558 SHA256 ab29cc49dc0fdcafed4211e11c1e5ecc5030522010af407deef227047bbf1820 SHA512 e8b09aaff1139e02d8bef6a755d5d744dca70a3a315ef2dfc666fcc920ef08191e6d013db81625b28abcecbcaea81eb0c4f6aca35dba9ba38f0665bcd88b57e9 WHIRLPOOL 4b325d03974d8108b1ea7883a033e3ac187c69c45449418e0dd39cdd7841a3e8420c39697619564684e793835538c7bec3f274039b2c4a14cda26a69bec21105
+MISC metadata.xml 328 SHA256 e0d38d757941f87b7ef533c53675ab8925355ba7e0437355f6b67e6f526cfc38 SHA512 440377f9aafbfb2b51e3ded2651cf638c918805328cf43474b62662d32a80592a30af92ed90a230a5306e3b05eb441bc72a8f14461282b8231cf68b08dc5cf34 WHIRLPOOL 73fc2e605d6aa1a77a871cfd4d46df7ad42bb549d84451a60a97990e8214b3f2e4762f1cddc0c61a3ee0bfe6ac27e25f0301db8d851a875c83e64e446170a2e7
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 000000000000..3312b504e58a
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
@@ -0,0 +1,51 @@
+commit b849851d3317903a8ab7c040966921384d9e6508
+Author: Peter Urbanec <git.user@urbanec.net>
+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 <git.user@urbanec.net>
+
+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
new file mode 100644
index 000000000000..3e8593f0cfef
--- /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="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" )
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
new file mode 100644
index 000000000000..d87d3af8d717
--- /dev/null
+++ b/kde-misc/kdiff3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kdiff3</remote-id>
+	</upstream>
+</pkgmetadata>
-- 
cgit v1.2.3