4 files changed, 34 insertions, 26 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 58eef682a7d7..81e0c532c681 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 10f05ac78757..990b3e0a03d8 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -1,4 +1,5 @@
+AUX pureadmin-0.4-QA-desktop-file.patch 186 BLAKE2B 964d5fa4353b6514dd70f997f251418f9ed4de7dd865693b3603e1f49dbef368ff2b298bab542a590ab417fefee8be1a0165e039d6b9f5189c9dbcdc19962ea6 SHA512 98e00f785a3fd5dca53321f0f6faa7f3ceaf5d8217e28492b4bcbb21eb59b3d0b894485850fb09f5e307bca3a6f03b2e442f8e863b655de1248beefa1e023134
 AUX pureadmin-0.4-gold.patch 842 BLAKE2B 43a20608f3d86ae4fa0ad3b9bb21f17e0643521a15e727ff206dcada573aad24ad525c36bdb4dde4910d5e591f145dfe651d42a46f0ea2ac5b7da58724086f1a SHA512 1c6848987cf21c023cabecd8107d9f4292e704164c4330bd8c43217b7ebd1a6d74a5476c8ab1586e2a1f683f7e35926dfe8c3cbae91b01617e6689dc966e8851
 DIST pureadmin-0.4.tar.gz 386739 BLAKE2B e0699210d6f22f4043bd667e82993b019e8a58b16d42157be42f4497ee383e1da7935beca77491e105a1b3537ef1920cbe57b0cc8ce1e48fb30c01c491f9605e SHA512 46fd4caff0d6c123412478690411409038d5590cc7388993eed35fc33a34302b8310ae1ede971ed31cbf29ba4ef3b4c21ce5b8c9b225659b3110c6abcd1e78c6
-EBUILD pureadmin-0.4-r1.ebuild 1334 BLAKE2B 43abad83efd463a0930a629dc1939f8bdd46816c9eddf67b2dd51b1741d95ce549b26e4ddba167aab2031d1b4cd270c881f887b3db68d71484e412739c5ed247 SHA512 a39baf4c784be696ba68faab95ece344a1075f6e087515d90e8d21a27f772df1324cb586483e4fbf5155ba46fc4c7c9b6cd4b0436550c37066fc485f4aa4fe1a
+EBUILD pureadmin-0.4-r1.ebuild 1293 BLAKE2B d29a24337ed7162606ecdff73eca78c63695d7bbacbfa2628ad124c4aa43b12d03a6c028d5d439cd85cee0e9533a326bb4ee60b7f1f47892e945761852ae0128 SHA512 fb1889e5bb130b02c6d67471b4e125a1830389d88b00dfe293358e59876a9ca8cc8d4903d6735d57de0f1038dcfdf010ae85d4b476f2c73dc3bce5733fea1284
 MISC metadata.xml 351 BLAKE2B 12ae9cba9bfff7f31147307074ea8ecdd9e9fed5df1f19fda1e2000d64ad58a8b181a27418b0e69114909385f9f85b45d7792d65d36f820b9a0b75a9ba84d6f2 SHA512 572cec5a1abc7ebd7cb0db74ab3e3cadefe7c85ab92f38a76bbdf37049961eb2e82c8f392fca6c15cecc59a78b01237d1a760d0d6cf381b9ba19781537bcd86b
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-QA-desktop-file.patch b/net-ftp/pureadmin/files/pureadmin-0.4-QA-desktop-file.patch
new file mode 100644
index 000000000000..39b47f60115b
--- /dev/null
+++ b/net-ftp/pureadmin/files/pureadmin-0.4-QA-desktop-file.patch
@@ -0,0 +1,9 @@
+--- a/pureadmin.desktop.in
++++ b/pureadmin.desktop.in
+@@ -9,5 +9,5 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GTK;Application;System;
++Categories=GTK;System;
+ 
diff --git a/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild b/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
index 815d949ac40e..e2cb7b43a5f8 100644
--- a/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
+++ b/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils
+inherit desktop
 
 DESCRIPTION="GUI tool used to make the management of Pure-FTPd a little easier"
 HOMEPAGE="http://purify.sourceforge.net/"
@@ -12,41 +12,38 @@ SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc"
+IUSE="doc"
 
 RDEPEND="
 	gnome-base/libglade:2.0
 	sys-libs/zlib
 	virtual/fam
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	cat >> po/POTFILES.skip <<- EOF
-	src/eggstatusicon.c
-	src/eggtrayicon.c
-	src/prereq_usrmanager.c
-	EOF
-	epatch "${FILESDIR}"/${P}-gold.patch
-}
-
-src_configure() {
-	local myconf=""
+PATCHES=(
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-QA-desktop-file.patch
+)
 
-	use debug && myconf="${myconf} --enable-debug"
+src_prepare() {
+	default
 
-	econf ${myconf}
+	cat >> po/POTFILES.skip <<- EOF || die
+		src/eggstatusicon.c
+		src/eggtrayicon.c
+		src/prereq_usrmanager.c
+	EOF
 }
 
 src_install() {
 	default
 
 	# Move the docs to the correct location, if we want the docs
-	if use doc ; then
-		dodoc "${ED}"usr/share/pureadmin/docs/*
-	fi
-	rm -Rfv "${ED}"usr/share/pureadmin/docs || die
+	use doc &&
+		dodoc -r "${ED}"/usr/share/pureadmin/docs/.
+	rm -Rfv "${ED}"/usr/share/pureadmin/docs || die
 
 	make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
 }
@@ -55,8 +52,9 @@ pkg_postinst() {
 	ewarn "PureAdmin is at a beta-stage right now and it may break your"
 	ewarn "configuration. DO NOT use it for safety critical system"
 	ewarn "or production use!"
-	echo
+
+	elog
 	elog "You need root-privileges to be able to use PureAdmin."
 	elog "This will probably change in the future."
-	echo
+	elog
 }