app-admin/gkrellm: Revbump to get rid of superfluous patch.

Also bumped to EAPI-7

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

2 files changed, 12 insertions, 32 deletions

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
deleted file mode 100644
index fa35ef672798..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gkrellm-2.3.5.old/server/monitor.c	2010-10-06 03:46:59.000000000 +1100
-+++ gkrellm-2.3.5/server/monitor.c	2011-11-24 02:01:30.871402778 +1100
-@@ -1329,7 +1329,8 @@
- static gchar *remote_fs_types[] =
- 	{
- 	"nfs",
--	"smbfs"
-+	"smbfs",
-+	"cifs"
- 	};
- 
- void
---- gkrellm-2.3.5.old/src/fs.c	2010-09-15 02:25:51.000000000 +1000
-+++ gkrellm-2.3.5/src/fs.c	2011-11-24 02:00:17.347088370 +1100
-@@ -163,7 +163,8 @@
- static gchar *remote_fs_types[]	=
- 	{
- 	"nfs",
--	"smbfs"
-+	"smbfs",
-+	"cifs"
- 	};
- 
- 
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index b921679f6f1b..472c7e81c4b3 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib user systemd toolchain-funcs
+inherit desktop multilib user systemd toolchain-funcs
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
-# Upstream named their xz compressed tarball tar.bz2 (*sigh*)
 SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
@@ -39,11 +38,13 @@ RDEPEND="
 		x11-libs/pango
 		)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-cifs.patch
 	"${FILESDIR}"/${PN}-2.3.5-config.patch
 	"${FILESDIR}"/${PN}-2.3.5-width.patch
 	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
@@ -61,8 +62,6 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
 	TARGET=
 	use kernel_FreeBSD && TARGET="freebsd"
 }
@@ -140,3 +139,8 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_preinst() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+}