QA - add error checking, clean up, fix use invocation

4 files changed, 44 insertions, 44 deletions

diff --git a/x11-plugins/wmium/ChangeLog b/x11-plugins/wmium/ChangeLog
index d78e92156a6f..2f85b063953a 100644
--- a/x11-plugins/wmium/ChangeLog
+++ b/x11-plugins/wmium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmium
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.4 2004/04/13 18:27:58 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.5 2004/06/23 22:37:29 agriffis Exp $
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmium-1.0.7.ebuild,
+  wmium-1.0.8.ebuild:
+  QA - add error checking, clean up, fix use invocation
 
   13 Apr 2004; Don Seiler <rizzo@gentoo.org>; wmium-1.0.7.ebuild,
   wmium-1.0.8.ebuild:
diff --git a/x11-plugins/wmium/Manifest b/x11-plugins/wmium/Manifest
index 5d2049922d8f..e30199b87ec0 100644
--- a/x11-plugins/wmium/Manifest
+++ b/x11-plugins/wmium/Manifest
@@ -1,6 +1,6 @@
-MD5 8c066bad135842dc42a65a783a7f527e wmium-1.0.8.ebuild 1343
-MD5 282e915345c40658db0ebe6cff34eb38 ChangeLog 958
+MD5 a9610386efce24dc53957568d4bb221c wmium-1.0.8.ebuild 1314
+MD5 57cc891e733fea056cde0c74d1a40709 ChangeLog 1109
 MD5 75bf1a2523c837fdd89f903e4b8252a4 metadata.xml 385
-MD5 5af8978f962ea665e51652c98118dd9a wmium-1.0.7.ebuild 1362
+MD5 f5be769d679b2452cc16574d696f46be wmium-1.0.7.ebuild 1314
 MD5 1be5e52a4c5ffe5723f22d0070ef8dbb files/digest-wmium-1.0.7 62
 MD5 94b9bdd7f9dc36bbc8bb0fd09f9e7f2c files/digest-wmium-1.0.8 62
diff --git a/x11-plugins/wmium/wmium-1.0.7.ebuild b/x11-plugins/wmium/wmium-1.0.7.ebuild
index 63767946c0c3..3bb69982fd80 100644
--- a/x11-plugins/wmium/wmium-1.0.7.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.7.ebuild
@@ -1,48 +1,45 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.7.ebuild,v 1.3 2004/04/13 18:27:58 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.7.ebuild,v 1.4 2004/06/23 22:37:29 agriffis Exp $
 
-DESCRIPTION="WindowMaker DockApp/Grellm2 pluggin that fetches the DSL usage information for Australian ISP Internode"
+IUSE="gtk"
 
+DESCRIPTION="WindowMaker DockApp/Grellm2 pluggin that fetches the DSL usage information for Australian ISP Internode"
 HOMEPAGE="http://www.earthmagic.org/?software"
-
 SRC_URI="http://www.earthmagic.org/files/${P}.tar.gz"
-
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="x86"
 
-IUSE="gtk"
-
 DEPEND="virtual/glibc
 	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
-	gtk? ( >=x11-libs/gtk+-2* )
-	gtk? ( app-admin/gkrellm )
-	gtk? ( dev-util/pkgconfig )"
+	gtk? (
+		>=x11-libs/gtk+-2*
+		app-admin/gkrellm
+		dev-util/pkgconfig 
+	)"
 
 RDEPEND="virtual/glibc
 	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
-	gtk? ( >=x11-libs/gtk+-2* )
-	gtk? ( app-admin/gkrellm )
+	gtk? (
+		>=x11-libs/gtk+-2*
+		app-admin/gkrellm
+	)
 	!gtk? ( x11-wm/windowmaker )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
-
-	emake build || die "Cannot make ${P}"
-	use gtk && emake build-gk2
+	emake build || die
+	if use gtk; then
+		emake build-gk2 || die
+	fi
 }
 
 src_install() {
-
-	if [ `use gtk` ]; then
+	if use gtk; then
 		exeinto /usr/lib/gkrellm2/plugins
 		doexe src-gk2/wmium-gk2.so
 	fi
@@ -58,6 +55,6 @@ src_install() {
 	einfo "To configure look at the /usr/share/doc/${PF}/dot.wmiumrc.sample"
 	einfo "(if using /usr/bin/wmium with WINDOWMAKER ONLY)"
 	einfo ""
-	einfo " or use the preferences within gkrellm2"
+	einfo "or use the preferences within gkrellm2"
 }
 
diff --git a/x11-plugins/wmium/wmium-1.0.8.ebuild b/x11-plugins/wmium/wmium-1.0.8.ebuild
index c1616bda9f28..8d1bfcb2ca1f 100644
--- a/x11-plugins/wmium/wmium-1.0.8.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.8.ebuild
@@ -1,46 +1,45 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.8.ebuild,v 1.3 2004/04/13 18:27:58 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.8.ebuild,v 1.4 2004/06/23 22:37:29 agriffis Exp $
 
-DESCRIPTION="WindowMaker DockApp/Grellm2 pluggin that fetches the DSL usage information for Australian ISP Internode"
+IUSE="gtk"
 
+DESCRIPTION="WindowMaker DockApp/Grellm2 pluggin that fetches the DSL usage information for Australian ISP Internode"
 HOMEPAGE="http://www.earthmagic.org/?software"
-
 SRC_URI="http://www.earthmagic.org/files/${P}.tar.gz"
-
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="x86"
 
-IUSE="gtk"
-
 DEPEND="virtual/glibc
 	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
-	gtk? ( >=x11-libs/gtk+-2* )
-	gtk? ( app-admin/gkrellm )
-	gtk? ( dev-util/pkgconfig )"
+	gtk? (
+		>=x11-libs/gtk+-2*
+		app-admin/gkrellm
+		dev-util/pkgconfig 
+	)"
 
 RDEPEND="virtual/glibc
 	virtual/x11
 	media-libs/xpm
 	dev-libs/openssl
-	gtk? ( >=x11-libs/gtk+-2* )
-	gtk? ( app-admin/gkrellm )
+	gtk? (
+		>=x11-libs/gtk+-2*
+		app-admin/gkrellm
+	)
 	!gtk? ( x11-wm/windowmaker )"
 
 src_compile() {
-
-	emake build || die "Cannot make ${P}"
-	use gtk && emake build-gk2
+	emake build || die
+	if use gtk; then
+		emake build-gk2 || die
+	fi
 }
 
 src_install() {
-
-	if [ `use gtk` ]; then
+	if use gtk; then
 		exeinto /usr/lib/gkrellm2/plugins
 		doexe src-gk2/wmium-gk2.so
 	fi
@@ -56,6 +55,6 @@ src_install() {
 	einfo "To configure look at the /usr/share/doc/${PF}/dot.wmiumrc.sample"
 	einfo "(if using /usr/bin/wmium with WINDOWMAKER ONLY)"
 	einfo ""
-	einfo " or use the preferences within gkrellm2"
+	einfo "or use the preferences within gkrellm2"
 }