gentoo resync : 10.03.2018

4 files changed, 2 insertions, 131 deletions

diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index a4e58d4e899e..387e21b399fd 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,7 +1,4 @@
 AUX qtfm-5.5-gcc6.patch 346 BLAKE2B 9b4757b2a6564c8842653c991b5c35e711a7291e0e745bdddffa1156cb0f4ae263aeb0573b998b0298f7c9b45dca7ff3990b4e18e055731f5794193dccf202e5 SHA512 e73c2be9cd2b5f3410500b813865c34458ec51a8902c4bf85faa607e7eb98f7e2f9c393a570dc6761938e2081cb43267bb8ab0a2d7450e10098b8f8db05a8634
-DIST qtfm-5.5.tar.gz 149667 BLAKE2B f369495fd5fba183e7bb5b38db61a8a667d5835b42cf78f424d0db4bb4f0c7fcb0856578df30cb50547c7799fa16147d17951b72d99398937774bd097487ccbf SHA512 0d592b482f35c76b424cc581394d34299bb93367f287f57718d640df256f352fef7e389a8370889d0d78ca8afb9868cdfb56ae15671614e279365b72f9e629e0
 DIST qtfm-5.9.zip 172616 BLAKE2B 50219cb9afbca78b4fe7767631e91008254f6a4e745c3f1b87b821dc49655117d6d61a0aeb37cb1771641aac6b5ccfa8eefaa6e2f6d453c68061594e47bf5c5e SHA512 7686a84f1678e1f04f439d65290f5c93da25fbe80487a37f4ce32eae0d29d7a03a169d3dd9cbc81c2b678f54d9fdc01967b6c1b1cb8a19cf37a910a19918a2ba
-EBUILD qtfm-5.5-r1.ebuild 957 BLAKE2B 992031bcf7ea55aef82b409361bf36e2cf5af5bf596daebfee82c657ec05e89d0b263d11170ba6a208c8bc3c2eb5e8c4101bbdd5690dece9aca67789f57b4c48 SHA512 d658f4f3aabd6f92786672b9985f89e061f2508d8d46ca81180578ba088c498a649335e8c6f28ac1f1ab80f198cc99542951911f1d05d54a1d9c4c60ff298f10
-EBUILD qtfm-5.9-r1.ebuild 1063 BLAKE2B 0f91c5ddfaf61e2593f47b979f72e0e1c861f4ffdbc5f78400b6f34b631e5994e6faab72289dd8ae576515d1761bb89777361bcfce54d392ee7fbe8e4844152d SHA512 7acff3a6560503cfcc0080af9930321762957d789460ffadb070c15b246c389f779884fd2d87853c5b986ecfbcb0af47043f5376f65e95377deba68ad35ee41b
-EBUILD qtfm-5.9.ebuild 1403 BLAKE2B 147e4c89fb3a5726be72d9e0c86f8e6e655a9a299c2bd87ef98758f4d27f89a47c63c581841a427b6e94c2c7e08356336a6c409e07b33dd93b13b065df80ebe2 SHA512 011f881aeaad7a13eb85e1bef8eb6b5679d14dc5132097065623bea54aed93e77fc382360ac5114871fcb3d8e4892ab3e995e3024942c4a0a7c56f3a58ee9efa
+EBUILD qtfm-5.9-r1.ebuild 1062 BLAKE2B 2b6400a30076f222ed51970e1f53553ad77dcfa1716fa4f0855d075666fc3e5a7872870581691c573b8443865520c10638e43cdf6e749d5d8322ab33fffb5ea6 SHA512 a817ed1a3a1acad5ffad0ed6d8c9633867bb8bdf619979a2673a18de6b1dd1ea70dffa72b6064a542ef0a337c0361a93d7d6c7b544a90bd039ed0eb40d5ab55b
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/qtfm-5.5-r1.ebuild b/x11-misc/qtfm/qtfm-5.5-r1.ebuild
deleted file mode 100644
index bab6abce4884..000000000000
--- a/x11-misc/qtfm/qtfm-5.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fdo-mime qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="http://www.qtfm.org/"
-SRC_URI="http://www.qtfm.org/${P}.tar.gz?attredirects=0 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# file is for LIBS += -lmagic
-RDEPEND="sys-apps/file
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^docs.path/s:qtfm:${PF}:" \
-		-e '/^docs.files/s: COPYING::' \
-		${PN}.desktop || die
-	sed -i \
-		-e '/MimeType=/s|$|;|' \
-		-e '/Categories=/s|$|;System;FileTools;|' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-5.9-r1.ebuild b/x11-misc/qtfm/qtfm-5.9-r1.ebuild
index 67b00a405fd3..7b60beb220b0 100644
--- a/x11-misc/qtfm/qtfm-5.9-r1.ebuild
+++ b/x11-misc/qtfm/qtfm-5.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/x11-misc/qtfm/qtfm-5.9.ebuild b/x11-misc/qtfm/qtfm-5.9.ebuild
deleted file mode 100644
index b6555362773a..000000000000
--- a/x11-misc/qtfm/qtfm-5.9.ebuild
+++ /dev/null
@@ -1,76 +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}
-	dev-qt/qtchooser
-"
-PATCHES=( "${FILESDIR}"/${PN}-5.5-gcc6.patch )
-S=${WORKDIR}/${PN}-master
-
-QTFM_LINGUAS="
-	da de es fr it pl ru sr sv zh zh_TW
-"
-for lingua in ${QTFM_LINGUAS}; do
-	IUSE+=" l10n_${lingua/_/-}"
-done
-
-src_prepare() {
-	rm translations/${PN}_XX.ts || die
-
-	default
-
-	sed -i \
-		-e '/MimeType=/s|$|;|' \
-		-e '/Categories=/s|$|;System;FileTools;|' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	if [[ -n "${L10N}" ]]; then
-		local lingua
-		for lingua in ${QTFM_LINGUAS}; do
-			if ! use l10n_${lingua/_/-}; then
-				sed -i -e "s:translations/${PN}_${lingua}.qm::g" ${PN}.pro || die
-				rm translations/${PN}_${lingua}.ts || die
-			fi
-		done
-	fi
-
-	lrelease translations/*.ts || die
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}