gentoo resync : 23.09.2020

3 files changed, 2 insertions, 56 deletions

diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 3cfcefee8dd7..453b5133881e 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST qdirstat-1.6.1.tar.gz 7708491 BLAKE2B e6a92f93c76de0f602a66409a2701cd06f1744ab67c3c829938695f1d59b7244998d3a6ddd9d6cfc6408db3ac98d355f4496348ebd198c93ea345b33414c3048 SHA512 fd4c6a3582184785d935e96e884cc3e2033e3ee174ea893816b14524c5c5c62923c5a8c5869969fb8b1d0e84bbffd9dc707a68bdb53898c55dfd14fe16946110
 DIST qdirstat-1.7.tar.gz 8057173 BLAKE2B 7de2d74933dcce190240569ca043faf76925592576016090498ae21d2074a79aa9b1313fa491c270d5a841238cb35007a85ca3de9c343a353b3de9235f9e5032 SHA512 9af03c110663eab0df48f69f7d949421feebfdca1299205d25a216587cf2c9e472cbe99ad98f3cd6c783be2b02e0308cdbc2f5549bf662b3061ff5e059317b01
-EBUILD qdirstat-1.6.1.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
-EBUILD qdirstat-1.7.ebuild 890 BLAKE2B d5cfa2cb6e00b037ab1c4a4636a3762430d267679a84c136b27a0b96f8991fdd2bef3ab5f4da1877787abdc7b0f072307babf613bd990a233f79c9813951f294 SHA512 5d861861b1e133c032dacb7cae0e8a705136c118f4c25a5f2c037969de2f94f02344c301068b1c596db6c3b38fbab1c299dd9a8196883347fc9cb422ef9a0941
+EBUILD qdirstat-1.7.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild b/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
deleted file mode 100644
index 1417eaf6d6f7..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt-based directory statistics"
-HOMEPAGE="https://github.com/shundhammer/qdirstat"
-SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
-
-src_prepare() {
-	default
-
-	# Fix QA warning about incorrect use of doc path
-	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/qdirstat/qdirstat-1.7.ebuild b/sys-apps/qdirstat/qdirstat-1.7.ebuild
index e4bae2ee165e..1417eaf6d6f7 100644
--- a/sys-apps/qdirstat/qdirstat-1.7.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5