[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-volume/

[David Seifert]

commit:     635494d3788266cc16df11d7512a27bedac1db22
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 22:34:33 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 09:16:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635494d3

x11-plugins/gkrellm-volume: Eclass update

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
index db88433d0fe..208a9d80056 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A mixer control plugin for gkrellm"
@@ -13,22 +14,20 @@ SLOT="2"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="alsa"
 
-DEPEND="alsa? ( media-libs/alsa-lib )"
-RDEPEND="${DEPEND}
-	app-admin/gkrellm[X]
-"
-
-S="${WORKDIR}/${PN}"
-
-PLUGIN_SO="volume.so"
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
 
+S=${WORKDIR}/${PN}
 PATCHES=(
 	"${FILESDIR}/${P}-reenable.patch"
 	"${FILESDIR}/${P}-makefile.patch"
 )
 
+PLUGIN_SO=( volume$(get_modname) )
+
 src_compile() {
-	local myconf=""
-	use alsa && myconf="${myconf} enable_alsa=1"
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" "${myconf}"
+	use alsa && local myconf="enable_alsa=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
 }