gentoo resync : 13.06.2020

3 files changed, 2 insertions, 57 deletions

diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index d9d05c1a9498..edc39c621c97 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.6.tar.gz 6398935 BLAKE2B dba15df3f9dd34276ee38ccdd97d1b8158596198b22a807b4d0a68c7d33d146a25ef5b987c4a6e3dc16df421422ddc0cad2e9f60a80493ac668bcb023c15c31c SHA512 8d1350bc8995dac2de90a32ca5ddaac47a317c7e7044f39ed87a7b2e208cda0b84f04c147f7a2414d7a0c5c731479847a879aedcf5781ca772fbfa8fa360cc77
-EBUILD qdirstat-1.6.1.ebuild 889 BLAKE2B 8faa6969eec2981808d95d70970bf564c9f1410b8bb52a42492da38a2ddb778ee706881eb0bac136121fa810c62b6897bf568e412971fd841ab57c573848d370 SHA512 6309e5202ec80bf204bb562abc061b07c081f3e3460b56fdd6f5ee489031ec91ff3eebca3eaa5a0fc78109f9dc9503d708ddf70675d5e19d8273b9f2241911de
-EBUILD qdirstat-1.6.ebuild 921 BLAKE2B 49357e923dd3fb8d9b022ea42c3aa6cb55e583caa6bd8800e1f45985e197aa144a436004974070b03757dff548dfdf6803261ecc33bea706cb4b3650ae3107d8 SHA512 a83e63e5b5102ccc790bf7098c43366aa3e6daf0d80fc435969c0157f56ad8e916885a581053d1c64d920673e1e0f06ba728be18de8744285a6efc424eb0a2ce
+EBUILD qdirstat-1.6.1.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
index 5adc75a04f39..1417eaf6d6f7 100644
--- a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.6.1.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
diff --git a/sys-apps/qdirstat/qdirstat-1.6.ebuild b/sys-apps/qdirstat/qdirstat-1.6.ebuild
deleted file mode 100644
index 1033decd52b1..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 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 path
-	sed -e "10s:/qdirstat:/${P}:" -i doc/doc.pro || die
-	sed -e "10s:/qdirstat:/${P}:" -i 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
-}