style fixes

(Portage version: 2.2.0_alpha92/cvs/Linux i686)

3 files changed, 31 insertions, 19 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index e9d5049120a3..726147182285 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.27 2012/03/19 13:47:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.28 2012/03/19 22:51:42 williamh Exp $
+
+  19 Mar 2012; William Hubbs <williamh@gentoo.org> kmod-7.ebuild,
+  kmod-9999.ebuild:
+  style fixes
 
 *kmod-7 (19 Mar 2012)
 
diff --git a/sys-apps/kmod/kmod-7.ebuild b/sys-apps/kmod/kmod-7.ebuild
index a7dbc6d35011..7df17f33b12a 100644
--- a/sys-apps/kmod/kmod-7.ebuild
+++ b/sys-apps/kmod/kmod-7.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.2 2012/03/19 13:49:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.3 2012/03/19 22:51:42 williamh Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
 
-[[ ${PV} == *9999* ]] && vcs=git-2
+[[ ${PV} == 9999 ]] && vcs=git-2
 inherit ${vcs} autotools eutils toolchain-funcs
 unset vcs
 
-if [[ ${PV} != *9999* ]] ; then
+if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 fi
@@ -26,14 +26,16 @@ COMMON_DEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	lzma? ( app-arch/xz-utils )
 	zlib? ( sys-libs/zlib )"
-RDEPEND="${COMMON_DEPEND}"
+
 DEPEND="${COMMON_DEPEND}
 	doc? ( dev-util/gtk-doc )"
+RDEPEND="${COMMON_DEPEND}"
 
-src_prepare() {
+src_prepare()
+{
 	if [ ! -e configure ]; then
 		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs || die
+			gtkdocize --copy --docdir libkmod/docs ||  die "gtkdocize failed"
 		else
 			touch libkmod/docs/gtk-doc.make
 		fi
@@ -43,9 +45,10 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
+src_configure()
+{
 	local myconf
-	[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+	[[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"
 
 	econf \
 		$(use_enable static-libs static) \
@@ -56,7 +59,8 @@ src_configure() {
 		${myconf}
 }
 
-src_install() {
+src_install()
+{
 	default
 
 	find "${D}" -name libkmod.la -exec rm -f {} +
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 800d3f774f10..34c13e003ac2 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.16 2012/03/19 13:49:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.17 2012/03/19 22:51:42 williamh Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
 
-[[ ${PV} == *9999* ]] && vcs=git-2
+[[ ${PV} == 9999 ]] && vcs=git-2
 inherit ${vcs} autotools eutils toolchain-funcs
 unset vcs
 
-if [[ ${PV} != *9999* ]] ; then
+if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
@@ -26,14 +26,16 @@ COMMON_DEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	lzma? ( app-arch/xz-utils )
 	zlib? ( sys-libs/zlib )"
-RDEPEND="${COMMON_DEPEND}"
+
 DEPEND="${COMMON_DEPEND}
 	doc? ( dev-util/gtk-doc )"
+RDEPEND="${COMMON_DEPEND}"
 
-src_prepare() {
+src_prepare()
+{
 	if [ ! -e configure ]; then
 		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs || die
+			gtkdocize --copy --docdir libkmod/docs ||  die "gtkdocize failed"
 		else
 			touch libkmod/docs/gtk-doc.make
 		fi
@@ -43,9 +45,10 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
+src_configure()
+{
 	local myconf
-	[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+	[[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"
 
 	econf \
 		$(use_enable static-libs static) \
@@ -56,7 +59,8 @@ src_configure() {
 		${myconf}
 }
 
-src_install() {
+src_install()
+{
 	default
 
 	find "${D}" -name libkmod.la -exec rm -f {} +