[gentoo-commits] repo/gentoo:master commit in: media-sound/volwheel/, media-sound/volwheel/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/volwheel/, media-sound/volwheel/files/

[David Seifert]

commit:     ceff433a6feee7d2a361280adda13f6fbe455b96
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 15:04:20 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 15:04:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceff433a

media-sound/volwheel: Port to EAPI 7

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../volwheel/files/volwheel-0.2.8-desktop-QA.patch |  9 +++++++++
 .../volwheel/files/volwheel-0.2.8-perl516.patch    |  4 ++--
 media-sound/volwheel/volwheel-0.2.8-r1.ebuild      | 23 ++++++++++------------
 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 00000000000..11af8697af6
--- /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 130d9b7c331..4a801cf5192 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 51ff9c182eb..49e02ece502 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; }

[gentoo-commits] repo/gentoo:master commit in: media-sound/volwheel/, media-sound/volwheel/files/

[Miroslav Šulc]

commit:     17b8829709e48037ecce75d4586c13cd511b3dd0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 21 05:20:36 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 05:20:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b88297

media-sound/volwheel: removed obsolete 0.2.8-r1

Closes: https://bugs.gentoo.org/667018
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/volwheel/Manifest                      |  1 -
 .../volwheel/files/volwheel-0.2.8-desktop-QA.patch |  9 ------
 .../volwheel/files/volwheel-0.2.8-perl516.patch    | 36 ----------------------
 media-sound/volwheel/volwheel-0.2.8-r1.ebuild      | 30 ------------------
 4 files changed, 76 deletions(-)

diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
index d84d0146920..1958eefc02b 100644
--- a/media-sound/volwheel/Manifest
+++ b/media-sound/volwheel/Manifest
@@ -1,2 +1 @@
-DIST volwheel-0.2.8.tar.gz 43140 BLAKE2B 87e23aa333485f31b2d21d79825d61aa421283d7ef62fc20e30e21cd11a2c379f5ae536cdba08883ced2a112a4ef0f8de9e719908afdcf5cd94d0431ce92f8b6 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b
 DIST volwheel-0.2.9.tar.gz 43921 BLAKE2B 9f555d8666373127de8a02cb4f83b12a2f6dab4c78087c3cef711fc6c59343d69af2f36e68a9354390bd820aff5ea41405b5cf5eef8d196da010efaf5d878b80 SHA512 9a16a9813953d2acfe7bae25c366094f244f34b6031e8d75761468590e76d63005580c26b0f27f26ac6e6537a179d15fdaa4348d94c84d0bb1fb7ec97e092e5d

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
deleted file mode 100644
index 11af8697af6..00000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index 4a801cf5192..00000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://code.google.com/p/olwtools/issues/detail?id=8
-
---- a/install.pl
-+++ b/install.pl
-@@ -2,7 +2,6 @@
- 
- use strict;
- use warnings;
--use Shell qw(install cp);
- 
- my $package = "volwheel";
- 
-@@ -33,17 +32,17 @@
- 	system("sed -i 's|/usr/local|$prefix|g\' volwheel");
- }
- 
--my $output = install ("-v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}");
-+my $output = qx|install -v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}|;
- print $output;
--$output = install ("-v -m755 volwheel $bindir");
-+$output = qx|install -v -m755 volwheel $bindir|;
- print $output;
--$output = install ("-v -m644 lib/* $libdir");
-+$output = qx|install -v -m644 lib/* $libdir|;
- print $output;
--$output = cp      ("-v -r icons $datadir/");
-+$output = qx|cp -v -r icons $datadir/|;
- print $output;
--$output = install ("-v -m644 icons/volwheel.svg $hicolor");
-+$output = qx|install -v -m644 icons/volwheel.svg $hicolor|;
- print $output;
--$output = install ("-v -m644 volwheel.desktop $desktop");
-+$output = qx|install -v -m644 volwheel.desktop $desktop|;
- 
- print "\nVolWheel has been succesfully installed.\n\n";
- 

diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
deleted file mode 100644
index 49e02ece502..00000000000
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A volume control trayicon with mouse wheel support"
-HOMEPAGE="https://oliwer.net/b/volwheel.html"
-SRC_URI="https://olwtools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="alsa"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Gtk2
-	alsa? ( media-sound/alsa-utils )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-perl516.patch
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
-src_install() {
-	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
-	einstalldocs
-}