gentoo resync : 16.02.1018

5 files changed, 2 insertions, 135 deletions

diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 0d39e043c2de..21d49c3ef377 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,10 +1,5 @@
-AUX qtfm-5.5-gcc6.patch 346 BLAKE2B 9b4757b2a6564c8842653c991b5c35e711a7291e0e745bdddffa1156cb0f4ae263aeb0573b998b0298f7c9b45dca7ff3990b4e18e055731f5794193dccf202e5 SHA512 e73c2be9cd2b5f3410500b813865c34458ec51a8902c4bf85faa607e7eb98f7e2f9c393a570dc6761938e2081cb43267bb8ab0a2d7450e10098b8f8db05a8634
-DIST qtfm-5.9.zip 172616 BLAKE2B 50219cb9afbca78b4fe7767631e91008254f6a4e745c3f1b87b821dc49655117d6d61a0aeb37cb1771641aac6b5ccfa8eefaa6e2f6d453c68061594e47bf5c5e SHA512 7686a84f1678e1f04f439d65290f5c93da25fbe80487a37f4ce32eae0d29d7a03a169d3dd9cbc81c2b678f54d9fdc01967b6c1b1cb8a19cf37a910a19918a2ba
-DIST qtfm-6.1.4.tar.gz 190220 BLAKE2B 31c9bc6564db111ac42451232470607d9327291296cf6c6fa02230c0285506f251bee03ca4f44570c0266cf51fddd3b4861137f67ed1983fda7cde118a20f0ab SHA512 492d4a5cd41320f0f69c6be6a0dbf8f9b13a2178e76dd79ac8c2a74952b482949073791ef247fc22e80fcdd7194f1b6db9cd489c10506b65e0c0b8918182d073
 DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
-DIST qtfm-6.1.6.tar.gz 247468 BLAKE2B 1775100281c25201e7abf1b8dcd47d9a10feae51d0d4cd9e2a62a7e739325207b0e9b15475acb29fe621c13ed7d2a7d96cef39f68f57a09a60d5721f22217a56 SHA512 7b7392ba79699ac479ae8618415d8fab8ad6129e132f54801560413e51e0e68932d325d9ca8462c4e02e2b7a7d05fcb7dcfe9b16c36212996061478171764867
-EBUILD qtfm-5.9-r1.ebuild 1062 BLAKE2B 2b6400a30076f222ed51970e1f53553ad77dcfa1716fa4f0855d075666fc3e5a7872870581691c573b8443865520c10638e43cdf6e749d5d8322ab33fffb5ea6 SHA512 a817ed1a3a1acad5ffad0ed6d8c9633867bb8bdf619979a2673a18de6b1dd1ea70dffa72b6064a542ef0a337c0361a93d7d6c7b544a90bd039ed0eb40d5ab55b
-EBUILD qtfm-6.1.4-r1.ebuild 959 BLAKE2B 069c0fd853b67f6b5da2887349c7b49ef11adf027a32de6d71b8c550f5b2d299d0cc6fa13a72590a9efbf4714e6a1c2166c79eaa8cdbc7edd686e51f6b0fb950 SHA512 e445eac16175f9d9090de0602354f405bcc6573b4d4ada6adb6b0c9cb0d66cac409e3272070cf479dd590827ddddbc0efd18bfb4d89a85e0c628a4e1df2d2dd0
+DIST qtfm-6.1.7.tar.gz 247617 BLAKE2B 4cd8cf22859d4d42f526d668fb1fb47a8a6d59c770c46cc1fb0fc05b752af8bb3c4bcaf81e977283544953c04006080754285cb411aa036c76a041ee2499f365 SHA512 04e14df63f9827fd00a923c91b6c66a022f3c2318df182222b15dc388a7c9fde579981b78d8057a57de29da348f42cfb0a1fe6169f3fbdc50a9f25f78d6d02a6
 EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
-EBUILD qtfm-6.1.6.ebuild 976 BLAKE2B 81b75e3b80d44733006aa28a6310bd661ffb9bc8c154b06505ab5cc14ecfeda2d89e0870d62d02dbec33a5fa5f113d6fa4994c51bb6232e85675c509c9c893b2 SHA512 394b07655de26c7b0ab3c89ac352e35d924dd0ef202907b32ec3d078a7e24274fe879075eacc5dabc0dee8727b9a8de92764c2fffdc3bc32eab8aeeb24aa6dba
+EBUILD qtfm-6.1.7.ebuild 868 BLAKE2B 82c82d234eae4faf1599c6688d89820c02b3767e1de5da591a8259a48e41c5d976385fd15ff3ad2c18ad8e596922f7ba4a1a9a6654d0d0d127e2d88b50c0eb43 SHA512 72b513c67d291a6466469ed0ddd3454967c0c81185c19e8c878394074ce05ac2f00c7ef8c296b99d8ca7e04b6598c5663e52b0ceb3d67c4ccee7a4c505986489
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch b/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch
deleted file mode 100644
index 371ee6afa562..000000000000
--- a/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtfm-5.5/src/mymodel.cpp.old	2012-05-27 20:05:45.000000000 -0400
-+++ qtfm-5.5/src/mymodel.cpp	2017-03-17 15:41:37.136770140 -0400
-@@ -166,7 +166,7 @@
- 

-     if(item) return item->absoluteFilePath();

- 

--    return false;

-+    return NULL;

- }

- 

- //---------------------------------------------------------------------------------------

diff --git a/x11-misc/qtfm/qtfm-5.9-r1.ebuild b/x11-misc/qtfm/qtfm-5.9-r1.ebuild
deleted file mode 100644
index 7b60beb220b0..000000000000
--- a/x11-misc/qtfm/qtfm-5.9-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="http://www.qtfm.org/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.5-gcc6.patch )
-
-S=${WORKDIR}/${PN}-master
-
-src_prepare() {
-	rm translations/${PN}_XX.ts || die
-
-	default
-
-	sed -i \
-		-e '/MimeType=/s|$|;|' \
-		-e '/Categories=/s|$|;System;FileTools;|' \
-		${PN}.desktop || die
-
-	sed -i -e '/^INSTALLS/s/docs//' ${PN}.pro || die
-}
-
-src_configure() {
-	"$(qt5_get_bindir)"/lrelease translations/*.ts || die
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild b/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild
deleted file mode 100644
index 22efcc7f255d..000000000000
--- a/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils gnome2-utils qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_prepare() {
-	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
-	default
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.1.6.ebuild b/x11-misc/qtfm/qtfm-6.1.7.ebuild
index df621215515e..47ad9c333070 100644
--- a/x11-misc/qtfm/qtfm-6.1.6.ebuild
+++ b/x11-misc/qtfm/qtfm-6.1.7.ebuild
@@ -27,11 +27,6 @@ DEPEND="
 	dev-qt/linguist-tools:5
 "
 
-src_prepare() {
-	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
-	default
-}
-
 src_configure() {
 	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
 }