gentoo resync : 25.09.2019

4 files changed, 65 insertions, 41 deletions

diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 55e8a2140a6e..68a1d78bf322 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,3 +1,3 @@
-DIST qdirstat-1.4.tar.gz 2534241 BLAKE2B 70b84376a949ab3d74879bc78dac9d41c592ee9a4c60d27ad9d85ab09378f85a65209c78f7030f76e86e8e418803eef5ed1dadb07a1058ec38c13d753f6e3e61 SHA512 5711a78297f4224e4471ac14d8e42ee9ac746cc31315ff894dafa1db578eff4ff2a5c62edc525a49c523154a0de402f878200d96601c7924bf0273f0eac9ab74
-EBUILD qdirstat-1.4.ebuild 750 BLAKE2B 59d9375f0252d35560bbbd3d9759b88afa67352ee7cb81695fa0bcd6c36f901a916ab5da7262f7b6c6ef9c1b1115eb3e28a2c564798ff630fe4579580949b532 SHA512 017e639e30a60f021541c547863bc2cdad0b70cb2b62981de9a2cc1a64c32a406f2b71691f0a59898d521ef128acb10d7a2e633a5bde16941711b01cf8aee75f
-MISC metadata.xml 733 BLAKE2B aeee605c2acccc13fe411e1858852c1e4b789ba78776a8c2939d554ecfc11db75312258852b56c6d04370e70a34e29ac00a4b91328ddd179e5103ba508ecf489 SHA512 2ec50f52984c0c8ffa7300cbae7a13a36fb614f4daa424525154efcf0f023792a8497744490a55207bf5cd2b64acf08d44ea851920f7482e416eb0f7b067c548
+DIST qdirstat-1.6.tar.gz 6398935 BLAKE2B dba15df3f9dd34276ee38ccdd97d1b8158596198b22a807b4d0a68c7d33d146a25ef5b987c4a6e3dc16df421422ddc0cad2e9f60a80493ac668bcb023c15c31c SHA512 8d1350bc8995dac2de90a32ca5ddaac47a317c7e7044f39ed87a7b2e208cda0b84f04c147f7a2414d7a0c5c731479847a879aedcf5781ca772fbfa8fa360cc77
+EBUILD qdirstat-1.6.ebuild 923 BLAKE2B 9e5bdbe90dfefa0ea8325a5189d7fc53b8fef84626c451417a5be962635e676bf109ea0af6cb329a86994c360bdb32b151c12b90ec86ae6aa361b1d9e0a73d91 SHA512 a4ea881bafb0a6e32ef4c0acb5c0fbce101a055487d1e08df244d335abe5ca1515da97db87bb8ae809938515eec16fc27ee3d9c25db6a8ae4d72baf574755f0f
+MISC metadata.xml 1003 BLAKE2B e6505926df58cfbc8aa44cab182f5e08ac6afa121e072c0fd44c32f4405706c39b86f50e778dc37d7ec43a4db4a22d32b92ea8f1487251036286ae002574c663 SHA512 cd813d8f11cefc14ffebd1bc574de8deb5922af780f6e580b3402e8e57879d9e42fb974cbd1d9c699946ea66df6deb6822bf54285a68721dcd7893c6be1d4a59
diff --git a/sys-apps/qdirstat/metadata.xml b/sys-apps/qdirstat/metadata.xml
index b811e95a6aec..b73ce0a34ae8 100644
--- a/sys-apps/qdirstat/metadata.xml
+++ b/sys-apps/qdirstat/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Qt-based directory statistics: KDirStat without any KDE -- from
 		the author of the original KDirStat.
@@ -15,6 +22,7 @@
 		and other Unix-like systems.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/shundhammer/qdirstat/issues</bugs-to>
 		<remote-id type="github">shundhammer/qdirstat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/qdirstat/qdirstat-1.4.ebuild b/sys-apps/qdirstat/qdirstat-1.4.ebuild
deleted file mode 100644
index c7c59c77ebdb..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="Qt app to show where your disk space has gone and to help you clean it up"
-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"
-
-RDEPEND="dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sys-apps/qdirstat/qdirstat-1.6.ebuild b/sys-apps/qdirstat/qdirstat-1.6.ebuild
new file mode 100644
index 000000000000..3a907d9e667c
--- /dev/null
+++ b/sys-apps/qdirstat/qdirstat-1.6.ebuild
@@ -0,0 +1,53 @@
+# 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
+}