gentoo resync : 01.10.2021

3 files changed, 2 insertions, 59 deletions

diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 60cfbd2f3599..157a5089b562 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST qdirstat-1.7.1.tar.gz 8532003 BLAKE2B 4e3eec17dbfedf602580eb94a8264af40e77e2d5f67d4f0b9bf4a073bcd951ec48b9c3cac50463d0c0a2512a31c69adf10c1f77d6df317c617d4260c7fd845cf SHA512 e272cb603262966f6f24ef0dda268b4c9819783ec43e4f09181f7c6c7c9dac576403b8fc0c3a5b90b85bdc381f491ef3fd0db79ed88993f2bed3157529651ce0
 DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10
-EBUILD qdirstat-1.7.1.ebuild 981 BLAKE2B 4573e11212221fe9d1afc86e2767e8292fa0a30b3b8d92bf33251d5465b56761f562fd536f58f69e4e5f0eb1b9942abdb994585cf92a51ed4d5e82550db53fa7 SHA512 438d72ad5a9e91577a5f7c401c588b9bd0670159447f8dac121aacf2ccc69176912aaa92bad5c0cf47a3a4cae5a144cb40df8f680b47e78155d4980c99a81924
-EBUILD qdirstat-1.8.ebuild 993 BLAKE2B f30bd927fdda466dd4bd2638b57200d7a11c5fdaa3a85d5fce2cf7076181f7c713187da8736c175b48401fb27be71865e5bd4c1bec406adf1838e3d2c47e2a60 SHA512 f6ad26d6e18be7a8007945ccac0cf53f3a4161e455b8ef79ad530d8de0caa834b31a1bdd04ff8ec2fca9a4ddb0ac941e2f481688ccfc01f5002014b331454ef7
+EBUILD qdirstat-1.8.ebuild 991 BLAKE2B 4799e6e46bfd638075328690e6a82bf3cc5b01c3d97951352cbf0eeb1261b7594796cc445f3d9b6e1306c15cd6fd5f84ebc0fbfe7b20097a43382db5111939c9 SHA512 7b18d715f765dc7fbf6a1ebf95ff91ed10f90f5ad38e6f0c3e6cb3d5faffa0dc604e608e98d2cef185b8e8b24738780189fdbee56bce4815cbd3b5841e302f02
 MISC metadata.xml 883 BLAKE2B b5a3c4f300c991de6174a8e46c9dfe672e9293713d5174b182d9cce2354840c9afa63aea8d5335e1bae365c12440ac93290a3abe46f7cff5264179835ba0a719 SHA512 5b23f2d2bd68dc0562df3cd78a066980cccedb5f7f3dca98b200b7b0ccf739a4a01a2fe84accd6fa96b2ceed5b35087db915b3cdd0d9af2cd080d4a590f4ce08
diff --git a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
deleted file mode 100644
index cf382f9d1410..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 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
-
-	# Don't install compressed man pages
-	sed -e '/gzip/d' -e 's/.gz//g' -i man/man.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.8.ebuild b/sys-apps/qdirstat/qdirstat-1.8.ebuild
index 6943b8116948..64ab49423bd4 100644
--- a/sys-apps/qdirstat/qdirstat-1.8.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5