diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-21 10:20:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-21 10:20:03 +0100 |
commit | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch) | |
tree | 3509e94070265053394b7f2e30a779d7e60c2064 /kde-misc/kdiff3 | |
parent | eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff) |
gentoo resync : 21.05.2019
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r-- | kde-misc/kdiff3/Manifest | 7 | ||||
-rw-r--r-- | kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch | 51 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 37 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-1.8.1.ebuild (renamed from kde-misc/kdiff3/kdiff3-1.8.ebuild) | 2 |
4 files changed, 3 insertions, 94 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index bc9d212bfc7c..72a99a01d7ba 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,6 +1,3 @@ -AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 BLAKE2B c85c377a8c5898a15233f5f4a1260dbd24c50f53869e673979c9d5ac42c2729a7cad39d066e0f4b6ae2f31687aa246c9420f1803c003168eb8e9b3bd7d43ed1b SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41 -DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64 -DIST kdiff3-1.8.tar.xz 897716 BLAKE2B bd5ec9ad0db639905d88429204ffca88450957f052712e45168f2d4bae808f38e7fc543bcb4ff53632c018c44929364e0314ec681f3475b517d8482b9ae5cbb5 SHA512 f4d791f593eb75a4a5dbd567af31f01be0a372a4058e50e8ab34b29409cc162cab022f33c1db5527f04ae9e8f35d6b485ca7789c4cd955d745887c3439172940 -EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 BLAKE2B 2575524af4656ebad0ca450a2ebf7039a3bd76128b14a6e9b0e9e08707ba79b4a7b328a9026ab5ebb5ac589f8539e750ce12a3a302d23e61334ba793618396ab SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c -EBUILD kdiff3-1.8.ebuild 860 BLAKE2B 9c54a0e866d30f890710800b5d6778213fab6b2d323667e04d0be782260bdf4afd631d4946900e3871d1405209be00357232bb810c047e7af866882e3eff3e87 SHA512 4d8f87b38683d19f42323f8fa6db11c0ae6c8639ce2c7705ecc397569620865f66d920d21ecef12e77aa733aa0599911eec2c37a25189e671e6c3713ab1b5db9 +DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720 +EBUILD kdiff3-1.8.1.ebuild 858 BLAKE2B 173e3604e8a1687f0eb7f781e805087b51c1a2ad65a3dcbef9cec3a946a235713a4c12db7c0305d886719da0f12119c719af74297a8d548a8cb5c62588dfbf14 SHA512 2c5ba21287fb4c766d0ab0582b09db4386e95f99a93d72cfaea889706a3aa593c526f97b90ce0d3be5f3c2932556b48655112698b3ec11cfecc46654555dcdda MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100 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 3312b504e58a..000000000000 --- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index 3e8593f0cfef..000000000000 --- 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" ) diff --git a/kde-misc/kdiff3/kdiff3-1.8.ebuild b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild index 85263eb39dbe..f78a6bf8684b 100644 --- a/kde-misc/kdiff3/kdiff3-1.8.ebuild +++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://userbase.kde.org/KDiff3" SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" |