From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- kde-misc/kio-stash/Manifest | 3 +- .../kio-stash-1.0-kioslave-no-desktop-app.patch | 43 ++++++++++++++++++++++ kde-misc/kio-stash/kio-stash-1.0-r1.ebuild | 32 ++++++++++++++++ kde-misc/kio-stash/kio-stash-1.0.ebuild | 29 --------------- 4 files changed, 77 insertions(+), 30 deletions(-) create mode 100644 kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch create mode 100644 kde-misc/kio-stash/kio-stash-1.0-r1.ebuild delete mode 100644 kde-misc/kio-stash/kio-stash-1.0.ebuild (limited to 'kde-misc/kio-stash') diff --git a/kde-misc/kio-stash/Manifest b/kde-misc/kio-stash/Manifest index 23fd97666e04..452a0d811d56 100644 --- a/kde-misc/kio-stash/Manifest +++ b/kde-misc/kio-stash/Manifest @@ -1,4 +1,5 @@ +AUX kio-stash-1.0-kioslave-no-desktop-app.patch 1407 BLAKE2B 5ad6fce0758832de2f2a765f747afe141a730d135f244eb4b58cfe5c0c0e0314f90dc9abb086091f19e39b8e4ae8539fd186e55e56703a08bbfdf0639c47e96a SHA512 f65426d9b201d9db7ba4907ee7276f9cc4e766116d418bdfc0a8f69266754cb9f655900cebf0086e54bbfde696d82e8e75729cb9ee1b2e216871c47ddef787d3 AUX kio-stash-1.0-no-kf5config.patch 1172 BLAKE2B 99c6f09278e649b375ff8dd4f42790aa25e88d3c7e8faa703111f585d315977eee2172f5baa12206d6ecd0d3acef93b56b8907cf6bb1328d22c07a701bf99574 SHA512 f50ca12e08a04fff8c4066875007237a97189a83de97d62b3f133b3ab79bb90cdc9c7bbc4160281800df16cb7fdce35083b5559f18698238c0b719894e0b13d9 DIST kio-stash-1.0.tar.xz 25308 BLAKE2B 36329831bacd9cd271a52f7018ef4a46894a9ef65190d3372584cc489998197057e7d3ec64017446963ea024e9c50afb5fd5dc8c2d01c27cde7bc83844419cc5 SHA512 ca345a2cd2d8df72ad1f8de366ba290a21f0f3a98ac098d0393d66ec43334258e1e7222a19f89de9a53f152fe4c63aab1221dc045efee94385299fc63e65a931 -EBUILD kio-stash-1.0.ebuild 678 BLAKE2B 9ced5a87eb6f06fc1484dc3ccb1829a314e829b18cd3f970f38fa90ad2581fbadcc98a973c515adf40712b6cac4f874cd91cf3cfb6f47289ccf8c0548950477c SHA512 66f019f46bb80e8fe853d93d3bf523b822ee9c68b6dbab8c48cf9f2c3866b67a1431e1640886a6ebd2156027a282f3e9a414be4dcf1aa4a82c8a042fb4f08c76 +EBUILD kio-stash-1.0-r1.ebuild 738 BLAKE2B 592ac4cd54648583b4b06e2756ecc02d89ed19b55116c6839f57c6f25017648d56e593f9986fc7d787effd5a71cf1f32117e455af3db494fa5a8e56be2168ef3 SHA512 7556ea63b59d0f93a443a055a0d3f8e1661c15f48642ae3349adc32cd149974b689f2dc8493c8712fa803686ec42560c1b93a1b716e8e27e8cc24c34aab47a9e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch b/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch new file mode 100644 index 000000000000..35b656fb6b73 --- /dev/null +++ b/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch @@ -0,0 +1,43 @@ +From f977b43a47ebf6d26ee0bd6d35e0ac576bbbbf8a Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Fri, 9 Mar 2018 17:48:15 +0100 +Subject: kio slaves aren't desktop applications & drop incorrect provides + +Summary: +https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#sect-Metadata-GenericComponent +https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html + +also it seems a filestash binary isn't actually installed, so drop the +provides entry for that + +Reviewers: shortstheory, bgupta, apol + +Reviewed By: apol + +Differential Revision: https://phabricator.kde.org/D11187 +--- + src/org.kde.filestash.appdata.xml | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/org.kde.filestash.appdata.xml b/src/org.kde.filestash.appdata.xml +index d532186..2df1a70 100644 +--- a/src/org.kde.filestash.appdata.xml ++++ b/src/org.kde.filestash.appdata.xml +@@ -1,5 +1,5 @@ + +- ++ + org.kde.filestash.desktop + CC0-1.0 + GPL-2.0 +@@ -89,8 +89,5 @@ + https://cdn.kde.org/screenshots/kio-stash/kio-stash.png + + +- +- filestash +- + KDE + +-- +cgit v1.1 diff --git a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild new file mode 100644 index 000000000000..e660fdc935cf --- /dev/null +++ b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="KIO Slave and daemon to stash discontinuous file selections" +HOMEPAGE="http://arnavdhamija.com/2017/07/04/kio-stash-shipped/index.html https://cgit.kde.org/kio-stash.git" +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT+=" test" + +DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_qt_dep qtdbus) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-no-kf5config.patch + "${FILESDIR}"/${P}-kioslave-no-desktop-app.patch +) diff --git a/kde-misc/kio-stash/kio-stash-1.0.ebuild b/kde-misc/kio-stash/kio-stash-1.0.ebuild deleted file mode 100644 index 5aeb21e2b3c0..000000000000 --- a/kde-misc/kio-stash/kio-stash-1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="KIO Slave and daemon to stash discontinuous file selections" -HOMEPAGE="http://arnavdhamija.com/blog/kio-stash-release.html https://cgit.kde.org/kio-stash.git" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RESTRICT+=" test" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_qt_dep qtdbus) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-no-kf5config.patch" ) -- cgit v1.2.3