3 files changed, 21 insertions, 15 deletions
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
new file mode 100644
index 000000000000..11af8697af6a
--- /dev/null
+++ b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
@@ -0,0 +1,9 @@
+--- a/volwheel.desktop
++++ b/volwheel.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=VolWheel
+ GenericName=VolWheel
+ Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
index 130d9b7c331f..4a801cf5192f 100644
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
@@ -1,7 +1,7 @@
 http://code.google.com/p/olwtools/issues/detail?id=8
 
---- install.pl
-+++ install.pl
+--- a/install.pl
++++ b/install.pl
 @@ -2,7 +2,6 @@
  
  use strict;
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
index 51ff9c182eb0..49e02ece502f 100644
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="A volume control trayicon with mouse wheel support"
 HOMEPAGE="https://oliwer.net/b/volwheel.html"
@@ -18,16 +19,12 @@ RDEPEND="${DEPEND}
 	dev-perl/Gtk2
 	alsa? ( media-sound/alsa-utils )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-perl516.patch
-	sed -i -e '/^Encoding/d' ${PN}.desktop || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-perl516.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_install() {
-	./install.pl prefix=/usr destdir="${D}" || die
-	dodoc ChangeLog README TODO
+	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
+	einstalldocs
 }
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }