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 3C833139085 for ; Mon, 23 Jan 2017 08:04:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB427234024; Mon, 23 Jan 2017 08:04:16 +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 851D8234024 for ; Mon, 23 Jan 2017 08:04:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 082F6341699 for ; Mon, 23 Jan 2017 08:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 708512C41 for ; Mon, 23 Jan 2017 08:04:13 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1485158553.284b5c56b5ade28c379d24181a6dc9545dfe527c.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/krusader/files/, kde-misc/krusader/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/krusader/Manifest kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild kde-misc/krusader/metadata.xml X-VCS-Directories: kde-misc/krusader/files/ kde-misc/krusader/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 284b5c56b5ade28c379d24181a6dc9545dfe527c X-VCS-Branch: master Date: Mon, 23 Jan 2017 08:04:13 +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: d205bc3b-4d9c-414b-92b3-eba00412f2d1 X-Archives-Hash: fe4a2ecdf6b9226ffb8c02dda04edba2 commit: 284b5c56b5ade28c379d24181a6dc9545dfe527c Author: Johannes Huber gentoo org> AuthorDate: Mon Jan 23 08:02:33 2017 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Jan 23 08:02:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284b5c56 kde-misc/krusader: Drop slot 4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-misc/krusader/Manifest | 1 - .../files/krusader-2.4.0_beta3-new-folder.patch | 11 --- .../krusader-2.5.0-hardcode-krarc-mimes.patch | 88 ---------------------- kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild | 38 ---------- kde-misc/krusader/metadata.xml | 3 - 5 files changed, 141 deletions(-) diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest index 5ce6940..0f334cf 100644 --- a/kde-misc/krusader/Manifest +++ b/kde-misc/krusader/Manifest @@ -1,2 +1 @@ -DIST krusader-2.4.0-beta3.tar.bz2 4305463 SHA256 ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae SHA512 a0288b0a5d37ade197120f6d96054b5eb9da9bae746969b041f6692a1377e6732a46cf3a672d2a24a5b1eb514ec74ba98695255af39057c4dabe1d935a6f720a WHIRLPOOL 08184cb69dd66ab6738bded5d2c7b470d2659110cb406a9779b61a0dbc28d41b334f86525e6d1a5570c82e751b9bfe3a135d0c35943837a814a3e6746464a4dd DIST krusader-2.5.0.tar.xz 2704584 SHA256 fb9f4b237378fd5d86d5c0202b9d714f3d8dfe549ba9e7926f6f9de60b5088d7 SHA512 e647b1ca2f3a61d74ceea892053465ec860642745a879f05d04d40e277ece7508a75672eaf4031dc8b6568bd67464182d6ea9d194db13907784350f364c99fec WHIRLPOOL c6cff096c55a2eda7c1a1c1805ed04ccf44eb82e7f97ec6ee37795297bf2de75bde67d8c6b12a441ea72a28ad181af2d7fc3bb616c5c8a391aacf4f591eccf98 diff --git a/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch b/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch deleted file mode 100644 index 1760adb..00000000 --- a/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/krusader/Panel/panelfunc.cpp -+++ b/krusader/Panel/panelfunc.cpp -@@ -100,7 +100,7 @@ - { - public: - virtual State validate(QString &input, int &pos) const { -- return input.isEmpty() ? Invalid : Acceptable; -+ return input.isEmpty() ? Intermediate : Acceptable; - } - }; - diff --git a/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch b/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch deleted file mode 100644 index 6ea7ad4..00000000 --- a/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch +++ /dev/null @@ -1,88 +0,0 @@ -commit f57edb20c4fa4e53d6a245dcc81273b62e44f611 -Author: Martin Kostolný -Date: Mon Dec 5 00:43:53 2016 +0100 - - Hard-code krarc.protocol mimetypes that were recently removed from protocol - - Differential Revision: https://phabricator.kde.org/D3566 - -diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp -index 86bc0cf..b286066 100644 ---- a/krusader/krservices.cpp -+++ b/krusader/krservices.cpp -@@ -30,14 +30,49 @@ - #include "defaults.h" - - QMap* KrServices::slaveMap = 0; -+QSet KrServices::krarcArchiveMimetypes = KrServices::generateKrarcArchiveMimetypes(); - #ifdef KRARC_QUERY_ENABLED --QSet KrServices::krarcArchiveMimetypes = QSet::fromList(KProtocolInfo::archiveMimetypes("krarc")); - QSet KrServices::isoArchiveMimetypes = QSet::fromList(KProtocolInfo::archiveMimetypes("iso")); - #else --QSet KrServices::krarcArchiveMimetypes; - QSet KrServices::isoArchiveMimetypes; - #endif - -+QSet KrServices::generateKrarcArchiveMimetypes() -+{ -+ // Hard-code these proven mimetypes openable by krarc protocol. -+ // They cannot be listed in krarc.protocol itself -+ // because it would baffle other file managers (like Dolphin). -+ QSet mimes; -+ mimes += QString("application/x-deb"); -+ mimes += QString("application/x-debian-package"); -+ mimes += QString("application/vnd.debian.binary-package"); -+ mimes += QString("application/x-java-archive"); -+ mimes += QString("application/x-rpm"); -+ mimes += QString("application/x-source-rpm"); -+ mimes += QString("application/vnd.oasis.opendocument.chart"); -+ mimes += QString("application/vnd.oasis.opendocument.database"); -+ mimes += QString("application/vnd.oasis.opendocument.formula"); -+ mimes += QString("application/vnd.oasis.opendocument.graphics"); -+ mimes += QString("application/vnd.oasis.opendocument.presentation"); -+ mimes += QString("application/vnd.oasis.opendocument.spreadsheet"); -+ mimes += QString("application/vnd.oasis.opendocument.text"); -+ mimes += QString("application/vnd.openxmlformats-officedocument.presentationml.presentation"); -+ mimes += QString("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); -+ mimes += QString("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); -+ mimes += QString("application/x-cbz"); -+ mimes += QString("application/x-cbr"); -+ mimes += QString("application/epub+zip"); -+ mimes += QString("application/x-webarchive"); -+ mimes += QString("application/x-plasma"); -+ mimes += QString("application/vnd.rar"); -+ -+ #ifdef KRARC_QUERY_ENABLED -+ mimes += QSet::fromList(KProtocolInfo::archiveMimetypes("krarc")); -+ #endif -+ -+ return mimes; -+} -+ - bool KrServices::cmdExist(QString cmdName) - { - KConfigGroup group(krConfig, "Dependencies"); -diff --git a/krusader/krservices.h b/krusader/krservices.h -index e9e805c..e54a0a6 100644 ---- a/krusader/krservices.h -+++ b/krusader/krservices.h -@@ -32,9 +32,6 @@ class QFile; - class KrServices - { - public: -- KrServices() {} -- ~KrServices() {} -- - static bool cmdExist(QString cmdName); - static QString chooseFullPathName(QStringList names, QString confName); - static QString fullPathName(QString name, QString confName = QString()); -@@ -57,6 +54,9 @@ protected: - static QString escape(QString name); - - private: -+ KrServices() {} -+ ~KrServices() {} -+ static QSet generateKrarcArchiveMimetypes(); - static QMap* slaveMap; - static QSet krarcArchiveMimetypes; - static QSet isoArchiveMimetypes; diff --git a/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild deleted file mode 100644 index 2806bc4..00000000 --- a/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga -gl hr hu it ja ko lt mai nb nds nl pa pl pt pt_BR ro ru sk sl sr -sr@ijekavian sr@ijekavianlatin sr@latin sv tr ug uk zh_CN zh_TW" -inherit kde4-base - -MY_P="${P/_/-}" - -DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras" -HOMEPAGE="https://quickgit.kde.org/?p=krusader.git" -SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="4" -KEYWORDS="amd64 x86" -IUSE="+bookmarks debug" - -COMMON_DEPEND=" - $(add_kdeapps_dep libkonq) - sys-libs/zlib - bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) -" -RDEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kdebase-kioslaves) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" - -PATCHES=( "${FILESDIR}/${P}-new-folder.patch" ) - -S="${WORKDIR}/${MY_P}" diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml index 636e170..13bd40c 100644 --- a/kde-misc/krusader/metadata.xml +++ b/kde-misc/krusader/metadata.xml @@ -5,9 +5,6 @@ kde@gentoo.org Gentoo KDE Project - - Add dependency on bookmark package. - krusader