Version bump.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 114 insertions, 30 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index ca84ba7d0b08..e9d5049120a3 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2012/03/09 23:51:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.27 2012/03/19 13:47:06 ssuominen Exp $
+
+*kmod-7 (19 Mar 2012)
+
+  19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-7.ebuild,
+  kmod-9999.ebuild:
+  Version bump.
 
   09 Mar 2012; William Hubbs <williamh@gentoo.org> kmod-6.ebuild,
   kmod-9999.ebuild, metadata.xml:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 66d3a5616c69..5be48f79896d 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,14 +2,20 @@
 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-9999.ebuild 1681 RMD160 033b8e46b199c8b83a052bed383fd336764e74f4 SHA1 65095735352827fb4552cd55a3abe0f9135a78cf SHA256 78c39aab52ff0760c4055547f77680592e279021ca97a6c98225d32995bfbe18
-MISC ChangeLog 3735 RMD160 81108be741a0ff32d6942aae21c0787a869052ef SHA1 78b91b24cac358259de4eb5a3d94169609d4d605 SHA256 682270f1d16b146ed9e862007084af99802f9b069c380446459daf5848e3ad67
+EBUILD kmod-7.ebuild 1662 RMD160 840d6a1cdd86a8c3256faa1eec682208c9f76d1d SHA1 9337bae6b7fd84c0bcd26f19d4bbf3f964d4ead8 SHA256 456d8f48d204e0d266a851e33ddd03db4bd9a3d8db091583e7cf13fa89956812
+EBUILD kmod-9999.ebuild 1702 RMD160 dfbd0b917993124c13cc1401bfcd3a85eb30bf1a SHA1 a870e221d05c47cc5e3e55c752af0fdf080c6f82 SHA256 dadf6782e63da4473605d5c37c0bd0368cd7c84aedff2eb4c99893a7eb15def5
+MISC ChangeLog 3866 RMD160 c414267da36d2971fe9be4cbd5cdcb8106bc92da SHA1 74c7e78f20d31aa8f2bfa489d875cf442eb4d6ea SHA256 e34bc1e7b3e0442afe7003fa6706801d41b5dcf52c11f188f906c14ca963eaa5
 MISC metadata.xml 317 RMD160 be31ecaa465b63dc5589669b36f431e05b878afe SHA1 4837b60e64a9a06be18dffb0f31b2ba5cb6bc2aa SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9al3oACgkQblQW9DDEZTiL4ACdEU5zYefjU7oahL+fiArrf8T4
-2UAAn0h5X97uWZvKpI4BQqnONUrfj5p8
-=083Q
+iQEcBAEBAgAGBQJPZzjGAAoJEEdUh39IaPFNm28H/1OonY1L1xz4s2OZgn/1NqvY
+JELohd3ZXeDGs4Zrk91kUTGzjTaSIhSx/68ohnH2bxefOAN9FYD9nCAoQlYQqI0s
+Rdfk5kGBrN9d4bjksQMe2SASumsTtO2bKkimBDmkfv8yWK/AD2fvqEKZEMP3c+iL
+MzvjVpc7rjFFyLRaQK/7dxrlhMw8cJxk7VVfny7EMUFhrF0o313fRa8tZndMs8IK
+RtZ0IkkZ07qb7HItuA+8zygE7Ba8rCJnGAjeM9MWdqHL12J+k5hEI2SFF4mxVnPj
+cXD7ZAPmKcGDOBI/7WWVMcesysL+qidEdMbG+l9chj+gt1khLpoBvtXlw/I3L/0=
+=yX0u
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-7.ebuild b/sys-apps/kmod/kmod-7.ebuild
new file mode 100644
index 000000000000..f21204a3a972
--- /dev/null
+++ b/sys-apps/kmod/kmod-7.ebuild
@@ -0,0 +1,73 @@
+# 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.1 2012/03/19 13:47:06 ssuominen Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+
+[[ ${PV} == "9999" ]] && vcs=git-2
+inherit ${vcs} autotools eutils toolchain-funcs
+unset vcs
+
+if [[ ${PV} != "9999" ]] ; then
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc lzma static-libs +tools zlib"
+
+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 )"
+
+src_prepare() {
+	if [ ! -e configure ]; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myconf
+	[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_with lzma xz) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name libkmod.la -exec rm -f {} +
+
+	if use tools; then
+		dodir /bin
+		dosym /usr/bin/kmod /bin/lsmod
+		dodir /sbin
+		local cmd
+		for cmd in depmod insmod modinfo modprobe rmmod; do
+			dosym /usr/bin/kmod /sbin/${cmd}
+		done
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 91a35b1bf84c..b6a2b4e9373c 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.14 2012/03/09 23:51:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.15 2012/03/19 13:47:06 ssuominen Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
 
-[[ "${PV}" == "9999" ]] && vcs=git-2
-inherit ${vcs}  autotools eutils toolchain-funcs
+[[ ${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
@@ -20,22 +20,20 @@ HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="doc debug lzma static-libs +tools zlib"
+IUSE="debug doc lzma static-libs +tools zlib"
 
 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 failed"
+			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
 		fi
@@ -45,30 +43,31 @@ src_prepare()
 	fi
 }
 
-src_configure()
-{
+src_configure() {
+	local myconf
+	[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+
 	econf \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with lzma xz) \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
-		$(use_with zlib)
+		$(use_enable debug) \
+		$(use_with lzma xz) \
+		$(use_with zlib) \
+		${myconf}
 }
 
-src_install()
-{
+src_install() {
 	default
 
-	# we have a .pc file for people to use
-	find "${D}" -name libkmod.la -delete
+	find "${D}" -name libkmod.la -exec rm -f {} +
 
 	if use tools; then
-	dodir /bin
-dosym /usr/bin/kmod /bin/lsmod
+		dodir /bin
+		dosym /usr/bin/kmod /bin/lsmod
 		dodir /sbin
+		local cmd
 		for cmd in depmod insmod modinfo modprobe rmmod; do
-			dosym /usr/bin/kmod /sbin/$cmd
+			dosym /usr/bin/kmod /sbin/${cmd}
 		done
 	fi
 }