Updated to use new gkrellm-plugin eclass

(Portage version: 2.1.2-r10)

3 files changed, 18 insertions, 28 deletions

diff --git a/x11-plugins/gkrellm-volume/ChangeLog b/x11-plugins/gkrellm-volume/ChangeLog
index 766736d17736..e2bc5cdfdf5e 100644
--- a/x11-plugins/gkrellm-volume/ChangeLog
+++ b/x11-plugins/gkrellm-volume/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellm-volume
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/ChangeLog,v 1.25 2007/02/21 21:29:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/ChangeLog,v 1.26 2007/03/12 15:26:46 lack Exp $
+
+  12 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellm-volume-2.1.9.ebuild,
+  gkrellm-volume-2.1.13.ebuild:
+  Updated to use new gkrellm-plugin eclass
 
   21 Feb 2007; Jim Ramsay <lack@gentoo.org> +metadata.xml,
   -gkrellm-volume-0.8-r1.ebuild, -gkrellm-volume-2.1.4.ebuild,
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
index 32fe2cb029f9..e519d6d76172 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild,v 1.5 2007/02/21 21:29:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild,v 1.6 2007/03/12 15:26:46 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 IUSE="alsa"
 DESCRIPTION="A mixer control plugin for gkrellm"
@@ -13,22 +13,15 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ppc sparc x86"
 
-DEPEND="=app-admin/gkrellm-2*
-	alsa? ( media-libs/alsa-lib )"
+DEPEND="alsa? ( media-libs/alsa-lib )"
 
 S=${WORKDIR}/${PN}
 
+PLUGIN_SO=volume.so
+
 src_compile() {
-	if use alsa
-	then
-		make enable_alsa=1 || die "make failed"
-	else
-		make || die "make failed"
-	fi
+	local myconf=""
+	use alsa && myconf="${myconf} enable_alsa=1"
+	make ${myconf} || die "make failed"
 }
 
-src_install() {
-	insinto /usr/$(get_libdir)/gkrellm2/plugins
-	doins volume.so
-	dodoc README Changelog
-}
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild
index 349585146063..93e9ee6acbf1 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild,v 1.10 2004/07/18 23:39:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.9.ebuild,v 1.11 2007/03/12 15:26:46 lack Exp $
+
+inherit gkrellm-plugin
 
 IUSE=""
 DESCRIPTION="A mixer control plugin for gkrellm"
@@ -11,16 +13,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="x86 ppc sparc alpha amd64"
 
-DEPEND="=app-admin/gkrellm-2*"
-
 S=${WORKDIR}/${PN}
 
-src_compile() {
-	make || die
-}
+PLUGIN_SO=volume.so
 
-src_install() {
-	insinto /usr/lib/gkrellm2/plugins
-	doins volume.so
-	dodoc README Changelog
-}