style fixes

Package-Manager: portage-2.2.0_alpha92/cvs/Linux i686

4 files changed, 38 insertions, 30 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/Manifest b/sys-apps/kmod/Manifest
index 45b1507d923a..294d2aab2f4c 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -4,18 +4,14 @@ Hash: SHA1
 DIST kmod-6.tar.xz 999660 RMD160 eb59ea53775f64b6cb603246be3144da2bc4d191 SHA1 56f2fdc22f97da1e8c8acddab10efbc6bf75c4a1 SHA256 6f1142519916d2dbe780693045a1b2d52d0b2212ec1bd23dd5a03134c3ba62b7
 DIST kmod-7.tar.xz 981936 RMD160 62acbee83cebe1874a71e318c28203b90d6171bc SHA1 1038cdb5c4570acc5614dcf1c29688f21f3d8c2d SHA256 9806ee5eeffe7e0c41959f6284795dca2fd1b1eade975524913536c7bef07af7
 EBUILD kmod-6.ebuild 1641 RMD160 64887ab24669eddfdffaf62a74ebeb52f43d34fc SHA1 20ef04fe603a0255f8188a4f8b196a3617a163c0 SHA256 a7397e033e22a0673b5058daf6c34f9a2f96c5c0c8f7ab5746c12159f710b2ca
-EBUILD kmod-7.ebuild 1662 RMD160 3868138bf2ba955de7529c9b16af04ec5438ecfe SHA1 6e1b1a3ef1f56b2666d66ceb3184dc892d475fc5 SHA256 cf3dbb910db39759b4178a8a7395dca79e53beff2a42f6339af1171428c8207c
-EBUILD kmod-9999.ebuild 1702 RMD160 ce22e27821177a5f55c872f50efdc29e0023eaa5 SHA1 6a0bebc2ec5e00bb806fa4774bd0f7ad4a678970 SHA256 e9c4f676d51b680eee09e6ba50f8ffdb98430e7fa75dfe22163ecd952f60db1d
-MISC ChangeLog 3866 RMD160 c414267da36d2971fe9be4cbd5cdcb8106bc92da SHA1 74c7e78f20d31aa8f2bfa489d875cf442eb4d6ea SHA256 e34bc1e7b3e0442afe7003fa6706801d41b5dcf52c11f188f906c14ca963eaa5
+EBUILD kmod-7.ebuild 1676 RMD160 7584ec725998d715efa1cdee7c1a4129aa1c104e SHA1 83f299caa3222413553506e61fc965f0962223eb SHA256 cf8bd9dbd9da5e66b84ee33da7115dfe04818a941c53909cbcf08c893a1061f6
+EBUILD kmod-9999.ebuild 1716 RMD160 db6c21ba952174efb3fb8279f95e1f2202ec3300 SHA1 0a9f9d2ed8529c5da10580b90b3457a8ec3e27da SHA256 d02952d0ca1889b00d6e9090fee7ddc5011d261d889b2e563c02dac70df228b9
+MISC ChangeLog 3966 RMD160 39f0ca7bf6ae229f4b0d753ac635890fa7cb75c6 SHA1 7fa0b52004686eee58d0f9688ed757d14ef19918 SHA256 63514fd85967aa791336f825f3a78fe7762bc4de69bc49aba192c2320c7c62db
 MISC metadata.xml 317 RMD160 be31ecaa465b63dc5589669b36f431e05b878afe SHA1 4837b60e64a9a06be18dffb0f31b2ba5cb6bc2aa SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPZzk7AAoJEEdUh39IaPFNvksH/A74R3NIKjpW6/S54tGLVkH1
-Hi+RZRVlwe1kgDQKV9RFg/4IWKvYmIunDfILLvU+QjYuWxcWlPWHmj6EUs6QtpJC
-55MUki2wPCh2903SL2Bm8BVz7NPiAhaXSXXcPgz3VHDoYCJRsZo1i1SIxZIoz7bF
-F5L1j2rGEzQLFBLMg27J/Jy1qqWtUgOxHMGe6Tx3FcXlMHLY0j1SXzyJirYyvMKa
-Hsw+i1LaHdW5AhsoB3NzJvi+0Dl58lNocBNotdIuNijJQ9XYk0TLGCjgh9izIFYR
-XAnu/Y7VhuttYMwpcq5BvP5eQu7ugag/47xlcv045f4K6wNuPDiTfVLk9J/ClwQ=
-=pY54
+iEYEARECAAYFAk9nuIwACgkQblQW9DDEZTgPBACgsyJ94u9duZJkNl3qGlmK8AW0
+fYYAn3QBDzxEjbgO4DiWLCS55SeSNRJF
+=RdSJ
 -----END PGP SIGNATURE-----
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 {} +